berkshelf 1.0.4 → 1.1.0.rc1

data/features/upload_command.feature

@@ -69,3 +69,200 @@ Feature: upload command
     And the Chef server should have the cookbooks:
       | artifact | 0.9.8 |
     And the exit status should be 0
+
+  @chef_server @slow_process
+  Scenario: Running the upload command for a single cookbook
+    Given I write to "Berksfile" with:
+      """
+      cookbook "build-essential", "1.2.0"
+      cookbook "mysql", "1.2.4"
+      """
+    And I successfully run `berks install`
+    And the Chef server does not have the cookbooks:
+      | mysql           | 1.2.4 |
+      | openssl         | 1.0.0 |
+      | build-essential | 1.2.0 |
+    When I run `berks upload mysql`
+    Then the output should contain "Uploading mysql (1.2.4)"
+    And the output should contain "Uploading openssl (1.0.0)"
+    And the output should not contain "Uploading build-essential (1.2.0)"
+    And the Chef server should have the cookbooks:
+      | mysql | 1.2.4 |
+      | openssl | 1.0.0 |
+    And the Chef server should not have the cookbooks:
+      | build-essential | 1.2.0 |
+    And the exit status should be 0
+
+  @chef_server @slow_process
+  Scenario: Running the upload command with multiple cookbooks
+    Given I write to "Berksfile" with:
+      """
+      cookbook "build-essential"
+      cookbook "chef-client"
+      cookbook "database"
+      cookbook "editor"
+      cookbook "git"
+      cookbook "known_host"
+      cookbook "networking_basic"
+      cookbook "vim"
+      """
+    And I successfully run `berks install`
+    And the Chef server does not have the cookbooks:
+      | build-essential  |
+      | chef-client      |
+      | database         |
+      | editor           |
+      | git              |
+      | known_host       |
+      | networking_basic |
+      | vim              |
+    When I run `berks upload build-essential chef-client database`
+    Then the output should contain "Uploading build-essential"
+    And the output should contain "Uploading chef-client"
+    And the output should contain "Uploading database"
+    And the output should not contain "Uploading editor"
+    And the output should not contain "Uploading git"
+    And the output should not contain "Uploading known_host"
+    And the output should not contain "Uploading networking_basic"
+    And the output should not contain "Uploading vim"
+    And the Chef server should have the cookbooks:
+      | build_essential |
+      | chef-client     |
+      | database        |
+    And the Chef server should not have the cookbooks:
+      | editor           |
+      | git              |
+      | known_host       |
+      | networking_basic |
+      | vim              |
+    And the exit status should be 0
+
+  @chef_server @slow_process
+  Scenario: Running the upload command with the :only option
+    Given I write to "Berksfile" with:
+      """
+      group :core do
+        cookbook "build-essential"
+        cookbook "chef-client"
+      end
+
+      group :system do
+        cookbook "database"
+        cookbook "editor"
+      end
+      """
+    And I successfully run `berks install`
+    And the Chef server does not have the cookbooks:
+      | build-essential  |
+      | chef-client      |
+      | database         |
+      | editor           |
+    When I run `berks upload --only core`
+    Then the output should contain "Uploading build-essential"
+    And the output should contain "Uploading chef-client"
+    And the output should not contain "Uploading database"
+    And the output should not contain "Uploading editor"
+    And the Chef server should have the cookbooks:
+      | build_essential |
+      | chef-client     |
+    And the Chef server should not have the cookbooks:
+      | database |
+      | editor   |
+    And the exit status should be 0
+
+  @chef_server @slow_process
+  Scenario: Running the upload command with the :only option multiple
+    Given I write to "Berksfile" with:
+      """
+      group :core do
+        cookbook "build-essential"
+        cookbook "chef-client"
+      end
+
+      group :system do
+        cookbook "database"
+        cookbook "editor"
+      end
+      """
+    And I successfully run `berks install`
+    And the Chef server does not have the cookbooks:
+      | build-essential  |
+      | chef-client      |
+      | database         |
+      | editor           |
+    When I run `berks upload --only core system`
+    Then the output should contain "Uploading build-essential"
+    And the output should contain "Uploading chef-client"
+    And the output should contain "Uploading database"
+    And the output should contain "Uploading editor"
+    And the Chef server should have the cookbooks:
+      | build_essential |
+      | chef-client     |
+      | database        |
+      | editor          |
+    And the exit status should be 0
+
+  @chef_server @slow_process
+  Scenario: Running the upload command with the :except option
+    Given I write to "Berksfile" with:
+      """
+      group :core do
+        cookbook "build-essential"
+        cookbook "chef-client"
+      end
+
+      group :system do
+        cookbook "database"
+        cookbook "editor"
+      end
+      """
+    And I successfully run `berks install`
+    And the Chef server does not have the cookbooks:
+      | build-essential  |
+      | chef-client      |
+      | database         |
+      | editor           |
+    When I run `berks upload --except core`
+    Then the output should not contain "Uploading build-essential"
+    And the output should not contain "Uploading chef-client"
+    And the output should contain "Uploading database"
+    And the output should contain "Uploading editor"
+    And the Chef server should not have the cookbooks:
+      | build_essential |
+      | chef-client     |
+    And the Chef server should have the cookbooks:
+      | database |
+      | editor   |
+    And the exit status should be 0
+
+  @chef_server @slow_process
+  Scenario: Running the upload command with the :except option multiple
+    Given I write to "Berksfile" with:
+      """
+      group :core do
+        cookbook "build-essential"
+        cookbook "chef-client"
+      end
+
+      group :system do
+        cookbook "database"
+        cookbook "editor"
+      end
+      """
+    And I successfully run `berks install`
+    And the Chef server does not have the cookbooks:
+      | build-essential  |
+      | chef-client      |
+      | database         |
+      | editor           |
+    When I run `berks upload --except core system`
+    Then the output should not contain "Uploading build-essential"
+    And the output should not contain "Uploading chef-client"
+    And the output should not contain "Uploading database"
+    And the output should not contain "Uploading editor"
+    And the Chef server should not have the cookbooks:
+      | build_essential |
+      | chef-client     |
+      | database        |
+      | editor          |
+    And the exit status should be 0

