berkshelf 5.5.0 → 5.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (106) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +21 -3
  3. data/Gemfile +31 -31
  4. data/Gemfile.lock +3 -3
  5. data/Guardfile +13 -13
  6. data/Rakefile +1 -0
  7. data/Thorfile +16 -16
  8. data/berkshelf.gemspec +35 -35
  9. data/features/step_definitions/chef/config_steps.rb +4 -4
  10. data/features/step_definitions/chef_server_steps.rb +6 -6
  11. data/features/step_definitions/cli_steps.rb +3 -3
  12. data/features/step_definitions/config_steps.rb +5 -5
  13. data/features/step_definitions/filesystem_steps.rb +12 -11
  14. data/features/support/env.rb +21 -21
  15. data/lib/berkshelf.rb +66 -66
  16. data/lib/berkshelf/base_generator.rb +10 -11
  17. data/lib/berkshelf/berksfile.rb +38 -38
  18. data/lib/berkshelf/cached_cookbook.rb +7 -7
  19. data/lib/berkshelf/cli.rb +126 -126
  20. data/lib/berkshelf/commands/shelf.rb +19 -18
  21. data/lib/berkshelf/commands/test_command.rb +2 -2
  22. data/lib/berkshelf/community_rest.rb +38 -38
  23. data/lib/berkshelf/config.rb +42 -41
  24. data/lib/berkshelf/cookbook_generator.rb +38 -38
  25. data/lib/berkshelf/cookbook_store.rb +4 -4
  26. data/lib/berkshelf/core_ext/file_utils.rb +1 -1
  27. data/lib/berkshelf/dependency.rb +23 -21
  28. data/lib/berkshelf/downloader.rb +24 -25
  29. data/lib/berkshelf/errors.rb +17 -17
  30. data/lib/berkshelf/file_syncer.rb +9 -8
  31. data/lib/berkshelf/formatters/human.rb +3 -3
  32. data/lib/berkshelf/formatters/json.rb +2 -2
  33. data/lib/berkshelf/init_generator.rb +64 -64
  34. data/lib/berkshelf/installer.rb +103 -102
  35. data/lib/berkshelf/location.rb +9 -9
  36. data/lib/berkshelf/locations/git.rb +16 -16
  37. data/lib/berkshelf/locations/github.rb +1 -1
  38. data/lib/berkshelf/locations/path.rb +2 -2
  39. data/lib/berkshelf/lockfile.rb +309 -315
  40. data/lib/berkshelf/mixin/git.rb +3 -3
  41. data/lib/berkshelf/packager.rb +4 -4
  42. data/lib/berkshelf/resolver.rb +2 -2
  43. data/lib/berkshelf/resolver/graph.rb +1 -1
  44. data/lib/berkshelf/shell.rb +1 -1
  45. data/lib/berkshelf/source.rb +6 -6
  46. data/lib/berkshelf/source_uri.rb +2 -2
  47. data/lib/berkshelf/ssl_policies.rb +3 -3
  48. data/lib/berkshelf/thor.rb +1 -1
  49. data/lib/berkshelf/uploader.rb +48 -48
  50. data/lib/berkshelf/validator.rb +2 -2
  51. data/lib/berkshelf/version.rb +1 -1
  52. data/lib/berkshelf/visualizer.rb +11 -11
  53. data/spec/config/knife.rb +2 -2
  54. data/spec/fixtures/Berksfile +3 -3
  55. data/spec/fixtures/cookbook-path/jenkins-config/metadata.rb +3 -3
  56. data/spec/fixtures/cookbook-store/jenkins-2.0.3/metadata.rb +5 -5
  57. data/spec/fixtures/cookbook-store/jenkins-2.0.4/metadata.rb +4 -4
  58. data/spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb +3 -3
  59. data/spec/fixtures/cookbooks/example_cookbook/metadata.rb +3 -3
  60. data/spec/spec_helper.rb +9 -9
  61. data/spec/support/chef_api.rb +11 -12
  62. data/spec/support/chef_server.rb +10 -10
  63. data/spec/support/git.rb +23 -23
  64. data/spec/support/kitchen.rb +2 -2
  65. data/spec/support/matchers/filepath_matchers.rb +2 -2
  66. data/spec/support/path_helpers.rb +12 -12
  67. data/spec/support/shared_examples/formatter.rb +1 -1
  68. data/spec/unit/berkshelf/berksfile_spec.rb +78 -78
  69. data/spec/unit/berkshelf/cached_cookbook_spec.rb +42 -42
  70. data/spec/unit/berkshelf/cli_spec.rb +6 -6
  71. data/spec/unit/berkshelf/community_rest_spec.rb +83 -83
  72. data/spec/unit/berkshelf/config_spec.rb +13 -13
  73. data/spec/unit/berkshelf/cookbook_generator_spec.rb +39 -39
  74. data/spec/unit/berkshelf/cookbook_store_spec.rb +41 -41
  75. data/spec/unit/berkshelf/core_ext/file_utils_spec.rb +5 -6
  76. data/spec/unit/berkshelf/core_ext/pathname_spec.rb +1 -1
  77. data/spec/unit/berkshelf/dependency_spec.rb +43 -43
  78. data/spec/unit/berkshelf/downloader_spec.rb +20 -20
  79. data/spec/unit/berkshelf/errors_spec.rb +3 -3
  80. data/spec/unit/berkshelf/file_syncer_spec.rb +86 -86
  81. data/spec/unit/berkshelf/formatters/base_spec.rb +23 -23
  82. data/spec/unit/berkshelf/formatters/human_spec.rb +2 -2
  83. data/spec/unit/berkshelf/formatters/json_spec.rb +2 -2
  84. data/spec/unit/berkshelf/formatters/null_spec.rb +3 -3
  85. data/spec/unit/berkshelf/init_generator_spec.rb +92 -92
  86. data/spec/unit/berkshelf/installer_spec.rb +8 -8
  87. data/spec/unit/berkshelf/location_spec.rb +11 -11
  88. data/spec/unit/berkshelf/locations/base_spec.rb +35 -35
  89. data/spec/unit/berkshelf/locations/git_spec.rb +87 -87
  90. data/spec/unit/berkshelf/locations/path_spec.rb +40 -40
  91. data/spec/unit/berkshelf/lockfile_parser_spec.rb +71 -71
  92. data/spec/unit/berkshelf/lockfile_spec.rb +197 -197
  93. data/spec/unit/berkshelf/logger_spec.rb +3 -3
  94. data/spec/unit/berkshelf/mixin/logging_spec.rb +5 -5
  95. data/spec/unit/berkshelf/packager_spec.rb +2 -2
  96. data/spec/unit/berkshelf/resolver/graph_spec.rb +1 -1
  97. data/spec/unit/berkshelf/resolver_spec.rb +17 -17
  98. data/spec/unit/berkshelf/shell_spec.rb +34 -34
  99. data/spec/unit/berkshelf/source_spec.rb +12 -11
  100. data/spec/unit/berkshelf/source_uri_spec.rb +1 -1
  101. data/spec/unit/berkshelf/ssl_policies_spec.rb +25 -25
  102. data/spec/unit/berkshelf/uploader_spec.rb +54 -54
  103. data/spec/unit/berkshelf/validator_spec.rb +16 -16
  104. data/spec/unit/berkshelf/visualizer_spec.rb +17 -17
  105. data/spec/unit/berkshelf_spec.rb +18 -18
  106. metadata +5 -5
