Skip to content

Commit

Permalink
Simplify external tests and make them work with Gemfile.lock
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkeiser
jkeiser committed Apr 18, 2016
1 parent 612932e commit bbc1d6e
Show file tree
Hide file tree
Showing 21 changed files with 822 additions and 430 deletions.
1 change: 0 additions & 1 deletion .bundle/config
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
---
BUNDLE_WITHOUT: omnibus_package
BUNDLE_FROZEN: '1'
213 changes: 114 additions & 99 deletions .travis.yml
View file

Large diffs are not rendered by default.

26 changes: 19 additions & 7 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,40 @@
# This buys us the ability to be included in other Gemfiles
require_relative "tasks/gemfile_util"
extend GemfileUtil

source "https://rubygems.org"
# path is needed because when we attempt to load this gemspec to look at it from
# another bundle, it will expand the path relative to the other bundle rather than
# this file.
gemspec path: File.dirname(__FILE__), name: "chef"
gemspec name: "chef"

gem "activesupport", "< 4.0.0", group: :compat_testing, platform: "ruby"
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
# Ensure that we can always install rake, regardless of gem groups
gem "rake"
gem "bundler"
gem "cheffish"

group(:omnibus_package) do
gem "appbundler"
gem "rb-readline"
gem "nokogiri"
end
group(:omnibus_package, :development) do
gem "cheffish"
end
group(:omnibus_package, :pry) do
gem "pry"
gem "pry-byebug"
gem "pry-remote"
gem "pry-stack_explorer"
end
# These are used for external tests
group(:integration) do
gem "chef-provisioning"
gem "chef-provisioning-aws"
gem "chef-rewind"
gem "chef-sugar"
gem "chefspec"
gem "halite"
gem "poise", git: "https://github.com/poise/poise" # until released poise's tests succeed against chef master
gem "knife-windows"
gem "foodcritic"
end

group(:docgen) do
gem "yard"
Expand Down
130 changes: 117 additions & 13 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ GIT
chefstyle (0.3.1)
rubocop (= 0.39.0)

GIT
remote: https://github.com/poise/poise
revision: a76980685a92283c08f5b2e4526ae1f08f87de79
specs:
poise (2.6.2.pre)
halite (~> 1.0)

GIT
remote: https://github.com/rubysec/bundler-audit.git
revision: 4e32fca89d75f0e249671431ff38aadc02bfb28b
Expand All @@ -15,20 +22,12 @@ GIT
bundler (~> 1.2)
thor (~> 0.18)

PATH
remote: chef-config
specs:
chef-config (12.10.1)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)

