berkshelf 1.0.0.rc1 → 1.0.0.rc2

data/lib/berkshelf/cookbook_generator.rb

@@ -50,7 +50,7 @@ module Berkshelf
       empty_directory target.join("providers")
       empty_directory target.join("recipes")
       empty_directory target.join("resources")
-            
+
       template "default_recipe.erb", target.join("recipes/default.rb")
       template "metadata.rb.erb", target.join("metadata.rb")
       template license_file, target.join("LICENSE")

data/lib/berkshelf/cookbook_source.rb

@@ -107,7 +107,7 @@ module Berkshelf
       if @location.is_a?(PathLocation)
         @cached_cookbook = CachedCookbook.from_path(location.path)
       end
-      
+
       @locked_version = Solve::Version.new(options[:locked_version]) if options[:locked_version]
 
       add_group(options[:group]) if options[:group]

data/lib/berkshelf/cookbook_store.rb

@@ -44,7 +44,7 @@ module Berkshelf
       [].tap do |cookbooks|
         storage_path.each_child do |p|
           cached_cookbook = CachedCookbook.from_store_path(p)
-          
+
           next unless cached_cookbook
           next if filter && cached_cookbook.cookbook_name != filter
 
@@ -76,7 +76,7 @@ module Berkshelf
       cookbooks(name).each { |cookbook| graph.artifacts(name, cookbook.version) }
 
       name, version = Solve.it!(graph, [[name, constraint]]).first
-      
+
       cookbook(name, version)
     rescue Solve::Errors::NoSolutionError
       nil

data/lib/berkshelf/core_ext/file_utils.rb

@@ -16,7 +16,7 @@ module FileUtils
       end
     end
 
-    # If we encounter Errno::EACCES, which seems to happen occasionally on Windows, 
+    # If we encounter Errno::EACCES, which seems to happen occasionally on Windows,
     # try to copy and delete the file instead of moving it.
     #
     # @see https://github.com/RiotGames/berkshelf/issues/140

data/lib/berkshelf/core_ext/pathname.rb

@@ -1,6 +1,6 @@
 class Pathname
-  # Returns true or false if the path of the instantiated 
-  # Pathname or a parent directory contains a Tryhard Pack 
+  # Returns true or false if the path of the instantiated
+  # Pathname or a parent directory contains a Tryhard Pack
   # data directory.
   #
   # @return [Boolean]

data/lib/berkshelf/formatters.rb

@@ -49,7 +49,7 @@ module Berkshelf
 
     # @author Michael Ivey <ivey@gweezlebur.com>
     #
-    # @abstract Include and override {#install} {#use} {#upload} 
+    # @abstract Include and override {#install} {#use} {#upload}
     #   {#msg} {#error} to implement.
     #
     #   Implement {#cleanup_hook} to run any steps required to run after the task is finished

data/lib/berkshelf/formatters/json.rb

@@ -21,7 +21,7 @@ module Berkshelf
           details[:name] = name
           output[:cookbooks] << details
         end
-        
+
         print MultiJson.dump(output)
       end
 

data/lib/berkshelf/git.rb

@@ -26,7 +26,7 @@ module Berkshelf
         unless cmd.exitstatus == 0
           raise GitError.new(cmd.stderr)
         end
-        
+
         cmd.stdout.chomp
       end
 
@@ -102,7 +102,7 @@ module Berkshelf
       #   "https://github.com/reset/solve.git"
       # @example Valid SSH protocol URI
       #   "git@github.com:reset/solve.git"
-      # 
+      #
       # @param [String] uri
       #
       # @return [Boolean]

data/lib/berkshelf/init_generator.rb

@@ -89,7 +89,7 @@ module Berkshelf
       def cookbook_name
         @cookbook_name ||= begin
           metadata = Chef::Cookbook::Metadata.new
-          
+
           metadata.from_file(target.join("metadata.rb").to_s)
           metadata.name.empty? ? File.basename(target) : metadata.name
         rescue IOError

data/lib/berkshelf/location.rb