@@ -1,9 +1,9 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  describe Berkshelf::Logger do
4
- %w(info warn error fatal debug deprecate exception).each do |meth|
4
+ %w{info warn error fatal debug deprecate exception}.each do |meth|
5
5
  describe "##{meth}" do
6
- it 'responds' do
6
+ it "responds" do
7
7
  expect(subject).to respond_to(meth.to_sym)
8
8
  end
9
9
  end
@@ -1,18 +1,18 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  describe Berkshelf::Mixin::Logging do
4
4
  subject do
5
5
  Class.new { include Berkshelf::Mixin::Logging }.new
6
6
  end
7
7
 
8
- describe '#logger' do
9
- it 'returns the Berkshelf::Logger' do
8
+ describe "#logger" do
9
+ it "returns the Berkshelf::Logger" do
10
10
  expect(subject.logger).to be_a(Berkshelf::Logger)
11
11
  end
12
12
  end
13
13
 
14
- describe '#log' do
15
- it 'returns the Berkshelf::Logger' do
14
+ describe "#log" do
15
+ it "returns the Berkshelf::Logger" do
16
16
  expect(subject.log).to be_a(Berkshelf::Logger)
17
17
  end
18
18
  end
@@ -1,10 +1,10 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  describe Berkshelf::Packager do
4
4
  let(:target) { tmp_path.join("cookbooks.tar.gz").to_s }
