berkshelf 4.0.1 → 4.1.0

data/lib/berkshelf/resolver.rb

@@ -1,5 +1,6 @@
 module Berkshelf
   class Resolver
+
     require_relative 'resolver/graph'
 
     extend Forwardable
@@ -23,6 +24,7 @@ module Berkshelf
       @demands   = Array.new
 
       Array(demands).each { |demand| add_demand(demand) }
+      compute_solver_engine(berksfile)
     end
 
     # Add the given dependency to the collection of demands
@@ -102,5 +104,30 @@ module Berkshelf
     def has_demand?(demand)
       !get_demand(demand).nil?
     end
+
+    # Look at berksfile's solvers, and ask Solve#engine= for the right one,
+    # swallowing any exceptions if it's preferred but not required
+    #
+    # @param [Berksfile] berksfile
+    def compute_solver_engine(berksfile)
+      if berksfile.required_solver
+        begin
+          Solve.engine = berksfile.required_solver
+        rescue Solve::Errors::InvalidEngine => e
+          raise ArgumentError, e.message
+        end
+      elsif berksfile.preferred_solver
+        begin
+          Solve.engine = berksfile.preferred_solver
+        rescue
+          # We should log this, but Berkshelf.log.warn and Berkshelf.formatter.warn
+          # both seem inappropriate here.
+          # "  Preferred solver ':#{berksfile.preferred_solver}' unavailable"
+        end
+      end
+      # We should log this, but Berkshelf.log.info and Berkshelf.formatter.msg
+      # both seem inappropriate here.
+      # "  Selected dependency solver engine ':#{Solve.engine}'"
+    end
   end
 end

data/lib/berkshelf/thor_ext/hash_with_indifferent_access.rb

@@ -6,7 +6,11 @@ class Thor
       end
 
       def fetch(key, default = nil)
-        super(convert_key(key), default)
+        if default
+          super(convert_key(key), default)
+        else
+          super(convert_key(key))
+        end
       end
     end
   end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "4.0.1"
+  VERSION = "4.1.0"
 end

data/spec/fixtures/berksfiles/default

@@ -0,0 +1,4 @@
+source 'https://supermarket.chef.io'
+cookbook 'apt', '~> 2.0'
+cookbook 'jenkins', '~> 2.0'
+cookbook 'jenkins-config', path: '../cookbook-path/jenkins-config'

data/spec/fixtures/cookbook-path/jenkins-config/metadata.rb

@@ -0,0 +1,4 @@
+name 'jenkins-config'
+version '0.1.0'
+
+depends 'jenkins', '~> 2.0'

data/spec/fixtures/cookbook-store/jenkins-2.0.3/metadata.rb

@@ -0,0 +1,6 @@
+name 'jenkins'
+version '2.0.3'
+
+depends 'apt', '~> 2.0'
+depends 'runit', '~> 1.5'
+depends 'yum', '~> 3.0'

data/spec/fixtures/cookbook-store/jenkins-2.0.4/metadata.rb

@@ -0,0 +1,5 @@
+name 'jenkins'
+version '2.0.4'
+
+depends 'apt', '~> 2.0'
+depends 'runit', '~> 1.5'

data/spec/fixtures/lockfiles/default.lock

@@ -1,6 +1,8 @@
 DEPENDENCIES
   apt (~> 2.0)
   jenkins (~> 2.0)
+  jenkins-config
+    path: ../cookbook-path/jenkins-config
 
 GRAPH
   apt (2.3.6)
@@ -9,6 +11,9 @@ GRAPH
     apt (~> 2.0)
     runit (~> 1.5)
     yum (~> 3.0)
+  jenkins-config (0.1.0)
+    jenkins (~> 2.0)
+    yum (~> 3.0)
   runit (1.5.8)
     build-essential (>= 0.0.0)
     yum (~> 3.0)

data/spec/fixtures/lockfiles/orphans.lock

@@ -0,0 +1,21 @@
+DEPENDENCIES
+  apt (~> 2.0)
+  jenkins (~> 2.0)
+  jenkins-config
+    path: ../cookbook-path/jenkins-config
+
+GRAPH
+  apt (2.3.6)
+  build-essential (1.4.2)
+  jenkins (2.0.3)
+    apt (~> 2.0)
+    runit (~> 1.5)
+  jenkins-config (0.1.0)
+    jenkins (~> 2.0)
+  runit (1.5.8)
+    build-essential (>= 0.0.0)
+  yum (3.0.6)
+  yum-epel (0.2.0)
+    yum (~> 3.0)
+  zum-foo (0.1.0)
+    yum (~> 3.0)

