berkshelf 3.0.0.beta4 → 3.0.0.beta5

data/lib/berkshelf/core_ext/pathname.rb

@@ -1,20 +1,18 @@
 class Pathname
-  # Returns true or false if the path of the instantiated
-  # Pathname or a parent directory contains a Tryhard Pack
-  # data directory.
+  # Returns true or false if the path contains a "metadata.json" or a "metadata.rb" file.
   #
   # @return [Boolean]
   def cookbook?
-    self.join('metadata.rb').exist?
+    join("metadata.json").exist? || join("metadata.rb").exist?
   end
   alias_method :chef_cookbook?, :cookbook?
 
-  # Ascend the directory structure from the given path to find a
-  # the root of a Chef Cookbook. If no Cookbook is found, nil is returned
+  # Ascend the directory structure from the given path to find  the root of a
+  # Cookbook. If no Cookbook is found, nil is returned.
   #
   # @return [Pathname, nil]
   def cookbook_root
-    self.ascend do |potential_root|
+    ascend do |potential_root|
       if potential_root.cookbook?
         return potential_root
       end

data/lib/berkshelf/dependency.rb

@@ -139,7 +139,7 @@ module Berkshelf
     # @return [Berkshelf::CachedCookbook]
     def cached_cookbook
       @cached_cookbook ||= if location
-        location.download
+        download
       else
         if locked_version
           CookbookStore.instance.cookbook(name, locked_version)
@@ -152,6 +152,13 @@ module Berkshelf
     # @return [Berkshelf::CachedCookbook]
     def download
       @cached_cookbook = location.download
+
+      if scm_location? || path_location?
+        @locked_version = Solve::Version.new(@cached_cookbook.version)
+        @version_constraint = Solve::Constraint.new(@cached_cookbook.version)
+      end
+
+      @cached_cookbook
     end
 
     # Returns true if the dependency has already been downloaded. A dependency is downloaded when a

data/lib/berkshelf/downloader.rb

@@ -1,3 +1,8 @@
+require 'net/http'
+require 'zlib'
+require 'archive/tar/minitar'
+require 'octokit'
+
 module Berkshelf
   class Downloader
     extend Forwardable
@@ -65,6 +70,38 @@ module Berkshelf
         # https://github.com/opscode/test-kitchen/blob/master/lib/kitchen.rb#L99
         Celluloid.logger = nil unless ENV["DEBUG_CELLULOID"]
         Ridley.open(credentials) { |r| r.cookbook.download(name, version) }
+      when :github
+        tmp_dir      = Dir.mktmpdir
+        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)
+
+        begin
+          url = URI(github_client.archive_link(remote_cookbook.location_path, ref: "v#{version}"))
+        rescue Octokit::Unauthorized
+          return nil
+        end
+
+        Net::HTTP.start(url.host, use_ssl: url.scheme == "https") 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) }
+        end
+
+        tgz = Zlib::GzipReader.new(File.open(archive_path, "rb"))
+        Archive::Tar::Minitar.unpack(tgz, unpack_dir)
+
+        # we need to figure out where the cookbook is located in the archive. This is because the directory name
+        # pattern is not cosistant between private and public github repositories
+        cookbook_directory = Dir.entries(unpack_dir).select do |f|
+          (! f.start_with?('.')) && (Pathname.new(File.join(unpack_dir, f)).cookbook?)
+        end[0]
+
+        File.join(unpack_dir, cookbook_directory)
       else
         raise RuntimeError, "unknown location type #{remote_cookbook.location_type}"
       end

data/lib/berkshelf/errors.rb

@@ -504,4 +504,5 @@ module Berkshelf
   end
 
   class InvalidLockFile < BerkshelfError; status_code(142); end
+  class PackageError < BerkshelfError; status_code(143); end
 end

data/lib/berkshelf/formatters.rb

@@ -80,6 +80,7 @@ module Berkshelf
       end
 
       formatter_methods :error,
+                        :warn,
                         :fetch,
                         :install,
                         :list,

data/lib/berkshelf/formatters/human_readable.rb

@@ -19,17 +19,25 @@ module Berkshelf
       #
       # @param [String] cookbook
       # @param [String] version