data/lib/berkshelf/berksfile.rb

@@ -239,7 +239,11 @@ module Berkshelf
     # @return [Array<Berkshelf::CookbookSource]
     def add_source(name, constraint = nil, options = {})
       if has_source?(name)
-        raise DuplicateSourceDefined, "Berksfile contains two sources named '#{name}'. Remove one and try again."
+        # Only raise an exception if the source is a true duplicate
+        groups = (options[:group].nil? || options[:group].empty?) ? [:default] : options[:group]
+        if !(@sources[name].groups & groups).empty?
+          raise DuplicateSourceDefined, "Berksfile contains multiple sources named '#{name}'. Use only one, or put them in different groups."
+        end
       end
 
       options[:constraint] = constraint
@@ -269,6 +273,8 @@ module Berkshelf
     # @option options [Symbol, Array] :only
     #   Group(s) to include which will cause any sources marked as a member of the
     #   group to be installed and all others to be ignored
+    # @option cookbooks [String, Array] :cookbooks
+    #   Names of the cookbooks to retrieve sources for
     #
     # @raise [Berkshelf::ArgumentError] if a value for both :except and :only is provided
     #
@@ -276,12 +282,18 @@ module Berkshelf
     def sources(options = {})
       l_sources = @sources.collect { |name, source| source }.flatten
 
-      except = Array(options.fetch(:except, nil)).collect(&:to_sym)
-      only   = Array(options.fetch(:only, nil)).collect(&:to_sym)
+      cookbooks = Array(options.fetch(:cookbooks, nil))
+      except    = Array(options.fetch(:except, nil)).collect(&:to_sym)
+      only      = Array(options.fetch(:only, nil)).collect(&:to_sym)
 
       case
       when !except.empty? && !only.empty?
         raise Berkshelf::ArgumentError, "Cannot specify both :except and :only"