PATH
remote: .
specs:
chef (12.10.1)
chef (12.10.4)
bundler (>= 1.10)
chef-config (= 12.10.1)
chef-config (= 12.10.4)
chef-zero (~> 4.5)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
Expand Down Expand Up @@ -56,7 +55,7 @@ PATH
PATH
remote: chef-config
specs:
chef-config (12.9.40)
chef-config (12.10.4)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
Expand All @@ -70,25 +69,60 @@ GEM
addressable (2.4.0)
appbundler (0.9.0)
mixlib-cli (~> 1.4)
artifactory (2.3.2)
ast (2.2.0)
aws-sdk (2.2.34)
aws-sdk-resources (= 2.2.34)
aws-sdk-core (2.2.34)
jmespath (~> 1.0)
aws-sdk-resources (2.2.34)
aws-sdk-core (= 2.2.34)
aws-sdk-v1 (1.66.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (8.2.4)
chef-zero (4.5.0)
chef-api (0.5.0)
logify (~> 0.1)
mime-types
chef-provisioning (1.7.0)
cheffish (>= 1.3.1, < 3.0)
inifile (>= 2.0.2)
mixlib-install (~> 1.0)
net-scp (~> 1.0)
net-ssh (>= 2.9, < 4.0)
net-ssh-gateway (~> 1.2.0)
winrm (~> 1.3)
chef-provisioning-aws (1.9.0)
aws-sdk (>= 2.1.26, < 3.0)
aws-sdk-v1 (>= 1.59.0)
chef-provisioning (~> 1.4)
retryable (~> 2.0, >= 2.0.1)
ubuntu_ami (~> 0.4, >= 0.4.1)
chef-rewind (0.0.9)
chef-sugar (3.3.0)
chef-zero (4.6.1)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 1.3)
rack
uuidtools (~> 2.1)
cheffish (2.0.3)
cheffish (2.0.4)
chef-zero (~> 4.3)
compat_resource
chefspec (4.6.1)
chef (>= 11.14)
fauxhai (~> 3.2)
rspec (~> 3.0)
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.1)
colorize (0.7.7)
compat_resource (12.9.1)
cucumber-core (1.4.0)
gherkin (~> 3.2.0)
debug_inspector (0.0.2)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
Expand All @@ -97,10 +131,21 @@ GEM
erubis (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
fauxhai (3.3.0)
net-ssh
ffi (1.9.10)
ffi-yajl (2.2.3)
libyajl2 (~> 1.2)
foodcritic (6.1.1)
cucumber-core (>= 1.3)
erubis
nokogiri (>= 1.5, < 2.0)
rake
rufus-lru (~> 1.0)
treetop (~> 1.4)
yajl-ruby (~> 1.1)
fuzzyurl (0.8.0)
gherkin (3.2.0)
github_api (0.13.1)
addressable (~> 2.4.0)
descendants_tracker (~> 0.0.4)
Expand All @@ -116,15 +161,39 @@ GEM
rake (>= 10.0)
rspec (>= 3.2)
rubocop (>= 0.31)
gssapi (1.2.0)
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
halite (1.2.1)
bundler
chef (~> 12.0)
stove (~> 3.2, >= 3.2.3)
thor
hashie (3.4.3)
highline (1.7.8)
httpclient (2.7.1)
i18n (0.7.0)
inifile (3.0.0)
iniparse (1.4.2)
ipaddress (0.8.3)
jmespath (1.2.4)
json_pure (>= 1.8.1)
json (1.8.3)
json_pure (1.8.3)
jwt (1.5.1)
knife-windows (1.4.0)
winrm (~> 1.7)
libyajl2 (1.2.0)
little-plugger (1.1.4)
logging (2.1.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
logify (0.2.0)
method_source (0.8.2)
mime-types (3.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
mixlib-authentication (1.4.0)
mixlib-log
Expand All @@ -133,8 +202,13 @@ GEM
rspec-mocks (~> 3.2)
mixlib-cli (1.5.0)
mixlib-config (2.2.1)
mixlib-install (1.0.6)
artifactory (>= 2.3.0)
mixlib-shellout (>= 2.2.6)
mixlib-versioning (>= 1.1.0)
mixlib-log (1.6.0)
mixlib-shellout (2.2.6)
mixlib-versioning (1.1.0)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
Expand All @@ -152,6 +226,7 @@ GEM
netrc (0.11.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nori (2.6.0)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0, < 1.5.2)
Expand All @@ -178,6 +253,7 @@ GEM
parser (2.3.0.7)
ast (~> 2.2)
plist (3.2.0)
polyglot (0.3.5)
powerpack (0.1.1)
proxifier (1.0.3)
pry (0.10.3)
Expand All @@ -197,6 +273,7 @@ GEM
rainbow (2.1.0)
rake (11.1.2)
rb-readline (0.5.3)
retryable (2.0.3)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
Expand Down Expand Up @@ -225,6 +302,8 @@ GEM
ruby-prof (0.15.9)
ruby-progressbar (1.7.5)
ruby-shadow (2.5.0)
rubyntlm (0.6.0)
rufus-lru (1.0.5)
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
Expand All @@ -245,14 +324,29 @@ GEM
net-ssh (>= 2.7, < 4.0)
net-telnet
sfl
stove (3.2.8)
chef-api (~> 0.5)
logify (~> 0.2)
syslog-logger (1.6.8)
systemu (2.6.5)
thor (0.19.1)
thread_safe (0.3.5)
tomlrb (1.2.1)
treetop (1.6.5)
polyglot (~> 0.3)
ubuntu_ami (0.4.1)
unicode-display_width (1.0.3)
uuidtools (2.1.5)
winrm (1.7.3)
builder (>= 2.1.2)
gssapi (~> 1.2)
gyoku (~> 1.0)
httpclient (~> 2.2, >= 2.2.0.2)
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rubyntlm (~> 0.6.0)
wmi-lite (1.0.0)
yajl-ruby (1.2.1)
yard (0.8.7.6)

PLATFORMS
Expand All @@ -261,15 +355,25 @@ PLATFORMS
DEPENDENCIES
activesupport (< 4.0.0)
appbundler
bundler
bundler-audit!
chef!
chef-config!
chef-provisioning
chef-provisioning-aws
chef-rewind
chef-sugar
cheffish
chefspec
chefstyle!
foodcritic
github_changelog_generator (= 1.11.3)
halite
knife-windows
netrc
nokogiri
octokit
poise!
pry
pry-byebug
pry-remote
Expand Down
4 changes: 1 addition & 3 deletions Gemfile.windows
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,4 @@
#

require_relative "tasks/gemfile_util"
extend GemfileUtil
generic_gemfile = File.expand_path("../Gemfile", __FILE__)
include_locked_gemfile(generic_gemfile)
GemfileUtil.include_locked_gemfile(self, "Gemfile", without_groups: [ :linux, :solaris, :aix ])
Loading

0 comments on commit bbc1d6e

Please sign in to comment.