berkshelf 3.0.0.beta2 → 3.0.0.beta3

data/lib/berkshelf/berksfile.rb

@@ -23,7 +23,7 @@ module Berkshelf
       end
     end
 
-    DEFAULT_API_URL = "http://api.berkshelf.com".freeze
+    DEFAULT_API_URL = "https://api.berkshelf.com".freeze
 
     include Berkshelf::Mixin::Logging
     include Berkshelf::Mixin::DSLEval
@@ -135,21 +135,21 @@ module Berkshelf
     # in a second source would not be used.
     #
     # @example
-    #   source "http://api.berkshelf.com"
-    #   source "http://berks-api.riotgames.com"
+    #   source "https://api.berkshelf.com"
+    #   source "https://berks-api.riotgames.com"
     #
     # @param [String] api_url
     #   url for the api to add
     #
     # @raise [Berkshelf::InvalidSourceURI]
     #
-    # @return [Array<SourceURI>]
+    # @return [Array<Berkshelf::Source>]
     def source(api_url)
       new_source = Source.new(api_url)
       @sources.push(new_source) unless @sources.include?(new_source)
     end
 
-    # @return [Array<SourceURI>]
+    # @return [Array<Berkshelf::Source>]
     def sources
       @sources.empty? ? self.class.default_sources : @sources
     end
@@ -342,7 +342,7 @@ module Berkshelf
     #   Names of the cookbooks to retrieve dependencies for
     #
     # @raise [Berkshelf::OutdatedDependency]
-    #   if the lockfile constraints do not satisfy the Berskfile constraints
+    #   if the lockfile constraints do not satisfy the Berksfile constraints
     #
     # @return [Array<Berkshelf::CachedCookbook>]
     def install(options = {})
@@ -468,6 +468,10 @@ module Berkshelf
     #   on the remote Chef Server and frozen.
     # @option options [String] :server_url
     #   An overriding Chef Server to upload the cookbooks to
+    # @option options [String] :client_name
+    #   An overriding client name to use for connecting to the chef server
+    # @option options [String] :client_key
+    #   An overriding client key to use for connecting to the chef server
     #
     # @raise [Berkshelf::UploadFailure]
     #   if you are uploading cookbooks with an invalid or not-specified client key
@@ -565,10 +569,10 @@ module Berkshelf
           FileUtils.cp_r(path, destination)
 
           unless options[:ignore_chefignore]
-            if ignore_file = Berkshelf::Chef::Cookbook::Chefignore.find_relative_to(path)
-              chefignore = Berkshelf::Chef::Cookbook::Chefignore.new(ignore_file)
-              chefignore.remove_ignores_from(destination) if chefignore
-            end
+            chefignore = Ridley::Chef::Chefignore.new(destination) rescue nil
+            Dir["#{destination}/**/*"].each do |path|
+              FileUtils.rm_rf(path) if chefignore.ignored?(path)
+            end if chefignore
           end
         end
 
@@ -612,13 +616,7 @@ module Berkshelf
       chefignore       = nil
       cached_cookbooks = install(options.slice(:except, :only))
 
-      if cached_cookbooks.empty?
-        return nil
-      end
-
-      if ignore_file = Berkshelf::Chef::Cookbook::Chefignore.find_relative_to(Dir.pwd)
-        chefignore = Berkshelf::Chef::Cookbook::Chefignore.new(ignore_file)
-      end
+      return nil if cached_cookbooks.empty?
 
       cached_cookbooks.each do |cookbook|
         Berkshelf.formatter.vendor(cookbook, destination)
@@ -634,6 +632,11 @@ module Berkshelf
         end
 
         FileUtils.cp_r(files, cookbook_destination)
+
+        chefignore = Ridley::Chef::Chefignore.new(destination) rescue nil
+        Dir["#{cookbook_destination}/**/*"].each do |path|
+          FileUtils.rm_rf(path) if chefignore.ignored?(path)
+        end if chefignore
       end
 
       FileUtils.mv(scratch, destination)
@@ -713,10 +716,11 @@ module Berkshelf
       # @raise [Berkshelf::ChefConnectionError]
       def ridley_connection(options = {}, &block)
         ridley_options               = options.slice(:ssl)
+
         ridley_options[:server_url]  = options[:server_url] || Berkshelf.config.chef.chef_server_url
