cookbook-omnifetch 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d885dea1d6f27e93aa303376a7caddd2725945daff18a30c07da8a98bebc5bd
-  data.tar.gz: ca7bde1e963ce293d9f04d2fc3f09dc07fb76d33c4a014998d92bbb9faf08500
+  metadata.gz: c776e06270962068025639cf40aa13a8bf2314d955a7ffb6a2eb5c70adaf3b2f
+  data.tar.gz: 4cdcf27b72e5f78c844f0bfe76bffb2d0b2f28994cb9cce4d73acaf75b8267f0
 SHA512:
-  metadata.gz: 32cb4fc4f4af6122720bb3bd3e4e8841f526c237a70b44041d38025eaefebcfaf1e7c79e078972d8908349fef2bdca8c94a49f3e231b66dd31efd5fca73c7899
-  data.tar.gz: ea541a9ca6d65c6ca4d50865fcf6b7ee975f04e4bf644d062cf6f35a54a7eba9adc76b90bb694c14045513813138478f3c3ac47f06610c5e9a289dc5d4bbc238
+  metadata.gz: 251ea1a319078be708323b242db7dad3dfc2a857c9d4991377bf05a7242837842b6e618d119b5cf1bbc4cbd854a9ae7057850fcc8396944218df0b3ae9d22eb1
+  data.tar.gz: f78bf50440d50ae17afc3e322750e8e0bea9dc0a1b75c0b44bb9605148a8cfe0fb7e4a21b65192d2e09c7869f34f1e3f7a58003ca8f1c492585b6110abb70715

data/lib/cookbook-omnifetch/artifactory.rb

@@ -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/metadata_based_installer.rb

@@ -5,17 +5,17 @@ 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
+      }.freeze
 
       def initialize(metadata)
         @metadata = metadata

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.8.1".freeze
+  VERSION = "0.9.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-omnifetch
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-archive
@@ -35,34 +35,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  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:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: 
 email:
 - jamie@vialstudios.com
@@ -102,7 +74,7 @@ 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:
   - - ">="