berkshelf 3.1.5 → 3.2.0

data/spec/unit/berkshelf/packager_spec.rb

@@ -4,14 +4,16 @@ describe Berkshelf::Packager do
   let(:target) { tmp_path.join("cookbooks.tar.gz").to_s }
   subject { described_class.new(target) }
 
-  its(:out_file) { should eql(target) }
+  it 'has the correct out_file' do
+    expect(subject.out_file).to eq(target)
+  end
 
   describe "#run" do
     let(:cookbooks) { fixtures_path.join("cookbooks") }
 
     it "writes a tar to the #out_file" do
       subject.run(cookbooks)
-      expect(File.exist?(subject.out_file)).to be_true
+      expect(File.exist?(subject.out_file)).to be(true)
     end
   end
 
@@ -19,7 +21,7 @@ describe Berkshelf::Packager do
     let(:out_dir) { File.dirname(target) }
 
     context "when the out_file's directory is not writable" do
-      before { File.stub(:directory?).with(out_dir).and_return(false) }
+      before { allow(File).to receive(:directory?).with(out_dir).and_return(false) }
 
       it "raises an error" do
         expect { subject.validate! }.to raise_error(Berkshelf::PackageError,
@@ -28,7 +30,7 @@ describe Berkshelf::Packager do
     end
 
     context "when the out_file's directory is not a directory" do
-      before { File.stub(:writable?).with(out_dir).and_return(false) }
+      before { allow(File).to receive(:writable?).with(out_dir).and_return(false) }
 
       it "raises an error" do
         expect { subject.validate! }.to raise_error(Berkshelf::PackageError,

data/spec/unit/berkshelf/resolver/graph_spec.rb

@@ -14,12 +14,12 @@ describe Berkshelf::Resolver::Graph, :not_supported_on_windows do
 
     it "adds each dependency to the graph" do
       subject.populate(sources)
-      expect(subject.artifacts).to have(3).items
+      expect(subject.artifacts.size).to eq(3)
     end
 
     it "adds the dependencies of each dependency to the graph" do
       subject.populate(sources)
-      expect(subject.artifact("ruby", "1.0.0").dependencies).to have(1).item
+      expect(subject.artifact("ruby", "1.0.0").dependencies.size).to eq(1)
     end
   end
 
@@ -38,7 +38,7 @@ describe Berkshelf::Resolver::Graph, :not_supported_on_windows do
     end
 
     it "contains the entire universe of dependencies" do
-      expect(subject.universe(sources)).to have(2).items
+      expect(subject.universe(sources).size).to eq(2)
     end
   end
 end

data/spec/unit/berkshelf/resolver_spec.rb

@@ -22,7 +22,7 @@ describe Berkshelf::Resolver do
     end
 
     it 'raises a DuplicateDemand exception if a demand of the same name is added' do
-      subject.should_receive(:has_demand?).with(demand).and_return(true)
+      expect(subject).to receive(:has_demand?).with(demand).and_return(true)
 
       expect {
         subject.add_demand(demand)
@@ -50,11 +50,11 @@ describe Berkshelf::Resolver do
     before { subject.add_demand(demand) }
 
     it 'returns true if the demand exists' do
-      expect(subject.has_demand?(demand.name)).to be_true
+      expect(subject.has_demand?(demand.name)).to be(true)
     end
 
     it 'returns false if the demand does not exist' do
-      expect(subject.has_demand?('non-existent')).to be_false
+      expect(subject.has_demand?('non-existent')).to be(false)
     end
   end
 

data/spec/unit/berkshelf/shell_spec.rb

@@ -6,44 +6,48 @@ module Berkshelf
     let(:stderr) { double('stderr') }
 
     before do
-      described_class.any_instance.stub(:stdout).and_return(stdout)
-      described_class.any_instance.stub(:stderr).and_return(stderr)
+      allow_any_instance_of(described_class).to receive(:stdout)
+        .and_return(stdout)
+
+      allow_any_instance_of(described_class).to receive(:stderr)
+        .and_return(stderr)
     end
 
     describe '#mute!' do
       it 'sets @mute to true' do
         subject.mute!
-        expect(subject.instance_variable_get(:@mute)).to be_true
+        expect(subject.instance_variable_get(:@mute)).to be(true)
       end
     end
 
     describe '#unmute!' do
       it 'sets @mute to false' do
         subject.unmute!
-        expect(subject.instance_variable_get(:@mute)).to be_false
+        expect(subject.instance_variable_get(:@mute)).to be(false)
       end
     end
 
     describe '#say' do
       context 'when quiet?' do
         before do
-          subject.stub(:quiet?).and_return(true)
+          allow(subject).to receive(:quiet?).and_return(true)
         end
 
         it 'does not output anything', :not_supported_on_windows do
-          stdout.should_not_receive(:print)
+          expect(stdout).to_not receive(:print)
+          expect(stdout).to_not receive(:puts)
           subject.say 'message'
         end
       end
 
       context 'with not quiet?' do
         before do
-          subject.stub(:quiet?).and_return(false)
+          allow(subject).to receive(:quiet?).and_return(false)
         end
 
         it 'prints to stdout' do
-          stdout.should_receive(:print).once
-          stdout.should_receive(:flush).with(no_args())
+          expect(stdout).to receive(:print).once
+          expect(stdout).to receive(:flush).once
           subject.say 'message'
         end
       end
@@ -52,23 +56,24 @@ module Berkshelf
     describe '#say_status' do
       context 'when quiet?' do
         before do
-          subject.stub(:quiet?).and_return(true)
+          allow(subject).to receive(:quiet?).and_return(true)
         end
 
         it 'does not output anything' do
-          stdout.should_not_receive(:puts)
+          expect(stdout).to_not receive(:print)
+          expect(stdout).to_not receive(:puts)
           subject.say_status 5, 'message'
         end
       end
 
       context 'with not quiet?' do
         before do
-          subject.stub(:quiet?).and_return(false)
+          allow(subject).to receive(:quiet?).and_return(false)
         end
 
         it 'prints to stdout' do
-          stdout.should_receive(:print).once
-          stdout.should_receive(:flush).with(no_args())
+          expect(stdout).to receive(:print).once
+          expect(stdout).to receive(:flush).once
           subject.say_status 5, 'message'
         end
       end
@@ -77,23 +82,24 @@ module Berkshelf
     describe '#warn' do
       context 'when quiet?' do
         before do
-          subject.stub(:quiet?).and_return(true)
+          allow(subject).to receive(:quiet?).and_return(true)
         end
 
         it 'does not output anything' do
-          stdout.should_not_receive(:print)
+          expect(stdout).to_not receive(:print)
+          expect(stdout).to_not receive(:puts)
           subject.warn 'warning'
         end
       end
 
       context 'with not quiet?' do
         before do
-          subject.stub(:quiet?).and_return(false)
+          allow(subject).to receive(:quiet?).and_return(false)
         end
 
         it 'calls #say with yellow coloring' do
-          stdout.should_receive(:print)
-          stdout.should_receive(:flush).with(no_args())
+          expect(stdout).to receive(:print).once
+          expect(stdout).to receive(:flush).once
           subject.warn 'warning'
         end
       end
@@ -102,26 +108,26 @@ module Berkshelf
     context '#error' do
       context 'when quiet?' do
         before do
-          subject.stub(:quiet?).and_return(true)
+          allow(subject).to receive(:quiet?).and_return(true)
         end
 
         it "outputs an error message", :not_supported_on_windows do
-          stderr.should_receive(:puts)
+          expect(stderr).to receive(:puts)
           subject.error 'error!'
         end
       end
 
       context 'with not quiet?' do
         before do
-          subject.stub(:quiet?).and_return(false)
+          allow(subject).to receive(:quiet?).and_return(false)
         end
 
         it 'prints to stderr' do
-          stderr.should_receive(:puts).with(windows? ? "error!" : "\e[31merror!\e[0m")
+          expect(stderr).to receive(:puts)
+            .with(windows? ? "error!" : "\e[31merror!\e[0m")
           subject.error 'error!'
         end
       end
     end
   end
-
 end

data/spec/unit/berkshelf/uploader_spec.rb

@@ -33,8 +33,8 @@ module Berkshelf
       it 'saves the options' do
         instance = Uploader.new(berksfile, force: true, validate: false)
         options = instance.options
-        expect(options[:force]).to be_true
-        expect(options[:validate]).to be_false
+        expect(options[:force]).to be(true)
+        expect(options[:validate]).to be(false)
       end
 
       it 'saves the names' do
@@ -43,35 +43,6 @@ module Berkshelf
       end
     end
 
-    describe '#validate_files!' do
-      before { Uploader.send(:public, :validate_files!) }
-
-      let(:cookbook) { double('cookbook', cookbook_name: 'cookbook', path: 'path') }
-
-      it 'raises an error when the cookbook has spaces in the files' do
-        Dir.stub(:glob).and_return(['/there are/spaces/in this/recipes/default.rb'])
-        expect {
-          subject.validate_files!(cookbook)
-        }.to raise_error
-      end
-
-      it 'does not raise an error when the cookbook is valid' do
-        Dir.stub(:glob).and_return(['/there-are/no-spaces/in-this/recipes/default.rb'])
-        expect {
-          subject.validate_files!(cookbook)
-        }.to_not raise_error
-      end
-
-      it 'does not raise an exception with spaces in the path' do
-        Dir.stub(:glob).and_return(['/there are/spaces/in this/recipes/default.rb'])
-        Pathname.any_instance.stub(:dirname).and_return('/there are/spaces/in this')
-
-        expect {
-          subject.validate_files!(cookbook)
-        }.to_not raise_error
-      end
-    end
-
     describe '#run' do
       let(:options) { Hash.new }
 
@@ -85,13 +56,16 @@ module Berkshelf
           cookbook_copyright: 'user',
           cookbook_email: 'user@example.com',
           cookbook_license: 'apachev2',
+          knife: {
+            chef_guard: false
+          }
         )
       end
 
       let(:berkshelf_config) do
         double(Config,
           ssl:  double(verify: true),
-          chef: chef_config,
+          chef: chef_config
         )
       end
 
@@ -106,11 +80,11 @@ module Berkshelf
       end
 
       before do
-        Berkshelf.stub(:config).and_return(berkshelf_config)
+        allow(Berkshelf).to receive(:config).and_return(berkshelf_config)
       end
 
       context 'when there is no value for :chef_server_url' do
-        before { chef_config.stub(chef_server_url: nil) }
+        before { allow(chef_config).to receive_messages(chef_server_url: nil) }
         let(:message) { 'Missing required attribute in your Berkshelf configuration: chef.server_url' }
 
         it 'raises an error' do
@@ -119,7 +93,7 @@ module Berkshelf
       end
 
       context 'when there is no value for :client_name' do
-        before { chef_config.stub(node_name: nil) }
+        before { allow(chef_config).to receive_messages(node_name: nil) }
         let(:message) { 'Missing required attribute in your Berkshelf configuration: chef.node_name' }
 
         it 'raises an error' do
@@ -128,7 +102,7 @@ module Berkshelf
       end
 
       context 'when there is no value for :client_key' do
-        before { chef_config.stub(client_key: nil) }
+        before { allow(chef_config).to receive_messages(client_key: nil) }
         let(:message) { 'Missing required attribute in your Berkshelf configuration: chef.client_key' }
 
         it 'raises an error' do

data/spec/unit/berkshelf/validator_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Berkshelf::Validator do
+  describe '#validate_files' do
+    let(:cookbook) { double('cookbook', cookbook_name: 'cookbook', path: 'path') }
+
+    it 'raises an error when the cookbook has spaces in the files' do
+      allow(Dir).to receive(:glob).and_return(['/there are/spaces/in this/recipes/default.rb'])
+      expect {
+        subject.validate_files(cookbook)
+      }.to raise_error
+    end
+
+    it 'does not raise an error when the cookbook is valid' do
+      allow(Dir).to receive(:glob).and_return(['/there-are/no-spaces/in-this/recipes/default.rb'])
+      expect {
+        subject.validate_files(cookbook)
+      }.to_not raise_error
+    end
+
+    it 'does not raise an exception with spaces in the path' do
+      allow(Dir).to receive(:glob).and_return(['/there are/spaces/in this/recipes/default.rb'])
+      allow_any_instance_of(Pathname).to receive(:dirname).and_return('/there are/spaces/in this')
+
+      expect {
+        subject.validate_files(cookbook)
+      }.to_not raise_error
+    end
+  end
+end

data/spec/unit/berkshelf/visualizer_spec.rb

@@ -1,3 +1,4 @@
+require 'rspec'
 require 'spec_helper'
 
 module Berkshelf
@@ -5,9 +6,12 @@ module Berkshelf
     describe '#to_png' do
       context 'when graphviz is not installed' do
         before do
-          Berkshelf.stub(:which)
+          allow(Berkshelf).to receive(:which)
             .with('dot')
             .and_return(nil)
+          allow(Berkshelf).to receive(:which)
+            .with('dot.exe')
+            .and_return(nil)
         end
 
         it 'raises a GraphvizNotInstalled exception' do
@@ -18,13 +22,24 @@ module Berkshelf
       context 'when the graphviz command fails', :graphviz do
         before do
           response = double(success?: false, stderr: 'Something happened!')
-          subject.stub(:shell_out).and_return(response)
+          allow(subject).to receive(:shell_out).and_return(response)
         end
 
         it 'raises a GraphvizCommandFailed exception' do
           expect { subject.to_png }.to raise_error(GraphvizCommandFailed)
         end
       end
+
+      context 'when the graphviz command succeeds', :graphviz do
+        it 'builds a png from a Lockfile' do
+          outfile = tmp_path.join('test-graph.png').to_s
+          lockfile = Lockfile.from_file(fixtures_path.join('lockfiles/default.lock').to_s)
+
+          Visualizer.from_lockfile(lockfile).to_png(outfile)
+
+          expect(File.exists?(outfile)).to be true
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -84,6 +84,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: cleanroom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -160,14 +174,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -188,42 +202,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
@@ -272,14 +286,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +392,7 @@ files:
 - features/commands/update.feature
 - features/commands/upload.feature
 - features/commands/vendor.feature
+- features/commands/verify.feature
 - features/commands/viz.feature
 - features/community_site.feature
 - features/config.feature
@@ -433,6 +448,7 @@ files:
 - lib/berkshelf/dependency.rb
 - lib/berkshelf/downloader.rb
 - lib/berkshelf/errors.rb
+- lib/berkshelf/file_syncer.rb
 - lib/berkshelf/formatters/base.rb
 - lib/berkshelf/formatters/human.rb
 - lib/berkshelf/formatters/json.rb
@@ -446,7 +462,6 @@ files:
 - lib/berkshelf/locations/path.rb
 - lib/berkshelf/lockfile.rb
 - lib/berkshelf/logger.rb
-- lib/berkshelf/mixin/dsl_eval.rb
 - lib/berkshelf/mixin/git.rb
 - lib/berkshelf/mixin/logging.rb
 - lib/berkshelf/packager.rb
@@ -459,6 +474,7 @@ files:
 - lib/berkshelf/thor_ext.rb
 - lib/berkshelf/thor_ext/hash_with_indifferent_access.rb
 - lib/berkshelf/uploader.rb
+- lib/berkshelf/validator.rb
 - lib/berkshelf/version.rb
 - lib/berkshelf/visualizer.rb
 - spec/config/berkshelf.pem
@@ -500,6 +516,7 @@ files:
 - spec/unit/berkshelf/dependency_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/errors_spec.rb
+- spec/unit/berkshelf/file_syncer_spec.rb
 - spec/unit/berkshelf/formatters/base_spec.rb
 - spec/unit/berkshelf/formatters/human_spec.rb
 - spec/unit/berkshelf/formatters/json_spec.rb
@@ -513,7 +530,6 @@ files:
 - spec/unit/berkshelf/lockfile_parser_spec.rb
 - spec/unit/berkshelf/lockfile_spec.rb
 - spec/unit/berkshelf/logger_spec.rb
-- spec/unit/berkshelf/mixin/dsl_eval_spec.rb
 - spec/unit/berkshelf/mixin/logging_spec.rb
 - spec/unit/berkshelf/packager_spec.rb
 - spec/unit/berkshelf/resolver/graph_spec.rb
@@ -522,6 +538,7 @@ files:
 - spec/unit/berkshelf/source_spec.rb
 - spec/unit/berkshelf/source_uri_spec.rb
 - spec/unit/berkshelf/uploader_spec.rb
+- spec/unit/berkshelf/validator_spec.rb
 - spec/unit/berkshelf/visualizer_spec.rb
 - spec/unit/berkshelf_spec.rb
 homepage: http://berkshelf.com
@@ -567,6 +584,7 @@ test_files:
 - features/commands/update.feature
 - features/commands/upload.feature
 - features/commands/vendor.feature
+- features/commands/verify.feature
 - features/commands/viz.feature
 - features/community_site.feature
 - features/config.feature
@@ -625,6 +643,7 @@ test_files:
 - spec/unit/berkshelf/dependency_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/errors_spec.rb
+- spec/unit/berkshelf/file_syncer_spec.rb
 - spec/unit/berkshelf/formatters/base_spec.rb
 - spec/unit/berkshelf/formatters/human_spec.rb
 - spec/unit/berkshelf/formatters/json_spec.rb
@@ -638,7 +657,6 @@ test_files:
 - spec/unit/berkshelf/lockfile_parser_spec.rb
 - spec/unit/berkshelf/lockfile_spec.rb
 - spec/unit/berkshelf/logger_spec.rb
-- spec/unit/berkshelf/mixin/dsl_eval_spec.rb
 - spec/unit/berkshelf/mixin/logging_spec.rb
 - spec/unit/berkshelf/packager_spec.rb
 - spec/unit/berkshelf/resolver/graph_spec.rb
@@ -647,6 +665,7 @@ test_files:
 - spec/unit/berkshelf/source_spec.rb
 - spec/unit/berkshelf/source_uri_spec.rb
 - spec/unit/berkshelf/uploader_spec.rb
+- spec/unit/berkshelf/validator_spec.rb
 - spec/unit/berkshelf/visualizer_spec.rb
 - spec/unit/berkshelf_spec.rb
 has_rdoc: