berkshelf 0.3.3 → 0.3.7

data/Guardfile

@@ -16,7 +16,7 @@ guard 'rspec', :version => 2, :cli => "--color --drb --format Fuubar", :all_on_s
   watch('spec/spec_helper.rb')       { "spec" }
 end
 
-guard 'cucumber', :cli => "--drb --format pretty --tags ~@wip", :all_on_start => false, :all_after_pass => false, :notification => false do
+guard 'cucumber', :cli => "--drb --format pretty --tags ~@no_run", :all_on_start => false, :all_after_pass => false, :notification => false do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})                      { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }

data/features/install.feature

@@ -3,7 +3,7 @@ Feature: install cookbooks from a Berksfile
   I want to be able to run knife berkshelf install to install my cookbooks
   So that I don't have to download my cookbooks and their dependencies manually
 
-  Scenario: install cookbooks
+  Scenario: installing a Berksfile that contains a source with a default location
     Given I write to "Berksfile" with:
       """
       cookbook "mysql", "1.2.4"
@@ -17,6 +17,83 @@ Feature: install cookbooks from a Berksfile
       Installing mysql (1.2.4) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       Installing openssl (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
       """
+    And the exit status should be 0
+
+  Scenario: installing a Berksfile that contains the cookbook explicitly desired by a source
+    Given the cookbook store has the cookbooks:
+      | mysql   | 1.2.4 |
+    And I write to "Berksfile" with:
+      """
+      cookbook "mysql", "= 1.2.4"
+      """
+    When I run the install command
+    Then the output should contain:
+      """
+      Using mysql (1.2.4)
+      """
+    And the exit status should be 0
+
+  Scenario: installing a Berksfile that contains a source with dependencies, all of which already have been installed
+    Given the cookbook store contains a cookbook "mysql" "1.2.4" with dependencies:
+      | openssl      | = 1.0.0 |
+      | windows      | = 1.3.0 |
+      | chef_handler | = 1.0.6 |
+    And the cookbook store has the cookbooks:
+      | openssl      | 1.0.0 |
+      | windows      | 1.3.0 |
+    And I write to "Berksfile" with:
+      """
+      cookbook "mysql", "~> 1.2.0"
+      """
+    When I run the install command
+    Then the output should contain:
+      """
+      Using mysql (1.2.4)
+      Using openssl (1.0.0)
+      Using windows (1.3.0)
+      Installing chef_handler (1.0.6) from site:
+      """
+    And the exit status should be 0
+
+  Scenario: installing a Berksfile that contains a path location
+    Given a Berksfile with path location sources to fixtures:
+      | example_cookbook | example_cookbook-0.5.0 |
+    When I run the install command
+    Then the output should contain:
+      """
+      Using example_cookbook (0.5.0) at path:
+      """
+    And the exit status should be 0
+
+  Scenario: installing a Berksfile that contains a Git location
+    Given I write to "Berksfile" with:
+      """
+      cookbook "artifact", git: "git://github.com/RiotGames/artifact-cookbook.git", ref: "0.9.8"
+      """
+    When I run the install command
+    Then the cookbook store should have the cookbooks:
+      | artifact | 0.9.8 |
+    And the output should contain:
+      """
+      Installing artifact (0.9.8) from git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: '0.9.8'
+      """
+    And the exit status should be 0
+
+  Scenario: installing a Berksfile that contains an explicit site location
+    Given I write to "Berksfile" with:
+      """
+      cookbook "mysql", "1.2.4", site: "http://cookbooks.opscode.com/api/v1/cookbooks"
+      """
+    When I run the install command
+    Then the cookbook store should have the cookbooks:
+      | mysql   | 1.2.4 |
+      | openssl | 1.0.0 |
+    And the output should contain:
+      """
+      Installing mysql (1.2.4) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      Installing openssl (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
+      """
+    And the exit status should be 0
 
   Scenario: running install when current project is a cookbook and the 'metadata' is specified
     Given a cookbook named "sparkle_motion"
@@ -54,7 +131,6 @@ Feature: install cookbooks from a Berksfile
       """
     And the CLI should exit with the status code for error "DownloadFailure"
 
-  @wip
   Scenario: running install command with the --shims flag to create a directory of shims
     Given I write to "Berksfile" with:
       """
