berkshelf 3.0.0.beta7 → 3.0.0.beta8

data/lib/berkshelf/cached_cookbook.rb

@@ -12,7 +12,7 @@ module Berkshelf
         cached_name = File.basename(path.to_s).slice(DIRNAME_REGEXP, 1)
         return nil if cached_name.nil?
 
-        loaded_cookbooks[path.to_s] ||= from_path(path, name: cached_name)
+        loaded_cookbooks[path.to_s] ||= from_path(path)
       end
 
       private
@@ -23,7 +23,7 @@ module Berkshelf
         end
     end
 
-    DIRNAME_REGEXP = /^(.+)-(.+)$/
+    DIRNAME_REGEXP = /^(.+)-(.+)$/.freeze
 
     extend Forwardable
 

data/lib/berkshelf/cli.rb

@@ -199,14 +199,13 @@ module Berkshelf
       default: false,
       desc: 'Halt uploading and exit if the Chef Server has a frozen version of the cookbook(s).'
     desc 'upload [COOKBOOKS]', 'Upload the cookbook specified in the Berksfile to the Chef Server'
-    def upload(*cookbook_names)
+    def upload(*names)
       berksfile = Berksfile.from_options(options)
 
-      options[:cookbooks] = cookbook_names
       options[:freeze]    = !options[:no_freeze]
       options[:validate]  = false if options[:skip_syntax_check]
 
-      berksfile.upload(options.symbolize_keys)
+      berksfile.upload(names, options.symbolize_keys)
     end
 
     method_option :lockfile,
@@ -259,6 +258,18 @@ module Berkshelf
       Berkshelf.formatter.outdated(outdated)
     end
 
+    method_option :source,
+      type: :string,
+      default: Berksfile::DEFAULT_API_URL,
+      desc: 'URL to search for sources',
+      banner: 'URL'
+    desc 'search NAME', 'Search the remote source for cookbooks matching the partial name'
+    def search(name)
+      source = Source.new(options[:source])
+      cookbooks = source.search(name)
+      Berkshelf.formatter.search(cookbooks)
+    end
+
     desc 'init [PATH]', 'Initialize Berkshelf in the given directory'
     def init(path = '.')
       Berkshelf.formatter.deprecation '--git is now the default' if options[:git]
@@ -384,6 +395,7 @@ module Berkshelf
     tasks['cookbook'].options = Berkshelf::CookbookGenerator.class_options
 
     private
+
       # Print a list of the given cookbooks. This is used by various
       # methods like {list} and {contingent}.
       #

data/lib/berkshelf/commands/shelf.rb

@@ -60,10 +60,10 @@ module Berkshelf
       # @param [String, nil] version
       #   the version of the cookbook to find
       #
-      # @raise [Berkshelf::CookbookNotFound]
+      # @raise [CookbookNotFound]
       #   if the cookbook does not exist
       #
-      # @return [Array<Berkshelf::CachedCookbook>]
+      # @return [Array<CachedCookbook>]
       #   the list of cookbooks that match the parameters - this is always an
       #   array!
       def find(name, version = nil)
@@ -74,11 +74,7 @@ module Berkshelf
         end
 
         if cookbooks.empty?
-          if version
-            raise Berkshelf::CookbookNotFound, "Cookbook '#{name}' (#{version}) is not in the Berkshelf shelf"
-          else
-            raise Berkshelf::CookbookNotFound, "Cookbook '#{name}' is not in the Berkshelf shelf"
-          end
+          raise CookbookNotFound.new(name, version, 'in the Berkshelf shelf')
         end
 
         cookbooks

data/lib/berkshelf/community_rest.rb

@@ -69,10 +69,10 @@ module Berkshelf
     def initialize(uri = V1_API, options = {})
       options         = options.reverse_merge(retries: 5, retry_interval: 0.5)
       @api_uri        = uri
-      @retries        = options[:retries]
-      @retry_interval = options[:retry_interval]
+      @retries        = options.delete(:retries)
+      @retry_interval = options.delete(:retry_interval)
 
-      options[:builder] ||= Faraday::Builder.new do |b|
+      options[:builder] ||= Faraday::RackBuilder.new do |b|
         b.response :parse_json
         b.response :gzip
         b.request :retry,
@@ -105,9 +105,9 @@ module Berkshelf
       when (200..299)
         response.body
       when 404