@@ -2,7 +2,7 @@ module Berkshelf
   # @author Jamie Winsor <jamie@vialstudios.com>
   module Location
     OPSCODE_COMMUNITY_API = 'http://cookbooks.opscode.com/api/v1/cookbooks'.freeze
-    
+
     module ClassMethods
       # Returns the location identifier key for the class
       #
@@ -32,7 +32,7 @@ module Berkshelf
       #
       # @example:
       #   constraint = Solve::Constraint.new("~> 0.101.2")
-      #   versions = { 
+      #   versions = {
       #     "1.0.0" => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/1_0_0",
       #     "2.0.0" => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/2_0_0"
       #   }

data/lib/berkshelf/locations/chef_api_location.rb

@@ -45,7 +45,7 @@ module Berkshelf
         uri =~ URI.regexp(['http', 'https'])
       end
 
-      # @raise [InvalidChefAPILocation] if the given object is not a String containing a 
+      # @raise [InvalidChefAPILocation] if the given object is not a String containing a
       #   valid Chef API URI
       #
       # @see validate_uri
@@ -130,16 +130,14 @@ module Berkshelf
     # @return [Berkshelf::CachedCookbook]
     def download(destination)
       version, uri = target_version
-      cookbook = rest.get_rest(uri)
-
-      scratch = download_files(cookbook.manifest)
+      scratch = download_files(download_manifest(uri))
 
       cb_path = File.join(destination, "#{name}-#{version}")
       FileUtils.mv(scratch, cb_path)
 
       cached = CachedCookbook.from_store_path(cb_path)
       validate_cached(cached)
-      
+
       set_downloaded_status(true)
       cached
     end
@@ -148,7 +146,7 @@ module Berkshelf
     # The keys are version strings and the values are URLs to download the cookbook version.
     #
     # @example
-    #   { 
+    #   {
     #     "0.101.2" => "https://api.opscode.com/organizations/vialstudios/cookbooks/nginx/0.101.2",
     #     "0.101.5" => "https://api.opscode.com/organizations/vialstudios/cookbooks/nginx/0.101.5"
     #   }
@@ -200,6 +198,15 @@ module Berkshelf
 
       attr_reader :rest
 
+      # Retrieve a cookbooks manifest from the given URL
+      #
+      # @param [String] uri
+      #
+      # @return [Hash]
+      def download_manifest(uri)
+        Chef::CookbookVersion.json_create(rest.get_rest(uri)).manifest
+      end
+
       # Returns an array containing the version and download URL for the cookbook version that
       # should be downloaded for this location.
       #
@@ -210,7 +217,7 @@ module Berkshelf
       def target_version
         if version_constraint
           solution = self.class.solve_for_constraint(version_constraint, versions)
-          
+
           unless solution
             raise NoSolution, "No cookbook version of '#{name}' found at #{self} that would satisfy constraint (#{version_constraint})."
           end
@@ -268,7 +275,7 @@ module Berkshelf
 
         self.class.validate_node_name!(options[:node_name])
         self.class.validate_client_key!(options[:client_key])
-        self.class.validate_uri!(options[:chef_api])          
+        self.class.validate_uri!(options[:chef_api])
       end
   end
 end

data/lib/berkshelf/locations/git_location.rb

@@ -45,7 +45,7 @@ module Berkshelf
       end
 
       unless File.chef_cookbook?(tmp_clone)
-        msg = "Cookbook '#{name}' not found at git: #{uri}" 
+        msg = "Cookbook '#{name}' not found at git: #{uri}"
         msg << " with branch '#{branch}'" if branch
         raise CookbookNotFound, msg
       end
@@ -53,7 +53,7 @@ module Berkshelf
       cb_path = File.join(destination, "#{self.name}-#{Git.rev_parse(tmp_clone)}")
       FileUtils.rm_rf(cb_path)
       FileUtils.mv(tmp_clone, cb_path)
-              
+
       cached = CachedCookbook.from_store_path(cb_path)
       validate_cached(cached)
 

