berkshelf 0.3.7 → 0.4.0.rc1

data/spec/unit/berkshelf/cookbook_store_spec.rb

@@ -36,10 +36,10 @@ module Berkshelf
 
     describe "#satisfy" do
       let(:name) { "nginx" }
-      let(:version) { DepSelector::Version.new("0.101.4") }
-      let(:constraint) { DepSelector::VersionConstraint.new("~> 0.101.2") }
-      let(:cached_cb) { double('cached-cb', name: name, version: version) }
-      let(:cached_two) { double('cached-two', name: "mysql", version: DepSelector::Version.new("1.2.6")) }
+      let(:version) { "0.101.4" }
+      let(:constraint) { Solve::Constraint.new("~> 0.101.2") }
+      let(:cached_cb) { double('cached-cb', name: name, version: Solve::Version.new(version)) }
+      let(:cached_two) { double('cached-two', name: "mysql", version: Solve::Version.new("1.2.6")) }
 
       before(:each) do
         subject.stub(:cookbooks).and_return([cached_cb, cached_two])
@@ -60,8 +60,8 @@ module Berkshelf
       end
 
       context "when there is no matching cookbook for the given name and constraint" do
-        let(:version) { DepSelector::Version.new("1.0.0") }
-        let(:constraint) { DepSelector::VersionConstraint.new("= 0.0.1") }
+        let(:version) { Solve::Version.new("1.0.0") }
+        let(:constraint) { Solve::Constraint.new("= 0.0.1") }
 
         before(:each) do
           subject.stub(:cookbooks).and_return([ double('badcache', name: 'none', version: version) ])

data/spec/unit/berkshelf/resolver_spec.rb