data/spec/support/chef_server.rb

@@ -62,8 +62,8 @@ module Berkshelf::RSpec
     end
 
     def chef_cookbooks
-      chef_server.data_store.list(['cookbooks']).inject({}) do |hash, name|
-        hash[name] = chef_server.data_store.list(['cookbooks', name])
+      chef_server.data_store.list(['organizations', 'chef', 'cookbooks']).inject({}) do |hash, name|
+        hash[name] = chef_server.data_store.list(['organizations', 'chef', 'cookbooks', name])
         hash
       end
     end
@@ -77,7 +77,7 @@ module Berkshelf::RSpec
     end
 
     def chef_environment_locks(name)
-      JSON.parse(chef_server.data_store.get(['environments', name]))['cookbook_versions']
+      JSON.parse(chef_server.data_store.get(['organizations', 'chef', 'environments', name]))['cookbook_versions']
     rescue ChefZero::DataStore::DataNotFoundError
       {}
     end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -9,6 +9,7 @@ describe Berkshelf::Berksfile do
         cookbook 'mysql'
         cookbook 'nginx', '< 0.101.2'
         cookbook 'ssh_known_hosts2', :git => 'https://github.com/erikh/chef-ssh_known_hosts2.git'
+        solver :foo, :required
         EOF
       end
       let(:berksfile) { tmp_path.join('Berksfile') }
@@ -238,7 +239,7 @@ describe Berkshelf::Berksfile do
   describe '#cookbooks' do
     it 'raises an exception if a cookbook is not installed' do
       subject.add_dependency('bacon', nil)
-      expect { subject.cookbooks }.to raise_error
+      expect { subject.cookbooks }.to raise_error(Berkshelf::DependencyNotFound)
     end
 
     it 'retrieves the locked (cached) cookbook for each dependency' do