-      # @option options [String] :api_source
+      # @option options [#to_s] :api_source
       #   the berkshelf-api source url
-      # @option options [String] :location_path
-      #   the chef server url for a cookbook's location
+      # @option options [#to_s] :location_path
+      #   endpoint location for the remote cookbook provided by the api server
+      # @option options [#to_s] :location_type
+      #   type of the location provided by the api server for the remote cookbook
       def install(cookbook, version, options = {})
         info_message = "Installing #{cookbook} (#{version})"
 
-        if options.has_key?(:api_source) && options.has_key?(:location_path)
-          api_source = options[:api_source]
-          info_message << " from #{options[:location_path]} (via #{URI(api_source).host})" unless api_source == Berkshelf::Berksfile::DEFAULT_API_URL
+        if options.has_key?(:api_source) && options.has_key?(:location_path) && options.has_key?(:location_type)
+          api_source    = options[:api_source].to_s
+          location_path = options[:location_path].to_s
+          location_type = options[:location_type].to_s
+
+          unless api_source == Berkshelf::Berksfile::DEFAULT_API_URL
+            info_message << " from [api: #{URI(api_source)}] ([#{location_type}] #{location_path})"
+          end
         end
+
         Berkshelf.ui.info info_message
       end
 
@@ -80,10 +88,9 @@ module Berkshelf
 
       # Output a Cookbook package message using {Berkshelf.ui}
       #
-      # @param [String] cookbook
       # @param [String] destination
-      def package(cookbook, destination)
-        Berkshelf.ui.info "Cookbook(s) packaged to #{destination}!"
+      def package(destination)
+        Berkshelf.ui.info "Cookbook(s) packaged to #{destination}"
       end
 
       # Output a list of cookbooks using {Berkshelf.ui}
@@ -130,6 +137,13 @@ module Berkshelf
         Berkshelf.ui.error message
       end
 
+      # Output a warning message using {Berkshelf.ui}
+      #
+      # @param [String] message
+      def warn(message)
+        Berkshelf.ui.warn message
+      end
+
       # Output a deprecation warning
       #
       # @param [String] message

data/lib/berkshelf/formatters/json.rb

@@ -109,15 +109,6 @@ module Berkshelf
         end
       end
 
-      # Add a Cookbook package entry to delayed output
-      #
-      # @param [String] cookbook
-      # @param [String] destination
-      def package(cookbook, destination)
-        cookbooks[cookbook] ||= {}
-        cookbooks[cookbook][:destination] = destination
-      end
-
       # Output a list of cookbooks to delayed output
       #
       # @param [Hash<Dependency, CachedCookbook>] list
@@ -161,6 +152,13 @@ module Berkshelf
         output[:errors] << message
       end
 
+      # Add a warning message entry to delayed output
+      #
+      # @param [String] message
+      def warn(message)
+        output[:warnings] << message
+      end
+
       private
 
         attr_reader :output

data/lib/berkshelf/git.rb

@@ -152,7 +152,6 @@ module Berkshelf
       #
       # @return [Boolean]
       def validate_uri(uri)
-
         unless uri.is_a?(String)
           return false
         end

data/lib/berkshelf/init_generator.rb

@@ -96,7 +96,7 @@ module Berkshelf
 
       if defined?(Kitchen::Generator::Init)
         unless options[:skip_test_kitchen]
-          # Temporarily use Dir.chdir to ensure the destionation_root of test kitchen's generator
+          # Temporarily use Dir.chdir to ensure the destination_root of test kitchen's generator
           # is where we expect until this bug can be addressed:
           # https://github.com/opscode/test-kitchen/pull/140
           Dir.chdir target do

data/lib/berkshelf/installer.rb

@@ -1,3 +1,5 @@
+require 'berkshelf/api-client'
+
 module Berkshelf
   class Installer
     extend Forwardable
@@ -14,7 +16,16 @@ module Berkshelf
     end
 
     def build_universe
-      berksfile.sources.map(&:universe)
+      berksfile.sources.collect do |source|
+        Thread.new do
+          begin
+            source.build_universe
+          rescue Berkshelf::APIClientError => ex
+            Berkshelf.formatter.warn "Error retrieving universe from source: #{source}"
+            Berkshelf.formatter.warn "  * [#{ex.class}] #{ex}"
+          end
+        end
+      end.map(&:join)
     end
 
     # @option options [Array<String>, String] cookbooks
@@ -23,23 +34,22 @@ module Berkshelf
     def run(options = {})
       dependencies = lockfile_reduce(berksfile.dependencies(options.slice(:except, :only)))
       resolver     = Resolver.new(berksfile, dependencies)
+      lock_deps    = []
 
       dependencies.each do |dependency|
-        next unless dependency.scm_location?
-        Berkshelf.formatter.fetch(dependency)
-        downloader.download(dependency)
-      end
+        if dependency.scm_location?
+          Berkshelf.formatter.fetch(dependency)
+          downloader.download(dependency)
+        end
 
-      dependencies.each do |dependency|
-        next unless dependency.cached_cookbook
-        resolver.add_explicit_dependencies(dependency)
+        next if (cookbook = dependency.cached_cookbook).nil?
+
+        resolver.add_explicit_dependencies(cookbook)
       end
 
       Berkshelf.formatter.msg("building universe...")
       build_universe
 
-      lock_deps = []
-
       cached_cookbooks = resolver.resolve.collect do |name, version, dependency|
         lock_deps << dependency
         dependency.locked_version ||= Solve::Version.new(version)
@@ -49,7 +59,8 @@ module Berkshelf
         else
           source = berksfile.sources.find { |source| source.cookbook(name, version) }
           remote_cookbook = source.cookbook(name, version)
-          Berkshelf.formatter.install(name, version, api_source: source.to_s, location_path: remote_cookbook.location_path)
+          Berkshelf.formatter.install(name, version, api_source: source, location_type: remote_cookbook.location_type,
+            location_path: remote_cookbook.location_path)
           temp_filepath = downloader.download(name, version)
           CookbookStore.import(name, version, temp_filepath)
         end
@@ -92,6 +103,14 @@ module Berkshelf
 
     private
 
+      # Returns an instance of `Berkshelf::Dependency` with an equality constraint matching
+      # the locked version of the dependency in the lockfile.
+      #
+      # If no matching dependency is found in the lockfile then nil is returned.
+      #
+      # @param [Berkshelf:Dependency] dependency
+      #
+      # @return [Berkshelf::Dependency, nil]
       def dependency_from_lockfile(dependency)
         locked = lockfile.find(dependency)
 
@@ -105,8 +124,7 @@ module Berkshelf
           end
         end
 
-        # Update to the constraint to be a hard one
-        locked.version_constraint = Solve::Constraint.new(locked.locked_version.to_s)
+        locked.version_constraint = Solve::Constraint.new("= #{locked.locked_version}")
         locked
       end
 
@@ -125,13 +143,19 @@ module Berkshelf
       #
       # @return [Array<Berkshelf::Dependency>]
       def lockfile_reduce(dependencies = [])
-        dependencies.collect do |dependency|
-          if dependency.path_location?
-            dependency
-          else
-            dependency_from_lockfile(dependency) || dependency
+        {}.tap do |h|
+          (dependencies + lockfile.dependencies).each do |dependency|
+            next if h.has_key?(dependency.name)
+
+            if dependency.path_location?
+              result = dependency
+            else
+              result = dependency_from_lockfile(dependency) || dependency
+            end
+
+            h[result.name] = result
           end
-        end
+        end.values
       end
 
       # The list of dependencies "locked" by the lockfile.

data/lib/berkshelf/location.rb

@@ -121,6 +121,13 @@ module Berkshelf
         true
       end
 
+      # Determines if the location is well formed and points to an accessible location
+      #
+      # @return [Boolean]
+      def valid?
+        true
+      end
+
       def to_hash
         { type: self.class.location_key }
       end
@@ -130,19 +137,7 @@ module Berkshelf
       end
     end
 