@@ -70,3 +146,54 @@ Feature: install cookbooks from a Berksfile
       Shims written to: 
       """
     And the exit status should be 0
+
+  Scenario: installing a Berksfile that has a Git location source with an invalid Git URI
+    Given I write to "Berksfile" with:
+      """
+      cookbook "nginx", git: "/something/on/disk"
+      """
+    When I run the install command
+    Then the output should contain:
+      """
+      '/something/on/disk' is not a valid Git URI.
+      """
+    And the CLI should exit with the status code for error "InvalidGitURI"
+
+  Scenario: installing when there are sources with duplicate names defined
+    Given I write to "Berksfile" with:
+      """
+      cookbook "artifact"
+      cookbook "artifact"
+      """
+    When I run the install command
+    Then the output should contain:
+      """
+      Berksfile contains two sources named 'artifact'. Remove one and try again.
+      """
+    And the CLI should exit with the status code for error "DuplicateSourceDefined"
+
+  Scenario: installing when a git source defines a branch that does not satisfy the version constraint
+    Given I write to "Berksfile" with:
+      """
+      cookbook "artifact", "= 0.9.8", git: "git://github.com/RiotGames/artifact-cookbook.git", ref: "0.10.0"
+      """
+    When I run the install command
+    Then the output should contain:
+      """
+      A cookbook satisfying 'artifact' (= 0.9.8) not found at git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: '0.10.0'
+      """
+    And the CLI should exit with the status code for error "ConstraintNotSatisfied"
+
+  Scenario: when a git location source is defined and a cookbook of the same name is already cached in the cookbook store
+    Given I write to "Berksfile" with:
+      """
+      cookbook "artifact", git: "git://github.com/RiotGames/artifact-cookbook.git", ref: "0.10.0"
+      """
+    And the cookbook store has the cookbooks:
+      | artifact | 0.10.0 |
+    When I run the install command
+    Then the output should contain:
+      """
+      Installing artifact (0.10.0) from git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: '0.10.0'
+      """
+    And the exit status should be 0

data/features/lockfile.feature

@@ -17,6 +17,6 @@ Feature: Berksfile.lock
       cookbook 'ntp', :locked_version => '1.1.8'
       cookbook 'mysql', :git => 'https://github.com/opscode-cookbooks/mysql.git', :ref => '190c0c2267785b7b9b303369b8a64ed04364d5f9'
       cookbook 'openssl', :locked_version => '1.0.0'
-      cookbook 'chef_handler', :locked_version => '1.0.6'
       cookbook 'windows', :locked_version => '1.3.0'
+      cookbook 'chef_handler', :locked_version => '1.0.6'
       """

data/features/step_definitions/filesystem_steps.rb

@@ -1,6 +1,7 @@
 require 'aruba/api'
 
 World(Aruba::Api)