data/lib/berkshelf/locations/site_location.rb

@@ -57,7 +57,7 @@ module Berkshelf
 
       cached = CachedCookbook.from_store_path(cb_path)
       validate_cached(cached)
-      
+
       set_downloaded_status(true)
       cached
     end
@@ -66,7 +66,7 @@ module Berkshelf
     # name of this location.
     #
     # @example
-    #   { 
+    #   {
     #     "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"
     #   }
@@ -142,7 +142,7 @@ module Berkshelf
       def target_version
         if version_constraint
           solution = self.class.solve_for_constraint(version_constraint, versions)
-          
+
           unless solution
             raise NoSolution, "No cookbook version of '#{name}' found at #{self} that would satisfy constraint (#{version_constraint})."
           end

data/lib/berkshelf/resolver.rb

@@ -47,7 +47,7 @@ module Berkshelf
       use_source(source) || install_source(source)
 
       graph.artifacts(source.name, source.cached_cookbook.version)
-      
+
       if include_dependencies
         add_source_dependencies(source)
       end
@@ -142,7 +142,7 @@ module Berkshelf
       #   CookbookSource.
       #
       # @return [Boolean]
-      def use_source(source)        
+      def use_source(source)
         if source.downloaded?
           cached = source.cached_cookbook
           source.location.validate_cached(cached)

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

@@ -16,13 +16,13 @@ module Berkshelf
         def call(env)
           recorder = ::Vagrant::Config::ErrorRecorder.new
           env[:vm].config.berkshelf.validate(env[:vm].env, recorder)
-          
+
           unless recorder.errors.empty?
-            raise ::Vagrant::Errors::ConfigValidationFailed, 
+            raise ::Vagrant::Errors::ConfigValidationFailed,
               messages: ::Vagrant::Util::TemplateRenderer.render("config/validation_failed", errors: { berkshelf: recorder })
           end
 
-          @app.call(env)          
+          @app.call(env)
         end
       end
     end

data/lib/berkshelf/vagrant/middleware.rb

@@ -46,7 +46,7 @@ module Berkshelf
             use Berkshelf::Vagrant::Action::Clean
           end
         end
-      end      
+      end
     end
   end
 end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0.rc2"
 end

data/spec/spec_helper.rb

@@ -1,16 +1,17 @@
 require 'rubygems'
+
 require 'bundler'
 require 'spork'
 require 'vcr'
 
 Spork.prefork do
-  require 'rspec'
-  require 'pp'
   require 'json_spec'
+  require 'pp'
+  require 'rspec'
   require 'webmock/rspec'
-  
+
   APP_ROOT = File.expand_path('../../', __FILE__)
-  
+
   Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 
   VCR.configure do |c|
@@ -22,7 +23,7 @@ Spork.prefork do
     config.include Berkshelf::RSpec::FileSystemMatchers
     config.include JsonSpec::Helpers
     config.include Berkshelf::RSpec::ChefAPI
-    
+
     config.mock_with :rspec
     config.treat_symbols_as_metadata_keys_with_true_values = true
     config.filter_run focus: true

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -10,7 +10,7 @@ cookbook 'nginx', '< 0.101.2'
 cookbook 'ssh_known_hosts2', :git => 'https://github.com/erikh/chef-ssh_known_hosts2.git'
 EOF
     end
-    
+
     describe "ClassMethods" do
       subject { Berksfile }
 
@@ -36,7 +36,7 @@ EOF
         it "returns the expanded filepath of the vendor directory" do
           cached_cookbooks = Array.new
           tmpdir = Dir.mktmpdir(nil, tmp_path)
-          
+
           subject.vendor(cached_cookbooks, tmpdir).should eql(tmpdir)
         end
       end
@@ -93,7 +93,7 @@ EOF
 
       it "sends the add_source message with an array of groups determined by the parameter passed to the group block" do
         subject.should_receive(:add_source).with(name, nil, group: [group])
-        
+
         subject.group group do
           subject.cookbook name
         end
