berkshelf 1.0.0.rc1 → 1.0.0.rc2

data/spec/unit/berkshelf/git_spec.rb

@@ -12,7 +12,7 @@ module Berkshelf
 
         it "should raise if it can't find git" do
           ENV.should_receive(:[]).with("PATH").and_return(String.new)
-          
+
           lambda {
             subject.find_git
           }.should raise_error(GitNotFound)

data/spec/unit/berkshelf/location_spec.rb

@@ -72,7 +72,7 @@ module Berkshelf
       describe "::solve_for_constraint" do
         let(:constraint) { "~> 0.101.2" }
         let(:versions) do
-          { 
+          {
             "0.101.2" => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_101_2",
             "0.101.0" => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_101_0",
             "0.100.2" => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_100_2",
@@ -143,7 +143,7 @@ module Berkshelf
           end
         end
       end
-    end 
+    end
 
     let(:name) { "nginx" }
     let(:constraint) { double('constraint') }
@@ -179,7 +179,7 @@ module Berkshelf
 
       it "returns true if cached_cookbooks satisfies the version constraint" do
         constraint.should_receive(:satisfies?).with(cached.version).and_return(true)
-        
+
         subject.validate_cached(cached).should be_true
       end
 

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

@@ -63,8 +63,8 @@ module Berkshelf
           end
         end
 
-        context "given the symbol :knife for the value of chef_api:" do
-          before(:each) { @loc = subject.new("nginx", constraint, chef_api: :knife) }
+        context "given the symbol :config for the value of chef_api:" do
+          before(:each) { @loc = subject.new("nginx", constraint, chef_api: :config) }
 
           it "uses the value of Chef::Config[:chef_server_url] for the uri attribute" do
             @loc.uri.should eql(Chef::Config[:chef_server_url])
@@ -106,7 +106,7 @@ module Berkshelf
     subject do
       loc = ChefAPILocation.new("nginx",
         double('constraint', satisfies?: true),
-        chef_api: :knife
+        chef_api: :config
       )
     end
 
@@ -143,11 +143,10 @@ module Berkshelf
 
       context "given a constraint that matches an available cookbook" do
         before(:each) do
-          cookbook_version = double('cookbook-version')
-          cookbook_version.stub(:manifest).and_return({})
+          manifest = Hash.new
           subject.stub(:version_constraint) { Solve::Constraint.new("= 0.99.0") }
-          rest.should_receive(:get_rest).with("https://api.opscode.com/organizations/vialstudios/cookbooks/nginx/0.99.0").and_return(cookbook_version)
-          subject.should_receive(:download_files).with(cookbook_version.manifest).and_return(
+          subject.should_receive(:download_manifest).with("https://api.opscode.com/organizations/vialstudios/cookbooks/nginx/0.99.0").and_return(manifest)
+          subject.should_receive(:download_files).with(manifest).and_return(
             generate_cookbook(Dir.mktmpdir, subject.name, "0.99.0")
           )
         end
@@ -169,10 +168,9 @@ module Berkshelf
         end
 
         it "downloads the manifest of the latest cookbook version of the cookbook" do
-          cookbook_version = double('cookbook-version')
-          cookbook_version.stub(:manifest).and_return({})
-          rest.should_receive(:get_rest).with("https://api.opscode.com/organizations/vialstudios/cookbooks/nginx/0.101.2").and_return(cookbook_version)
-          subject.should_receive(:download_files).with(cookbook_version.manifest).and_return(
+          manifest = Hash.new
+          subject.should_receive(:download_manifest).with("https://api.opscode.com/organizations/vialstudios/cookbooks/nginx/0.101.2").and_return(manifest)
+          subject.should_receive(:download_files).with(manifest).and_return(
             generate_cookbook(Dir.mktmpdir, subject.name, subject.latest_version[0])
           )
 
@@ -225,7 +223,7 @@ module Berkshelf
       subject do
         ChefAPILocation.new('nginx',
           double('constraint'),
-          chef_api: :knife
+          chef_api: :config
         )
       end
 

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Berkshelf
   describe GitLocation do
     let(:complacent_constraint) { double('comp-vconstraint', satisfies?: true) }
-    
+
     describe "ClassMethods" do
       subject { GitLocation }
 
@@ -86,7 +86,7 @@ module Berkshelf
 
       context "given a value for ref that is a tag or branch and not a commit hash" do
         subject do
-          GitLocation.new("artifact", 
+          GitLocation.new("artifact",
             complacent_constraint,
             git: "git://github.com/RiotGames/artifact-cookbook.git",
             ref: "0.9.8"

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Berkshelf
   describe Lockfile do
     let(:downloader) { Downloader.new(Berkshelf.cookbook_store) }
-    
+
     describe "without a lockfile in place already" do
       before(:all) do
         @old_dir = Dir.pwd

data/spec/unit/berkshelf/resolver_spec.rb

@@ -7,7 +7,7 @@ module Berkshelf
         name: 'mysql',
         version_constraint: Solve::Constraint.new('= 1.2.4'),
         downloaded?: true,
-        cached_cookbook: double('mysql-cookbook', 
+        cached_cookbook: double('mysql-cookbook',
           name: 'mysql-1.2.4',
           cookbook_name: 'mysql',
           version: '1.2.4',
@@ -22,7 +22,7 @@ module Berkshelf
         name: 'nginx',
         version_constraint: Solve::Constraint.new('= 0.101.2'),
         downloaded?: true,
-        cached_cookbook: double('nginx-cookbook', 
+        cached_cookbook: double('nginx-cookbook',
           name: 'nginx-0.101.2',
           cookbook_name: 'nginx',
           version: '0.101.2',
@@ -46,7 +46,7 @@ module Berkshelf
 
         it "adds the dependencies of the source as sources" do
           resolver = subject.new(downloader, sources: source)
-          
+
           resolver.should have_source("nginx")
           resolver.should have_source("artifact")
         end
@@ -76,13 +76,13 @@ module Berkshelf
 
       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
         subject.should_receive(:add_source_dependencies).with(source)
-        
+
         subject.add_source(source)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -12,16 +12,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chozo
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,15 +29,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ridley
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 10.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,15 +45,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 10.12.0
 - !ruby/object:Gem::Dependency
-  name: solve
+  name: ridley
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0.rc1
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,25 +61,25 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0.rc1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: chozo
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '10.12'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '10.12'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: minitar
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -95,45 +95,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-- !ruby/object:Gem::Dependency
-  name: vagrant
+  name: minitar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,15 +125,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: solve
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -157,39 +141,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0.rc1
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: vagrant
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
 - jamie@vialstudios.com