-        ridley_options[:client_name] = Berkshelf.config.chef.node_name
-        ridley_options[:client_key]  = Berkshelf.config.chef.client_key
-        ridley_options[:ssl]         = { verify: (options[:ssl_verify] || Berkshelf.config.ssl.verify) }
+        ridley_options[:client_name] = options[:client_name] || Berkshelf.config.chef.node_name
+        ridley_options[:client_key]  = options[:client_key] || Berkshelf.config.chef.client_key
+        ridley_options[:ssl]         = { verify: (options[:ssl_verify].nil?) ? Berkshelf.config.ssl.verify : options[:ssl_verify]}
 
         unless ridley_options[:server_url].present?
           raise ChefConnectionError, 'Missing required attribute in your Berkshelf configuration: chef.server_url'

data/lib/berkshelf/cached_cookbook.rb

@@ -12,8 +12,15 @@ module Berkshelf
         cached_name = File.basename(path.to_s).slice(DIRNAME_REGEXP, 1)
         return nil if cached_name.nil?
 
-        from_path(path, name: cached_name)
+        loaded_cookbooks[path.to_s] ||= from_path(path, name: cached_name)
       end
+
+      private
+
+        # @return [Hash<String, CachedCookbook>]
+        def loaded_cookbooks
+          @loaded_cookbooks ||= {}
+        end
     end
 
     DIRNAME_REGEXP = /^(.+)-(.+)$/

data/lib/berkshelf/cli.rb

@@ -40,12 +40,12 @@ module Berkshelf
 
     class << self
       def dispatch(meth, given_args, given_opts, config)
-        unless (given_args & ['-h', '--help']).empty?
-          if given_args.length == 1
-            # berks --help
-            super
+        if given_args.length > 1 && !(given_args & Thor::HELP_MAPPINGS).empty?
+          command = given_args.first
+
+          if self.subcommands.include?(command)
+            super(meth, [command, 'help'].compact, nil, config)
           else
-            command = given_args.first
             super(meth, ['help', command].compact, nil, config)
           end
         else
@@ -308,11 +308,6 @@ module Berkshelf
       Berkshelf.formatter.deprecation '--git is now the default' if options[:git]
       Berkshelf.formatter.deprecation '--vagrant is now the default' if options[:vagrant]
 
-      if File.chef_cookbook?(path)
-        options[:chefignore]     = true
-        options[:metadata_entry] = true
-      end
-
       Berkshelf::InitGenerator.new([path], options).invoke_all
 
       Berkshelf.formatter.msg 'Successfully initialized'

data/lib/berkshelf/community_rest.rb

@@ -1,6 +1,5 @@
 require 'open-uri'
 require 'retryable'
-require 'addressable/uri'
 
 module Berkshelf
   class CommunityREST < Faraday::Connection
@@ -49,7 +48,7 @@ module Berkshelf
         end
     end
 
-    V1_API = 'http://cookbooks.opscode.com/api/v1'.freeze
+    V1_API = 'https://cookbooks.opscode.com/api/v1'.freeze
 
     # @return [String]
     attr_reader :api_uri
@@ -69,11 +68,11 @@ module Berkshelf
     #   how often we should pause between retries
     def initialize(uri = V1_API, options = {})
       options         = options.reverse_merge(retries: 5, retry_interval: 0.5)
-      @api_uri        = Addressable::URI.parse(uri)
+      @api_uri        = uri
       @retries        = options[:retries]
       @retry_interval = options[:retry_interval]
 
-      builder = Faraday::Builder.new do |b|
+      options[:builder] ||= Faraday::Builder.new do |b|
         b.response :parse_json
         b.response :gzip
         b.request :retry,
@@ -84,7 +83,7 @@ module Berkshelf
         b.adapter :net_http
       end
 
-      super(api_uri, builder: builder)
+      super(api_uri, options)
     end
 
     # @param [String] name

data/lib/berkshelf/config.rb

@@ -95,11 +95,11 @@ module Berkshelf
       default: false
     attribute 'vagrant.vm.box',
       type: String,
-      default: 'Berkshelf-CentOS-6.3-x86_64-minimal',
+      default: 'opscode_ubuntu-12.04_provisionerless',
       required: true
     attribute 'vagrant.vm.box_url',
       type: String,
-      default: 'https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box',
+      default: 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box',
       required: true
     attribute 'vagrant.vm.forward_port',
       type: Hash,