-    class ScmLocation < Location::Base
-      class << self
-        # Create a temporary directory for the cloned repository within Berkshelf's
-        # temporary directory
-        #
-        # @return [String]
-        #   the path to the created temporary directory
-        def tmpdir
-          @tmpdir ||= Berkshelf.mktmpdir
-        end
-      end
-    end
-
+    class ScmLocation < Location::Base; end
   end
 end
 

data/lib/berkshelf/locations/git_location.rb

@@ -1,6 +1,5 @@
 module Berkshelf
   class GitLocation < Location::ScmLocation
-
     set_location_key :git
     set_valid_options :ref, :branch, :tag, :rel
 
@@ -36,13 +35,19 @@ module Berkshelf
       Git.validate_uri!(@uri)
     end
 
+    # @example
+    #     irb> location.checkout_info
+    #     { kind: "branch", rev: "master" }
+    #
+    # @return [Hash]
     def checkout_info
       if @sha
         kind, rev = "ref", @sha
       else
         kind, rev = "branch", branch
       end
-      { :kind => kind, :rev => rev }
+
+      { kind: kind, rev: rev }
     end
 
     # @param [#to_s] destination
@@ -56,10 +61,12 @@ module Berkshelf
         return local_revision(destination)
       end
 
-      Berkshelf::Git.checkout(clone, ref || checkout_info[:rev])
-      @ref = Berkshelf::Git.rev_parse(clone)
+      repo_path = Berkshelf::Git.clone(uri)
 
-      tmp_path = rel ? File.join(clone, rel) : clone
+      Berkshelf::Git.checkout(repo_path, ref || checkout_info[:rev])
+      @ref = Berkshelf::Git.rev_parse(repo_path)
+
+      tmp_path = rel ? File.join(repo_path, rel) : repo_path
       unless File.chef_cookbook?(tmp_path)
         msg = "Cookbook '#{dependency.name}' not found at git: #{to_display}"
         msg << " at path '#{rel}'" if rel
@@ -96,20 +103,6 @@ module Berkshelf
         s
       end
 
-      def git
-        @git ||= Berkshelf::Git.new(uri)
-      end
-
-      def clone
-        tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/,'-'))
-        FileUtils.mkdir_p(File.join(File.split(tmp_clone).shift))
-        unless File.exists?(tmp_clone)
-          Berkshelf::Git.clone(uri, tmp_clone)
-        end
-
-        tmp_clone
-      end
-
       def cached?(destination)
         revision_path(destination) && File.exists?(revision_path(destination))
       end

data/lib/berkshelf/locations/mercurial_location.rb

@@ -1,6 +1,5 @@
 module Berkshelf
   class MercurialLocation < Location::ScmLocation
-
     set_location_key :hg
     set_valid_options :rev, :branch, :tag, :rel
 
@@ -43,10 +42,12 @@ module Berkshelf
         return local_revision(destination)
       end
 
-      Berkshelf::Mercurial.checkout(clone, rev || branch || tag) if rev || branch || tag
-      @rev = Berkshelf::Mercurial.rev_parse(clone)
+      repo_path = Berkshelf::Mercurial.clone(uri)
+
+      Berkshelf::Mercurial.checkout(repo_path, rev || branch || tag) if rev || branch || tag
+      @rev = Berkshelf::Mercurial.rev_parse(repo_path)
 
-      tmp_path = rel ? File.join(clone, rel) : clone
+      tmp_path = rel ? File.join(repo_path, rel) : repo_path
       unless File.chef_cookbook?(tmp_path)
         msg = "Cookbook '#{dependency.name}' not found at hg: #{uri}"
         msg << " with rev '#{rev}'" if rev
@@ -79,20 +80,6 @@ module Berkshelf
 
     private
 
-      def hg
-        @hg ||= Berkshelf::Mercurial.new(uri)
-      end
-
-      def clone
-        tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/,'-'))
-        FileUtils.mkdir_p(File.join(File.split(tmp_clone).shift))
-        unless File.exists?(tmp_clone)
-          Berkshelf::Mercurial.clone(uri, tmp_clone)
-        end
-
-        tmp_clone
-      end
-
       def cached?(destination)
         revision_path(destination) && File.exists?(revision_path(destination))
       end