cookbook-omnifetch 0.7.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 64e4ca89bc3c10a6c4bf4e224bb39f5657d1cd12
-  data.tar.gz: c16cfaa9e0b3c9eb655faa3d12a293b6ec166931
+SHA256:
+  metadata.gz: 9491fb99bc2194cfb805a87ab4d543be68e51a4fc4c3d27e954c62e96b42df33
+  data.tar.gz: 1f364b47c66fe2c7ac35d45f9a343dc8a14e6eaad3050007db5c4c59f255029b
 SHA512:
-  metadata.gz: 8e3354f49b0ed00fd5ab23f6de8dd8994419bb8e15c1d32b5dc85f960c46c1d20af45b8f2ca4cbb0e96a812a57e9a8bc04bba1907a319c13e9a6a323eda673be
-  data.tar.gz: f7841d6c9081275526ba60ece1fd3f349b24d812d9c2bba66110a3c1da6800d0e35e2da1a304f7601e4fda6849e9f78f49c8a127f3c3fcaf4f33dc1f919db3dd
+  metadata.gz: bfe5d751f1891af706db45ebf57867207078876419eaa7f7629ee4ae9b5437897528782062186e2eec04cee2516dae01c602d68581b6b759f7b1a8eb7eea6fea
+  data.tar.gz: 6f1668723a48ca94e337e1aba18138a745b82a65008ad88c41fea1e63318120002a516334d238ad61c3faf8b623f5625220a291fa53fd1e17ae6229151389b8d

data/lib/cookbook-omnifetch.rb

@@ -1,14 +1,14 @@
-require "cookbook-omnifetch/version"
-require "cookbook-omnifetch/integration"
-
-require "cookbook-omnifetch/base"
-require "cookbook-omnifetch/git"
-require "cookbook-omnifetch/github"
-require "cookbook-omnifetch/path"
-require "cookbook-omnifetch/artifactserver"
-require "cookbook-omnifetch/artifactory"
-require "cookbook-omnifetch/chef_server"
-require "cookbook-omnifetch/chef_server_artifact"
+require_relative "cookbook-omnifetch/version"
+require_relative "cookbook-omnifetch/integration"
+
+require_relative "cookbook-omnifetch/base"
+require_relative "cookbook-omnifetch/git"
+require_relative "cookbook-omnifetch/github"
+require_relative "cookbook-omnifetch/path"
+require_relative "cookbook-omnifetch/artifactserver"
+require_relative "cookbook-omnifetch/artifactory"
+require_relative "cookbook-omnifetch/chef_server"
+require_relative "cookbook-omnifetch/chef_server_artifact"
 
 module CookbookOmnifetch
 
@@ -30,7 +30,7 @@ module CookbookOmnifetch
   #
   # @return [~BaseLocation, nil]
   def self.init(dependency, options = {})
-    if klass = klass_from_options(options)
+    if klass = klass_from_options(options) # rubocop: disable Lint/AssignmentInCondition
       klass.new(dependency, options)
     else
       nil
@@ -124,6 +124,10 @@ module CookbookOmnifetch
     integration.chef_server_download_concurrency
   end
 
+  def self.default_chef_server_http_client
+    integration.default_chef_server_http_client
+  end
+
   # Returns true or false if the given path contains a Chef Cookbook
   #
   # @param [#to_s] path
@@ -131,7 +135,7 @@ module CookbookOmnifetch
   #
   # @return [Boolean]
   def self.cookbook?(path)
-    File.exists?(File.join(path, "metadata.json")) || File.exists?(File.join(path, "metadata.rb"))
+    File.exist?(File.join(path, "metadata.json")) || File.exist?(File.join(path, "metadata.rb"))
   end
 
   class << self

data/lib/cookbook-omnifetch/artifactory.rb

@@ -1,4 +1,4 @@
-require "cookbook-omnifetch/base"
+require_relative "base"
 
 require "mixlib/archive"
 require "tmpdir"
@@ -15,7 +15,12 @@ module CookbookOmnifetch
       super
       @uri ||= options[:artifactory]
       @cookbook_version = options[:version]
-      @http_client = options[:http_client]
+      if options[:http_client]
+        @http_client = options[:http_client]
+      else
+        headers = { "X-Jfrog-Art-API" => Chef::Config.artifactory_api_key || ENV["ARTIFACTORY_API_KEY"] }
+        @http_client = Chef::HTTP::Simple.new(uri, headers: headers)
+      end
     end
 
     def repo_host
@@ -93,13 +98,13 @@ module CookbookOmnifetch
         "#to_lock must be implemented on #{self.class.name}!"
     end
 
-    # The path where all pristine tarballs from an artifactserver are held.
+    # The path where all pristine tarballs from an artifactory are held.
     # Tarballs are moved/swapped into this location once they have been staged
     # in a co-located staging directory.
     #
     # @return [Pathname]
     def cache_root