@@ -113,6 +113,12 @@ module Berkshelf
     attribute 'vagrant.vm.provision',
       type: String,
       default: 'chef_solo'
+    attribute 'vagrant.omnibus.enabled',
+      type: Boolean,
+      default: true
+    attribute 'vagrant.omnibus.version',
+      type: String,
+      default: 'latest'
     attribute 'ssl.verify',
       type: Boolean,
       default: true,

data/lib/berkshelf/cookbook_store.rb

@@ -89,25 +89,20 @@ module Berkshelf
     # Returns an array of the Cookbooks that have been cached to the
     # storage_path of this instance of CookbookStore.
     #
-    # @param [String] filter
+    # @param [String, Regexp] filter
     #   return only the CachedCookbooks whose name match the given filter
     #
     # @return [Array<Berkshelf::CachedCookbook>]
     def cookbooks(filter = nil)
-      cookbooks = []
+      cookbooks = storage_path.children.collect do |path|
+        CachedCookbook.from_store_path(path)
+      end.compact
 
-      storage_path.each_child.map do |path|
-        Celluloid::Future.new do
-          cached_cookbook = CachedCookbook.from_store_path(path)
+      return cookbooks unless filter
 
-          next unless cached_cookbook
-          next if filter && cached_cookbook.cookbook_name != filter
-
-          cookbooks << cached_cookbook
-        end
-      end.each(&:value)
-
-      cookbooks
+      cookbooks.select do |cookbook|
+        filter === cookbook.cookbook_name
+      end
     end
 
     # Returns an expanded path to the location on disk where the Cookbook
@@ -141,7 +136,7 @@ module Berkshelf
       graph = Solve::Graph.new
       cookbooks(name).each { |cookbook| graph.artifacts(name, cookbook.version) }
 
-      name, version = Solve.it!(graph, [[name, constraint]]).first
+      name, version = Solve.it!(graph, [[name, constraint]], ENV['DEBUG_RESOLVER'] ? { ui: Berkshelf.ui } : {}).first
 
       cookbook(name, version)
     rescue Solve::Errors::NoSolutionError

data/lib/berkshelf/dependency.rb

@@ -76,6 +76,8 @@ module Berkshelf
     attr_reader :groups
     # @return [Berkshelf::Location]
     attr_reader :location
+    # @return [Solve::Version]
+    attr_accessor :locked_version
     # @return [Solve::Constraint]
     attr_accessor :version_constraint
     # @return [Berkshelf::CachedCookbook]
@@ -139,7 +141,11 @@ module Berkshelf
       @cached_cookbook ||= if location
         location.download
       else
-        Berkshelf::CookbookStore.instance.satisfy(name, version_constraint)
+        if locked_version
+          CookbookStore.instance.cookbook(name, locked_version)
+        else
+          Berkshelf::CookbookStore.instance.satisfy(name, version_constraint)
+        end
       end
     end
 
@@ -163,18 +169,6 @@ module Berkshelf
       groups.include?(group.to_sym)
     end
 
-    # Get the locked version of this cookbook. First check the instance variable
-    # and then resort to the cached_cookbook for the version.
-    #
-    # This was formerly a delegator, but it would fail if the `@cached_cookbook`
-    # was nil or undefined.
-    #
-    # @return [Solve::Version, nil]
-    #   the locked version of this cookbook
-    def locked_version
-      @locked_version ||= cached_cookbook ? cached_cookbook.version : nil
-    end
-
     # The location for this dependency, such as a remote Chef Server, the
     # community API, :git, or a :path location. By default, this will be the
     # community API.
@@ -191,6 +185,15 @@ module Berkshelf
       @groups ||= []
     end
 
+    # Determines if this dependency has a location and is it a {PathLocation}
+    #
+    # @return [Boolean]
+    def path_location?
+      location.nil? ? false : location.is_a?(PathLocation)
+    end
+
+    # Determines if this dependency has a location and if it is an SCM location
+    #
     # @return [Boolean]
     def scm_location?
       if location.nil?

data/lib/berkshelf/errors.rb

@@ -323,7 +323,7 @@ module Berkshelf
       "    #{@dependency.name} (#{@dependency.version_constraint})\n\n" +
       "  In Berksfile.lock:\n" +
       "    #{@locked_dependency.name} (#{@locked_dependency.locked_version})\n\n" +