+      when !cookbooks.empty?
+        if !except.empty? && !only.empty?
+          Berkshelf.ui.warn "Cookbooks were specified, ignoring :except and :only"
+        end
+        l_sources.select { |source| options[:cookbooks].include?(source.name) }
       when !except.empty?
         l_sources.select { |source| (except & source.groups).empty? }
       when !only.empty?
@@ -352,6 +364,75 @@ module Berkshelf
       self.cached_cookbooks
     end
 
+    # @option options [Symbol, Array] :except
+    #   Group(s) to exclude which will cause any sources marked as a member of the
+    #   group to not be installed
+    # @option options [Symbol, Array] :only
+    #   Group(s) to include which will cause any sources marked as a member of the
+    #   group to be installed and all others to be ignored
+    # @option cookbooks [String, Array] :cookbooks
+    #   Names of the cookbooks to retrieve sources for
+    def update(options = {})
+      resolver = Resolver.new(
+        self.downloader,
+        sources: sources(options)
+      )
+
+      cookbooks         = resolver.resolve
+      sources           = resolver.sources
+      missing_cookbooks = (options[:cookbooks] - cookbooks.map(&:cookbook_name))
+
+      unless missing_cookbooks.empty?
+        raise Berkshelf::CookbookNotFound, "Could not find cookbooks #{missing_cookbooks.collect{|cookbook| "'#{cookbook}'"}.join(', ')} in any of the sources. #{missing_cookbooks.size == 1 ? 'Is it' : 'Are they' } in your Berksfile?"
+      end
+
+      update_lockfile(sources)
+
+      if options[:path]
+        self.class.vendor(cookbooks, options[:path])
+      end
+
+      cookbooks
+    end
+
+    # Get a list of all the cookbooks which have newer versions found on the community
+    # site versus what your current constraints allow
+    #
+    # @option options [Symbol, Array] :except
+    #   Group(s) to exclude which will cause any sources marked as a member of the
+    #   group to not be installed
+    # @option options [Symbol, Array] :only
+    #   Group(s) to include which will cause any sources marked as a member of the
+    #   group to be installed and all others to be ignored
+    # @option cookbooks [String, Array] :cookbooks
+    #   Names of the cookbooks to retrieve sources for
+    #
+    # @return [Hash]
+    #   a hash of cached cookbooks and their latest version. An empty hash is returned
+    #   if there are no newer cookbooks for any of your sources
+    # 
+    # @example
+    #   berksfile.outdated => {
+    #     <#CachedCookbook name="artifact"> => "0.11.2"  
+    #   }
+    def outdated(options = {})
+      outdated = Hash.new
+
+      sources(options).each do |cookbook|
+        location = cookbook.location || Location.init(cookbook.name, cookbook.version_constraint)
+
+        if location.is_a?(SiteLocation)
+          latest_version = SiteLocation.new(cookbook.name, cookbook.version_constraint).latest_version[0]
+
+          unless cookbook.version_constraint.satisfies?(latest_version)
+            outdated[cookbook] = latest_version
+          end
+        end
+      end
+
+      outdated
+    end
+
     # @option options [String] :server_url
     #   URL to the Chef API
     # @option options [String] :client_name
@@ -372,6 +453,8 @@ module Berkshelf
     # @option options [Symbol, Array] :only
     #   Group(s) to include which will cause any sources marked as a member of the
     #   group to be installed and all others to be ignored
+    # @option cookbooks [String, Array] :cookbooks
+    #   Names of the cookbooks to retrieve sources for
     # @option options [Integer] :thread_count
     # @option options [Hash] :params
     #   URI query unencoded key/value pairs
@@ -383,6 +466,8 @@ module Berkshelf
     #   SSL options
     # @option options [URI, String, Hash] :proxy
     #   URI, String, or Hash of HTTP proxy options
