cookbook-omnifetch 0.8.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43c39456987fef3b32d9b037565804e5293bd8ed
-  data.tar.gz: 776b3865d04123606bdafb1f4f7c7412b993724b
+SHA256:
+  metadata.gz: 4df0a66a67a46dc690434e1bc71a7cf0020496214b51b6639236fa3a9843873a
+  data.tar.gz: 3c1d54feae73211f2977a1c4b04fa5c294bd62aa0ace636e9b447175380b7b7b
 SHA512:
-  metadata.gz: 1dea15259b08c5de8a97f111c103f9f8a54d6ad6499806c4659b9870f6b73fb587a57b1297d1fb52faa146904b643e698f18572c393f7fd2c334b3f71484d9b2
-  data.tar.gz: 1005b451253f385241b319c7601f7bb2594502c712d7583f0c92761836acdda45dde4a027aafd303d6a730fa344ece4fb8276bcad1fbec58d6b2d07bda6d5e14
+  metadata.gz: 6dcfe66630ecb1af6dabce0f37b5d92454afe523ff22755ec4ebacdb047d6dbfc3fb17ad9cff5d1440d9ebca9d4811663054f344e65e45f81339e530a48250a6
+  data.tar.gz: 94edbbeba3fc3d31a9789a1461cdf878073ed2bfb8d632a52e6ba1b16092331e680d7d720ea01ab2b0d069a70678c3ed20d849453fd1da42f80873535b822f88

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
@@ -135,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,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

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

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,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.8.0"
+  VERSION = "0.10.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-omnifetch
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -13,50 +13,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2020-08-21 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: []

data/.gitignore

@@ -1,23 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-.idea/*

data/.rspec

@@ -1 +0,0 @@
--c -f documentation

data/.travis.yml

@@ -1,11 +0,0 @@
-branches:
-  only:
-    master
-
-language: ruby
-rvm:
-  - 2.2
-  - 2.3.3
-  - 2.4.1
-before_install: gem install bundler -v 1.14.6
-script: bundle exec rake ci

data/Gemfile

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-group :development, :test do
-  gem "minitar"
-  gem "chefstyle"
-end

data/README.md

@@ -1,90 +0,0 @@
-# CookbookOmnifetch
-
-`CookbookOmnifetch` provides library code for fetching Chef cookbooks
-from an artifact server (usually https://supermarket.chef.io),
-git/github, a local path, or a chef-server to a local cache for
-developement.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'cookbook-omnifetch'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install cookbook-omnifetch
-
-## Usage
-
-#### Inject Dependencies and Configure
-
-Cookbook Omnifetch is designed to work with utilities from both the
-Berkshelf and Chef Software ecosystems, so you have to configure it
-before you can use it. In ChefDK, we do this:
-
-```ruby
-# Configure CookbookOmnifetch's dependency injection settings to use our classes and config.
-CookbookOmnifetch.configure do |c|
-  c.cache_path = File.expand_path('~/.chefdk/cache')
-  c.storage_path = Pathname.new(File.expand_path('~/.chefdk/cache/cookbooks'))
-  c.shell_out_class = ChefDK::ShellOut
-  c.cached_cookbook_class = ChefDK::CookbookMetadata
-end
-```
-
-#### Fetching Cookbooks
-
-To download a cookbook:
-
-```ruby
-fetcher = CookbookOmnifetch.init(dependency, source_options)
-fetcher.install
-```
-
-To specify the cookbook you want, you give CookbookOmnifetch a
-dependency object that responds to `#name` and `#version_constraint`,
-e.g.:
-
-```ruby
-require 'semverse'
-
-Dependency = Struct.new(:name, :version_constraint)
-
-my_dep = Dependency.new("apache2", Semverse::Constraint.new("~> 1.0"))
-```
-
-The source options for the cookbook are given as a Hash; the keys and
-values vary based on the kind of storage location. As with Bundler's
-`gem` options, one key specifies the type of upstream service for the
-cookbook while other keys specify other options specific to that type.
-For example:
-
-```ruby
-CookbookOmnifetch.init(dependency, artifact_server: "https://supermarket.chef.io/api/v1/cookbooks/apache2/versions/3.0.1/download")
-CookbookOmnifetch.init(dependency, git: "git@github.com:svanzoest/apache2-cookbook.git", tag: "v3.0.1")
-CookbookOmnifetch.init(dependency, github: "svanzoest/apache2-cookbook", tag: "v3.0.1")
-CookbookOmnifetch.init(dependency, path: "~/chef-cookbooks/apache2")
-```
-
-## Contributing
-
-For information on contributing to this project, see https://github.com/chef/chef/blob/master/CONTRIBUTING.md
-
-After that:
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -asm 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
-
-## Thanks
-
-This code was initially extracted from Berkshelf. Thanks to the
-Berkshelf core teams and contributors.
-