berkshelf 0.4.0.rc4 → 0.4.0

data/spec/unit/berkshelf/{cookbook_source → locations}/path_location_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 module Berkshelf
-  describe CookbookSource::PathLocation do
+  describe PathLocation do
     let(:complacent_constraint) { double('comp-vconstraint', satisfies?: true) }
     let(:path) { fixtures_path.join("cookbooks", "example_cookbook").to_s }
-    subject { CookbookSource::PathLocation.new("nginx", complacent_constraint, path: path) }
+    subject { PathLocation.new("nginx", complacent_constraint, path: path) }
 
     describe "#download" do
       it "returns an instance of CachedCookbook" do
@@ -18,7 +18,7 @@ module Berkshelf
       end
 
       context "given a path that does not exist" do
-        subject { CookbookSource::PathLocation.new("doesnot_exist", complacent_constraint, path: tmp_path.join("doesntexist_noway")) }
+        subject { PathLocation.new("doesnot_exist", complacent_constraint, path: tmp_path.join("doesntexist_noway")) }
 
         it "raises a CookbookNotFound error" do
           lambda {
@@ -28,7 +28,7 @@ module Berkshelf
       end
 
       context "given a path that does not contain a cookbook" do
-        subject { CookbookSource::PathLocation.new("doesnot_exist", complacent_constraint, path: fixtures_path) }
+        subject { PathLocation.new("doesnot_exist", complacent_constraint, path: fixtures_path) }
 
         it "raises a CookbookNotFound error" do
           lambda {
@@ -38,7 +38,7 @@ module Berkshelf
       end
 
       context "given the content at path does not satisfy the version constraint" do
-        subject { CookbookSource::PathLocation.new("nginx", double('constraint', satisfies?: false), path: path) }
+        subject { PathLocation.new("nginx", double('constraint', satisfies?: false), path: path) }
 
         it "raises a ConstraintNotSatisfied error" do
           lambda {

data/spec/unit/berkshelf/{cookbook_source → locations}/site_location_spec.rb

@@ -1,9 +1,23 @@
 require 'spec_helper'
 
 module Berkshelf
-  describe CookbookSource::SiteLocation do
+  describe SiteLocation do
+    describe "ClassMethods" do
+      subject { SiteLocation }
+
+      describe "::initialize" do
+        context "given the symbol :opscode for the value of URI" do
+          it "creates a SiteLocation with a URI equal to the default Opscode Community Site API" do
+            result = subject.new("nginx", double('constraint'), site: :opscode)
+
+            result.api_uri.should eql(Location::OPSCODE_COMMUNITY_API)
+          end
+        end
+      end
+    end
+
     let(:complacent_constraint) { double('comp-vconstraint', satisfies?: true) }
-    subject { CookbookSource::SiteLocation.new("nginx", complacent_constraint) }
+    subject { SiteLocation.new("nginx", complacent_constraint) }
 
     describe "#download" do
       before(:each) do
@@ -44,7 +58,7 @@ module Berkshelf
 
       context "given an explicit :site location key" do
         subject do
-          CookbookSource::SiteLocation.new("nginx",
+          SiteLocation.new("nginx",
             complacent_constraint,
             site: "http://cookbooks.opscode.com/api/v1/cookbooks"
           )

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -1,25 +1,34 @@
 require 'spec_helper'
 
-describe Berkshelf::Lockfile do
-  describe "without a lockfile in place already" do
-    before do
-      @old_dir = Dir.pwd
-      Dir.chdir fixtures_path.join("lockfile_spec", "without_lock")
-    end
+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
+        Dir.chdir fixtures_path.join("lockfile_spec", "without_lock")
+      end
+
+      after(:all) do
+        FileUtils.rm(fixtures_path.join("lockfile_spec", "without_lock", "Berksfile.lock"))
+        Dir.chdir(@old_dir)
+      end
 
-    it "should be able to write a Berksfile.lock from a list of cookbooks" do
-      resolver = Berkshelf::Resolver.new(Berkshelf.downloader, Berkshelf::CookbookSource.new('nginx', '= 0.101.0'))
-      resolver.resolve
+      it "should be able to write a Berksfile.lock from a list of cookbooks" do
+        resolver = Resolver.new(downloader, sources: CookbookSource.new('nginx', constraint: '= 0.101.0'))
+        resolver.resolve
 
-      Berkshelf::Lockfile.new(resolver.sources).write
+        Lockfile.new(resolver.sources).write
 
-      File.read('Berksfile.lock').split(/\r?\n/).sort.should == [
-        "cookbook 'bluepill', :locked_version => '1.0.6'",
-        "cookbook 'build-essential', :locked_version => '1.1.0'", 
-        "cookbook 'nginx', :locked_version => '0.101.0'", 
-        "cookbook 'ohai', :locked_version => '1.0.2'", 
-        "cookbook 'runit', :locked_version => '0.15.0'"
-      ] 
+        File.read('Berksfile.lock').split(/\r?\n/).sort.should == [
+          "cookbook 'bluepill', :locked_version => '1.0.4'",
+          "cookbook 'build-essential', :locked_version => '1.0.2'",
+          "cookbook 'nginx', :locked_version => '0.101.0'",
+          "cookbook 'ohai', :locked_version => '1.0.2'",
+          "cookbook 'runit', :locked_version => '0.15.0'"
+        ]
+      end
     end
   end
 end

data/spec/unit/berkshelf/resolver_spec.rb

@@ -36,16 +36,16 @@ module Berkshelf
       subject { Resolver }
 
       describe "::initialize" do
-        let(:downloader) { Berkshelf.downloader }
+        let(:downloader) { Downloader.new(Berkshelf.cookbook_store) }
 
         it "adds the specified sources to the sources hash" do
-          resolver = subject.new(downloader, source)
+          resolver = subject.new(downloader, sources: source)
 
           resolver.should have_source(source.name)
         end
 
         it "adds the dependencies of the source as sources" do
-          resolver = subject.new(downloader, source)
+          resolver = subject.new(downloader, sources: source)
           
           resolver.should have_source("nginx")
           resolver.should have_source("artifact")
@@ -54,7 +54,7 @@ module Berkshelf
         context "given an array of sources" do
           it "adds each source to the sources hash" do
             sources = [source]
-            resolver = subject.new(downloader, sources)
+            resolver = subject.new(downloader, sources: sources)
 
             resolver.should have_source(sources[0].name)
           end
@@ -62,7 +62,8 @@ module Berkshelf
       end
     end
 
-    subject { Resolver.new(Berkshelf.downloader) }
+    let(:downloader) { Downloader.new(Berkshelf.cookbook_store) }
+    subject { Resolver.new(downloader) }
 
     describe "#add_source" do
       let(:package_version) { double('package-version', dependencies: Array.new) }

data/spec/unit/berkshelf/uploader_spec.rb

@@ -20,16 +20,18 @@ module Berkshelf
           subject.should_receive(:save_cookbook)
         end
 
-        it "returns a successful TXResult" do
-          subject.upload(cookbook).should be_success
+        it "returns true" do
+          subject.upload(cookbook).should be_true
         end
       end
 
       context "when cookbook is not valid" do
         before(:each) { cookbook.should_receive(:validate!).and_raise(CookbookSyntaxError) }
 
-        it "returns a failed TXResult" do
-          subject.upload(cookbook).should be_failed
+        it "raises a CookbookSyntaxError error" do
+          lambda {
+            subject.upload(cookbook)
+          }.should raise_error(CookbookSyntaxError)
         end
       end
     end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc4
-  prerelease: 6
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Josiah Kiehl
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solve
@@ -371,6 +371,7 @@ files:
 - berkshelf.gemspec
 - bin/berks
 - features/cookbook_command.feature
+- features/default_locations.feature
 - features/init_command.feature
 - features/install.feature
 - features/json_formatter.feature
@@ -405,11 +406,6 @@ files:
 - lib/berkshelf/cli.rb
 - lib/berkshelf/cookbook_generator.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
-- lib/berkshelf/cookbook_source/site_location.rb
 - lib/berkshelf/cookbook_store.rb
 - lib/berkshelf/core_ext.rb
 - lib/berkshelf/core_ext/file.rb
@@ -418,18 +414,20 @@ files:
 - lib/berkshelf/core_ext/pathname.rb
 - lib/berkshelf/core_ext/string.rb
 - lib/berkshelf/downloader.rb
-- lib/berkshelf/dsl.rb
 - lib/berkshelf/errors.rb
 - lib/berkshelf/formatters.rb
 - lib/berkshelf/formatters/human_readable.rb
 - lib/berkshelf/formatters/json.rb
 - lib/berkshelf/git.rb
 - lib/berkshelf/init_generator.rb
+- lib/berkshelf/location.rb
+- lib/berkshelf/locations/chef_api_location.rb
+- lib/berkshelf/locations/git_location.rb
+- lib/berkshelf/locations/path_location.rb
+- lib/berkshelf/locations/site_location.rb
 - lib/berkshelf/lockfile.rb
 - lib/berkshelf/resolver.rb
 - lib/berkshelf/thor.rb
-- lib/berkshelf/tx_result.rb
-- lib/berkshelf/tx_result_set.rb
 - lib/berkshelf/uploader.rb
 - lib/berkshelf/version.rb
 - spec/fixtures/Berksfile
@@ -456,7 +454,7 @@ files:
 - spec/fixtures/cookbooks/nginx-0.100.5/templates/default/nginx.pill.erb
 - 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/lockfile_spec/without_lock/.gitkeep
 - spec/fixtures/reset.pem
 - spec/knife.rb.sample
 - spec/spec_helper.rb
@@ -467,23 +465,20 @@ files:
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/cookbook_generator_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
-- spec/unit/berkshelf/cookbook_source/site_location_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
 - spec/unit/berkshelf/core_ext/fileutils_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
-- spec/unit/berkshelf/dsl_spec.rb
 - spec/unit/berkshelf/formatters_spec.rb
 - spec/unit/berkshelf/git_spec.rb
 - spec/unit/berkshelf/init_generator_spec.rb
+- spec/unit/berkshelf/location_spec.rb
+- spec/unit/berkshelf/locations/chef_api_location_spec.rb
+- spec/unit/berkshelf/locations/git_location_spec.rb
+- spec/unit/berkshelf/locations/path_location_spec.rb
+- spec/unit/berkshelf/locations/site_location_spec.rb
 - spec/unit/berkshelf/lockfile_spec.rb
 - spec/unit/berkshelf/resolver_spec.rb
-- spec/unit/berkshelf/tx_result_set_spec.rb
-- spec/unit/berkshelf/tx_result_spec.rb
 - spec/unit/berkshelf/uploader_spec.rb
 - spec/unit/berkshelf_spec.rb
 homepage: https://github.com/RiotGames/berkshelf
@@ -501,9 +496,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -718551766010983641
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -512,6 +510,7 @@ specification_version: 3
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
 - features/cookbook_command.feature
+- features/default_locations.feature
 - features/init_command.feature
 - features/install.feature
 - features/json_formatter.feature
@@ -549,7 +548,7 @@ test_files:
 - spec/fixtures/cookbooks/nginx-0.100.5/templates/default/nginx.pill.erb
 - 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/lockfile_spec/without_lock/.gitkeep
 - spec/fixtures/reset.pem
 - spec/knife.rb.sample
 - spec/spec_helper.rb
@@ -560,23 +559,20 @@ test_files:
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/cookbook_generator_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
-- spec/unit/berkshelf/cookbook_source/site_location_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
 - spec/unit/berkshelf/core_ext/fileutils_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
-- spec/unit/berkshelf/dsl_spec.rb
 - spec/unit/berkshelf/formatters_spec.rb
 - spec/unit/berkshelf/git_spec.rb
 - spec/unit/berkshelf/init_generator_spec.rb
+- spec/unit/berkshelf/location_spec.rb
+- spec/unit/berkshelf/locations/chef_api_location_spec.rb
+- spec/unit/berkshelf/locations/git_location_spec.rb
+- spec/unit/berkshelf/locations/path_location_spec.rb
+- spec/unit/berkshelf/locations/site_location_spec.rb
 - spec/unit/berkshelf/lockfile_spec.rb
 - spec/unit/berkshelf/resolver_spec.rb
-- spec/unit/berkshelf/tx_result_set_spec.rb
-- spec/unit/berkshelf/tx_result_spec.rb
 - spec/unit/berkshelf/uploader_spec.rb
 - spec/unit/berkshelf_spec.rb
 has_rdoc: 

data/lib/berkshelf/cookbook_source/chef_api_location.rb

@@ -1,256 +0,0 @@
-require 'uri'
-
-module Berkshelf
-  class CookbookSource
-    # @author Jamie Winsor <jamie@vialstudios.com>
-    class ChefAPILocation
-      class << self
-        # @param [String] node_name
-        #
-        # @return [Boolean]
-        def validate_node_name(node_name)
-          node_name.is_a?(String) && !node_name.empty?
-        end
-
-        # @raise [InvalidChefAPILocation]
-        #
-        # @see validate_node_name
-        def validate_node_name!(node_name)
-          unless validate_node_name(node_name)
-            raise InvalidChefAPILocation
-          end
-
-          true
-        end
-
-        # @param [String] client_key
-        #
-        # @return [Boolean]
-        def validate_client_key(client_key)
-          File.exists?(client_key)
-        end
-
-        # @raise [InvalidChefAPILocation]
-        #
-        # @see validate_client_key
-        def validate_client_key!(client_key)
-          unless validate_client_key(client_key)
-            raise InvalidChefAPILocation
-          end
-
-          true
-        end
-
-        # @param [String] uri
-        #
-        # @return [Boolean]
-        def validate_uri(uri)
-          uri =~ URI.regexp(['http', 'https'])
-        end
-
-        # @raise [InvalidChefAPILocation] if the given object is not a String containing a 
-        #   valid Chef API URI
-        #
-        # @see validate_uri
-        def validate_uri!(uri)
-          unless validate_uri(uri)
-            raise InvalidChefAPILocation, "'#{uri}' is not a valid Chef API URI."
-          end
-
-          true
-        end
-      end
-
-      include Location
-
-      location_key :chef_api
-      valid_options :node_name, :client_key
-
-      attr_reader :uri
-      attr_reader :node_name
-      attr_reader :client_key
-
-      # @param [#to_s] name
-      # @param [Solve::Constraint] version_constraint
-      # @param [Hash] options
-      #
-      # @option options [String, Symbol] :chef_api
-      #   a URL to a Chef API. Alternatively the symbol :knife can be provided
-      #   which will instantiate this location with the values found in your
-      #   knife configuration.
-      # @option options [String] :node_name
-      #   the name of the client to use to communicate with the Chef API.
-      #   Default: Chef::Config[:node_name]
-      # @option options [String] :client_key
-      #   the filepath to the authentication key for the client
-      #   Default: Chef::Config[:client_key]
-      def initialize(name, version_constraint, options = {})
-        @name = name
-        @version_constraint = version_constraint
-        @downloaded_status = false
-
-        validate_options!(options)
-
-        if options[:chef_api] == :knife
-          begin
-            Berkshelf.load_config
-          rescue KnifeConfigNotFound => e
-            raise KnifeConfigNotFound, "A Knife config is required when ':knife' is given for the value of a 'chef_api' location. #{e}"
-          end
-          @node_name  = Chef::Config[:node_name]
-          @client_key = Chef::Config[:client_key]
-          @uri        = Chef::Config[:chef_server_url]
-        else
-          @node_name  = options[:node_name]
-          @client_key = options[:client_key]
-          @uri        = options[:chef_api]
-        end
-
-        @rest = Chef::REST.new(uri, node_name, client_key)
-      end
-
-      # @param [#to_s] destination
-      #
-      # @return [Berkshelf::CachedCookbook]
-      def download(destination)
-        version, uri = target_version
-        cookbook = rest.get_rest(uri)
-
-        scratch = download_files(cookbook.manifest)
-
-        cb_path = File.join(destination, "#{name}-#{version}")
-        FileUtils.mv(scratch, cb_path, force: true)
-
-        cached = CachedCookbook.from_store_path(cb_path)
-        validate_cached(cached)
-        
-        set_downloaded_status(true)
-        cached
-      end
-
-      # Returns a hash representing the cookbook versions on at a Chef API for location's cookbook.
-      # 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"
-      #   }
-      #
-      # @return [Hash]
-      def versions
-        {}.tap do |versions|
-          rest.get_rest("cookbooks/#{name}").each do |name, data|
-            data["versions"].each do |version_info|
-              versions[version_info["version"]] = version_info["url"]
-            end
-          end
-        end
-      rescue Net::HTTPServerException => e
-        if e.response.code == "404"
-          raise CookbookNotFound, "Cookbook '#{name}' not found at chef_api: '#{uri}'"
-        else
-          raise
-        end
-      end
-
-      # Returns an array where the first element is a string representing the latest version of
-      # the Cookbook and the second element is the download URL for that version.
-      #
-      # @example
-      #   [ "0.101.2" => "https://api.opscode.com/organizations/vialstudios/cookbooks/nginx/0.101.2" ]
-      #
-      # @return [Array]
-      def latest_version
-        graph = Solve::Graph.new
-        versions.each do |version, url|
-          graph.artifacts(name, version)
-        end
-        graph.demands(name, ">= 0.0.0")
-
-        version = Solve.it!(graph)[name]
-
-        [ version, versions[version] ]
-      end
-
-      def to_s
-        "chef_api: '#{uri}'"
-      end
-
-      private
-
-        attr_reader :rest
-
-        # Returns an array containing the version and download URL for the cookbook version that
-        # should be downloaded for this location.
-        #
-        # @example
-        #   [ "0.101.2" => "https://api.opscode.com/organizations/vialstudios/cookbooks/nginx/0.101.2" ]
-        #
-        # @return [Array]
-        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
-
-            solution
-          else
-            latest_version
-          end
-        end
-
-        # Download all of the files in the given manifest to the given destination. If no destination
-        # is provided a temporary directory will be created and the files will be downloaded to there.
-        #
-        # @note
-        #   the manifest Hash is the same manifest that you get by sending the manifest message to
-        #   an instance of Chef::CookbookVersion.
-        #
-        # @param [Hash] manifest
-        # @param [String] destination
-        #
-        # @return [String]
-        #   the path to the directory containing the files
-        def download_files(manifest, destination = Dir.mktmpdir)
-          Chef::CookbookVersion::COOKBOOK_SEGMENTS.each do |segment|
-            next unless manifest.has_key?(segment)
-            manifest[segment].each do |segment_file|
-              dest = File.join(destination, segment_file['path'].gsub('/', File::SEPARATOR))
-              FileUtils.mkdir_p(File.dirname(dest))
-              rest.sign_on_redirect = false
-              tempfile = rest.get_rest(segment_file['url'], true)
-              FileUtils.mv(tempfile.path, dest)
-            end
-          end
-
-          destination
-        end
-
-        # Validates the options hash given to the constructor.
-        #
-        # @param [Hash] options
-        #
-        # @raise [InvalidChefAPILocation] if any of the options are missing or their values do not
-        #   pass validation
-        def validate_options!(options)
-          if options[:chef_api] == :knife
-            return true
-          end
-
-          missing_options = [:node_name, :client_key] - options.keys
-
-          unless missing_options.empty?
-            missing_options.collect! { |opt| "'#{opt}'" }
-            raise InvalidChefAPILocation, "Source '#{name}' is a 'chef_api' location with a URL for it's value but is missing options: #{missing_options.join(', ')}."
-          end
-
-          self.class.validate_node_name!(options[:node_name])
-          self.class.validate_client_key!(options[:client_key])
-          self.class.validate_uri!(options[:chef_api])          
-        end
-    end
-  end
-end