-      "Try running `berks update #{@dependency.name}, which will try to find '#{@dependency.name}' matching " +
+      "Try running `berks update #{@dependency.name}`, which will try to find '#{@dependency.name}' matching " +
         "'#{@dependency.version_constraint}'."
     end
   end
@@ -475,4 +475,18 @@ module Berkshelf
   class DuplicateDemand < BerkshelfError; status_code(138); end
   class VendorError < BerkshelfError; status_code(139); end
   class LockfileNotFound < BerkshelfError; status_code(140); end
+
+  class NotACookbook < BerkshelfError
+    status_code(141)
+
+    # @param [String] path
+    #   the path to the thing that is not a cookbook
+    def initialize(path)
+      @path = File.expand_path(path) rescue path
+    end
+
+    def to_s
+      "#{@path} does not appear to be a valid cookbook. Does it have a `metadata.rb`?"
+    end
+  end
 end

data/lib/berkshelf/formatters/json.rb

@@ -33,7 +33,7 @@ module Berkshelf
       # @param [Berkshelf::Dependency] dependency
       def fetch(dependency)
         cookbooks[dependency] ||= {}
-        cookbooks[dependency][:version]  = dependency.cached_cookbook.version
+        cookbooks[dependency][:version]  = dependency.locked_version.to_s
         cookbooks[dependency][:location] = dependency.location
       end
 

data/lib/berkshelf/init_generator.rb

@@ -13,11 +13,11 @@ module Berkshelf
 
     class_option :metadata_entry,
       type: :boolean,
-      default: false
+      default: true
 
     class_option :chefignore,
       type: :boolean,
-      default: false
+      default: true
 
     class_option :skip_vagrant,
       type: :boolean,
@@ -59,6 +59,7 @@ module Berkshelf
     end
 
     def generate
+      validate_cookbook
       validate_configuration
       check_option_support
 
@@ -66,7 +67,7 @@ module Berkshelf
       template 'Thorfile.erb', target.join('Thorfile')
 
       if options[:chefignore]
-        copy_file 'chefignore', target.join(Berkshelf::Chef::Cookbook::Chefignore::FILENAME)
+        copy_file 'chefignore', target.join(Ridley::Chef::Chefignore::FILENAME)
       end
 
       unless options[:skip_git]
@@ -129,6 +130,19 @@ module Berkshelf
         end
       end
 
+      # Assert the current working directory is a cookbook
+      #
+      # @raise [NotACookbook] if the current working directory is
+      #   not a cookbook
+      #
+      # @return [nil]
+      def validate_cookbook
+        path = File.expand_path(File.join(target, 'metadata.rb'))
+        unless File.exists?(path)
+          raise Berkshelf::NotACookbook.new(path)
+        end
+      end
+
       # Assert valid configuration
       #
       # @raise [InvalidConfiguration] if the configuration is invalid

data/lib/berkshelf/installer.rb

@@ -42,6 +42,7 @@ module Berkshelf
 
       cached_cookbooks = resolver.resolve.collect do |name, version, dependency|
         lock_deps << dependency
+        dependency.locked_version ||= Solve::Version.new(version)
         if dependency.downloaded?
           Berkshelf.formatter.use(dependency.name, dependency.cached_cookbook.version, dependency.location)
           dependency.cached_cookbook
@@ -115,9 +116,19 @@ module Berkshelf
       #
       # If a locked dependency exists, but doesn't satisfy the constraint, raise a
       # {Berkshelf::OutdatedDependency} and tell the user to run update.
+      #
+      # Never use the locked constraint for a dependency with a {PathLocation}
+      #
+      # @param [Array<Berkshelf::Dependency>] dependencies
+      #
+      # @return [Array<Berkshelf::Dependency>]
       def lockfile_reduce(dependencies = [])
         dependencies.collect do |dependency|
-          dependency_from_lockfile(dependency) || dependency
+          if dependency.path_location?
+            dependency
+          else
+            dependency_from_lockfile(dependency) || dependency
+          end
         end
       end
 

data/lib/berkshelf/logger.rb

@@ -1,9 +1,12 @@
 module Berkshelf
-  Logger = Celluloid::Logger.dup
+  Logger = Ridley.logger
 
-  Logger.module_eval do
-    def self.fatal(string)
-      error(string)
+  Logger.class.class_eval do
+    alias_method :fatal, :error
+
+    def deprecate(message)
+      trace = caller.join("\n\t")
+      warn "DEPRECATION WARNING: #{message}\n\t#{trace}"
     end
   end
 end