-      Pathname.new(CookbookOmnifetch.cache_path).join(".cache", "artifactserver")
+      Pathname.new(CookbookOmnifetch.cache_path).join(".cache", "artifactory")
     end
 
     # The path where tarballs are downloaded to and unzipped.  On certain platforms
@@ -113,7 +118,7 @@ module CookbookOmnifetch
     #
     # @return [Pathname]
     def staging_root
-      Pathname.new(CookbookOmnifetch.cache_path).join(".cache_tmp", "artifactserver")
+      Pathname.new(CookbookOmnifetch.cache_path).join(".cache_tmp", "artifactory")
     end
 
     # The path where the pristine tarball is cached

data/lib/cookbook-omnifetch/artifactserver.rb

@@ -1,4 +1,4 @@
-require "cookbook-omnifetch/base"
+require_relative "base"
 
 require "mixlib/archive"
 require "tmpdir"

data/lib/cookbook-omnifetch/base.rb

@@ -1,4 +1,4 @@
-require "cookbook-omnifetch/exceptions"
+require_relative "exceptions"
 
 module CookbookOmnifetch
   class BaseLocation

data/lib/cookbook-omnifetch/chef_server.rb

@@ -1,5 +1,5 @@
-require "cookbook-omnifetch/base"
-require "cookbook-omnifetch/metadata_based_installer"
+require_relative "base"
+require_relative "metadata_based_installer"
 
 module CookbookOmnifetch
   class ChefServerLocation < BaseLocation
@@ -10,7 +10,7 @@ module CookbookOmnifetch
     def initialize(dependency, options = {})
       super
       @cookbook_version = options[:version]
-      @http_client = options[:http_client]
+      @http_client = options[:http_client] || default_chef_server_http_client
       @uri ||= options[:chef_server]
     end
 
@@ -57,5 +57,16 @@ module CookbookOmnifetch
       "#{dependency.name}-#{cookbook_version}"
     end
 
+    # @see BaseLocation#cached_cookbook
+    def cached_cookbook
+      @cached_cookbook ||= CookbookOmnifetch.cached_cookbook_class.from_path(install_path)
+    end
+
+    private
+
+    def default_chef_server_http_client
+      CookbookOmnifetch.default_chef_server_http_client
+    end
+
   end
 end

data/lib/cookbook-omnifetch/chef_server_artifact.rb

@@ -1,5 +1,5 @@
-require "cookbook-omnifetch/base"
-require "cookbook-omnifetch/metadata_based_installer"
+require_relative "base"
+require_relative "metadata_based_installer"
 
 module CookbookOmnifetch
   # This location allows fetching from the `cookbook_artifacts/` API where Chef
@@ -17,7 +17,7 @@ module CookbookOmnifetch
     def initialize(dependency, options = {})
       super
       @cookbook_identifier = options[:identifier]
-      @http_client = options[:http_client]
+      @http_client = options[:http_client] || default_chef_server_http_client
       @uri ||= options[:chef_server_artifact]
     end
 
@@ -61,12 +61,23 @@ module CookbookOmnifetch
     end
 
     def lock_data
-      { "chef_server" => uri, "server_identifier" => cookbook_identifier }
+      { "chef_server_artifact" => uri, "identifier" => cookbook_identifier }
     end
 
     def cache_key
       "#{dependency.name}-#{cookbook_identifier}"
     end
 
+    # @see BaseLocation#cached_cookbook
+    def cached_cookbook
+      @cached_cookbook ||= CookbookOmnifetch.cached_cookbook_class.from_path(install_path)
+    end
+
+    private
+
+    def default_chef_server_http_client
+      CookbookOmnifetch.default_chef_server_http_client
+    end
+
   end
 end

data/lib/cookbook-omnifetch/git.rb

@@ -1,7 +1,7 @@
 require "tmpdir"
-require "cookbook-omnifetch"
-require "cookbook-omnifetch/base"
-require "cookbook-omnifetch/exceptions"
+require_relative "../cookbook-omnifetch"
+require_relative "base"
+require_relative "exceptions"
 
 module CookbookOmnifetch
   class GitLocation < BaseLocation

data/lib/cookbook-omnifetch/integration.rb

@@ -1,4 +1,4 @@
-require "cookbook-omnifetch/exceptions"
+require_relative "exceptions"
 
 module CookbookOmnifetch
 
@@ -39,6 +39,11 @@ module CookbookOmnifetch
     # commentary in cookbook_omnifetch.rb
     configurable :chef_server_download_concurrency
 
+    # HTTP client object that will be used for source option `http_client` by
+    # `ChefServerLocation` and `ChefServerArtifactLocation` if not explicitly
+    # passed
+    configurable :default_chef_server_http_client
+
     def initialize
       self.class.configurables.each do |configurable|
         instance_variable_set("@#{configurable}".to_sym, NullValue.new)