5
5
  subject { described_class.new(target) }
6
6
 
7
- it 'has the correct out_file' do
7
+ it "has the correct out_file" do
8
8
  expect(subject.out_file).to eq(target)
9
9
  end
10
10
 
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  describe Berkshelf::Resolver::Graph, :not_supported_on_windows do
4
4
  subject { described_class.new }
@@ -1,7 +1,7 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  describe Berkshelf::Resolver do
4
- let(:berksfile) { double('berksfile') }
4
+ let(:berksfile) { double("berksfile") }
5
5
  let(:demand) { Berkshelf::Dependency.new(berksfile, "mysql", constraint: "= 1.2.4") }
6
6
 
7
7
  before(:each) do
@@ -11,7 +11,7 @@ describe Berkshelf::Resolver do
11
11
 
12
12
  describe "ClassMethods" do
13
13
  describe "::initialize" do
14
- it 'adds the specified dependencies to the dependencies hash' do
14
+ it "adds the specified dependencies to the dependencies hash" do
15
15
  resolver = described_class.new(berksfile, demand)
16
16
  expect(resolver).to have_demand(demand)
17
17
  end
@@ -21,17 +21,17 @@ describe Berkshelf::Resolver do
21
21
  subject { Berkshelf::Resolver.new(berksfile) }
22
22
 
23
23
  describe "#add_demand" do
24
- it 'adds the demand to the instance of resolver' do
24
+ it "adds the demand to the instance of resolver" do
25
25
  subject.add_demand(demand)
26
26
  expect(subject.demands).to include(demand)
27
27
  end
28
28
 
29
- it 'raises a DuplicateDemand exception if a demand of the same name is added' do
29
+ it "raises a DuplicateDemand exception if a demand of the same name is added" do
30
30
  expect(subject).to receive(:has_demand?).with(demand).and_return(true)
31
31
 
32
- expect {
32
+ expect do
33
33
  subject.add_demand(demand)
34
- }.to raise_error(Berkshelf::DuplicateDemand)
34
+ end.to raise_error(Berkshelf::DuplicateDemand)
35
35
  end
36
36
  end
37
37
 
@@ -44,44 +44,44 @@ describe Berkshelf::Resolver do
44
44
  describe "#get_demand" do
45
45
  before { subject.add_demand(demand) }
46
46
 
47
- context 'given a string representation of the demand to retrieve' do
48
- it 'returns a Berkshelf::Dependency of the same name' do
47
+ context "given a string representation of the demand to retrieve" do
48
+ it "returns a Berkshelf::Dependency of the same name" do
49
49
  expect(subject.get_demand(demand.name)).to eq(demand)
50
50
  end
51
51
  end
52
52
  end
53
53
 
54
- describe '#has_demand?' do
54
+ describe "#has_demand?" do
55
55
  before { subject.add_demand(demand) }
56
56
 
57
- it 'returns true if the demand exists' do
57
+ it "returns true if the demand exists" do
58
58
  expect(subject.has_demand?(demand.name)).to be(true)
59
59
  end
60
60
 
61
- it 'returns false if the demand does not exist' do
62
- expect(subject.has_demand?('non-existent')).to be(false)
61
+ it "returns false if the demand does not exist" do
62
+ expect(subject.has_demand?("non-existent")).to be(false)
63
63
  end
64
64
  end
65
65
 
66
66
  describe "#resolve" do
67
- describe 'given a missing required solver' do
67
+ describe "given a missing required solver" do
68
68
  before do
