berkshelf 1.3.1 → 1.4.0.rc1

data/spec/unit/berkshelf/chef/cookbook/chefignore_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Berkshelf::Chef::Cookbook::Chefignore do
+  describe "ClassMethods" do
+    subject { described_class }
+
+    describe "::find_relative_to" do
+      let(:path) { tmp_path.join('chefignore-test') }
+      before(:each) { FileUtils.mkdir_p(path) }
+
+      it "finds a chefignore file in a 'cookbooks' directory relative to the given path" do
+        FileUtils.touch(path.join('chefignore'))
+        subject.find_relative_to(path)
+      end
+
+      it "finds a chefignore file relative to the given path" do
+        FileUtils.mkdir_p(path.join('cookbooks'))
+        FileUtils.touch(path.join('cookbooks', 'chefignore'))
+        subject.find_relative_to(path)
+      end
+    end
+  end
+end

data/spec/unit/berkshelf/cookbook_source_spec.rb

@@ -11,24 +11,48 @@ module Berkshelf
         context "given no location key (i.e. :git, :path, :site)" do
           let(:source) { subject.new(cookbook_name) }
 
-          it "sets a nil value for location" do
+          it "sets a nil valie for location" do
             source.location.should be_nil
           end
         end
 
-        context "given no value for constraint" do
+        context 'given no value for :locked_version' do
           let(:source) { subject.new(cookbook_name) }
 
-          it "returns a wildcard match for any version" do
-            source.version_constraint.to_s.should eql(">= 0.0.0")
+          it 'returns a wildcard match for any version' do
+            expect(source.version_constraint.to_s).to eq('>= 0.0.0')
           end
         end
 
-        context "given a value for constraint" do
-          let(:source) { subject.new(cookbook_name, constraint: "~> 1.0.84") }
+        context 'given a value for :locked_version' do
+          let(:source) { subject.new(cookbook_name, locked_version: '1.2.3') }
 
-          it "returns a Solve::Constraint for the given version for version_constraint" do
-            source.version_constraint.to_s.should eql("~> 1.0.84")
+          it 'returns the locked_version as the constraint' do
+            expect(source.version_constraint.to_s).to eq('= 1.2.3')
+          end
+        end
+
+        context 'given no value for :constraint' do
+          let(:source) { subject.new(cookbook_name) }
+
+          it 'returns a wildcard match for any version' do
+            expect(source.version_constraint.to_s).to eq('>= 0.0.0')
+          end
+        end
+
+        context 'given a value for :constraint' do
+          let(:source) { subject.new(cookbook_name, constraint: '~> 1.0.84') }
+
+          it 'returns a Solve::Constraint for the given version for version_constraint' do
+            expect(source.version_constraint.to_s).to eq('~> 1.0.84')
+          end
+        end
+
+        context 'given a value for :locked_version and :constraint' do
+          let(:source) { subject.new(cookbook_name, constraint: '~> 1.0.84', locked_version: '1.2.3') }
+
+          it 'uses the :locked_version' do
+            expect(source.version_constraint.to_s).to eq('= 1.2.3')
           end
         end
 

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

@@ -24,6 +24,20 @@ describe Berkshelf::GitLocation do
   subject { described_class.new("nginx", complacent_constraint, git: "git://github.com/opscode-cookbooks/nginx.git") }
 
   describe "#download" do
+    context "when a local revision is present" do
+      let(:cached) { double('cached') }
+
+      before do
+        Berkshelf::GitLocation.any_instance.stub(:cached?).and_return(true)
+        Berkshelf::GitLocation.any_instance.stub(:validate_cached).with(cached).and_return(cached)
+        Berkshelf::CachedCookbook.stub(:from_store_path).with(any_args()).and_return(cached)
+      end
+
+      it "returns the cached cookbook" do
+        expect(subject.download(tmp_path)).to eq(cached)
+      end
+    end
+
     it "returns an instance of Berkshelf::CachedCookbook" do
       subject.download(tmp_path).should be_a(Berkshelf::CachedCookbook)
     end