+    #
+    # @raise [UploadFailure] if you are uploading cookbooks with an invalid or not-specified client key
     def upload(options = {})
       uploader = Uploader.new(options)
       solution = resolve(options)
@@ -391,6 +476,11 @@ module Berkshelf
         Berkshelf.formatter.upload cb.cookbook_name, cb.version, options[:server_url]
         uploader.upload(cb, options)
       end
+
+    rescue Ridley::Errors::ClientKeyFileNotFound => e
+      msg = "Could not upload cookbooks: Missing Chef client key: '#{Berkshelf::Config.instance.chef.client_key}'."
+      msg << " Generate or update your Berkshelf configuration that contains a valid path to a Chef client key."
+      raise UploadFailure, msg
     end
 
     # Finds a solution for the Berksfile and returns an array of CachedCookbooks.
@@ -401,6 +491,8 @@ module Berkshelf
     # @option options [Symbol, Array] :only
     #   Group(s) to include which will cause any sources marked as a member of the
     #   group to be installed and all others to be ignored
+    # @option cookbooks [String, Array] :cookbooks
+    #   Names of the cookbooks to retrieve sources for
     #
     # @return [Array<Berkshelf::CachedCookbooks]
     def resolve(options = {})
@@ -441,5 +533,9 @@ module Berkshelf
       def write_lockfile(sources)
         Berkshelf::Lockfile.new(sources).write
       end
+
+      def update_lockfile(sources)
+        Berkshelf::Lockfile.update!(sources)
+      end
   end
 end

data/lib/berkshelf/cached_cookbook.rb

@@ -213,6 +213,10 @@ module Berkshelf
       "#{cookbook_name} (#{version}) '#{path}'"
     end
 
+    def <=>(other_cookbook)
+      [self.cookbook_name, self.version] <=> [other_cookbook.cookbook_name, other_cookbook.version]
+    end
+
     private
 
       attr_reader :files

data/lib/berkshelf/cli.rb

@@ -31,6 +31,7 @@ module Berkshelf
     map 'in'        => :install
     map 'up'        => :upload
     map 'ud'        => :update
+    map 'ls'        => :list
     map 'ver'       => :version
     map 'book'      => :cookbook
 
@@ -130,10 +131,15 @@ module Berkshelf
       type: :array,
       desc: "Only cookbooks that are in these groups.",
       aliases: "-o"
-    desc "update", "Update all Cookbooks and their dependencies specified by a Berksfile to their latest versions"
-    def update
-      Lockfile.remove!
-      invoke :install
+    desc "update [COOKBOOKS]", "Update all Cookbooks and their dependencies specified by a Berksfile to their latest versions"
+    def update(*cookbook_names)
+      berksfile = Berksfile.from_file(options[:berksfile])
+
+      update_options = {
+        cookbooks: cookbook_names
+      }.merge(options).symbolize_keys
+
+      berksfile.update(update_options)
     end
 
     method_option :berksfile,
@@ -157,13 +163,13 @@ module Berkshelf
     option :force,
       type: :boolean,
       default: false,
-      desc: "Upload all cookbooks even if a frozen one exists on the target Chef Server"
+      desc: "Upload cookbook(s) even if a frozen one exists on the target Chef Server"
     option :ssl_verify,
       type: :boolean,
       default: nil,
       desc: "Disable/Enable SSL verification when uploading cookbooks"
-    desc "upload", "Upload the Cookbooks specified by a Berksfile or a Berksfile.lock to a Chef Server"
-    def upload
+    desc "upload [COOKBOOKS]", "Upload cookbook(s) specified by a Berksfile to the configured Chef Server."
+    def upload(*cookbook_names)
       berksfile = ::Berkshelf::Berksfile.from_file(options[:berksfile])
 
       unless Berkshelf::Config.instance.chef.chef_server_url.present?
@@ -178,18 +184,54 @@ module Berkshelf
         raise UploadFailure, msg
       end
 