69
69
  allow(berksfile).to receive(:required_solver).and_return(:xyzzy)
70
70
  allow(berksfile).to receive(:preferred_solver).and_return(nil)
71
71
  end
72
72
 
73
- it 'should raise an exception about missing required resolver :xyzzy' do
73
+ it "should raise an exception about missing required resolver :xyzzy" do
74
74
  expect { subject.compute_solver_engine(berksfile) }.to raise_error(/Engine `xyzzy` is not supported/)
75
75
  end
76
76
  end
77
77
 
78
- describe 'given a missing preferred solver' do
78
+ describe "given a missing preferred solver" do
79
79
  before do
80
80
  allow(berksfile).to receive(:required_solver).and_return(nil)
81
81
  allow(berksfile).to receive(:preferred_solver).and_return(:xyzzy)
82
82
  end
83
83
 
84
- it 'should not raise an exception about missing preferred resolver :xyzzy' do
84
+ it "should not raise an exception about missing preferred resolver :xyzzy" do
85
85
  expect { subject.compute_solver_engine(berksfile) }.not_to raise_error
86
86
  end
87
87
  end
@@ -1,9 +1,9 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  module Berkshelf
4
4
  describe Shell do
5
- let(:stdout) { double('stdout', tty?: true) }
6
- let(:stderr) { double('stderr') }
5
+ let(:stdout) { double("stdout", tty?: true) }
6
+ let(:stderr) { double("stderr") }
7
7
 
8
8
  before do
9
9
  allow_any_instance_of(described_class).to receive(:stdout)
@@ -13,119 +13,119 @@ module Berkshelf
13
13
  .and_return(stderr)
14
14
  end
15
15
 
16
- describe '#mute!' do
17
- it 'sets @mute to true' do
16
+ describe "#mute!" do
17
+ it "sets @mute to true" do
18
18
  subject.mute!
19
19
  expect(subject.instance_variable_get(:@mute)).to be(true)
20
20
  end
21
21
  end
22
22
 
23
- describe '#unmute!' do
24
- it 'sets @mute to false' do
23
+ describe "#unmute!" do
24
+ it "sets @mute to false" do
25
25
  subject.unmute!
26
26
  expect(subject.instance_variable_get(:@mute)).to be(false)
27
27
  end
28
28
  end
29
29
 
30
- describe '#say' do
31
- context 'when quiet?' do
30
+ describe "#say" do
31
+ context "when quiet?" do
32
32
  before do
33
33
  allow(subject).to receive(:quiet?).and_return(true)
34
34
  end
35
35
 
36
- it 'does not output anything', :not_supported_on_windows do
36
+ it "does not output anything", :not_supported_on_windows do
37
37
  expect(stdout).to_not receive(:print)
38
38
  expect(stdout).to_not receive(:puts)
39
- subject.say 'message'
39
+ subject.say "message"
40
40
  end
41
41
  end
42
42
 
43
- context 'with not quiet?' do
43
+ context "with not quiet?" do
44
44
  before do
45
45
  allow(subject).to receive(:quiet?).and_return(false)
46
46
  end
47
47
 
48
- it 'prints to stdout' do
48
+ it "prints to stdout" do
49
49
  expect(stdout).to receive(:print).once
50
50
  expect(stdout).to receive(:flush).once
51
- subject.say 'message'
51
+ subject.say "message"
52
52
  end
53
53
  end
54
54
  end
55
55
 
56
- describe '#say_status' do
57
- context 'when quiet?' do
56
+ describe "#say_status" do
57
+ context "when quiet?" do
58
58
  before do
59
59
  allow(subject).to receive(:quiet?).and_return(true)
60
60
  end
61
61
 
62
- it 'does not output anything' do
62
+ it "does not output anything" do
63
63
  expect(stdout).to_not receive(:print)
64
64
  expect(stdout).to_not receive(:puts)
65
- subject.say_status 5, 'message'
65
+ subject.say_status 5, "message"
66
66
  end
67
67
  end
68
68
 
69
- context 'with not quiet?' do
69
+ context "with not quiet?" do
70
70
  before do