data/lib/cookbook-omnifetch/metadata_based_installer.rb

@@ -1,21 +1,22 @@
-require "cookbook-omnifetch/threaded_job_queue"
+require_relative "threaded_job_queue"
 
 module CookbookOmnifetch
 
   class MetadataBasedInstaller
     class CookbookMetadata
 
-      FILE_TYPES = [
-        :resources,
-        :providers,
-        :recipes,
-        :definitions,
-        :libraries,
-        :attributes,
-        :files,
-        :templates,
-        :root_files,
-      ].freeze
+      FILE_TYPES = %i{
+        resources
+        providers
+        recipes
+        definitions
+        libraries
+        attributes
+        files
+        templates
+        root_files
+        all_files
+      }.freeze
 
       def initialize(metadata)
         @metadata = metadata
@@ -23,7 +24,7 @@ module CookbookOmnifetch
 
       def files(&block)
         FILE_TYPES.each do |type|
-          next unless @metadata.has_key?(type.to_s)
+          next unless @metadata.key?(type.to_s)
 
           @metadata[type.to_s].each do |file|
             yield file["url"], file["path"]

data/lib/cookbook-omnifetch/path.rb

@@ -1,4 +1,4 @@
-require "cookbook-omnifetch/base"
+require_relative "base"
 
 module CookbookOmnifetch
   class PathLocation < BaseLocation

data/lib/cookbook-omnifetch/threaded_job_queue.rb

@@ -40,7 +40,7 @@ module CookbookOmnifetch
         end
       end
       workers.each { |worker| self << Thread.method(:exit) }
-      workers.each { |worker| worker.join }
+      workers.each(&:join)
     end
   end
 end

data/lib/cookbook-omnifetch/version.rb

@@ -1,3 +1,3 @@
 module CookbookOmnifetch
-  VERSION = "0.7.0"
+  VERSION = "0.10.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-omnifetch
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -13,50 +13,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-archive
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '0.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 description: 
 email:
 - jamie@vialstudios.com
@@ -64,19 +42,12 @@ email:
 - michael.ivey@riotgames.com
 - justin@justincampbell.me
 - sethvargo@gmail.com
-- dan@getchef.com
+- dan@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
 - LICENSE
-- README.md
-- Rakefile
-- cookbook-omnifetch.gemspec
 - lib/cookbook-omnifetch.rb
 - lib/cookbook-omnifetch/artifactory.rb
 - lib/cookbook-omnifetch/artifactserver.rb
@@ -91,29 +62,9 @@ files:
 - lib/cookbook-omnifetch/path.rb
 - lib/cookbook-omnifetch/threaded_job_queue.rb
 - lib/cookbook-omnifetch/version.rb
-- spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
-- spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
-- spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb
-- spec/fixtures/cookbooks/example_cookbook/.gitignore
-- spec/fixtures/cookbooks/example_cookbook/.kitchen.yml
-- spec/fixtures/cookbooks/example_cookbook/Berksfile
-- spec/fixtures/cookbooks/example_cookbook/Berksfile.lock
-- spec/fixtures/cookbooks/example_cookbook/README.md
-- spec/fixtures/cookbooks/example_cookbook/metadata.rb
-- spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
-- spec/spec_helper.rb
-- spec/unit/artifactory_spec.rb
-- spec/unit/artifactserver_spec.rb
-- spec/unit/base_spec.rb
-- spec/unit/chef_server_artifact_spec.rb
-- spec/unit/chef_server_spec.rb
-- spec/unit/exceptions_spec.rb
-- spec/unit/git_spec.rb
-- spec/unit/metadata_based_installer_spec.rb
-- spec/unit/path_spec.rb
-homepage: http://www.getchef.com/
+homepage: https://github.com/chef/cookbook-omnifetch
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -123,37 +74,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Library code to fetch Chef cookbooks from a variety of sources to a local
   cache
-test_files:
-- spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
-- spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
-- spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb
-- spec/fixtures/cookbooks/example_cookbook/.gitignore
-- spec/fixtures/cookbooks/example_cookbook/.kitchen.yml
-- spec/fixtures/cookbooks/example_cookbook/Berksfile
-- spec/fixtures/cookbooks/example_cookbook/Berksfile.lock
-- spec/fixtures/cookbooks/example_cookbook/README.md
-- spec/fixtures/cookbooks/example_cookbook/metadata.rb
-- spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
-- spec/spec_helper.rb
-- spec/unit/artifactory_spec.rb
-- spec/unit/artifactserver_spec.rb
-- spec/unit/base_spec.rb
-- spec/unit/chef_server_artifact_spec.rb
-- spec/unit/chef_server_spec.rb
-- spec/unit/exceptions_spec.rb
-- spec/unit/git_spec.rb
-- spec/unit/metadata_based_installer_spec.rb
-- spec/unit/path_spec.rb
+test_files: []