-        raise CookbookNotFound, "Cookbook '#{name}' (#{version}) not found at site: '#{api_uri}'"
+        raise CookbookNotFound.new(name, nil, "at `#{api_uri}'")
       else
-        raise CommunitySiteError, "Error finding cookbook '#{name}' (#{version}) at site: '#{api_uri}'"
+        raise CommunitySiteError.new(api_uri, "'#{name}' (#{version})")
       end
     end
 
@@ -121,9 +121,9 @@ module Berkshelf
       when (200..299)
         self.class.version_from_uri response.body['latest_version']
       when 404
-        raise CookbookNotFound, "Cookbook '#{name}' not found at site: '#{api_uri}'"
+        raise CookbookNotFound.new(name, nil, "at `#{api_uri}'")
       else
-        raise CommunitySiteError, "Error retrieving latest version of cookbook '#{name}' at site: '#{api_uri}'"
+        raise CommunitySiteError.new(api_uri, "the latest version of '#{name}'")
       end
     end
 
@@ -139,9 +139,9 @@ module Berkshelf
           self.class.version_from_uri(version_uri)
         end
       when 404
-        raise CookbookNotFound, "Cookbook '#{name}' not found at site: '#{api_uri}'"
+        raise CookbookNotFound.new(name, nil, "at `#{api_uri}'")
       else
-        raise CommunitySiteError, "Error retrieving versions of cookbook '#{name}' at site: '#{api_uri}'"
+        raise CommunitySiteError.new(api_uri, "versions of '#{name}'")
       end
     end
 

data/lib/berkshelf/config.rb

@@ -123,9 +123,9 @@ module Berkshelf
       type: Boolean,
       default: true,
       required: true
-    attribute 'github.access_token',
-      type: String,
-      default: '',
+    attribute 'github',
+      type: Array,
+      default: [],
       required: false
   end
 end

data/lib/berkshelf/cookbook_generator.rb

@@ -2,14 +2,6 @@ module Berkshelf
   class CookbookGenerator < BaseGenerator
     require_relative 'config'
 
-    LICENSES = [
-      "apachev2",
-      "gplv2",
-      "gplv3",
-      "mit",
-      "reserved"
-    ].freeze
-
     argument :name,
       type: :string,
       required: true

data/lib/berkshelf/cookbook_store.rb

@@ -128,8 +128,7 @@ module Berkshelf
       FileUtils.mkdir_p(storage_path, mode: 0755)
 
       unless File.writable?(storage_path)
-        raise InsufficientPrivledges, "You do not have permission to write to '#{storage_path}'!" +
-          " Please either chown the directory or use a different Cookbook Store."
+        raise InsufficientPrivledges.new(storage_path)
       end
     end
 

data/lib/berkshelf/dependency.rb

@@ -1,69 +1,6 @@
 module Berkshelf
   class Dependency
     class << self
-      @@valid_options = [:constraint, :locations, :group, :locked_version]
-      @@location_keys = Hash.new
-
-      # Returns an array of valid options to pass to the initializer
-      #
-      # @return [Array<Symbol>]
-      def valid_options
-        @@valid_options
-      end
-
-      # Returns an array of the registered source location keys. Every source
-      # location is identified by a key (symbol) to differentiate which class
-      # to instantiate for the location of a Dependency at initialization.
-      #
-      # @return [Array<Symbol>]
-      def location_keys
-        @@location_keys
-      end
-
-      # Add a option to the list of valid options
-      # @see #valid_options
-      #
-      # @param [Symbol] option
-      #
-      # @return [Array<Symbol>]
-      def add_valid_option(option)
-        @@valid_options.push(option) unless @@valid_options.include?(option)
-        @@valid_options
-      end
-
-      # Register a location key with the Dependency class
-      # @see #location_keys
-      #
-      # @param [Symbol] location
-      #
-      # @raise [ArgumentError] if the location key has already been defined
-      #
-      # @return [Array<Symbol>]
-      def add_location_key(location, klass)
-        unless @@location_keys.has_key?(location)
-          add_valid_option(location)
-          @@location_keys[location] = klass
-        end
-
-        @@location_keys
-      end
-
-      def validate_options(options)
-        invalid_options = (options.keys - valid_options)
-
-        unless invalid_options.empty?
-          invalid_options.collect! { |opt| "'#{opt}'" }
-          raise InternalError, "Invalid options for dependency: #{invalid_options.join(', ')}."
-        end
-
-        if (options.keys & location_keys.keys).size > 1
-          invalid = (options.keys & location_keys.keys).map { |opt| "'#{opt}'" }
-          raise InternalError, "Cannot specify #{invalid.join(' and ')} for a dependency!"
-        end
-
-        true
-      end
-
       # Returns the name of this cookbook (because it's the key in hash tables).
       #
       # @param [Dependency, #to_s] dependency
