berkshelf 0.5.1 → 0.6.0.beta1

data/berkshelf.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9.1"
 
   s.add_runtime_dependency 'ridley',  '>= 0.0.5'
-  s.add_runtime_dependency 'solve',   '~> 0.2.1'
+  s.add_runtime_dependency 'solve',   '>= 0.3.0'
   s.add_runtime_dependency 'chef',    '~> 10.12.0'
   s.add_runtime_dependency 'minitar'
   s.add_runtime_dependency 'thor',    '~> 0.16.0'

data/lib/berkshelf/berksfile.rb

@@ -32,9 +32,7 @@ module Berkshelf
         
         scratch = Berkshelf.mktmpdir
         cookbooks.each do |cb|
-          dest = File.join(scratch, cb.cookbook_name, "/")
-          FileUtils.mkdir_p(dest)
-          FileUtils.cp_r(Dir.glob(File.join(cb.path, "*")), dest)
+          FileUtils.cp_r(cb.path, File.join(scratch, cb.cookbook_name))
         end
 
         FileUtils.remove_dir(path, force: true)

data/lib/berkshelf/cookbook_store.rb

@@ -74,12 +74,11 @@ module Berkshelf
     def satisfy(name, constraint)
       graph = Solve::Graph.new
       cookbooks(name).each { |cookbook| graph.artifacts(name, cookbook.version) }
-      graph.demands(name, constraint)
 
-      name, version = Solve.it!(graph).first
+      name, version = Solve.it!(graph, [[name, constraint]]).first
       
       cookbook(name, version)
-    rescue Solve::NoSolutionError
+    rescue Solve::Errors::NoSolutionError
       nil
     end
 

data/lib/berkshelf/location.rb

@@ -49,21 +49,11 @@ module Berkshelf
       #
       # @return [Array, nil]
       def solve_for_constraint(constraint, versions)
-        graph = Solve::Graph.new
-        name = "none"
-
-        versions.each do |version, uri|
-          graph.artifacts(name, version)
-        end
-
-        graph.demands(name, constraint)
-        result = Solve.it(graph)
-
-        return nil if result.nil?
-
-        version = result[name]
+        version = Solve::Solver.satisfy_best(constraint, versions.keys).to_s
 
         [ version, versions[version] ]
+      rescue Solve::Errors::NoSolutionError
+        nil
       end
     end
 

data/lib/berkshelf/locations/chef_api_location.rb

@@ -177,9 +177,8 @@ module Berkshelf
       versions.each do |version, url|
         graph.artifacts(name, version)
       end
-      graph.demands(name, ">= 0.0.0")
 
-      version = Solve.it!(graph)[name]
+      version = Solve.it!(graph, [name])[name]
 
       [ version, versions[version] ]
     end

data/lib/berkshelf/resolver.rb

@@ -83,11 +83,13 @@ module Berkshelf
     #
     # @return [Array<Berkshelf::CachedCookbook>]
     def resolve
-      graph.artifacts.each do |artifact|
-        graph.demands(artifact.name)
+      demands = [].tap do |l_demands|
+        graph.artifacts.each do |artifact|
+          l_demands << [ artifact.name, artifact.version ]
+        end
       end
 
-      solution = Solve.it!(graph)
+      solution = Solve.it!(graph, demands)
 
       [].tap do |cached_cookbooks|
         solution.each do |name, version|

data/lib/berkshelf/vagrant/action/clean.rb

@@ -11,7 +11,7 @@ module Berkshelf
         end
 
         def call(env)
-          if Berkshelf::Vagrant.chef_solo?(env[:vm].config) && self.shelf
+          if Berkshelf::Vagrant.chef_solo?(env[:global_config]) && self.shelf
             Berkshelf.formatter.msg "cleaning Vagrant's shelf"
             FileUtils.remove_dir(self.shelf, fore: true)
           end

data/lib/berkshelf/vagrant/action/install.rb

@@ -11,14 +11,14 @@ module Berkshelf
         def initialize(app, env)
           @app                  = app
           @shelf                = Berkshelf::Vagrant.shelf_for(env)
-          @config               = env[:vm].config.berkshelf
+          @config               = env[:global_config].berkshelf
           Berkshelf.config_path = @config.config_path
           Berkshelf.load_config
           @berksfile            = Berksfile.from_file(@config.berksfile_path)
         end
 
         def call(env)
