berkshelf 1.4.0.rc1 → 1.4.0

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
-describe Berkshelf::InitGenerator do
+describe Berkshelf::InitGenerator, vcr: { record: :new_episodes, serialize_with: :json } do
   subject { described_class }
 
   let(:target) { tmp_path.join("some_cookbook") }
+  let(:resolver) { double('resolver') }
 
   context "with default options" do
     before(:each) do
@@ -157,4 +158,42 @@ describe Berkshelf::InitGenerator do
       }
     end
   end
+
+  context "with the chef_minitest option true" do
+    before(:each) do
+        Berkshelf::Resolver.stub(:resolve) { resolver }
+        pending "Runs fine with no mock for the HTTP call on the first pass, subsequent passes throw errors"
+        capture(:stdout) {
+          subject.new([target], chef_minitest: true).invoke_all
+        }
+    end
+
+    specify do
+      target.should have_structure {
+        file "Berksfile" do
+          contains "cookbook \"minitest-handler\""
+        end
+        file "Vagrantfile" do
+          contains "\"recipe[minitest-handler::default]\""
+        end
+       directory "files" do
+         directory "default" do
+           directory "tests" do
+             directory "minitest" do
+               file "default_test.rb" do
+                 contains "describe 'some_cookbook::default' do"
+                 contains "include Helpers::Some_cookbook"
+               end
+               directory "support" do
+                 file "helpers.rb" do
+                   contains "module Some_cookbook"
+                 end
+               end
+             end
+           end
+         end
+       end
+      }
+    end
+  end
 end

data/spec/unit/berkshelf/locations/path_location_spec.rb

@@ -4,6 +4,16 @@ describe Berkshelf::PathLocation do
   let(:complacent_constraint) { double('comp-vconstraint', satisfies?: true) }
   let(:path) { fixtures_path.join("cookbooks", "example_cookbook").to_s }
 
+  describe "ClassMethods" do
+    describe "::new" do
+      it "assigns the value of :path to @path" do
+        obj = described_class.new("nginx", complacent_constraint, path: path)
+
+        obj.path.should eql(path)
+      end
+    end
+  end
+
   subject { described_class.new("nginx", complacent_constraint, path: path) }
 
   describe "#download" do

