berkshelf 6.3.4 → 7.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.rubocop.yml +10 -0
- data/.travis.yml +6 -8
- data/CHANGELOG.md +7 -19
- data/Gemfile +10 -0
- data/Gemfile.lock +68 -103
- data/Thorfile +2 -2
- data/berkshelf.gemspec +6 -8
- data/features/commands/info.feature +50 -8
- data/features/commands/shelf/show.feature +10 -40
- data/features/commands/upload.feature +73 -0
- data/features/commands/vendor.feature +43 -0
- data/features/json_formatter.feature +1 -1
- data/features/step_definitions/chef_server_steps.rb +2 -2
- data/features/step_definitions/filesystem_steps.rb +16 -0
- data/features/support/env.rb +11 -10
- data/lib/berkshelf.rb +15 -20
- data/lib/berkshelf/berksfile.rb +57 -47
- data/lib/berkshelf/cached_cookbook.rb +120 -19
- data/lib/berkshelf/chef_config_compat.rb +50 -0
- data/lib/berkshelf/chef_repo_universe.rb +2 -2
- data/lib/berkshelf/cli.rb +3 -42
- data/lib/berkshelf/community_rest.rb +40 -61
- data/lib/berkshelf/config.rb +92 -118
- data/lib/berkshelf/cookbook_store.rb +3 -2
- data/lib/berkshelf/core_ext/file.rb +1 -1
- data/lib/berkshelf/dependency.rb +1 -10
- data/lib/berkshelf/downloader.rb +19 -7
- data/lib/berkshelf/errors.rb +3 -0
- data/lib/berkshelf/location.rb +1 -1
- data/lib/berkshelf/locations/base.rb +1 -1
- data/lib/berkshelf/lockfile.rb +17 -13
- data/lib/berkshelf/logger.rb +62 -1
- data/lib/berkshelf/packager.rb +1 -1
- data/lib/berkshelf/resolver.rb +1 -1
- data/lib/berkshelf/ridley_compat.rb +22 -3
- data/lib/berkshelf/uploader.rb +76 -48
- data/lib/berkshelf/version.rb +1 -1
- data/spec/fixtures/cookbook-path-uploader/apt-2.3.6/metadata.rb +2 -0
- data/spec/fixtures/cookbook-path-uploader/build-essential-1.4.2/metadata.rb +2 -0
- data/spec/fixtures/cookbook-path-uploader/jenkins-2.0.3/metadata.rb +5 -0
- data/spec/fixtures/cookbook-path-uploader/jenkins-config-0.1.0/metadata.rb +4 -0
- data/spec/fixtures/cookbook-path-uploader/runit-1.5.8/metadata.rb +5 -0
- data/spec/fixtures/cookbook-path-uploader/yum-3.0.6/metadata.rb +2 -0
- data/spec/fixtures/cookbook-path-uploader/yum-epel-0.2.0/metadata.rb +3 -0
- data/spec/spec_helper.rb +2 -2
- data/spec/support/chef_api.rb +4 -4
- data/spec/support/chef_server.rb +1 -1
- data/spec/support/matchers/file_system_matchers.rb +1 -3
- data/spec/support/path_helpers.rb +1 -1
- data/spec/unit/berkshelf/berksfile_spec.rb +3 -24
- data/spec/unit/berkshelf/cached_cookbook_spec.rb +13 -15
- data/spec/unit/berkshelf/community_rest_spec.rb +3 -12
- data/spec/unit/berkshelf/config_spec.rb +4 -4
- data/spec/unit/berkshelf/downloader_spec.rb +6 -11
- data/spec/unit/berkshelf/lockfile_spec.rb +10 -7
- data/spec/unit/berkshelf/source_spec.rb +1 -1
- data/spec/unit/berkshelf/ssl_policies_spec.rb +2 -5
- data/spec/unit/berkshelf/uploader_spec.rb +60 -10
- data/spec/unit/berkshelf/visualizer_spec.rb +2 -2
- metadata +49 -102
- data/features/commands/cookbook.feature +0 -35
- data/features/commands/init.feature +0 -27
- data/features/config.feature +0 -111
- data/lib/berkshelf/base_generator.rb +0 -42
- data/lib/berkshelf/cookbook_generator.rb +0 -133
- data/lib/berkshelf/init_generator.rb +0 -195
- data/lib/berkshelf/streaming_file_adapter.rb +0 -22
- data/spec/unit/berkshelf/cookbook_generator_spec.rb +0 -108
- data/spec/unit/berkshelf/init_generator_spec.rb +0 -265
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c1fa6835af52a54149248c29a9e110b26bb8c5d479aec8095cca8ab252d3a3cd
|
|
4
|
+
data.tar.gz: c75eee318205302ff8c69b2c70afffe6d665bd40f7306c44965e45163b26cd3b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 31044607572e40f4d07e803fe86221f7fef2bc65beceba38bf082f6e3328072d983c6cac3734f28647b3a55f8aa29c3775ff9e7ca96aab34e5135d0c1b9c06a6
|
|
7
|
+
data.tar.gz: ac687fc8c1f793260768542c6b9f00100051fd10d2306848598babf593b058a53aef91f0365849ff32e83e3bbb6e939f16894fa4a868f37a6879f6b75c22cd4c
|
data/.gitignore
CHANGED
data/.rubocop.yml
CHANGED
data/.travis.yml
CHANGED
|
@@ -27,8 +27,6 @@ notifications:
|
|
|
27
27
|
branches:
|
|
28
28
|
only:
|
|
29
29
|
- master
|
|
30
|
-
- berkshelf-6
|
|
31
|
-
|
|
32
30
|
before_install:
|
|
33
31
|
- gem update --system
|
|
34
32
|
- gem install bundler
|
|
@@ -39,19 +37,19 @@ before_script:
|
|
|
39
37
|
- git config --global user.name "Berkshelf"
|
|
40
38
|
matrix:
|
|
41
39
|
include:
|
|
42
|
-
- rvm: 2.
|
|
43
|
-
- rvm: 2.
|
|
40
|
+
- rvm: 2.4.4
|
|
41
|
+
- rvm: 2.5.1
|
|
44
42
|
- rvm: ruby-head
|
|
45
|
-
- rvm: 2.
|
|
43
|
+
- rvm: 2.5.1
|
|
46
44
|
before_install:
|
|
47
45
|
- gem update --system
|
|
48
46
|
- gem install bundler
|
|
49
47
|
- rm Gemfile.lock
|
|
50
|
-
- rvm: 2.
|
|
48
|
+
- rvm: 2.5.1
|
|
51
49
|
env:
|
|
52
50
|
CHEFSTYLE: 1
|
|
53
51
|
script: bundle exec rake style
|
|
54
|
-
- rvm: 2.
|
|
52
|
+
- rvm: 2.5.1
|
|
55
53
|
before_install:
|
|
56
54
|
# Failures in the berkshelf-api gemspec were happening with bundler 1.8
|
|
57
55
|
- gem install bundler --version=1.10.6
|
|
@@ -66,7 +64,7 @@ matrix:
|
|
|
66
64
|
- rvmsudo_secure_path=1
|
|
67
65
|
script:
|
|
68
66
|
- git clone https://github.com/chef/proxy_tests.git
|
|
69
|
-
- cd proxy_tests && chef-client -z -o proxy_tests::render && cd ..
|
|
67
|
+
- cd proxy_tests && bundle exec chef-client -z -o proxy_tests::render && cd ..
|
|
70
68
|
- rvmsudo -E bundle exec bash $PROXY_TESTS_DIR/run_tests.sh berkshelf \* \* /tmp/out.txt
|
|
71
69
|
after_script: cat /tmp/out.txt
|
|
72
70
|
allow_failures:
|
data/CHANGELOG.md
CHANGED
|
@@ -1,27 +1,15 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
-
## [
|
|
4
|
-
[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.3.
|
|
5
|
-
|
|
6
|
-
**Merged pull requests:**
|
|
7
|
-
|
|
8
|
-
- \[SHACK-295\] Kitchen generator conflicts on 'chefignore' [\#1791](https://github.com/berkshelf/berkshelf/pull/1791) ([tyler-ball](https://github.com/tyler-ball))
|
|
9
|
-
|
|
10
|
-
## [6.3.3](https://github.com/berkshelf/berkshelf/tree/6.3.3) (2018-08-03)
|
|
11
|
-
[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v7.0.4...6.3.3)
|
|
12
|
-
|
|
13
|
-
**Merged pull requests:**
|
|
14
|
-
|
|
15
|
-
- \[SHACK-295\] Missing require for ChefDK 2.x patch release [\#1788](https://github.com/berkshelf/berkshelf/pull/1788) ([tyler-ball](https://github.com/tyler-ball))
|
|
16
|
-
- Additional generator removal cleanup [\#1786](https://github.com/berkshelf/berkshelf/pull/1786) ([lamont-granquist](https://github.com/lamont-granquist))
|
|
17
|
-
- fixes for latest chefstyle updates [\#1784](https://github.com/berkshelf/berkshelf/pull/1784) ([lamont-granquist](https://github.com/lamont-granquist))
|
|
18
|
-
- remove hashrockets syntax [\#1783](https://github.com/berkshelf/berkshelf/pull/1783) ([lamont-granquist](https://github.com/lamont-granquist))
|
|
19
|
-
|
|
20
|
-
## [v6.3.2](https://github.com/berkshelf/berkshelf/tree/v6.3.2) (2018-04-04)
|
|
21
|
-
[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.3.1...v6.3.2)
|
|
3
|
+
## [7.0.0](https://github.com/berkshelf/berkshelf/tree/7.0.0) (2018-04-24)
|
|
4
|
+
[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.3.2...7.0.0)
|
|
22
5
|
|
|
23
6
|
**Merged pull requests:**
|
|
24
7
|
|
|
8
|
+
- generate and upload metadata.json [\#1763](https://github.com/berkshelf/berkshelf/pull/1763) ([lamont-granquist](https://github.com/lamont-granquist))
|
|
9
|
+
- ship compiled metadata in the vendored cookbook [\#1760](https://github.com/berkshelf/berkshelf/pull/1760) ([lamont-granquist](https://github.com/lamont-granquist))
|
|
10
|
+
- Fix chefignores being ignored in berkshelf 7.0.0 [\#1758](https://github.com/berkshelf/berkshelf/pull/1758) ([lamont-granquist](https://github.com/lamont-granquist))
|
|
11
|
+
- pin cucumber-expressions to working version [\#1757](https://github.com/berkshelf/berkshelf/pull/1757) ([lamont-granquist](https://github.com/lamont-granquist))
|
|
12
|
+
- changelog update and bonus bump to Gemfile.lock [\#1756](https://github.com/berkshelf/berkshelf/pull/1756) ([lamont-granquist](https://github.com/lamont-granquist))
|
|
25
13
|
- remove buff-extensions [\#1747](https://github.com/berkshelf/berkshelf/pull/1747) ([lamont-granquist](https://github.com/lamont-granquist))
|
|
26
14
|
- remove buff-config / varia\_model [\#1746](https://github.com/berkshelf/berkshelf/pull/1746) ([lamont-granquist](https://github.com/lamont-granquist))
|
|
27
15
|
- ignore .svn recursively [\#1742](https://github.com/berkshelf/berkshelf/pull/1742) ([lamont-granquist](https://github.com/lamont-granquist))
|
data/Gemfile
CHANGED
|
@@ -10,10 +10,14 @@ group :build do
|
|
|
10
10
|
gem "rake", ">= 10.1"
|
|
11
11
|
end
|
|
12
12
|
|
|
13
|
+
# temporarily until 13.7.x is released
|
|
14
|
+
gem "chef", git: "https://github.com/chef/chef", branch: "master"
|
|
15
|
+
|
|
13
16
|
group :development do
|
|
14
17
|
# these all deliberately float because berkshelf has a Gemfile.lock that
|
|
15
18
|
# equality pins them. temporarily pin as necessary for API breaks.
|
|
16
19
|
gem "aruba", ">= 0.10.0"
|
|
20
|
+
gem "cucumber-expressions", "= 5.0.13"
|
|
17
21
|
gem "chef-zero", ">= 4.0"
|
|
18
22
|
gem "dep_selector", ">= 1.0"
|
|
19
23
|
gem "fuubar", ">= 2.0"
|
|
@@ -24,3 +28,9 @@ group :development do
|
|
|
24
28
|
gem "http", ">= 0.9.8"
|
|
25
29
|
gem "chefstyle"
|
|
26
30
|
end
|
|
31
|
+
|
|
32
|
+
instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
|
|
33
|
+
|
|
34
|
+
# If you want to load debugging tools into the bundle exec sandbox,
|
|
35
|
+
# add these additional dependencies into Gemfile.local
|
|
36
|
+
eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")
|
data/Gemfile.lock
CHANGED
|
@@ -1,60 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
remote: .
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
buff-config (~> 2.0)
|
|
6
|
-
buff-extensions (~> 2.0)
|
|
7
|
-
chef (>= 12.7.2, < 14.0)
|
|
8
|
-
cleanroom (~> 1.0)
|
|
9
|
-
concurrent-ruby (~> 1.0)
|
|
10
|
-
faraday (~> 0.9)
|
|
11
|
-
httpclient (~> 2.7)
|
|
12
|
-
minitar (~> 0.5, >= 0.5.4)
|
|
13
|
-
mixlib-archive (~> 0.4)
|
|
14
|
-
mixlib-shellout (~> 2.0)
|
|
15
|
-
octokit (~> 4.0)
|
|
16
|
-
retryable (~> 2.0)
|
|
17
|
-
ridley (~> 5.0)
|
|
18
|
-
solve (~> 4.0)
|
|
19
|
-
thor (~> 0.19, < 0.19.2)
|
|
20
|
-
|
|
21
|
-
GEM
|
|
22
|
-
remote: https://rubygems.org/
|
|
1
|
+
GIT
|
|
2
|
+
remote: https://github.com/chef/chef
|
|
3
|
+
revision: 5ef14cc77226fe16b734ec90aead1de5d49ca7fb
|
|
4
|
+
branch: master
|
|
23
5
|
specs:
|
|
24
|
-
|
|
25
|
-
concurrent-ruby (~> 1.0, >= 1.0.2)
|
|
26
|
-
i18n (>= 0.7, < 2)
|
|
27
|
-
minitest (~> 5.1)
|
|
28
|
-
tzinfo (~> 1.1)
|
|
29
|
-
addressable (2.5.2)
|
|
30
|
-
public_suffix (>= 2.0.2, < 4.0)
|
|
31
|
-
aruba (0.14.5)
|
|
32
|
-
childprocess (>= 0.6.3, < 0.10.0)
|
|
33
|
-
contracts (~> 0.9)
|
|
34
|
-
cucumber (>= 1.3.19)
|
|
35
|
-
ffi (~> 1.9.10)
|
|
36
|
-
rspec-expectations (>= 2.99)
|
|
37
|
-
thor (~> 0.19)
|
|
38
|
-
ast (2.4.0)
|
|
39
|
-
backports (3.11.1)
|
|
40
|
-
buff-config (2.0.0)
|
|
41
|
-
buff-extensions (~> 2.0)
|
|
42
|
-
varia_model (~> 0.6)
|
|
43
|
-
buff-extensions (2.0.0)
|
|
44
|
-
buff-ignore (1.2.0)
|
|
45
|
-
buff-ruby_engine (1.0.0)
|
|
46
|
-
buff-shell_out (1.1.0)
|
|
47
|
-
buff-ruby_engine (~> 1.0)
|
|
48
|
-
builder (3.2.3)
|
|
49
|
-
celluloid (0.16.0)
|
|
50
|
-
timers (~> 4.0.0)
|
|
51
|
-
celluloid-io (0.16.2)
|
|
52
|
-
celluloid (>= 0.16.0)
|
|
53
|
-
nio4r (>= 1.1.0)
|
|
54
|
-
chef (13.8.5)
|
|
6
|
+
chef (14.0.210)
|
|
55
7
|
addressable
|
|
56
8
|
bundler (>= 1.10)
|
|
57
|
-
chef-config (=
|
|
9
|
+
chef-config (= 14.0.210)
|
|
58
10
|
chef-zero (>= 13.0)
|
|
59
11
|
diff-lcs (~> 1.2, >= 1.2.4)
|
|
60
12
|
erubis (~> 2.7)
|
|
@@ -63,14 +15,14 @@ GEM
|
|
|
63
15
|
iniparse (~> 1.4)
|
|
64
16
|
iso8601 (~> 0.9.1)
|
|
65
17
|
mixlib-archive (~> 0.4)
|
|
66
|
-
mixlib-authentication (~>
|
|
18
|
+
mixlib-authentication (~> 2.0)
|
|
67
19
|
mixlib-cli (~> 1.7)
|
|
68
|
-
mixlib-log (~>
|
|
20
|
+
mixlib-log (~> 2.0, >= 2.0.3)
|
|
69
21
|
mixlib-shellout (~> 2.0)
|
|
70
22
|
net-sftp (~> 2.1, >= 2.1.2)
|
|
71
|
-
net-ssh (
|
|
23
|
+
net-ssh (~> 4.2)
|
|
72
24
|
net-ssh-multi (~> 1.2, >= 1.2.1)
|
|
73
|
-
ohai (~>
|
|
25
|
+
ohai (~> 14.0)
|
|
74
26
|
plist (~> 3.2)
|
|
75
27
|
proxifier (~> 1.0)
|
|
76
28
|
rspec-core (~> 3.5)
|
|
@@ -81,16 +33,54 @@ GEM
|
|
|
81
33
|
specinfra (~> 2.10)
|
|
82
34
|
syslog-logger (~> 1.6)
|
|
83
35
|
uuidtools (~> 2.1.5)
|
|
84
|
-
chef-config (
|
|
36
|
+
chef-config (14.0.210)
|
|
85
37
|
addressable
|
|
86
38
|
fuzzyurl
|
|
87
39
|
mixlib-config (~> 2.0)
|
|
88
40
|
mixlib-shellout (~> 2.0)
|
|
89
41
|
tomlrb (~> 1.2)
|
|
90
|
-
|
|
42
|
+
|
|
43
|
+
PATH
|
|
44
|
+
remote: .
|
|
45
|
+
specs:
|
|
46
|
+
berkshelf (7.0.0)
|
|
47
|
+
chef (>= 13.6.52)
|
|
48
|
+
chef-config
|
|
49
|
+
cleanroom (~> 1.0)
|
|
50
|
+
concurrent-ruby (~> 1.0)
|
|
51
|
+
minitar (>= 0.6)
|
|
52
|
+
mixlib-archive (~> 0.4)
|
|
53
|
+
mixlib-config (>= 2.2.5)
|
|
54
|
+
mixlib-shellout (~> 2.0)
|
|
55
|
+
octokit (~> 4.0)
|
|
56
|
+
retryable (~> 2.0)
|
|
57
|
+
solve (~> 4.0)
|
|
58
|
+
thor (~> 0.19, < 0.19.2)
|
|
59
|
+
|
|
60
|
+
GEM
|
|
61
|
+
remote: https://rubygems.org/
|
|
62
|
+
specs:
|
|
63
|
+
activesupport (5.2.0)
|
|
64
|
+
concurrent-ruby (~> 1.0, >= 1.0.2)
|
|
65
|
+
i18n (>= 0.7, < 2)
|
|
66
|
+
minitest (~> 5.1)
|
|
67
|
+
tzinfo (~> 1.1)
|
|
68
|
+
addressable (2.5.2)
|
|
69
|
+
public_suffix (>= 2.0.2, < 4.0)
|
|
70
|
+
aruba (0.14.5)
|
|
71
|
+
childprocess (>= 0.6.3, < 0.10.0)
|
|
72
|
+
contracts (~> 0.9)
|
|
73
|
+
cucumber (>= 1.3.19)
|
|
74
|
+
ffi (~> 1.9.10)
|
|
75
|
+
rspec-expectations (>= 2.99)
|
|
76
|
+
thor (~> 0.19)
|
|
77
|
+
ast (2.4.0)
|
|
78
|
+
backports (3.11.3)
|
|
79
|
+
builder (3.2.3)
|
|
80
|
+
chef-zero (14.0.6)
|
|
91
81
|
ffi-yajl (~> 2.2)
|
|
92
82
|
hashie (>= 2.0, < 4.0)
|
|
93
|
-
mixlib-log (~>
|
|
83
|
+
mixlib-log (~> 2.0)
|
|
94
84
|
rack (~> 2.0)
|
|
95
85
|
uuidtools (~> 2.1)
|
|
96
86
|
chefstyle (0.9.0)
|
|
@@ -115,7 +105,7 @@ GEM
|
|
|
115
105
|
backports (>= 3.8.0)
|
|
116
106
|
cucumber-tag_expressions (~> 1.1.0)
|
|
117
107
|
gherkin (>= 5.0.0)
|
|
118
|
-
cucumber-expressions (5.0.
|
|
108
|
+
cucumber-expressions (5.0.13)
|
|
119
109
|
cucumber-tag_expressions (1.1.1)
|
|
120
110
|
cucumber-wire (0.0.1)
|
|
121
111
|
dep-selector-libgecode (1.3.1)
|
|
@@ -123,10 +113,10 @@ GEM
|
|
|
123
113
|
dep-selector-libgecode (~> 1.0)
|
|
124
114
|
ffi (~> 1.9)
|
|
125
115
|
diff-lcs (1.3)
|
|
126
|
-
domain_name (0.5.
|
|
116
|
+
domain_name (0.5.20180417)
|
|
127
117
|
unf (>= 0.0.5, < 1.0.0)
|
|
128
118
|
erubis (2.7.0)
|
|
129
|
-
faraday (0.
|
|
119
|
+
faraday (0.15.0)
|
|
130
120
|
multipart-post (>= 1.2, < 3)
|
|
131
121
|
faraday-http-cache (2.0.0)
|
|
132
122
|
faraday (~> 0.8)
|
|
@@ -149,33 +139,30 @@ GEM
|
|
|
149
139
|
hashdiff (0.3.7)
|
|
150
140
|
hashie (3.5.7)
|
|
151
141
|
highline (1.7.10)
|
|
152
|
-
|
|
153
|
-
http (3.0.0)
|
|
142
|
+
http (3.2.1)
|
|
154
143
|
addressable (~> 2.3)
|
|
155
144
|
http-cookie (~> 1.0)
|
|
156
|
-
http-form_data (
|
|
145
|
+
http-form_data (~> 2.0)
|
|
157
146
|
http_parser.rb (~> 0.6.0)
|
|
158
147
|
http-cookie (1.0.3)
|
|
159
148
|
domain_name (~> 0.5)
|
|
160
149
|
http-form_data (2.1.0)
|
|
161
150
|
http_parser.rb (0.6.0)
|
|
162
|
-
|
|
163
|
-
i18n (1.0.0)
|
|
151
|
+
i18n (1.0.1)
|
|
164
152
|
concurrent-ruby (~> 1.0)
|
|
165
153
|
iniparse (1.4.4)
|
|
166
154
|
ipaddress (0.8.3)
|
|
167
155
|
iso8601 (0.9.1)
|
|
168
|
-
json (2.1.0)
|
|
169
156
|
libyajl2 (1.2.0)
|
|
170
157
|
minitar (0.6.1)
|
|
171
158
|
minitest (5.11.3)
|
|
172
159
|
mixlib-archive (0.4.1)
|
|
173
160
|
mixlib-log
|
|
174
|
-
mixlib-authentication (
|
|
161
|
+
mixlib-authentication (2.0.0)
|
|
175
162
|
mixlib-cli (1.7.0)
|
|
176
163
|
mixlib-config (2.2.6)
|
|
177
164
|
tomlrb
|
|
178
|
-
mixlib-log (
|
|
165
|
+
mixlib-log (2.0.4)
|
|
179
166
|
mixlib-shellout (2.3.2)
|
|
180
167
|
molinillo (0.6.5)
|
|
181
168
|
multi_json (1.13.1)
|
|
@@ -192,51 +179,32 @@ GEM
|
|
|
192
179
|
net-ssh (>= 2.6.5)
|
|
193
180
|
net-ssh-gateway (>= 1.2.0)
|
|
194
181
|
net-telnet (0.1.1)
|
|
195
|
-
nio4r (2.3.0)
|
|
196
182
|
octokit (4.8.0)
|
|
197
183
|
sawyer (~> 0.8.0, >= 0.5.3)
|
|
198
|
-
ohai (
|
|
199
|
-
chef-config (>= 12.
|
|
184
|
+
ohai (14.0.29)
|
|
185
|
+
chef-config (>= 12.8, < 15)
|
|
200
186
|
ffi (~> 1.9)
|
|
201
187
|
ffi-yajl (~> 2.2)
|
|
202
188
|
ipaddress
|
|
203
189
|
mixlib-cli
|
|
204
190
|
mixlib-config (~> 2.0)
|
|
205
|
-
mixlib-log (
|
|
191
|
+
mixlib-log (~> 2.0, >= 2.0.1)
|
|
206
192
|
mixlib-shellout (~> 2.0)
|
|
207
193
|
plist (~> 3.1)
|
|
208
194
|
systemu (~> 2.6.4)
|
|
209
195
|
wmi-lite (~> 1.0)
|
|
210
196
|
parallel (1.12.1)
|
|
211
|
-
parser (2.5.0
|
|
197
|
+
parser (2.5.1.0)
|
|
212
198
|
ast (~> 2.4.0)
|
|
213
199
|
plist (3.4.0)
|
|
214
200
|
powerpack (0.1.1)
|
|
215
201
|
proxifier (1.0.3)
|
|
216
202
|
public_suffix (3.0.2)
|
|
217
|
-
rack (2.0.
|
|
203
|
+
rack (2.0.5)
|
|
218
204
|
rainbow (3.0.0)
|
|
219
205
|
rake (12.3.1)
|
|
220
206
|
retriable (2.1.0)
|
|
221
207
|
retryable (2.0.4)
|
|
222
|
-
ridley (5.1.1)
|
|
223
|
-
addressable
|
|
224
|
-
buff-config (~> 2.0)
|
|
225
|
-
buff-extensions (~> 2.0)
|
|
226
|
-
buff-ignore (~> 1.2)
|
|
227
|
-
buff-shell_out (~> 1.0)
|
|
228
|
-
celluloid (~> 0.16.0)
|
|
229
|
-
celluloid-io (~> 0.16.1)
|
|
230
|
-
chef-config (>= 12.5.0)
|
|
231
|
-
erubis
|
|
232
|
-
faraday (~> 0.9)
|
|
233
|
-
hashie (>= 2.0.2, < 4.0.0)
|
|
234
|
-
httpclient (~> 2.7)
|
|
235
|
-
json (>= 1.7.7)
|
|
236
|
-
mixlib-authentication (>= 1.3.0)
|
|
237
|
-
retryable (~> 2.0)
|
|
238
|
-
semverse (~> 2.0)
|
|
239
|
-
varia_model (~> 0.6)
|
|
240
208
|
rspec (3.7.0)
|
|
241
209
|
rspec-core (~> 3.7.0)
|
|
242
210
|
rspec-expectations (~> 3.7.0)
|
|
@@ -278,7 +246,7 @@ GEM
|
|
|
278
246
|
solve (4.0.0)
|
|
279
247
|
molinillo (~> 0.6)
|
|
280
248
|
semverse (>= 1.1, < 3.0)
|
|
281
|
-
specinfra (2.73.
|
|
249
|
+
specinfra (2.73.3)
|
|
282
250
|
net-scp
|
|
283
251
|
net-ssh (>= 2.7, < 5.0)
|
|
284
252
|
net-telnet
|
|
@@ -287,19 +255,14 @@ GEM
|
|
|
287
255
|
systemu (2.6.5)
|
|
288
256
|
thor (0.19.1)
|
|
289
257
|
thread_safe (0.3.6)
|
|
290
|
-
timers (4.0.4)
|
|
291
|
-
hitimes
|
|
292
258
|
tomlrb (1.2.6)
|
|
293
259
|
tzinfo (1.2.5)
|
|
294
260
|
thread_safe (~> 0.1)
|
|
295
261
|
unf (0.1.4)
|
|
296
262
|
unf_ext
|
|
297
263
|
unf_ext (0.0.7.5)
|
|
298
|
-
unicode-display_width (1.3.
|
|
264
|
+
unicode-display_width (1.3.2)
|
|
299
265
|
uuidtools (2.1.5)
|
|
300
|
-
varia_model (0.6.0)
|
|
301
|
-
buff-extensions (~> 2.0)
|
|
302
|
-
hashie (>= 2.0.2, < 4.0.0)
|
|
303
266
|
webmock (3.3.0)
|
|
304
267
|
addressable (>= 2.3.6)
|
|
305
268
|
crack (>= 0.3.2)
|
|
@@ -313,8 +276,10 @@ PLATFORMS
|
|
|
313
276
|
DEPENDENCIES
|
|
314
277
|
aruba (>= 0.10.0)
|
|
315
278
|
berkshelf!
|
|
279
|
+
chef!
|
|
316
280
|
chef-zero (>= 4.0)
|
|
317
281
|
chefstyle
|
|
282
|
+
cucumber-expressions (= 5.0.13)
|
|
318
283
|
dep_selector (>= 1.0)
|
|
319
284
|
fuubar (>= 2.0)
|
|
320
285
|
github_changelog_generator
|
data/Thorfile
CHANGED
|
@@ -51,11 +51,11 @@ class Spec < Thor
|
|
|
51
51
|
|
|
52
52
|
no_tasks do
|
|
53
53
|
def units_command
|
|
54
|
-
run("rspec --color
|
|
54
|
+
run("rspec --color spec/unit")
|
|
55
55
|
end
|
|
56
56
|
|
|
57
57
|
def acceptance_command
|
|
58
|
-
run("cucumber --color --
|
|
58
|
+
run("cucumber --color --tags ~@no_run --strict")
|
|
59
59
|
end
|
|
60
60
|
end
|
|
61
61
|
end
|
data/berkshelf.gemspec
CHANGED
|
@@ -27,22 +27,20 @@ Gem::Specification.new do |s|
|
|
|
27
27
|
s.name = "berkshelf"
|
|
28
28
|
s.require_paths = ["lib"]
|
|
29
29
|
s.version = Berkshelf::VERSION
|
|
30
|
-
s.required_ruby_version = ">= 2.
|
|
30
|
+
s.required_ruby_version = ">= 2.4.0"
|
|
31
31
|
s.required_rubygems_version = ">= 2.0.0"
|
|
32
32
|
|
|
33
|
-
s.add_dependency "buff-config", "~> 2.0"
|
|
34
|
-
s.add_dependency "buff-extensions", "~> 2.0"
|
|
35
33
|
s.add_dependency "mixlib-shellout", "~> 2.0"
|
|
36
34
|
s.add_dependency "cleanroom", "~> 1.0"
|
|
37
|
-
s.add_dependency "
|
|
38
|
-
s.add_dependency "httpclient", "~> 2.7"
|
|
39
|
-
s.add_dependency "minitar", "~> 0.5", ">= 0.5.4"
|
|
35
|
+
s.add_dependency "minitar", ">= 0.6"
|
|
40
36
|
s.add_dependency "retryable", "~> 2.0"
|
|
41
|
-
s.add_dependency "ridley", "~> 5.0"
|
|
42
37
|
s.add_dependency "solve", "~> 4.0"
|
|
43
38
|
s.add_dependency "thor", "~> 0.19", "< 0.19.2"
|
|
44
39
|
s.add_dependency "octokit", "~> 4.0"
|
|
45
40
|
s.add_dependency "mixlib-archive", "~> 0.4"
|
|
46
41
|
s.add_dependency "concurrent-ruby", "~> 1.0"
|
|
47
|
-
s.add_dependency "chef", ">=
|
|
42
|
+
s.add_dependency "chef", ">= 13.6.52"
|
|
43
|
+
s.add_dependency "chef-config"
|
|
44
|
+
# this is required for Mixlib::Config#from_json
|
|
45
|
+
s.add_dependency "mixlib-config", ">= 2.2.5"
|
|
48
46
|
end
|