@@ -406,4 +407,29 @@ describe Berkshelf::Berksfile do
       expect(excludes[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/metadata.rb', File::FNM_DOTMATCH) }).to be(true)
     end
   end
+
+  describe '#solver' do
+
+    let(:solver_precedence) { :please_dont_exist }
+
+    it "defaults to nil required solver and :gecode preferred solver" do
+      expect(subject.preferred_solver).to equal(:gecode)
+      expect(subject.required_solver).to equal(nil)
+    end
+
+    it "adds preferred and required solvers" do
+      subject.solver(:a, :preferred)
+      subject.solver(:b, :required)
+      expect(subject.preferred_solver).to equal(:a)
+      expect(subject.required_solver).to equal(:b)
+    end
+
+    it "raises an exception with a bad precedence" do
+      expect { subject.solver(:foo, :bar) }.to raise_error(/Invalid solver precedence ':bar'/)
+    end
+
+    it "is a DSL method" do
+      expect(subject).to have_exposed_method(:solver)
+    end
+  end
 end

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -24,9 +24,7 @@ describe Berkshelf::InitGenerator do
       expect(target).to have_structure {
         file '.gitignore'
         file 'Berksfile'
-        file 'Gemfile' do
-          contains %(gem 'berkshelf')
-        end
+        file 'Gemfile'
         file 'Vagrantfile' do
           contains %(recipe[some_cookbook::default])
           contains %(config.omnibus.chef_version = 'latest')
@@ -57,7 +55,7 @@ describe Berkshelf::InitGenerator do
       FileUtils.rm(File.join(target, 'metadata.rb'))
       expect {
         Berkshelf::InitGenerator.new([target]).invoke_all
-        }.to raise_error(Berkshelf::NotACookbook)
+      }.to raise_error(Berkshelf::NotACookbook)
     end
   end
 

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -292,6 +292,43 @@ describe Berkshelf::Lockfile do
       expect(subject).to_not have_dependency('apache2')
     end
   end
+
+  describe '#reduce!' do
+    let(:berksfile_path) { fixtures_path.join('berksfiles/default').to_s }
+    let(:berksfile) { Berkshelf::Berksfile.from_file(berksfile_path) }
+
+    describe 'with some orphan dependencies' do
+      let(:orphans_lock) { fixtures_path.join('lockfiles/orphans.lock').to_s }
+      subject { Berkshelf::Lockfile.new(filepath: orphans_lock, berksfile: berksfile) }
+
+      it 'removes orphan dependencies' do
+        graph = subject.graph.instance_variable_get(:@graph)
+        expect(graph).to receive(:delete).with('yum-epel').and_call_original
+        expect(graph).to receive(:delete).with('zum-foo').and_call_original
+        expect(graph).to receive(:delete).with('yum').and_call_original
+        subject.reduce!
+      end
+    end
+
+    describe 'minimizes updates' do
+      subject { Berkshelf::Lockfile.new(filepath: filepath, berksfile: berksfile) }
+
+      before(:each) do
+        cs = fixtures_path.join('cookbook-store')
+        allow(Berkshelf::CookbookStore.instance).to receive(:storage_path).and_return(cs)
+      end
+
+      it 'uses the cookbook version specified in the lockfile' do
+        subject.reduce!
+        expect(subject.berksfile.dependencies[1].cached_cookbook.version).to eq('2.0.3')
+      end
+
+      it 'does not remove locks unnecessarily' do
+        expect(subject).to_not receive(:unlock)
+        subject.reduce!
+      end
+    end
+  end
 end
 
 describe Berkshelf::Lockfile::Graph do

data/spec/unit/berkshelf/resolver_spec.rb

@@ -4,6 +4,11 @@ describe Berkshelf::Resolver do
   let(:berksfile) { double('berksfile') }
   let(:demand) { Berkshelf::Dependency.new(berksfile, "mysql", constraint: "= 1.2.4") }
 
+  before(:each) do
+    allow(berksfile).to receive(:required_solver).and_return(nil)
+    allow(berksfile).to receive(:preferred_solver).and_return(nil)
+  end
+
   describe "ClassMethods" do
     describe "::initialize" do
       it 'adds the specified dependencies to the dependencies hash' do
@@ -58,5 +63,27 @@ describe Berkshelf::Resolver do
     end
   end
 
-  describe "#resolve"
+  describe "#resolve" do
+    describe 'given a missing required solver' do
+      before do
+        allow(berksfile).to receive(:required_solver).and_return(:xyzzy)
+        allow(berksfile).to receive(:preferred_solver).and_return(nil)
+      end
+
+      it 'should raise an exception about missing required resolver :xyzzy' do
+        expect { subject.compute_solver_engine(berksfile) }.to raise_error(/Engine `xyzzy` is not supported/)
+      end
+    end
+
+    describe 'given a missing preferred solver' do
+      before do
+        allow(berksfile).to receive(:required_solver).and_return(nil)
+        allow(berksfile).to receive(:preferred_solver).and_return(:xyzzy)
+      end
+
+      it 'should not raise an exception about missing preferred resolver :xyzzy' do
+        expect { subject.compute_solver_engine(berksfile) }.not_to raise_error
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -174,14 +174,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -202,14 +202,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -244,56 +244,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: dep_selector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -364,6 +378,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
 - jamie@vialstudios.com
@@ -381,6 +409,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - PLUGINS.md
@@ -496,6 +525,10 @@ files:
 - spec/config/knife.rb
 - spec/config/validator.pem
 - spec/fixtures/Berksfile
+- spec/fixtures/berksfiles/default
+- spec/fixtures/cookbook-path/jenkins-config/metadata.rb
+- spec/fixtures/cookbook-store/jenkins-2.0.3/metadata.rb
+- spec/fixtures/cookbook-store/jenkins-2.0.4/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb
@@ -510,6 +543,7 @@ files:
 - spec/fixtures/lockfiles/blank.lock
 - spec/fixtures/lockfiles/default.lock
 - spec/fixtures/lockfiles/empty.lock
+- spec/fixtures/lockfiles/orphans.lock
 - spec/spec_helper.rb
 - spec/support/chef_api.rb
 - spec/support/chef_server.rb
@@ -576,7 +610,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
@@ -623,6 +657,10 @@ test_files:
 - spec/config/knife.rb
 - spec/config/validator.pem
 - spec/fixtures/Berksfile
+- spec/fixtures/berksfiles/default
+- spec/fixtures/cookbook-path/jenkins-config/metadata.rb
+- spec/fixtures/cookbook-store/jenkins-2.0.3/metadata.rb
+- spec/fixtures/cookbook-store/jenkins-2.0.4/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb
@@ -637,6 +675,7 @@ test_files:
 - spec/fixtures/lockfiles/blank.lock
 - spec/fixtures/lockfiles/default.lock
 - spec/fixtures/lockfiles/empty.lock
+- spec/fixtures/lockfiles/orphans.lock
 - spec/spec_helper.rb
 - spec/support/chef_api.rb
 - spec/support/chef_server.rb