71
71
  allow(subject).to receive(:quiet?).and_return(false)
72
72
  end
73
73
 
74
- it 'prints to stdout' do
74
+ it "prints to stdout" do
75
75
  expect(stdout).to receive(:print).once
76
76
  expect(stdout).to receive(:flush).once
77
- subject.say_status 5, 'message'
77
+ subject.say_status 5, "message"
78
78
  end
79
79
  end
80
80
  end
81
81
 
82
- describe '#warn' do
83
- context 'when quiet?' do
82
+ describe "#warn" do
83
+ context "when quiet?" do
84
84
  before do
85
85
  allow(subject).to receive(:quiet?).and_return(true)
86
86
  end
87
87
 
88
- it 'does not output anything' do
88
+ it "does not output anything" do
89
89
  expect(stdout).to_not receive(:print)
90
90
  expect(stdout).to_not receive(:puts)
91
- subject.warn 'warning'
91
+ subject.warn "warning"
92
92
  end
93
93
  end
94
94
 
95
- context 'with not quiet?' do
95
+ context "with not quiet?" do
96
96
  before do
97
97
  allow(subject).to receive(:quiet?).and_return(false)
98
98
  end
99
99
 
100
- it 'calls #say with yellow coloring' do
100
+ it "calls #say with yellow coloring" do
101
101
  expect(stdout).to receive(:print).once
102
102
  expect(stdout).to receive(:flush).once
103
- subject.warn 'warning'
103
+ subject.warn "warning"
104
104
  end
105
105
  end
106
106
  end
107
107
 
108
- context '#error' do
109
- context 'when quiet?' do
108
+ context "#error" do
109
+ context "when quiet?" do
110
110
  before do
111
111
  allow(subject).to receive(:quiet?).and_return(true)
112
112
  end
113
113
 
114
114
  it "outputs an error message", :not_supported_on_windows do
115
115
  expect(stderr).to receive(:puts)
116
- subject.error 'error!'
116
+ subject.error "error!"
117
117
  end
118
118
  end
119
119
 
120
- context 'with not quiet?' do
120
+ context "with not quiet?" do
121
121
  before do
122
122
  allow(subject).to receive(:quiet?).and_return(false)
123
123
  end
124
124
 
125
- it 'prints to stderr' do
125
+ it "prints to stderr" do
126
126
  expect(stderr).to receive(:puts)
127
127
  .with(windows? ? "error!" : "\e[31merror!\e[0m")
128
- subject.error 'error!'
128
+ subject.error "error!"
129
129
  end
130
130
  end
131
131
  end
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  module Berkshelf
4
4
  describe Source do
@@ -22,28 +22,29 @@ module Berkshelf
22
22
  end
23
23
  end
24
24
 
25
- describe '.default?' do
26
- it 'returns true when the source is the default' do
25
+ describe ".default?" do
26
+ it "returns true when the source is the default" do
27
27
  instance = described_class.new(Berksfile::DEFAULT_API_URL)
28
28
  expect(instance).to be_default
29
29
  end
30
30
 
31
- it 'returns true when the scheme is different' do
32
- instance = described_class.new('http://supermarket.chef.io')
31
+ it "returns true when the scheme is different" do
32
+ instance = described_class.new("http://supermarket.chef.io")
33
33
  expect(instance).to be_default
34
34
  end
35
35
 
36
- it 'returns false when the source is not the default' do
37
- instance = described_class.new('http://localhost:8080')
36
+ it "returns false when the source is not the default" do
37
+ instance = described_class.new("http://localhost:8080")
38
38
  expect(instance).to_not be_default
39
39
  end
40
40
  end
41
41
 
42
42
  describe "#search" do
43
- let (:cookbooks) {[
44
- APIClient::RemoteCookbook.new("cb1","1.0.8"),
45
- APIClient::RemoteCookbook.new("cb1","1.0.22")
46
- ]}
43
+ let (:cookbooks) do
44
+ [
45
+ APIClient::RemoteCookbook.new("cb1", "1.0.8"),
46
+ APIClient::RemoteCookbook.new("cb1", "1.0.22"),
47
+ ] end
47
48
 
48
49
  before do
