berkshelf 5.2.0 → 8.0.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/Gemfile +19 -47
- data/Rakefile +14 -4
- data/berkshelf.gemspec +61 -40
- data/bin/berks +2 -2
- data/lib/berkshelf/api-client.rb +1 -0
- data/lib/berkshelf/api_client/chef_server_connection.rb +29 -0
- data/lib/berkshelf/api_client/connection.rb +57 -0
- data/lib/berkshelf/api_client/errors.rb +10 -0
- data/lib/berkshelf/api_client/remote_cookbook.rb +56 -0
- data/lib/berkshelf/api_client/version.rb +5 -0
- data/lib/berkshelf/api_client.rb +24 -0
- data/lib/berkshelf/berksfile.rb +149 -122
- data/lib/berkshelf/cached_cookbook.rb +127 -24
- data/lib/berkshelf/chef_config_compat.rb +51 -0
- data/lib/berkshelf/chef_repo_universe.rb +47 -0
- data/lib/berkshelf/cli.rb +143 -174
- data/lib/berkshelf/commands/shelf.rb +20 -19
- data/lib/berkshelf/community_rest.rb +59 -94
- data/lib/berkshelf/config.rb +97 -127
- data/lib/berkshelf/cookbook_store.rb +7 -6
- data/lib/berkshelf/core_ext/file.rb +1 -1
- data/lib/berkshelf/core_ext/file_utils.rb +4 -4
- data/lib/berkshelf/core_ext.rb +1 -1
- data/lib/berkshelf/dependency.rb +25 -32
- data/lib/berkshelf/downloader.rb +66 -39
- data/lib/berkshelf/errors.rb +23 -17
- data/lib/berkshelf/file_syncer.rb +24 -47
- data/lib/berkshelf/formatters/human.rb +7 -5
- data/lib/berkshelf/formatters/json.rb +6 -6
- data/lib/berkshelf/installer.rb +120 -111
- data/lib/berkshelf/location.rb +14 -14
- data/lib/berkshelf/locations/base.rb +1 -1
- data/lib/berkshelf/locations/git.rb +16 -24
- data/lib/berkshelf/locations/github.rb +2 -2
- data/lib/berkshelf/locations/path.rb +2 -2
- data/lib/berkshelf/lockfile.rb +326 -328
- data/lib/berkshelf/logger.rb +64 -1
- data/lib/berkshelf/mixin/git.rb +6 -5
- data/lib/berkshelf/packager.rb +44 -10
- data/lib/berkshelf/resolver/graph.rb +1 -1
- data/lib/berkshelf/resolver.rb +4 -4
- data/lib/berkshelf/ridley_compat.rb +109 -0
- data/lib/berkshelf/shell.rb +2 -1
- data/lib/berkshelf/shell_out.rb +18 -0
- data/lib/berkshelf/source.rb +77 -33
- data/lib/berkshelf/source_uri.rb +4 -4
- data/lib/berkshelf/ssl_policies.rb +38 -0
- data/lib/berkshelf/thor.rb +1 -1
- data/lib/berkshelf/thor_ext/hash_with_indifferent_access.rb +1 -1
- data/lib/berkshelf/thor_ext.rb +1 -1
- data/lib/berkshelf/uploader.rb +106 -70
- data/lib/berkshelf/validator.rb +13 -5
- data/lib/berkshelf/version.rb +1 -1
- data/lib/berkshelf/visualizer.rb +16 -11
- data/lib/berkshelf.rb +106 -81
- data/spec/config/knife.rb +4 -4
- data/spec/data/trusted_certs/example.crt +22 -0
- data/spec/fixtures/Berksfile +3 -3
- data/spec/fixtures/complex-cookbook-path/cookbooks/app/metadata.rb +2 -0
- data/spec/fixtures/complex-cookbook-path/cookbooks/jenkins/metadata.rb +2 -0
- data/spec/fixtures/complex-cookbook-path/cookbooks/jenkins-config/metadata.rb +4 -0
- data/spec/fixtures/cookbook-path/jenkins-config/metadata.rb +3 -3
- 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/fixtures/cookbook-store/jenkins-2.0.3/metadata.rb +5 -5
- data/spec/fixtures/cookbook-store/jenkins-2.0.4/metadata.rb +4 -4
- data/spec/fixtures/cookbooks/example_cookbook/metadata.rb +3 -3
- data/spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb +3 -3
- data/spec/spec_helper.rb +56 -64
- data/spec/support/chef_api.rb +15 -16
- data/spec/support/chef_server.rb +71 -69
- data/spec/support/git.rb +59 -58
- data/spec/support/kitchen.rb +0 -14
- data/spec/support/matchers/file_system_matchers.rb +4 -5
- data/spec/support/matchers/filepath_matchers.rb +2 -2
- data/spec/support/path_helpers.rb +17 -17
- data/spec/support/shared_examples/formatter.rb +1 -1
- data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/attributes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/files/default/file.h +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/metadata.rb +2 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/recipes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/templates/default/template.erb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/attributes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/files/default/file.h +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/metadata.rb +2 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/recipes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/templates/default/template.erb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/attributes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/files/default/file.h +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/metadata.rb +2 -0
- data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/recipes/default.rb +0 -0
- data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/templates/default/template.erb +0 -0
- data/spec/unit/berkshelf/berksfile_spec.rb +84 -105
- data/spec/unit/berkshelf/berkshelf/api_client/chef_server_connection_spec.rb +65 -0
- data/spec/unit/berkshelf/berkshelf/api_client/connection_spec.rb +157 -0
- data/spec/unit/berkshelf/berkshelf/api_client/remote_cookbook_spec.rb +23 -0
- data/spec/unit/berkshelf/berkshelf/api_client_spec.rb +9 -0
- data/spec/unit/berkshelf/cached_cookbook_spec.rb +45 -47
- data/spec/unit/berkshelf/chef_repo_universe_spec.rb +37 -0
- data/spec/unit/berkshelf/cli_spec.rb +7 -8
- data/spec/unit/berkshelf/community_rest_spec.rb +82 -90
- data/spec/unit/berkshelf/config_spec.rb +51 -22
- data/spec/unit/berkshelf/cookbook_store_spec.rb +41 -41
- data/spec/unit/berkshelf/core_ext/file_utils_spec.rb +7 -8
- data/spec/unit/berkshelf/core_ext/pathname_spec.rb +1 -1
- data/spec/unit/berkshelf/dependency_spec.rb +48 -48
- data/spec/unit/berkshelf/downloader_spec.rb +191 -34
- data/spec/unit/berkshelf/errors_spec.rb +3 -3
- data/spec/unit/berkshelf/file_syncer_spec.rb +87 -87
- data/spec/unit/berkshelf/formatters/base_spec.rb +23 -23
- data/spec/unit/berkshelf/formatters/human_spec.rb +2 -2
- data/spec/unit/berkshelf/formatters/json_spec.rb +2 -2
- data/spec/unit/berkshelf/formatters/null_spec.rb +3 -3
- data/spec/unit/berkshelf/installer_spec.rb +8 -8
- data/spec/unit/berkshelf/location_spec.rb +11 -11
- data/spec/unit/berkshelf/locations/base_spec.rb +35 -36
- data/spec/unit/berkshelf/locations/git_spec.rb +90 -93
- data/spec/unit/berkshelf/locations/path_spec.rb +40 -41
- data/spec/unit/berkshelf/lockfile_parser_spec.rb +71 -71
- data/spec/unit/berkshelf/lockfile_spec.rb +205 -211
- data/spec/unit/berkshelf/logger_spec.rb +3 -3
- data/spec/unit/berkshelf/mixin/logging_spec.rb +5 -5
- data/spec/unit/berkshelf/packager_spec.rb +2 -2
- data/spec/unit/berkshelf/resolver/graph_spec.rb +10 -8
- data/spec/unit/berkshelf/resolver_spec.rb +17 -17
- data/spec/unit/berkshelf/ridley_compat_spec.rb +16 -0
- data/spec/unit/berkshelf/shell_spec.rb +34 -34
- data/spec/unit/berkshelf/source_spec.rb +186 -20
- data/spec/unit/berkshelf/source_uri_spec.rb +1 -1
- data/spec/unit/berkshelf/ssl_policies_spec.rb +86 -0
- data/spec/unit/berkshelf/uploader_spec.rb +146 -64
- data/spec/unit/berkshelf/validator_spec.rb +23 -16
- data/spec/unit/berkshelf/visualizer_spec.rb +24 -15
- data/spec/unit/berkshelf_spec.rb +18 -18
- metadata +138 -289
- data/.gitignore +0 -29
- data/.travis.yml +0 -64
- data/CHANGELOG.legacy.md +0 -307
- data/CHANGELOG.md +0 -1358
- data/CONTRIBUTING.md +0 -64
- data/Gemfile.lock +0 -399
- data/Guardfile +0 -23
- data/PLUGINS.md +0 -25
- data/README.md +0 -70
- data/Thorfile +0 -61
- data/appveyor.yml +0 -31
- data/docs/berkshelf_for_newcomers.md +0 -65
- data/features/berksfile.feature +0 -46
- data/features/commands/apply.feature +0 -41
- data/features/commands/contingent.feature +0 -48
- data/features/commands/cookbook.feature +0 -35
- data/features/commands/info.feature +0 -99
- data/features/commands/init.feature +0 -27
- data/features/commands/install.feature +0 -636
- data/features/commands/list.feature +0 -78
- data/features/commands/outdated.feature +0 -130
- data/features/commands/package.feature +0 -17
- data/features/commands/search.feature +0 -17
- data/features/commands/shelf/list.feature +0 -32
- data/features/commands/shelf/show.feature +0 -143
- data/features/commands/shelf/uninstall.feature +0 -96
- data/features/commands/show.feature +0 -83
- data/features/commands/update.feature +0 -142
- data/features/commands/upload.feature +0 -426
- data/features/commands/vendor.feature +0 -111
- data/features/commands/verify.feature +0 -29
- data/features/commands/viz.feature +0 -66
- data/features/community_site.feature +0 -37
- data/features/config.feature +0 -111
- data/features/help.feature +0 -11
- data/features/json_formatter.feature +0 -161
- data/features/lifecycle.feature +0 -378
- data/features/lockfile.feature +0 -378
- data/features/step_definitions/berksfile_steps.rb +0 -39
- data/features/step_definitions/chef/config_steps.rb +0 -12
- data/features/step_definitions/chef_server_steps.rb +0 -60
- data/features/step_definitions/cli_steps.rb +0 -18
- data/features/step_definitions/config_steps.rb +0 -46
- data/features/step_definitions/environment_steps.rb +0 -7
- data/features/step_definitions/filesystem_steps.rb +0 -269
- data/features/step_definitions/gem_steps.rb +0 -13
- data/features/step_definitions/json_steps.rb +0 -23
- data/features/step_definitions/utility_steps.rb +0 -11
- data/features/support/aruba.rb +0 -12
- data/features/support/env.rb +0 -82
- data/generator_files/Berksfile.erb +0 -11
- data/generator_files/CHANGELOG.md.erb +0 -3
- data/generator_files/Gemfile.erb +0 -8
- data/generator_files/README.md.erb +0 -42
- data/generator_files/Thorfile.erb +0 -11
- data/generator_files/Vagrantfile.erb +0 -117
- data/generator_files/chefignore +0 -94
- data/generator_files/default_recipe.erb +0 -6
- data/generator_files/default_test.rb.erb +0 -11
- data/generator_files/gitignore.erb +0 -23
- data/generator_files/helpers.rb.erb +0 -7
- data/generator_files/licenses/apachev2.erb +0 -13
- data/generator_files/licenses/gplv2.erb +0 -15
- data/generator_files/licenses/gplv3.erb +0 -14
- data/generator_files/licenses/mit.erb +0 -20
- data/generator_files/licenses/reserved.erb +0 -3
- data/generator_files/metadata.rb.erb +0 -11
- data/lib/berkshelf/base_generator.rb +0 -43
- data/lib/berkshelf/commands/test_command.rb +0 -13
- data/lib/berkshelf/cookbook_generator.rb +0 -133
- data/lib/berkshelf/init_generator.rb +0 -195
- data/spec/fixtures/cookbooks/example_cookbook/.gitignore +0 -2
- data/spec/fixtures/cookbooks/example_cookbook/.kitchen.yml +0 -26
- data/spec/unit/berkshelf/cookbook_generator_spec.rb +0 -110
- data/spec/unit/berkshelf/init_generator_spec.rb +0 -263
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require "spec_helper"
|
2
2
|
|
3
3
|
describe Berkshelf::Lockfile do
|
4
4
|
before do
|
@@ -6,127 +6,127 @@ describe Berkshelf::Lockfile do
|
|
6
6
|
subject.parse
|
7
7
|
end
|
8
8
|
|
9
|
-
context
|
10
|
-
let(:fixture) { fixtures_path.join(
|
9
|
+
context "with an old 2.0 lockfile format" do
|
10
|
+
let(:fixture) { fixtures_path.join("lockfiles/2.0.lock") }
|
11
11
|
|
12
|
-
it
|
12
|
+
it "does not blow up" do
|
13
13
|
expect { subject }.to_not raise_error
|
14
14
|
end
|
15
15
|
|
16
|
-
it
|
16
|
+
it "warns the user" do
|
17
17
|
expect(Berkshelf.formatter).to receive(:warn)
|
18
18
|
subject.parse
|
19
19
|
end
|
20
20
|
|
21
|
-
it
|
22
|
-
expect(subject).to have_dependency(
|
23
|
-
expect(subject).to have_dependency(
|
24
|
-
expect(subject).to have_dependency(
|
25
|
-
expect(subject).to have_dependency(
|
26
|
-
|
27
|
-
expect(subject.find(
|
28
|
-
expect(subject.find(
|
29
|
-
expect(subject.find(
|
30
|
-
expect(subject.find(
|
31
|
-
|
32
|
-
expect(subject.find(
|
33
|
-
expect(subject.find(
|
34
|
-
expect(subject.find(
|
35
|
-
expect(subject.find(
|
21
|
+
it "sets the dependencies" do
|
22
|
+
expect(subject).to have_dependency("apt")
|
23
|
+
expect(subject).to have_dependency("jenkins")
|
24
|
+
expect(subject).to have_dependency("runit")
|
25
|
+
expect(subject).to have_dependency("yum")
|
26
|
+
|
27
|
+
expect(subject.find("apt").version_constraint.to_s).to eq(">= 0.0.0")
|
28
|
+
expect(subject.find("jenkins").version_constraint.to_s).to eq(">= 0.0.0")
|
29
|
+
expect(subject.find("runit").version_constraint.to_s).to eq(">= 0.0.0")
|
30
|
+
expect(subject.find("yum").version_constraint.to_s).to eq(">= 0.0.0")
|
31
|
+
|
32
|
+
expect(subject.find("apt").locked_version.to_s).to eq("2.3.6")
|
33
|
+
expect(subject.find("jenkins").locked_version.to_s).to eq("2.0.3")
|
34
|
+
expect(subject.find("runit").locked_version.to_s).to eq("1.5.8")
|
35
|
+
expect(subject.find("yum").locked_version.to_s).to eq("3.0.6")
|
36
36
|
end
|
37
37
|
|
38
|
-
it
|
38
|
+
it "sets the graph" do
|
39
39
|
graph = subject.graph
|
40
40
|
|
41
|
-
expect(graph).to have_lock(
|
42
|
-
expect(graph).to have_lock(
|
43
|
-
expect(graph).to have_lock(
|
44
|
-
expect(graph).to have_lock(
|
41
|
+
expect(graph).to have_lock("apt")
|
42
|
+
expect(graph).to have_lock("jenkins")
|
43
|
+
expect(graph).to have_lock("runit")
|
44
|
+
expect(graph).to have_lock("yum")
|
45
45
|
|
46
|
-
expect(graph.find(
|
47
|
-
expect(graph.find(
|
48
|
-
expect(graph.find(
|
49
|
-
expect(graph.find(
|
46
|
+
expect(graph.find("apt").version).to eq("2.3.6")
|
47
|
+
expect(graph.find("jenkins").version).to eq("2.0.3")
|
48
|
+
expect(graph.find("runit").version).to eq("1.5.8")
|
49
|
+
expect(graph.find("yum").version).to eq("3.0.6")
|
50
50
|
end
|
51
51
|
end
|
52
52
|
|
53
|
-
context
|
54
|
-
let(:fixture) { fixtures_path.join(
|
53
|
+
context "with a blank lockfile" do
|
54
|
+
let(:fixture) { fixtures_path.join("lockfiles/blank.lock") }
|
55
55
|
|
56
|
-
it
|
56
|
+
it "warns the user" do
|
57
57
|
expect(Berkshelf.formatter).to receive(:warn)
|
58
58
|
subject.parse
|
59
59
|
end
|
60
60
|
|
61
|
-
it
|
61
|
+
it "sets an empty list of dependencies" do
|
62
62
|
expect(subject.dependencies).to be_empty
|
63
63
|
end
|
64
64
|
|
65
|
-
it
|
65
|
+
it "sets an empty graph" do
|
66
66
|
expect(subject.graph.locks).to be_empty
|
67
67
|
end
|
68
68
|
end
|
69
69
|
|
70
|
-
context
|
71
|
-
let(:fixture) { fixtures_path.join(
|
70
|
+
context "with an empty lockfile" do
|
71
|
+
let(:fixture) { fixtures_path.join("lockfiles/empty.lock") }
|
72
72
|
|
73
|
-
it
|
73
|
+
it "does not warn the user" do
|
74
74
|
expect(Berkshelf.formatter).to_not receive(:warn)
|
75
75
|
subject.parse
|
76
76
|
end
|
77
77
|
|
78
|
-
it
|
78
|
+
it "sets an empty list of dependencies" do
|
79
79
|
expect(subject.dependencies).to be_empty
|
80
80
|
end
|
81
81
|
|
82
|
-
it
|
82
|
+
it "sets an empty graph" do
|
83
83
|
expect(subject.graph.locks).to be_empty
|
84
84
|
end
|
85
85
|
end
|
86
86
|
|
87
|
-
context
|
88
|
-
let(:fixture) { fixtures_path.join(
|
87
|
+
context "with real lockfile" do
|
88
|
+
let(:fixture) { fixtures_path.join("lockfiles/default.lock") }
|
89
89
|
|
90
|
-
it
|
91
|
-
expect(subject).to have_dependency(
|
92
|
-
expect(subject).to have_dependency(
|
90
|
+
it "sets the dependencies" do
|
91
|
+
expect(subject).to have_dependency("apt")
|
92
|
+
expect(subject).to have_dependency("jenkins")
|
93
93
|
|
94
|
-
expect(subject.find(
|
95
|
-
expect(subject.find(
|
94
|
+
expect(subject.find("apt").version_constraint.to_s).to eq("~> 2.0")
|
95
|
+
expect(subject.find("jenkins").version_constraint.to_s).to eq("~> 2.0")
|
96
96
|
|
97
|
-
expect(subject.find(
|
98
|
-
expect(subject.find(
|
97
|
+
expect(subject.find("apt").locked_version.to_s).to eq("2.3.6")
|
98
|
+
expect(subject.find("jenkins").locked_version.to_s).to eq("2.0.3")
|
99
99
|
end
|
100
100
|
|
101
|
-
it
|
101
|
+
it "sets the graph" do
|
102
102
|
graph = subject.graph
|
103
103
|
|
104
|
-
expect(graph).to have_lock(
|
105
|
-
expect(graph).to have_lock(
|
106
|
-
expect(graph).to have_lock(
|
107
|
-
expect(graph).to have_lock(
|
108
|
-
expect(graph).to have_lock(
|
109
|
-
expect(graph).to have_lock(
|
110
|
-
|
111
|
-
expect(graph.find(
|
112
|
-
expect(graph.find(
|
113
|
-
expect(graph.find(
|
114
|
-
expect(graph.find(
|
115
|
-
expect(graph.find(
|
116
|
-
expect(graph.find(
|
104
|
+
expect(graph).to have_lock("apt")
|
105
|
+
expect(graph).to have_lock("build-essential")
|
106
|
+
expect(graph).to have_lock("jenkins")
|
107
|
+
expect(graph).to have_lock("runit")
|
108
|
+
expect(graph).to have_lock("yum")
|
109
|
+
expect(graph).to have_lock("yum-epel")
|
110
|
+
|
111
|
+
expect(graph.find("apt").version).to eq("2.3.6")
|
112
|
+
expect(graph.find("build-essential").version).to eq("1.4.2")
|
113
|
+
expect(graph.find("jenkins").version).to eq("2.0.3")
|
114
|
+
expect(graph.find("runit").version).to eq("1.5.8")
|
115
|
+
expect(graph.find("yum").version).to eq("3.0.6")
|
116
|
+
expect(graph.find("yum-epel").version).to eq("0.2.0")
|
117
117
|
end
|
118
118
|
|
119
|
-
it
|
120
|
-
jenkins = subject.graph.find(
|
121
|
-
runit = subject.graph.find(
|
119
|
+
it "sets the graph item dependencies" do
|
120
|
+
jenkins = subject.graph.find("jenkins")
|
121
|
+
runit = subject.graph.find("runit")
|
122
122
|
|
123
|
-
expect(jenkins.dependencies).to include(
|
124
|
-
expect(jenkins.dependencies).to include(
|
125
|
-
expect(jenkins.dependencies).to include(
|
123
|
+
expect(jenkins.dependencies).to include("apt" => "~> 2.0")
|
124
|
+
expect(jenkins.dependencies).to include("runit" => "~> 1.5")
|
125
|
+
expect(jenkins.dependencies).to include("yum" => "~> 3.0")
|
126
126
|
|
127
|
-
expect(runit.dependencies).to include(
|
128
|
-
expect(runit.dependencies).to include(
|
129
|
-
expect(runit.dependencies).to include(
|
127
|
+
expect(runit.dependencies).to include("build-essential" => ">= 0.0.0")
|
128
|
+
expect(runit.dependencies).to include("yum" => "~> 3.0")
|
129
|
+
expect(runit.dependencies).to include("yum-epel" => ">= 0.0.0")
|
130
130
|
end
|
131
131
|
end
|
132
132
|
end
|