data/spec/unit/berkshelf/resolver_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Berkshelf::Resolver, :chef_server, vcr: { record: :new_episodes, serialize_with: :yaml } do
+  let(:downloader ) { Berkshelf::Downloader.new(Berkshelf.cookbook_store) }
+  let(:berksfile) { double(downloader: downloader) }
   let(:source) do
     double('source',
       name: 'mysql',
@@ -20,30 +22,27 @@ describe Berkshelf::Resolver, :chef_server, vcr: { record: :new_episodes, serial
     subject { described_class }
 
     describe "::initialize" do
-      let(:downloader) { Berkshelf::Downloader.new(Berkshelf.cookbook_store) }
-
       it "adds the specified sources to the sources hash" do
-        resolver = subject.new(downloader, sources: [source], skip_dependencies: true)
+        resolver = subject.new(berksfile, sources: [source], skip_dependencies: true)
 
         resolver.should have_source(source.name)
       end
 
       it "should not add dependencies if requested" do
-        resolver = subject.new(downloader, sources: [source], skip_dependencies: true)
+        resolver = subject.new(berksfile, sources: [source], skip_dependencies: true)
 
         resolver.should_not have_source("nginx")
       end
 
       it "adds the dependencies of the source as sources" do
-        resolver = subject.new(downloader, sources: [source])
+        resolver = subject.new(berksfile, sources: [source])
 
         resolver.should have_source("nginx")
       end
     end
   end
 
-  let(:downloader) { Berkshelf::Downloader.new(Berkshelf.cookbook_store) }
-  subject { described_class.new(downloader) }
+  subject { described_class.new(berksfile) }
 
   describe "#add_source" do
     let(:package_version) { double('package-version', dependencies: Array.new) }

data/spec/unit/berkshelf/ui_spec.rb

@@ -92,7 +92,8 @@ describe Thor::Shell::Color do
       end
 
       it 'calls #say with yellow coloring' do
-        stdout.should_receive(:puts).with("\e[33mwarning\e[0m")
+        stdout.stub :tty?
+        stdout.should_receive(:puts).with("warning")
         stdout.should_receive(:flush).with(no_args())
         subject.warn 'warning'
       end

data/spec/unit/chef/config_spec.rb

@@ -1,9 +1,84 @@
 require 'spec_helper'
 
 describe Berkshelf::Chef::Config do
-  describe "::path" do
-    subject { described_class.path }
+  subject { described_class }
 
-    it { should be_a String }
+  describe '::path' do
+    let(:path) { '/fake/path/for/.chef' }
+    let(:config) { File.join(path, 'knife.rb') }
+
+    before do
+      ENV.stub(:[]).and_return(nil)
+
+      File.stub(:exists?).with(any_args()).and_return(false)
+      File.stub(:exists?).with(config).and_return(true)
+
+      subject.instance_variable_set(:@path, nil)
+    end
+
+    it 'uses $BERKSHELF_CHEF_CONFIG' do
+      ENV.stub(:[]).with('BERKSHELF_CHEF_CONFIG').and_return(config)
+      expect(subject.path).to eq(config)
+    end
+
+    it 'uses $KNIFE_HOME' do
+      ENV.stub(:[]).with('KNIFE_HOME').and_return(path)
+      expect(subject.path).to eq(config)
+    end
+
+    it 'uses ::working_dir' do
+      Berkshelf::Chef::Config.stub(:working_dir).and_return(path)
+      expect(subject.path).to eq(config)
+    end
+
+    context 'an ascending search' do
+      context 'with multiple .chef directories' do
+        let(:path) { '/fake/.chef/path/with/multiple/.chef/directories' }
+
+        before do
+          Berkshelf::Chef::Config.stub(:working_dir).and_return(path)
+          File.stub(:exists?).and_return(false)
+          File.stub(:exists?).with('/fake/.chef/knife.rb').and_return(true)
+          File.stub(:exists?).with('/fake/.chef/path/with/multiple/.chef/knife.rb').and_return(true)
+        end
+
+        it 'chooses the closest path' do
+          expect(subject.path).to eq('/fake/.chef/path/with/multiple/.chef/knife.rb')
+        end
+      end
+
+      context 'with the current directory as .chef' do
+        let(:path) { '/fake/.chef' }
+
+        before do
+          Berkshelf::Chef::Config.stub(:working_dir).and_return(path)
+          File.stub(:exists?).and_return(false)
+          File.stub(:exists?).with('/fake/.chef/knife.rb').and_return(true)
+        end
+
+        it 'uses the current directory' do
+          expect(subject.path).to eq('/fake/.chef/knife.rb')
+        end
+      end
+
+      context 'with .chef at the top-level' do
+        let(:path) { '/.chef/some/random/sub/directories' }
+
+        before do
+          Berkshelf::Chef::Config.stub(:working_dir).and_return(path)
+          File.stub(:exists?).and_return(false)
+          File.stub(:exists?).with('/.chef/knife.rb').and_return(true)
+        end
+
+        it 'uses the top-level directory' do
+          expect(subject.path).to eq('/.chef/knife.rb')
+        end
+      end
+    end
+
+    it 'uses $HOME' do
+      ENV.stub(:[]).with('HOME').and_return(File.join(path, '..'))
+      expect(subject.path).to eq(config)
+    end
   end
-end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc1
-  prerelease: 6
+  version: 1.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -229,7 +229,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -237,7 +237,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +254,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -441,10 +457,12 @@ files:
 - bin/berks
 - features/config.feature
 - features/configure_command.feature
+- features/contingent_command.feature
 - features/cookbook_command.feature
 - features/default_locations.feature
 - features/groups_install.feature
 - features/help.feature
+- features/info_command.feature
 - features/init_command.feature
 - features/install_command.feature
 - features/json_formatter.feature
@@ -472,7 +490,9 @@ files:
 - generator_files/Vagrantfile.erb
 - generator_files/chefignore
 - generator_files/default_recipe.erb
+- generator_files/default_test.rb.erb
 - generator_files/gitignore.erb
+- generator_files/helpers.rb.erb
 - generator_files/licenses/apachev2.erb
 - generator_files/licenses/gplv2.erb
 - generator_files/licenses/gplv3.erb
@@ -518,6 +538,7 @@ files:
 - lib/berkshelf/mixin/logging.rb
 - lib/berkshelf/mixin/path_helpers.rb
 - lib/berkshelf/resolver.rb
+- lib/berkshelf/test.rb
 - lib/berkshelf/thor.rb
 - lib/berkshelf/ui.rb
 - lib/berkshelf/version.rb
@@ -612,22 +633,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -3407693517536282074
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
 - features/config.feature
 - features/configure_command.feature
+- features/contingent_command.feature
 - features/cookbook_command.feature
 - features/default_locations.feature
 - features/groups_install.feature
 - features/help.feature
+- features/info_command.feature
 - features/init_command.feature
 - features/install_command.feature
 - features/json_formatter.feature