+World(Berkshelf::RSpec::ChefAPI)
 
 Given /^a cookbook named "(.*?)"$/ do |name|
   steps %{
@@ -21,6 +22,17 @@ Given /^the cookbook "(.*?)" has the file "(.*?)" with:$/ do |cookbook_name, fil
   write_file(File.join(cookbook_name, file_name), content)
 end
 
+Given /^the cookbook store has the cookbooks:$/ do |cookbooks|
+  cookbooks.raw.each do |name, version|
+    generate_cookbook(cookbook_store, name, version)
+  end
+end
+
+Given /^the cookbook store contains a cookbook "(.*?)" "(.*?)" with dependencies:$/ do |name, version, dependencies|
+  generate_cookbook(cookbook_store, name, version, dependencies: dependencies.raw)
+end
+
+
 Then /^the cookbook store should have the cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
     cookbook_store.should have_structure {

data/features/update.feature

@@ -18,6 +18,6 @@ Feature: update
       """
       cookbook 'mysql', :locked_version => '1.2.6'
       cookbook 'openssl', :locked_version => '1.0.0'
-      cookbook 'chef_handler', :locked_version => '1.0.6'
       cookbook 'windows', :locked_version => '1.3.0'
+      cookbook 'chef_handler', :locked_version => '1.0.6'
       """

data/features/upload_command.feature

@@ -3,7 +3,7 @@ Feature: upload command
   I need a way to upload cookbooks to a Chef server that I have installed into my Bookshelf
   So they are available to Chef clients
 
-  @slow_process @wip
+  @no_run @slow_process
   Scenario: running the upload command when the Sources in the Berksfile are already installed
     Given I write to "Berksfile" with:
       """

data/lib/berkshelf/berksfile.rb

@@ -47,7 +47,9 @@ module Berkshelf
     #
     # @return [Array<Berkshelf::CookbookSource]
     def add_source(source)
-      raise DuplicateSourceDefined if has_source?(source)
+      if has_source?(source)
+        raise DuplicateSourceDefined, "Berksfile contains two sources named '#{source.name}'. Remove one and try again."
+      end
       @sources[source.to_s] = source
     end
 
@@ -186,6 +188,7 @@ module Berkshelf
       FileUtils.mkdir_p(path)
       cached_cookbooks.each do |cached_cookbook|
         destination = File.expand_path(File.join(path, cached_cookbook.cookbook_name))
+        FileUtils.rm_rf(destination)
         begin
           FileUtils.ln_r(cached_cookbook.path, destination, force: true)
         rescue ArgumentError

data/lib/berkshelf/cached_cookbook.rb

@@ -5,22 +5,48 @@ module Berkshelf
   # @author Jamie Winsor <jamie@vialstudios.com>
   class CachedCookbook
     class << self
-      # @param [String] path
+      # Creates a new instance of Berkshelf::CachedCookbook from a path on disk that
+      # contains a Cookbook. The name of the Cookbook will be determined first by the
+      # name attribute of the metadata.rb file if it is present. If the name attribute
+      # has not been set the Cookbook name will be determined by the basename of the
+      # given filepath.
+      #
+      # @param [#to_s] path
+      #   a path on disk to the location of a Cookbook
+      #
+      # @return [Berkshelf::CachedCookbook]
+      def from_path(path)
+        path = Pathname.new(path)
+        metadata = Chef::Cookbook::Metadata.new
+
+        begin
+          metadata.from_file(path.join("metadata.rb").to_s)
+        rescue IOError
+          raise CookbookNotFound, "No 'metadata.rb' file found at: '#{path}'"
+        end
+
+        name = metadata.name.empty? ? File.basename(path) : metadata.name
+
+        new(name, path, metadata)
+      end
+
+      # @param [#to_s] path
       #   a path on disk to the location of a Cookbook downloaded by the Downloader
       #
       # @return [CachedCookbook]
       #   an instance of CachedCookbook initialized by the contents found at the
       #   given path.
-      def from_path(path)        
-        matchdata = File.basename(path.to_s).match(DIRNAME_REGEXP)
-        return nil if matchdata.nil?
-
-        cached_name = matchdata[1]
+      def from_store_path(path)
+        path = Pathname.new(path)
+        cached_name = File.basename(path.to_s).slice(DIRNAME_REGEXP, 1)
+        return nil if cached_name.nil?
 
         metadata = Chef::Cookbook::Metadata.new
 
-        if path.join("metadata.rb").exist?
+        begin
           metadata.from_file(path.join("metadata.rb").to_s)
+        rescue IOError
+          raise CookbookNotFound, "No 'metadata.rb' file found at: '#{path}'"
         end
 
         new(cached_name, path, metadata)
@@ -37,7 +63,7 @@ module Berkshelf
       end
     end
 
-    DIRNAME_REGEXP = /^(.+)-(\d+\.\d+\.\d+)$/
+    DIRNAME_REGEXP = /^(.+)-(.+)$/
     CHEF_TYPE = "cookbook_version".freeze
     CHEF_JSON_CLASS = "Chef::CookbookVersion".freeze
 
@@ -67,7 +93,8 @@ module Berkshelf
     #     }
     attr_reader :manifest
 
-    def_delegators :@metadata, :version
+    def_delegator :@metadata, :version
+    def_delegator :@metadata, :dependencies
 
     def initialize(name, path, metadata)
       @cookbook_name = name

data/lib/berkshelf/cli.rb

@@ -8,7 +8,6 @@ module Berkshelf
       super
       # JW TODO: Replace Chef::Knife::UI with our own UI class
       ::Berkshelf.ui = Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
-      load_config
       @options = options.dup # unfreeze frozen options Hash from Thor
     rescue BerkshelfError => e
       Berkshelf.ui.fatal e
@@ -24,7 +23,7 @@ module Berkshelf
 
     class_option :config,
       type: :string,
-      default: File.expand_path("~/.chef/knife.rb"),
+      default: File.expand_path(ENV["CHEF_CONFIG"] || "~/.chef/knife.rb"),
       desc: "Path to Knife or Chef configuration to use.",
       aliases: "-c",
       banner: "PATH"
@@ -96,6 +95,7 @@ module Berkshelf
       desc: "Upload all cookbooks even if a frozen one exists on the target Chef Server"
     desc "upload", "Upload the Cookbooks specified by a Berksfile or a Berksfile.lock to a Chef Server."
     def upload
+      load_config 
       berksfile = ::Berkshelf::Berksfile.from_file(options[:berksfile])
       berksfile.upload(Chef::Config[:chef_server_url], options)
     rescue BerkshelfError => e

data/lib/berkshelf/cookbook_source.rb

@@ -1,18 +1,9 @@
 module Berkshelf
   # @author Jamie Winsor <jamie@vialstudios.com>
   class CookbookSource
-    module Location
-      attr_reader :name
-
-      def initialize(name)
-        @name = name
-      end
-
-      def download(destination)
-        raise NotImplementedError, "Function must be implemented on includer"
-      end
-    end
+    extend Forwardable
 
+    autoload :Location, 'berkshelf/cookbook_source/location'
     autoload :SiteLocation, 'berkshelf/cookbook_source/site_location'
     autoload :GitLocation, 'berkshelf/cookbook_source/git_location'
     autoload :PathLocation, 'berkshelf/cookbook_source/path_location'
@@ -20,49 +11,52 @@ module Berkshelf
     LOCATION_KEYS = [:git, :path, :site]
 
     attr_reader :name
+    alias_method :to_s, :name
+
     attr_reader :version_constraint
     attr_reader :groups
     attr_reader :location
-    attr_reader :local_path
+    attr_accessor :cached_cookbook
 
-    # TODO: describe how the options on this function work.
-    #
-    # @param [String] name
-    # @param [String] version_constraint (optional)
-    # @param [Hash] options (optional)
+    def_delegator :@location, :downloaded?
+
+    # @overload initialize(name, version_constraint, options = {})
+    #   @param [#to_s] name
+    #   @param [#to_s] version_constraint
+    #   @param [Hash] options
+    # @overload initialize(name, options = {})
+    #   @param [#to_s] name
+    #   @param [Hash] options
     def initialize(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
       name, constraint = args
 
       @name = name
-      @version_constraint = DepSelector::VersionConstraint.new(constraint)
+      @version_constraint = DepSelector::VersionConstraint.new(constraint || ">= 0.0.0")
       @groups = []
-      @local_path = nil
+      @cached_cookbook = nil
 
       if (options.keys & LOCATION_KEYS).length > 1
         raise ArgumentError, "Only one location key (#{LOCATION_KEYS.join(', ')}) may be specified"
       end
 
-      options[:version_constraint] = version_constraint if version_constraint
-
       @location = case 
       when options[:git]
-        GitLocation.new(name, options)
+        GitLocation.new(name, version_constraint, options)
       when options[:path]
-        loc = PathLocation.new(name, options)
-        set_local_path loc.path
+        loc = PathLocation.new(name, version_constraint, options)
+        @cached_cookbook = CachedCookbook.from_path(loc.path)
         loc
       when options[:site]
-        SiteLocation.new(name, options)
+        SiteLocation.new(name, version_constraint, options)
       else
-        SiteLocation.new(name, options)
+        SiteLocation.new(name, version_constraint, options)
       end
 
       @locked_version = DepSelector::Version.new(options[:locked_version]) if options[:locked_version]
 
       add_group(options[:group]) if options[:group]
       add_group(:default) if groups.empty?
-      set_downloaded_status(false)
     end
 
     def add_group(*groups)
@@ -83,55 +77,24 @@ module Berkshelf
     #     [ :ok, "/tmp/nginx" ]
     #     [ :error, "Cookbook 'sparkle_motion' not found at site: http://cookbooks.opscode.com/api/v1/cookbooks" ]
     def download(destination)
-      set_local_path location.download(destination)
-      [ :ok, local_path ]
+      self.cached_cookbook = location.download(destination)
+
+      [ :ok, self.cached_cookbook ]
     rescue CookbookNotFound => e
-      set_local_path = nil
+      self.cached_cookbook = nil
       [ :error, e.message ]
     end
 
-    def downloaded?
-      !local_path.nil?
-    end
-
-    def metadata
-      return nil unless local_path
-
-      cookbook_metadata = Chef::Cookbook::Metadata.new
-      cookbook_metadata.from_file(File.join(local_path, "metadata.rb"))
-      cookbook_metadata
-    end
-
-    def to_s
-      name
-    end
-
     def has_group?(group)
       groups.include?(group.to_sym)
     end
 
-    def dependencies
-      return nil unless metadata
-
-      metadata.dependencies
-    end
-
-    def local_version
-      return nil unless metadata
-
-      metadata.version
-    end
-
     def locked_version
-      @locked_version || local_version
+      @locked_version || cached_cookbook.version
     end
 
     private
 
-      def set_downloaded_status(state)
-        @downloaded_state = state
-      end
-
       def set_local_path(path)
         @local_path = path
       end