cookbook-omnifetch 0.8.1 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d885dea1d6f27e93aa303376a7caddd2725945daff18a30c07da8a98bebc5bd
-  data.tar.gz: ca7bde1e963ce293d9f04d2fc3f09dc07fb76d33c4a014998d92bbb9faf08500
+  metadata.gz: b6b7baff1c908f3ee02466f86ff7225a6a567006ed325313514d429eb07bddaa
+  data.tar.gz: a30c239d1ff4f032738cf9755226aff95e6f7df330c5119b367fa520306a9372
 SHA512:
-  metadata.gz: 32cb4fc4f4af6122720bb3bd3e4e8841f526c237a70b44041d38025eaefebcfaf1e7c79e078972d8908349fef2bdca8c94a49f3e231b66dd31efd5fca73c7899
-  data.tar.gz: ea541a9ca6d65c6ca4d50865fcf6b7ee975f04e4bf644d062cf6f35a54a7eba9adc76b90bb694c14045513813138478f3c3ac47f06610c5e9a289dc5d4bbc238
+  metadata.gz: c7f11e46181d038e79d55e527ebc743b977ed012ad0630dbfe8f687bdc36c9638a0a7e70eb24feacc1fc2ef960cdd68f4cdbff55eea8d5bdd98c5f29f2b25962
+  data.tar.gz: 5ad4d570c3fe10fa6f30c055d8bb0d73dd24fc1a90c15fe804007bda3b9738780d0e87128ecfae2cb569e5bdba949ad3d2f3e48999e58c27b99dd970f4cae297

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
 

data/lib/cookbook-omnifetch/artifactory.rb

@@ -1,7 +1,7 @@
-require "cookbook-omnifetch/base"
+require_relative "base"
 
-require "mixlib/archive"
-require "tmpdir"
+require "mixlib/archive" unless defined?(Mixlib::Archive)
+require "tmpdir" unless defined?(Dir.mktmpdir)
 
 module CookbookOmnifetch
 
@@ -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,7 +1,7 @@
-require "cookbook-omnifetch/base"
+require_relative "base"
 
-require "mixlib/archive"
-require "tmpdir"
+require "mixlib/archive" unless defined?(Mixlib::Archive)
+require "tmpdir" unless defined?(Dir.mktmpdir)
 
 module CookbookOmnifetch
 

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
@@ -34,7 +34,8 @@ module CookbookOmnifetch
     #
     # @return [Boolean]
     def installed?
-      install_path.exist?
+      # Always force a refresh of cache
+      false
     end
 
     def http_client

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
@@ -45,7 +45,8 @@ module CookbookOmnifetch
     #
     # @return [Boolean]
     def installed?
-      install_path.exist?
+      # Always force a refresh of cache
+      false
     end
 
     def http_client

data/lib/cookbook-omnifetch/git.rb

@@ -1,7 +1,7 @@
-require "tmpdir"
-require "cookbook-omnifetch"
-require "cookbook-omnifetch/base"
-require "cookbook-omnifetch/exceptions"
+require "tmpdir" unless defined?(Dir.mktmpdir)
+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
 

data/lib/cookbook-omnifetch/metadata_based_installer.rb

@@ -1,21 +1,23 @@
-require "cookbook-omnifetch/threaded_job_queue"
+require_relative "threaded_job_queue"
+require "digest/md5"
 
 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
@@ -26,7 +28,7 @@ module CookbookOmnifetch
           next unless @metadata.key?(type.to_s)
 
           @metadata[type.to_s].each do |file|
-            yield file["url"], file["path"]
+            yield file["url"], file["path"], file["checksum"]
           end
         end
       end
@@ -45,50 +47,58 @@ module CookbookOmnifetch
     end
 
     def install
-      FileUtils.rm_rf(staging_path) # ensure we have a clean dir, just in case
-      FileUtils.mkdir_p(staging_root) unless staging_root.exist?
-      md = http_client.get(url_path)
-
-      queue = ThreadedJobQueue.new
+      metadata = http_client.get(url_path)
+      clean_cache(metadata)
+      sync_cache(metadata)
+    end
 
-      CookbookMetadata.new(md).files do |url, path|
-        stage = staging_path.join(path)
-        FileUtils.mkdir_p(File.dirname(stage))
+    # Removes files from cache that are not supposed to be there, based on
+    # files in metadata.
+    def clean_cache(metadata)
+      actual_file_list = Dir.glob(File.join(install_path, "**/*"))
+      expected_file_list = []
+      CookbookMetadata.new(metadata).files { |_, path, _| expected_file_list << File.join(install_path, path) }
+
+      extra_files = actual_file_list - expected_file_list
+      extra_files.each do |path|
+        if File.file?(path)
+          FileUtils.rm(path)
+        end
+      end
+    end
 
-        queue << lambda do |_lock|
-          http_client.streaming_request(url) do |tempfile|
-            tempfile.close
-            FileUtils.mv(tempfile.path, stage)
+    # Downloads any out-of-date files into installer cache, overwriting
+    # those that don't match the checksum provided the metadata @ url_path
+    def sync_cache(metadata)
+      queue = ThreadedJobQueue.new
+      CookbookMetadata.new(metadata).files do |url, path, checksum|
+        dest_path = File.join(install_path, path)
+        FileUtils.mkdir_p(File.dirname(dest_path))
+        if file_outdated?(dest_path, checksum)
+          queue << lambda do |_lock|
+            http_client.streaming_request(url) do |tempfile|
+              tempfile.close
+              FileUtils.mv(tempfile.path, dest_path)
+            end
           end
         end
       end
-
       queue.process(CookbookOmnifetch.chef_server_download_concurrency)
-
-      FileUtils.mv(staging_path, install_path)
     end
 
-    # The path where files are downloaded to.  On certain platforms you have a
-    # better chance of getting an atomic move if your temporary working
-    # directory is on the same device/volume as the  destination.  To support
-    # this, we use a staging directory located under the cache path under the
-    # rather mild assumption that everything under the cache path is going to
-    # be on one device.
+    # Check if a given file (at absolute path) is missing or does has a mismatched md5sum
     #
-    # @return [Pathname]
-    def staging_root
-      Pathname.new(CookbookOmnifetch.cache_path).join(".cache_tmp", "metadata-installer")
-    end
-
-    def staging_path
-      staging_root.join(staging_cache_key)
-    end
-
-    # Convert the URL to a safe name for a file and append our random slug.
-    # This helps us avoid colliding in the case that there are multiple
-    # processes installing the same cookbook at the same time.
-    def staging_cache_key
-      "#{url_path.gsub(/[^[:alnum:]]/, "_")}_#{slug}"
+    # @return [TrueClass, FalseClass]
+    def file_outdated?(path, expected_md5sum)
+      return true unless File.exist?(path)
+
+      md5 = Digest::MD5.new
+      File.open(path, "r") do |file|
+        while (chunk = file.read(1024))
+          md5.update chunk
+        end
+      end
+      md5.to_s != expected_md5sum
     end
   end
 end

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.8.1".freeze
+  VERSION = "0.11.1".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.11.1
 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: 2020-08-31 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.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="