@@ -108,7 +108,7 @@ EOF
 
       it "sends the add_source message with an explicit version constraint and the path to the cookbook" do
         subject.should_receive(:add_source).with("example_cookbook", "= 0.5.0", path: cb_path.to_s)
-        
+
         subject.metadata
       end
     end
@@ -147,11 +147,11 @@ EOF
         subject.chef_api(uri, options)
       end
 
-      context "given the symbol :knife" do
-        it "sends an add_location message with the the type :chef_api and the URI :knife" do
-          subject.should_receive(:add_location).with(:chef_api, :knife, {})
+      context "given the symbol :config" do
+        it "sends an add_location message with the the type :chef_api and the URI :config" do
+          subject.should_receive(:add_location).with(:chef_api, :config, {})
 
-          subject.chef_api(:knife)
+          subject.chef_api(:config)
         end
       end
     end
@@ -384,7 +384,7 @@ EOF
 
       it "delegates 'add_location' to the downloader" do
         subject.downloader.should_receive(:add_location).with(type, value, options)
-        
+
         subject.add_location(type, value, options)
       end
     end

data/spec/unit/berkshelf/config_spec.rb

@@ -45,7 +45,7 @@ describe Berkshelf::Config do
     describe "::chef_config_path" do
       subject { klass.chef_config_path }
 
-      it { should be_a String }  
+      it { should be_a String }
     end
   end
 end

data/spec/unit/berkshelf/cookbook_source_spec.rb

@@ -117,7 +117,7 @@ module Berkshelf
             after(:each) do
               subject.class_variable_set :@@location_keys, @original
             end
-            
+
             it "adds a location key and the associated class to the list of valid locations" do
               subject.add_location_key(:git, subject.class)
 
@@ -129,7 +129,7 @@ module Berkshelf
             it "does not add duplicate location keys to the list of location keys" do
               subject.add_location_key(:git, subject.class)
               subject.add_location_key(:git, subject.class)
-              
+
               subject.location_keys.should have(1).item
               subject.location_keys.should include(:git)
             end
@@ -228,7 +228,7 @@ module Berkshelf
     describe "#to_s" do
       it "contains the name, constraint, and groups" do
         source = CookbookSource.new("artifact", constraint: "= 0.10.0")
-        
+
         source.to_s.should eql("artifact (= 0.10.0) groups: [:default]")
       end
 

data/spec/unit/berkshelf/cookbook_store_spec.rb

@@ -102,7 +102,7 @@ module Berkshelf
       end
 
       context "given a value for the filter parameter" do
-        it "returns only the CachedCookbooks whose name match the filter" do          
+        it "returns only the CachedCookbooks whose name match the filter" do
           subject.cookbooks("mysql").should have(1).item
         end
       end

data/spec/unit/berkshelf/downloader_spec.rb

@@ -54,7 +54,7 @@ module Berkshelf
           source.should_receive(:cached_cookbook=).with(cached_cookbook)
         end
 
-        it "sends 'download' to the source's location and sets the source's cached_cookbook to the result" do          
+        it "sends 'download' to the source's location and sets the source's cached_cookbook to the result" do
           subject.download(source).should be_true
         end
 
@@ -70,11 +70,11 @@ module Berkshelf
       context "when the source does not have a location" do
         before(:each) do
           source.stub(:location).and_return(nil)
-          subject.stub(:locations).and_return([{type: :chef_api, value: :knife, options: Hash.new}])
+          subject.stub(:locations).and_return([{type: :chef_api, value: :config, options: Hash.new}])
         end
 
         it "sends the 'download' message to the default location" do
-          Location.should_receive(:init).with(source.name, source.version_constraint, chef_api: :knife).and_return(location)
+          Location.should_receive(:init).with(source.name, source.version_constraint, chef_api: :config).and_return(location)
           location.should_receive(:download).with(subject.storage_path).and_return(cached_cookbook)
           source.should_receive(:cached_cookbook=).with(cached_cookbook)