-      berksfile.upload(
+      upload_options = {
         server_url: Berkshelf::Config.instance.chef.chef_server_url,
         client_name: Berkshelf::Config.instance.chef.node_name,
         client_key: Berkshelf::Config.instance.chef.client_key,
         ssl: {
           verify: (options[:ssl_verify].nil? ? Berkshelf::Config.instance.ssl.verify : options[:ssl_verify])
-        }
-      )
-    rescue Ridley::Errors::ClientKeyFileNotFound => e
-      msg = "Could not upload cookbooks: Missing Chef client key: '#{Berkshelf::Config.instance.chef.client_key}'."
-      msg << " Generate or update your Berkshelf configuration that contains a valid path to a Chef client key."
-      raise UploadFailure, msg
+        },
+        cookbooks: cookbook_names
+      }.merge(options).symbolize_keys
+
+      berksfile.upload(upload_options)
+    end
+
+    method_option :berksfile,
+      type: :string,
+      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      desc: "Path to a Berksfile to operate off of.",
+      aliases: "-b",
+      banner: "PATH"
+    method_option :except,
+      type: :array,
+      desc: "Exclude cookbooks that are in these groups.",
+      aliases: "-e"
+    method_option :only,
+      type: :array,
+      desc: "Only cookbooks that are in these groups.",
+      aliases: "-o"
+    desc "outdated [COOKBOOKS]", "Show all outdated cookbooks (exclusively from the community site)"
+    def outdated(*cookbook_names)
+      berksfile = ::Berkshelf::Berksfile.from_file(options[:berksfile])
+      Berkshelf.formatter.msg "Listing outdated cookbooks with newer versions available..."
+      Berkshelf.formatter.msg "BETA: this feature will only pull differences from the community site and will"
+      Berkshelf.formatter.msg "BETA: ignore all other sources you may have defined"
+      Berkshelf.formatter.msg ""
+
+      outdated_options = {
+        cookbooks: cookbook_names
+      }.merge(options).symbolize_keys
+
+      outdated = berksfile.outdated(outdated_options)
+
+      if outdated.empty?
+        Berkshelf.formatter.msg "All cookbooks up to date"
+      else
+        outdated.each do |cookbook, latest_version|
+          Berkshelf.formatter.msg "Cookbook '#{cookbook.name} (#{cookbook.version_constraint})' is outdated (#{latest_version})"
+        end
+      end
     end
 
     method_option :foodcritic,
@@ -228,6 +270,39 @@ module Berkshelf
       ::Berkshelf.formatter.msg "Successfully initialized"
     end
 
+    method_option :berksfile,
+      type: :string,
+      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      desc: "Path to a Berksfile to operate off of.",
+      aliases: "-b",
+      banner: "PATH"
+    desc "list", "Show all of the cookbooks in the current Berkshelf"
+    def list
+      berksfile = ::Berkshelf::Berksfile.from_file(options[:berksfile])
+
+      Berkshelf.ui.say "Cookbooks installed by your Berksfile:"
+      Berkshelf.ui.mute { berksfile.resolve }.sort.each do |cookbook|
+        Berkshelf.ui.say "  * #{cookbook.cookbook_name} (#{cookbook.version})"
+      end
+    end
+
+    method_option :berksfile,
+      type: :string,
+      default: File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME),
+      desc: "Path to a Berksfile to operate off of.",
+      aliases: "-b",
+      banner: "PATH"
+    desc "show [COOKBOOK]", "Display the source path on the local file system for the given cookbook"
+    def show(name = nil)
+      return list if name.nil?
+
+      berksfile = ::Berkshelf::Berksfile.from_file(options[:berksfile])
+      cookbook = Berkshelf.ui.mute { berksfile.resolve }.find{ |cookbook| cookbook.cookbook_name == name }
+
+      raise CookbookNotFound, "Cookbook '#{name}' was not installed by your Berksfile" unless cookbook
+      Berkshelf.ui.say(cookbook.path)
+    end
+
     desc "version", "Display version and copyright information"
     def version
       Berkshelf.formatter.msg version_header