data/spec/unit/berkshelf/logger_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Berkshelf::Logger do
+  subject { described_class }
+
+  it "responds to :info" do
+    subject.should respond_to(:info)
+  end
+
+  it "responds to :warn" do
+    subject.should respond_to(:warn)
+  end
+
+  it "responds to :error" do
+    subject.should respond_to(:error)
+  end
+
+  it "responds to :fatal" do
+    subject.should respond_to(:fatal)
+  end
+
+  it "responds to :debug" do
+    subject.should respond_to(:debug)
+  end
+
+  it "responds to :deprecate" do
+    subject.should respond_to(:deprecate)
+  end
+end

data/spec/unit/berkshelf/mixin/logging_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Berkshelf::Mixin::Logging do
+  subject do
+    Class.new do
+      include Berkshelf::Mixin::Logging
+    end.new
+  end
+
+  describe "#log" do
+    it "returns the Berkshelf::Logger" do
+      subject.log.should eql(Berkshelf::Logger)
+    end
+  end
+
+  describe "#log_exception" do
+    it "logs the exception and it's backtrace as fatal" do
+      ex = Exception.new('msg')
+      ex.stub(:backtrace).and_return(['one', 'two'])
+      subject.log.should_receive(:fatal).exactly(2).times
+
+      subject.log_exception(ex)
+    end
+  end
+end

data/spec/unit/berkshelf_spec.rb

@@ -54,8 +54,8 @@ describe Berkshelf do
     end
 
     describe "::log" do
-      it "returns an instance of Logger" do
-        subject.log.should be_a(::Logger)
+      it "returns Berkshelf::Logger" do
+        subject.log.should eql(Berkshelf::Logger)
       end
     end
   end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.3.1
-  prerelease: 
+  version: 1.4.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -115,17 +115,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: chozo
   requirement: !ruby/object:Gem::Requirement
@@ -513,7 +513,9 @@ files:
 - lib/berkshelf/locations/path_location.rb
 - lib/berkshelf/locations/site_location.rb
 - lib/berkshelf/lockfile.rb
+- lib/berkshelf/logger.rb
 - lib/berkshelf/mixin.rb
+- lib/berkshelf/mixin/logging.rb
 - lib/berkshelf/mixin/path_helpers.rb
 - lib/berkshelf/resolver.rb
 - lib/berkshelf/thor.rb
@@ -570,6 +572,7 @@ files:
 - spec/support/test_generators.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
+- spec/unit/berkshelf/chef/cookbook/chefignore_spec.rb
 - spec/unit/berkshelf/community_rest_spec.rb
 - spec/unit/berkshelf/config_spec.rb
 - spec/unit/berkshelf/cookbook_generator_spec.rb
@@ -587,6 +590,8 @@ files:
 - spec/unit/berkshelf/locations/path_location_spec.rb
 - spec/unit/berkshelf/locations/site_location_spec.rb
 - spec/unit/berkshelf/lockfile_spec.rb
+- spec/unit/berkshelf/logger_spec.rb
+- spec/unit/berkshelf/mixin/logging_spec.rb
 - spec/unit/berkshelf/resolver_spec.rb
 - spec/unit/berkshelf/ui_spec.rb
 - spec/unit/berkshelf_spec.rb
@@ -607,12 +612,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1990198724109386499
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -694,6 +696,7 @@ test_files:
 - spec/support/test_generators.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
+- spec/unit/berkshelf/chef/cookbook/chefignore_spec.rb
 - spec/unit/berkshelf/community_rest_spec.rb
 - spec/unit/berkshelf/config_spec.rb
 - spec/unit/berkshelf/cookbook_generator_spec.rb
@@ -711,6 +714,8 @@ test_files:
 - spec/unit/berkshelf/locations/path_location_spec.rb
 - spec/unit/berkshelf/locations/site_location_spec.rb
 - spec/unit/berkshelf/lockfile_spec.rb
+- spec/unit/berkshelf/logger_spec.rb
+- spec/unit/berkshelf/mixin/logging_spec.rb
 - spec/unit/berkshelf/resolver_spec.rb
 - spec/unit/berkshelf/ui_spec.rb
 - spec/unit/berkshelf_spec.rb