@@ -81,7 +18,6 @@ module Berkshelf
     end
 
     DEFAULT_CONSTRAINT = '>= 0.0.0'.freeze
-    SCM_LOCATIONS      = [ :git, :github ].freeze
 
     # @return [Berkshelf::Berksfile]
     attr_reader :berksfile
@@ -97,8 +33,6 @@ module Berkshelf
     attr_reader :version_constraint
     # @return [Source]
     attr_accessor :source
-    # @return [Berkshelf::CachedCookbook]
-    attr_accessor :cached_cookbook
 
     # @param [Berkshelf::Berksfile] berksfile
     #   the berksfile this dependency belongs to
@@ -123,8 +57,6 @@ module Berkshelf
     #   same as tag
     # @option options [String] :locked_version
     def initialize(berksfile, name, options = {})
-      self.class.validate_options(options)
-
       @options            = options
       @berksfile          = berksfile
       @name               = name
@@ -169,12 +101,33 @@ module Berkshelf
       end
     end
 
-    # The cached (downloaded) cookbook for this dependency.
+    # Determine if this dependency is installed. A dependency is "installed" if
+    # the associated {CachedCookbook} exists on disk.
+    #
+    # @return [Boolean]
+    def installed?
+      !cached_cookbook.nil?
+    end
+
+    # Attempt to load the cached_cookbook for this dependency. For SCM/path
+    # locations, this method delegates to {BaseLocation#cached_cookbook}. For
+    # generic dependencies, this method tries attemps to load a matching
+    # cookbook from the {CookbookStore}.
     #
     # @return [CachedCookbook, nil]
-    def download
+    def cached_cookbook
+      return @cached_cookbook if @cached_cookbook
+
       @cached_cookbook = if location
-        location.download
+        cookbook = location.cached_cookbook
+
+        # If we have a cached cookbook, tighten our constraints
+        if cookbook
+          self.locked_version     = cookbook.version
+          self.version_constraint = cookbook.version
+        end
+
+        cookbook
       else
         if locked_version
           CookbookStore.instance.cookbook(name, locked_version)
@@ -183,31 +136,9 @@ module Berkshelf
         end
       end
 
-      if scm_location? || path_location?
-        self.locked_version     = @cached_cookbook.version
-        self.version_constraint = @cached_cookbook.version
-      end
-
       @cached_cookbook
     end
 
-    # Download the dependency. If this dependency is an SCM location or Path
-    # location, the constraints are also updated to correspond to the cookbook
-    # on disk.
-    #
-    # @return [CachedCookbook, nil]
-    def cached_cookbook
-      @cached_cookbook ||= download
-    end
-
-    # Returns true if the dependency has already been downloaded. A dependency is downloaded when a
-    # cached cookbook is present.
-    #
-    # @return [Boolean]
-    def downloaded?
-      !cached_cookbook.nil?
-    end
-
     # Returns true if this dependency has the given group.
     #
     # @return [Boolean]
@@ -231,24 +162,6 @@ 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?
-        return false
-      end
-
-      SCM_LOCATIONS.include?(location.class.location_key)
-    end
-
     def <=>(other)
       [self.name, self.version_constraint] <=> [other.name, other.version_constraint]
     end
@@ -267,7 +180,7 @@ module Berkshelf
     end
 
     def to_lock
-      out = if path_location? || scm_location? || version_constraint.to_s == '>= 0.0.0'
+      out = if location || version_constraint.to_s == '>= 0.0.0'
         "  #{name}\n"
       else
         "  #{name} (#{version_constraint})\n"
@@ -276,31 +189,5 @@ module Berkshelf
       out << location.to_lock if location
       out
     end