49
50
  allow_any_instance_of(APIClient::Connection).to receive(:universe).and_return(cookbooks)
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  describe Berkshelf::SourceURI do
4
4
  describe "ClassMethods" do
@@ -1,21 +1,21 @@
1
- require 'spec_helper'
1
+ require "spec_helper"
2
2
 
3
3
  describe Berkshelf::SSLPolicy do
4
- let(:self_signed_crt_path) { File.join(BERKS_SPEC_DATA, 'trusted_certs') }
4
+ let(:self_signed_crt_path) { File.join(BERKS_SPEC_DATA, "trusted_certs") }
5
5
 
6
6
  let(:chef_config) do
7
7
  double(Ridley::Chef::Config,
8
- node_name: 'fake-client',
9
- client_key: 'client-key',
10
- chef_server_url: 'http://configured-chef-server/',
11
- validation_client_name: 'validator',
12
- validation_key: 'validator.pem',
13
- cookbook_copyright: 'user',
14
- cookbook_email: 'user@example.com',
15
- cookbook_license: 'apachev2',
8
+ node_name: "fake-client",
9
+ client_key: "client-key",
10
+ chef_server_url: "http://configured-chef-server/",
11
+ validation_client_name: "validator",
12
+ validation_key: "validator.pem",
13
+ cookbook_copyright: "user",
14
+ cookbook_email: "user@example.com",
15
+ cookbook_license: "apachev2",
16
16
  trusted_certs_dir: self_signed_crt_path,
17
17
  knife: {
18
- chef_guard: false
18
+ chef_guard: false,
19
19
  }
20
20
  )
21
21
  end
@@ -35,38 +35,38 @@ describe Berkshelf::SSLPolicy do
35
35
  allow(Berkshelf).to receive(:config).and_return(berkshelf_config)
36
36
  end
37
37
 
38
- describe '#initialize' do
39
- it 'sets up the store' do
38
+ describe "#initialize" do
39
+ it "sets up the store" do
40
40
  expect(subject.store.class).to be(OpenSSL::X509::Store)
41
41
  end
42
42
 
43
- it 'sets up custom certificates for chef' do
43
+ it "sets up custom certificates for chef" do
44
44
  end
45
45
  end
46
46
 
47
- describe '#trusted_certs_dir' do
48
- it 'uses the trusted_certs_dir from Berkshelf config' do
49
- expect(subject.trusted_certs_dir).to eq(self_signed_crt_path)
47
+ describe "#trusted_certs_dir" do
48
+ it "uses the trusted_certs_dir from Berkshelf config" do
49
+ expect(subject.trusted_certs_dir).to eq(self_signed_crt_path)
50
50
  end
51
51
 
52
- context 'trusted_certs_dir in Berkshelf' do
52
+ context "trusted_certs_dir in Berkshelf" do
53
53
 
54
- context 'config is not set' do
54
+ context "config is not set" do
55
55
  before { allow(chef_config).to receive_messages(trusted_certs_dir: nil) }
56
56
 
57
- it 'defaults to ~/.chef/trusted_certs' do
57
+ it "defaults to ~/.chef/trusted_certs" do
58
58
  expect(subject.trusted_certs_dir).to eq(
59
- File.join(ENV['HOME'], '.chef', 'trusted_certs')
59
+ File.join(ENV["HOME"], ".chef", "trusted_certs")
60
60
  )
61
61
  end
62
62
  end
63
63
 
64
- context 'config is seti but does not exist' do
65
- before { allow(chef_config).to receive_messages(trusted_certs_dir: '/fake') }
64
+ context "config is seti but does not exist" do
65
+ before { allow(chef_config).to receive_messages(trusted_certs_dir: "/fake") }
66
66
 
67
- it 'defaults to ~/.chef/trusted_certs' do
67
+ it "defaults to ~/.chef/trusted_certs" do
68
68
  expect(subject.trusted_certs_dir).to eq(
69
- File.join(ENV['HOME'], '.chef', 'trusted_certs')
69
+ File.join(ENV["HOME"], ".chef", "trusted_certs")
70
70
  )
71
71
  end
72
72
  end