@@ -5,7 +5,7 @@ module Berkshelf
     let(:source) do
       double('source',
         name: 'mysql',
-        version_constraint: DepSelector::VersionConstraint.new('= 1.2.4'),
+        version_constraint: Solve::Constraint.new('= 1.2.4'),
         downloaded?: true,
         cached_cookbook: double('mysql-cookbook', 
           name: 'mysql-1.2.4',
@@ -20,7 +20,7 @@ module Berkshelf
     let(:source_two) do
       double('source-two',
         name: 'nginx',
-        version_constraint: DepSelector::VersionConstraint.new('= 0.101.2'),
+        version_constraint: Solve::Constraint.new('= 0.101.2'),
         downloaded?: true,
         cached_cookbook: double('nginx-cookbook', 
           name: 'nginx-0.101.2',
@@ -46,18 +46,9 @@ module Berkshelf
 
         it "adds the dependencies of the source as sources" do
           resolver = subject.new(downloader, source)
-
-          source.cached_cookbook.dependencies.each do |name, constraint|
-            resolver.package(name).should_not be_nil
-          end
-        end
-
-        it "adds the version_constraints of the dependencies to the graph" do
-          resolver = subject.new(downloader, source)
-
-          source.cached_cookbook.dependencies.each do |name, constraint|
-            resolver.package(name).versions.should_not be_empty
-          end
+          
+          resolver.should have_source("nginx")
+          resolver.should have_source("artifact")
         end
 
         context "given an array of sources" do
@@ -82,14 +73,10 @@ module Berkshelf
         subject.sources.should include(source)
       end
 
-      it "adds a package of the same name of the source to the graph" do
-        subject.package(source.name).should_not be_nil
-      end
-
-      it "adds a version constraint specified by the source to the package of the same name" do
-        subject.add_source(source)
-
-        subject.package(source.name).versions.collect(&:version).should include(source.version_constraint.version)
+      it "adds an artifact of the same name of the source to the graph" do
+        subject.graph.should_receive(:artifacts).with(source.name, source.cached_cookbook.version)
+        
+        subject.add_source(source, false)
       end
 
       it "adds the dependencies of the source as packages to the graph" do
@@ -106,14 +93,6 @@ module Berkshelf
         }.should raise_error(DuplicateSourceDefined)
       end
 
-      it "adds a package for each dependency to the packages attribute" do
-        subject.add_source(source)
-
-        source.cached_cookbook.dependencies.each do |name, constraint|
-          subject.package(name).should_not be_nil
-        end
-      end
-
       context "when include_dependencies is false" do
         it "does not try to include_dependencies" do
           subject.should_not_receive(:add_source_dependencies)

data/spec/unit/berkshelf/uploader_spec.rb

@@ -2,16 +2,7 @@ require 'spec_helper'
 
 module Berkshelf
   describe Uploader do
-
-    unless config = YAML.load_file('features/config.yml')
-      raise "Could not load features/config.yml -- please generate it from features/config.sample.yml"
-    end
-
-    let(:server_url) { config["chef_server_url"] }
-    let(:client_key) { config["client_key"] }
-    let(:node_name) { config["node_name"] }
-
-    subject { Uploader.new(server_url, client_key: client_key, node_name: node_name) }
+    subject { Uploader.new(Chef::Config[:chef_server_url], client_key: Chef::Config[:client_key], node_name: Chef::Config[:node_name]) }
 
     describe "#upload" do
       let(:cookbook) { double('nginx', name: "nginx-0.101.2", cookbook_name: "nginx", version: "0.101.2") }

data/spec/unit/berkshelf_spec.rb

@@ -4,7 +4,7 @@ describe Berkshelf do
   context "ClassMethods" do
     subject { Berkshelf }
 
-    describe "#find_metadata" do
+    describe "::find_metadata" do
       let(:metadata_path) { fixtures_path.join("cookbooks", "example_cookbook", "metadata.rb") }
 
       context "given a path containing a metadata.rb file" do
@@ -25,5 +25,25 @@ describe Berkshelf do
         end
       end
     end
+
+    describe "::config_path" do
+      it "returns a default value if nothing is specified" do
+        subject.config_path.should eql(Berkshelf::DEFAULT_CONFIG)
+      end
+
+      it "returns the value assigned if specified" do
+        subject.config_path = value = "/Users/reset/.chef/knife.rb"
+
+        subject.config_path.should eql(value)
+      end
+    end
+
+    describe "::load_config" do
+      it "loads the path specified by config_path if no parameter given" do
+        Chef::Config.should_receive(:from_file).with(Berkshelf.config_path)
+
+        subject.load_config
+      end
+    end
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.3.7
-  prerelease: 
+  version: 0.4.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Josiah Kiehl
@@ -12,24 +12,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dep_selector
+  name: solve
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -370,7 +370,6 @@ files:
 - Thorfile
 - berkshelf.gemspec
 - bin/berks
-- features/config.sample.yml
 - features/init_command.feature
 - features/install.feature
 - features/lockfile.feature
@@ -387,6 +386,7 @@ files:
 - lib/berkshelf/cached_cookbook.rb
 - lib/berkshelf/cli.rb
 - lib/berkshelf/cookbook_source.rb
+- lib/berkshelf/cookbook_source/chef_api_location.rb
 - lib/berkshelf/cookbook_source/git_location.rb
 - lib/berkshelf/cookbook_source/location.rb
 - lib/berkshelf/cookbook_source/path_location.rb
@@ -436,12 +436,16 @@ files:
 - spec/fixtures/cookbooks/nginx-0.100.5/templates/default/plugins/nginx.rb.erb
 - spec/fixtures/lockfile_spec/with_lock/Berksfile
 - spec/fixtures/lockfile_spec/without_lock/Berksfile.lock
+- spec/fixtures/reset.pem
+- spec/knife.rb.sample
 - spec/spec_helper.rb
 - spec/support/chef_api.rb
+- spec/support/knife.rb
 - spec/support/matchers/file_system_matchers.rb
 - spec/support/matchers/filepath_matchers.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
+- spec/unit/berkshelf/cookbook_source/chef_api_location_spec.rb
 - spec/unit/berkshelf/cookbook_source/git_location_spec.rb
 - spec/unit/berkshelf/cookbook_source/location_spec.rb
 - spec/unit/berkshelf/cookbook_source/path_location_spec.rb
@@ -473,12 +477,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: -4298839394573709666
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -486,7 +487,6 @@ signing_key:
 specification_version: 3
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
-- features/config.sample.yml
 - features/init_command.feature
 - features/install.feature
 - features/lockfile.feature
@@ -522,12 +522,16 @@ test_files:
 - spec/fixtures/cookbooks/nginx-0.100.5/templates/default/plugins/nginx.rb.erb
 - spec/fixtures/lockfile_spec/with_lock/Berksfile
 - spec/fixtures/lockfile_spec/without_lock/Berksfile.lock
+- spec/fixtures/reset.pem
+- spec/knife.rb.sample
 - spec/spec_helper.rb
 - spec/support/chef_api.rb
+- spec/support/knife.rb
 - spec/support/matchers/file_system_matchers.rb
 - spec/support/matchers/filepath_matchers.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
+- spec/unit/berkshelf/cookbook_source/chef_api_location_spec.rb
 - spec/unit/berkshelf/cookbook_source/git_location_spec.rb
 - spec/unit/berkshelf/cookbook_source/location_spec.rb
 - spec/unit/berkshelf/cookbook_source/path_location_spec.rb

data/features/config.sample.yml

@@ -1,3 +0,0 @@
-node_name: 'reset'
-client_key: '/Users/reset/.chef/reset.pem'
-chef_server_url: 'https://api.opscode.com/organizations/vialstudios'