-
-    def to_hash
-      {}.tap do |h|
-        h[:locked_version] = locked_version.to_s
-
-        if location.kind_of?(PathLocation)
-          h[:path] = location.relative_path(berksfile.filepath)
-        end
-
-        if location.kind_of?(MercurialLocation)
-          h[:hg] = location.uri
-          h[:rev] = location.rev
-          h[:rel] = location.rel if location.rel
-        end
-
-        if location.kind_of?(GitLocation)
-          h[:git] = location.uri
-          h[:ref] = location.ref
-          h[:rel] = location.rel if location.rel
-        end
-      end.reject { |k,v| v.blank? }
-    end
-
-    def to_json(options = {})
-      JSON.pretty_generate(to_hash, options)
-    end
   end
 end

data/lib/berkshelf/downloader.rb

@@ -35,7 +35,7 @@ module Berkshelf
         end
       end
 
-      raise CookbookNotFound, "#{dependency} (#{version}) not found in any sources"
+      raise CookbookNotFound.new(dependency, version, 'in any of the sources')
     end
 
     # @param [Berkshelf::Source] source
@@ -72,18 +72,28 @@ module Berkshelf
         archive_path = File.join(tmp_dir, "#{name}-#{version}.tar.gz")
         unpack_dir   = File.join(tmp_dir, "#{name}-#{version}")
 
-        github_access_token          = Berkshelf::Config.instance.github.access_token
-        github_config                = {}
-        github_config[:access_token] = github_access_token unless github_access_token == ""
-        github_client                = Octokit::Client.new(github_config)
+        # Find the correct github connection options for this specific cookbook.
+        cookbook_uri = URI.parse(remote_cookbook.location_path)
+        if cookbook_uri.host == "github.com"
+          options = Berkshelf::Config.instance.github.detect { |opts| opts["web_endpoint"] == nil }
+          options = {} if options == nil
+        else
+          options = Berkshelf::Config.instance.github.detect { |opts| opts["web_endpoint"] == "#{cookbook_uri.scheme}://#{cookbook_uri.host}" }
+          raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options == nil
+        end
+
+        github_client = Octokit::Client.new(access_token: options[:access_token],
+          api_endpoint: options[:api_endpoint], web_endpoint: options[:web_endpoint],
+          connection_options: {ssl: {verify: options[:ssl_verify].nil? ? true : options[:ssl_verify]}})
 
         begin
-          url = URI(github_client.archive_link(remote_cookbook.location_path, ref: "v#{version}"))
+          url = URI(github_client.archive_link(cookbook_uri.path.gsub(/^\//, ""), ref: "v#{version}"))
         rescue Octokit::Unauthorized
           return nil
         end
 
-        Net::HTTP.start(url.host, use_ssl: url.scheme == "https") do |http|
+        Net::HTTP.start(url.host, use_ssl: url.scheme == "https",
+          verify_mode: (options[:ssl_verify].nil? || options[:ssl_verify]) ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE) do |http|
           resp = http.get(url.request_uri)
           return nil unless resp.is_a?(Net::HTTPSuccess)
           open(archive_path, "wb") { |file| file.write(resp.body) }
@@ -99,6 +109,30 @@ module Berkshelf
         end[0]
 
         File.join(unpack_dir, cookbook_directory)
+      when :uri
+        require 'open-uri' unless defined?(OpenURI)
+
+        tmp_dir      = Dir.mktmpdir
+        archive_path = Pathname.new(tmp_dir) + "#{name}-#{version}.tar.gz"
+        unpack_dir   = Pathname.new(tmp_dir) + "#{name}-#{version}"
+
+        url = remote_cookbook.location_path
+        open(url, 'rb') do |remote_file|
+          archive_path.open('wb') { |local_file| local_file.write remote_file.read }
+        end
+
+        archive_path.open('rb') do |file|
+          tgz = Zlib::GzipReader.new(file)
+          Archive::Tar::Minitar.unpack(tgz, unpack_dir.to_s)
+        end
+
+        # The top level directory is inconsistant. So we unpack it and
+        # use the only directory created in the unpack_dir.
+        cookbook_directory = unpack_dir.entries.select do |filename|
+          (! filename.to_s.start_with?('.')) && (unpack_dir + filename).cookbook?
+        end.first
+
+        (unpack_dir + cookbook_directory).to_s
       else
         raise RuntimeError, "unknown location type #{remote_cookbook.location_type}"
       end