-          if Berkshelf::Vagrant.chef_solo?(env[:vm].config)
+          if Berkshelf::Vagrant.chef_solo?(env[:global_config])
             configure_cookbooks_path(env)
             install(env)
           end
@@ -37,7 +37,7 @@ module Berkshelf
           end
 
           def configure_cookbooks_path(env)
-            Berkshelf::Vagrant.provisioners(:chef_solo, env[:vm].config).each do |provisioner|
+            Berkshelf::Vagrant.provisioners(:chef_solo, env[:global_config]).each do |provisioner|
               provisioner.config.cookbooks_path.unshift(self.shelf)
             end
           end

data/lib/berkshelf/vagrant/action/upload.rb

@@ -10,14 +10,14 @@ module Berkshelf
 
         def initialize(app, env)
           @app = app
-          @node_name  = env[:vm].config.berkshelf.node_name
-          @client_key = env[:vm].config.berkshelf.client_key
-          @ssl_verify = env[:vm].config.berkshelf.ssl_verify
-          @berksfile  = Berksfile.from_file(env[:vm].config.berkshelf.berksfile_path)
+          @node_name  = env[:global_config].berkshelf.node_name
+          @client_key = env[:global_config].berkshelf.client_key
+          @ssl_verify = env[:global_config].berkshelf.ssl_verify
+          @berksfile  = Berksfile.from_file(env[:global_config].berkshelf.berksfile_path)
         end
 
         def call(env)
-          if Berkshelf::Vagrant.chef_client?(env[:vm].config)
+          if Berkshelf::Vagrant.chef_client?(env[:global_config])
             upload(env)
           end
 
@@ -27,7 +27,7 @@ module Berkshelf
         private
 
           def upload(env)
-            Berkshelf::Vagrant.provisioners(:chef_client, env[:vm].config).each do |provisioner|
+            Berkshelf::Vagrant.provisioners(:chef_client, env[:global_config]).each do |provisioner|
               Berkshelf.formatter.msg "uploading cookbooks to '#{provisioner.config.chef_server_url}'"
               berksfile.upload(
                 server_url: provisioner.config.chef_server_url,

data/lib/berkshelf/vagrant.rb

@@ -18,12 +18,12 @@ module Berkshelf
 
     class << self
       # @param [Vagrant::Action::Environment] env
-      #
-      # @return [String, nil]
       def shelf_for(env)
-        return nil if env[:vm].uuid.nil?
+        unless env[:global_config].vm.host_name
+          return nil
+        end
 
-        File.join(Berkshelf.berkshelf_path, "vagrant", env[:vm].uuid)
+        File.join(Berkshelf.berkshelf_path, "vagrant", env[:global_config].vm.host_name)
       end
 
       # @param [Symbol] shortcut
@@ -64,7 +64,7 @@ module Berkshelf
           ::Vagrant.actions[action].insert(::Vagrant::Action::VM::Provision, Berkshelf::Vagrant::Middleware.upload)
         end
 
-        ::Vagrant.actions[:destroy].insert(::Vagrant::Action::VM::ProvisionerCleanup, Berkshelf::Vagrant::Middleware.clean)
+        ::Vagrant.actions[:destroy].insert(::Vagrant::Action::VM::CleanMachineFolder, Berkshelf::Vagrant::Middleware.clean)
       end
     end
   end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.5.1"
+  VERSION = "0.6.0.beta1"
 end

data/spec/unit/berkshelf/resolver_spec.rb

@@ -110,7 +110,7 @@ module Berkshelf
         it "returns the source of the same name" do
           subject.get_source(source.name).should eql(source)
         end
-      end       
+      end
     end
 
     describe "#has_source?" do
@@ -120,25 +120,5 @@ module Berkshelf
         subject.has_source?(source.name).should be_true
       end
     end
-
-    describe "#resolve" do
-      before(:each) do
-        subject.add_source(source)
-        subject.add_source(source_two)
-        @solution = subject.resolve
-      end
-      
-      it "returns an array of the CachedCookbooks which make up the solution" do
-        @solution.should include(source.cached_cookbook)
-        @solution.should include(source_two.cached_cookbook)
-      end
-      
-      it "resolves the given mysql source" do
-        @solution[0].cookbook_name.should eql("mysql")
-        @solution[0].version.should eql("1.2.4")
-        @solution[1].cookbook_name.should eql("nginx")
-        @solution[1].version.should eql("0.101.2")
-      end
-    end
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.6.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Josiah Kiehl
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -35,17 +35,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -586,12 +586,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: -3087057702069049964
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23