berkshelf 5.6.5 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33e876c1bf17b5d4b7f9476c516e1650ee94ec06
-  data.tar.gz: 60ec3493e1c2588b9d57a1b9955b9835e41dcc0c
+  metadata.gz: c31585edab49dfddf07f23af1d5d14dd998bd856
+  data.tar.gz: f9ce9ff33e601797b53c0355da9464c230894130
 SHA512:
-  metadata.gz: 76b01e75c80bd1babc5cc47713f7d24b61853eaa64657b806ce5a5b1eb7139da9d90529d4837d570f3ae2ce56f7674ec91b0c86e464b13e7d33838b9895e8a74
-  data.tar.gz: 47b2910e768383ca4ed83d6e9bf1bfa4a539b8e4688484549c11d6f497b7ddfd63f8bdd004ec913383076c40de237d419fc4dd5e1a425e6e1ed893c3272a7c0a
+  metadata.gz: 899e6e73d3e9431e4662b07c3b118b99f60fd970dd54f3bc963bdc8e0e5d4a4379736ad4ea183b5f2e9e5eb924c0f66dc8ad946b6bc11aef837e5865e0d4bfea
+  data.tar.gz: 99a42e0ba55c5daf4909743b31c9bf2b80a75ba73c112e0e987ca3f255c4876760ce3bb47974c2360b16e980d69f3fc846a9a11af81f02f2f477a0469c2a16aa

data/CHANGELOG.md

@@ -1,14 +1,22 @@
 # Change Log
 
-## [5.6.5](https://github.com/berkshelf/berkshelf/tree/5.6.4) (2017-05-04)
-[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.4...5.6.5)
+## [6.0.0](https://github.com/berkshelf/berkshelf/tree/6.0.0) (2017-05-17)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.5...6.0.0)
 
 **Merged pull requests:**
 
-- Handle Windows backslashes in trusted_certs path [\#1689](https://github.com/berkshelf/berkshelf/pull/1689) ([jeremymv2](https://github.com/jeremymv2))
+- Minor refactor on the default artifactory options and support artifactory\_api\_key in knife.rb [\#1691](https://github.com/berkshelf/berkshelf/pull/1691) ([coderanger](https://github.com/coderanger))
+- Artifactory support [\#1690](https://github.com/berkshelf/berkshelf/pull/1690) ([coderanger](https://github.com/coderanger))
 
-## [5.6.4](https://github.com/berkshelf/berkshelf/tree/5.6.4) (2017-03-14)
-[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.3...5.6.4)
+## [v5.6.5](https://github.com/berkshelf/berkshelf/tree/v5.6.5) (2017-05-04)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.4...v5.6.5)
+
+**Merged pull requests:**
+
+- handle Windows backslashes in trusted\_certs path [\#1689](https://github.com/berkshelf/berkshelf/pull/1689) ([jeremymv2](https://github.com/jeremymv2))
+
+## [v5.6.4](https://github.com/berkshelf/berkshelf/tree/v5.6.4) (2017-03-14)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.3...v5.6.4)
 
 **Merged pull requests:**
 
@@ -1426,4 +1434,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -45,6 +45,7 @@ group :development do
   gem "dep_selector",  ">= 1.0"
   gem "fuubar",        ">= 2.0"
   gem "rspec",         ">= 3.0"
+  gem "rspec-its",     ">= 1.2"
   gem "test-kitchen",  ">= 1.2"
   gem "webmock",       ">= 1.11"
   gem "yard",          ">= 0.8"

data/Gemfile.lock

@@ -20,7 +20,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (5.6.5)
+    berkshelf (6.0.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -40,9 +40,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
@@ -50,7 +49,7 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     archive (0.0.6)
       ffi (~> 1.9.3)
-    artifactory (2.6.0)
+    artifactory (2.8.1)
     aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
@@ -85,7 +84,7 @@ GEM
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (5.3.0)
+    chef-zero (13.0.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
@@ -97,7 +96,7 @@ GEM
     coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    contracts (0.14.0)
+    contracts (0.16.0)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
     crack (0.4.3)
@@ -120,7 +119,7 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    domain_name (0.5.20161129)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
     erubis (2.7.0)
@@ -128,7 +127,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.9.17)
+    ffi (1.9.18)
     ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
     formatador (0.2.5)
@@ -136,7 +135,7 @@ GEM
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
-    gherkin (4.0.0)
+    gherkin (4.1.3)
     github_changelog_generator (1.14.3)
       activesupport
       faraday-http-cache
@@ -145,13 +144,13 @@ GEM
       rainbow (>= 2.1)
       rake (>= 10.0)
       retriable (~> 2.1)
-    grape (0.19.1)
+    grape (0.19.2)
       activesupport
       builder
       hashie (>= 2.1.0)
       multi_json (>= 1.3.2)
       multi_xml (>= 0.5.2)
-      mustermann-grape (~> 0.4.0)
+      mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
       virtus (>= 1.0.0)
@@ -177,22 +176,22 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (0.3.2)
+    hashdiff (0.3.4)
     hashie (3.5.5)
     hitimes (1.2.4)
-    http (2.2.0)
+    http (2.2.2)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (1.0.1)
+    http-form_data (1.0.2)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (0.8.0)
+    i18n (0.8.1)
     ice_nine (0.11.2)
-    json (1.8.6)
+    json (2.1.0)
     libnotify (0.8.4)
       ffi (>= 1.0.11)
     libyajl2 (1.2.0)
@@ -200,10 +199,10 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.11)
+    lumberjack (1.0.12)
     method_source (0.8.2)
     minitar (0.6.1)
-    minitest (5.10.1)
+    minitest (5.10.2)
     mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
@@ -218,19 +217,18 @@ GEM
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
     molinillo (0.5.7)
-    msgpack (1.0.3)
+    msgpack (1.1.0)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustermann (0.4.0)
-      tool (~> 0.2)
-    mustermann-grape (0.4.0)
-      mustermann (= 0.4.0)
+    mustermann (1.0.0)
+    mustermann-grape (1.0.0)
+      mustermann (~> 1.0.0)
     nenv (0.3.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (4.0.1)
+    net-ssh (4.1.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
     nio4r (2.0.0)
@@ -244,10 +242,11 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
-    rack (2.0.1)
+    rack (2.0.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (12.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
@@ -279,19 +278,22 @@ GEM
       retryable (~> 2.0)
       semverse (~> 2.0)
       varia_model (~> 0.6)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
@@ -305,24 +307,23 @@ GEM
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
     terminal-notifier-guard (1.5.3)
-    test-kitchen (1.15.0)
+    test-kitchen (1.16.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
-      thor (~> 0.18)
+      thor (~> 0.19, < 0.19.2)
     thor (0.19.1)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     timers (4.0.4)
       hitimes
-    tool (0.2.3)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.4)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
     varia_model (0.6.0)
@@ -334,7 +335,7 @@ GEM
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
     wdm (0.1.1)
-    webmock (2.3.2)
+    webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -342,7 +343,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     win32console (1.3.2)
-    yard (0.9.8)
+    yard (0.9.9)
 
 PLATFORMS
   ruby
@@ -368,6 +369,7 @@ DEPENDENCIES
   rb-inotify
   rb-notifu (>= 0.0.4)
   rspec (>= 3.0)
+  rspec-its (>= 1.2)
   terminal-notifier-guard (~> 1.5.3)
   test-kitchen (>= 1.2)
   wdm

data/berkshelf.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.name                      = "berkshelf"
   s.require_paths             = ["lib"]
   s.version                   = Berkshelf::VERSION
-  s.required_ruby_version     = ">= 2.2.0"
+  s.required_ruby_version     = ">= 2.3.3"
   s.required_rubygems_version = ">= 2.0.0"
 
   s.add_dependency "addressable",          "~> 2.3", ">= 2.3.4"

data/features/artifactory.feature

@@ -0,0 +1,70 @@
+Feature: Installing cookbooks from an Artifactory server
+  This integration test uses some environment variables to configure which
+  Artifactory server to talk to, as there is no ArtifactoryZero to test against.
+  If those aren't present, we skip the tests.
+
+  $TEST_BERKSHELF_ARTIFACTORY - URL to the Chef virtual repository.
+  $TEST_BERKSHELF_ARTIFACTORY_API_KEY - API key to use.
+
+  Scenario: when the cookbook exists
+    Given I have a Berksfile pointing at an authenticated Artifactory server with:
+      """
+      cookbook 'poise', '2.7.2'
+      """
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      Installing poise (2.7.2)
+      """
+    And the cookbook store should have the cookbooks:
+      | poise | 2.7.2 |
+
+  Scenario: when the cookbook does not exist
+    Given I have a Berksfile pointing at an authenticated Artifactory server with:
+      """
+      cookbook '1234567890'
+      """
+    When I run `berks install`
+    Then the output should contain:
+      """
+      Unable to find a solution for demands: 1234567890 (>= 0.0.0)
+      """
+    And the exit status should be "NoSolutionError"
+
+  Scenario: when the cookbook exists, but the version does not
+    Given I have a Berksfile pointing at an authenticated Artifactory server with:
+      """
+      cookbook 'poise', '0.0.0'
+      """
+    When I run `berks install`
+    Then the output should contain:
+      """
+      Unable to find a solution for demands: poise (= 0.0.0)
+      """
+    And the exit status should be "NoSolutionError"
+
+  Scenario: when the API key is not present:
+    Given I have a Berksfile pointing at an Artifactory server with:
+      """
+      cookbook 'poise'
+      """
+    When I run `berks install`
+    Then the output should contain:
+      """
+      Unable to find a solution for demands: poise (>= 0.0.0)
+      """
+    And the exit status should be "NoSolutionError"
+
+  Scenario: when the API key is given in $ARTIFACTORY_API_KEY:
+    Given I have a Berksfile pointing at an Artifactory server with:
+      """
+      cookbook 'poise', '2.7.2'
+      """
+    And the environment variable ARTIFACTORY_API_KEY is $TEST_BERKSHELF_ARTIFACTORY_API_KEY
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      Installing poise (2.7.2)
+      """
+    And the cookbook store should have the cookbooks:
+      | poise | 2.7.2 |

data/features/step_definitions/berksfile_steps.rb

@@ -37,3 +37,18 @@ Given /^I have a Berksfile at "(.+)" pointing at the local Berkshelf API with:$/
       """
   }
 end
+
+Given /I have a Berksfile pointing at an( authenticated)? Artifactory server with:/ do |authenticated, content|
+  if ENV['TEST_BERKSHELF_ARTIFACTORY']
+    steps %Q{
+      Given a file named "Berksfile" with:
+        """
+        source artifactory: '#{ENV['TEST_BERKSHELF_ARTIFACTORY']}'#{authenticated ? ", api_key: '#{ENV['TEST_BERKSHELF_ARTIFACTORY_API_KEY']}'" : ''}
+
+        #{content}
+        """
+    }
+  else
+    skip_this_scenario
+  end
+end

data/features/step_definitions/environment_steps.rb

@@ -5,3 +5,7 @@ end
 Given /^the environment variable (.+) is "(.+)"$/ do |variable, value|
   set_environment_variable(variable, value)
 end
+
+Given /^the environment variable (.+) is \$TEST_BERKSHELF_ARTIFACTORY_API_KEY$/ do |variable|
+  set_environment_variable(variable, ENV['TEST_BERKSHELF_ARTIFACTORY_API_KEY'])
+end

data/features/step_definitions/filesystem_steps.rb

@@ -44,7 +44,7 @@ Then /^the cookbook store should have the cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
     expect(cookbook_store.storage_path).to have_structure {
       directory "#{name}-#{version}" do
-        file "metadata.rb" do
+        file "metadata.{rb,json}" do
           contains version
         end
       end
@@ -56,7 +56,7 @@ Then /^the cookbook store should have the git cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version, sha1|
     expect(cookbook_store.storage_path).to have_structure {
       directory "#{name}-#{sha1}" do
-        file "metadata.rb" do
+        file "metadata.{rb,json}" do
           contains version
         end
       end

data/features/step_definitions/json_steps.rb

@@ -14,10 +14,16 @@ class Hash
   end
 end
 
+# Pending Ridley allowing newer Faraday and Celluloid.
+def clean_json_output(output)
+  output.gsub(/^.+warning: constant ::Fixnum is deprecated$/, '') \
+        .gsub(/^.*forwarding to private method Celluloid::PoolManager#url_prefix$/, '')
+end
+
 Then /^the output should contain JSON:$/ do |data|
   parsed = ERB.new(data).result
   target = JSON.pretty_generate(JSON.parse(parsed).sort_by_key)
-  actual = JSON.pretty_generate(JSON.parse(all_commands.map { |c| c.output }.join("\n")).sort_by_key)
+  actual = JSON.pretty_generate(JSON.parse(all_commands.map { |c| clean_json_output(c.output) }.join("\n")).sort_by_key)
 
   expect(actual).to eq(target)
 end

data/lib/berkshelf/berksfile.rb

@@ -191,11 +191,15 @@ module Berkshelf
     # @param [String] api_url
     #   url for the api to add
     #
+    # @param [Hash] options
+    #   extra source options
+    #
     # @raise [InvalidSourceURI]
     #
     # @return [Array<Source>]
-    def source(api_url)
-      @sources[api_url] = Source.new(api_url)
+    def source(api_url, **options)
+      source = Source.new(api_url, **options)
+      @sources[source.uri.to_s] = source
     end
     expose :source
 

data/lib/berkshelf/community_rest.rb

@@ -115,6 +115,11 @@ module Berkshelf
     def find(name, version)
       response = get("cookbooks/#{name}/versions/#{self.class.uri_escape_version(version)}")
 
+      # Artifactory responds with a 200 and blank body for unknown cookbooks.
+      if response.status == 200 && response.body.to_s == ''
+        response.env.status = 404
+      end
+
       case response.status
       when (200..299)
         response.body
@@ -131,6 +136,11 @@ module Berkshelf
     def latest_version(name)
       response = get("cookbooks/#{name}")
 
+      # Artifactory responds with a 200 and blank body for unknown cookbooks.
+      if response.status == 200 && response.body.to_s == ''
+        response.env.status = 404
+      end
+
       case response.status
       when (200..299)
         self.class.version_from_uri response.body["latest_version"]

data/lib/berkshelf/downloader.rb

@@ -63,17 +63,18 @@ module Berkshelf
 
       case remote_cookbook.location_type
       when :opscode, :supermarket
-        CommunityREST.new(remote_cookbook.location_path).download(name, version)
+        options = {}
+        if source.type == :artifactory
+          options[:headers] = {'X-Jfrog-Art-Api' => source.options[:api_key]}
+        end
+        CommunityREST.new(remote_cookbook.location_path, options).download(name, version)
       when :chef_server
         # @todo Dynamically get credentials for remote_cookbook.location_path
-        ssl_options = { verify: Berkshelf::Config.instance.ssl.verify }
-        ssl_options[:cert_store] = ssl_policy.store if ssl_policy.store
-
         credentials = {
           server_url: remote_cookbook.location_path,
-          client_name: Berkshelf::Config.instance.chef.node_name,
-          client_key: Berkshelf::Config.instance.chef.client_key,
-          ssl: ssl_options,
+          client_name: source.options[:client_name] || Berkshelf::Config.instance.chef.node_name,
+          client_key: source.options[:client_key] || Berkshelf::Config.instance.chef.client_key,
+          ssl: source.options[:ssl],
         }
         # @todo  Something scary going on here - getting an instance of Kitchen::Logger from test-kitchen
         # https://github.com/opscode/test-kitchen/blob/master/lib/kitchen.rb#L99

data/lib/berkshelf/source.rb

@@ -6,11 +6,42 @@ module Berkshelf
   class Source
     include Comparable
 
-    attr_accessor :source
+    attr_accessor :type
+    attr_accessor :uri_string
+    attr_accessor :options
 
     # @param [String, Berkshelf::SourceURI] source
-    def initialize(source)
-      @source = source
+    def initialize(source, **options)
+      @options = {timeout: api_timeout, open_timeout: [(api_timeout / 10), 3].max, ssl: {}}
+      @options.update(options)
+      case source
+      when String
+        # source "https://supermarket.chef.io/"
+        @type = :supermarket
+        @uri_string = source
+      when :chef_server
+        # source :chef_server
+        @type = :chef_server
+        @uri_string = options[:url] || Berkshelf::Config.instance.chef.chef_server_url
+      when Hash
+        # source type: uri, option: value, option: value
+        source = source.dup
+        @type, @uri_string = source.shift
+        @options.update(source)
+      end
+      # Default options for some source types.
+      case @type
+      when :chef_server
+        @options[:client_name] ||= Berkshelf::Config.instance.chef.node_name
+        @options[:client_key] ||= Berkshelf::Config.instance.chef.client_key
+      when :artifactory
+        @options[:api_key] ||= Berkshelf::Config.instance.chef.artifactory_api_key || ENV['ARTIFACTORY_API_KEY']
+      end
+      # Set some default SSL options.
+      Berkshelf::Config.instance.ssl.each do |key, value|
+        @options[:ssl][key.to_sym] = value unless @options[:ssl].include?(key.to_sym)
+      end
+      @options[:ssl][:cert_store] = ssl_policy.store if ssl_policy.store
       @universe = nil
     end
 
@@ -19,35 +50,21 @@ module Berkshelf
     end
 
     def api_client
-      @api_client ||= begin
-                        ssl_options = { verify: Berkshelf::Config.instance.ssl.verify }
-                        ssl_options[:cert_store] = ssl_policy.store if ssl_policy.store
-
-                        if source == :chef_server
-                          APIClient.chef_server(
-                            ssl: ssl_options,
-                            timeout: api_timeout,
-                            open_timeout: [(api_timeout / 10), 3].max,
-                            client_name: Berkshelf::Config.instance.chef.node_name,
-                            server_url: Berkshelf::Config.instance.chef.chef_server_url,
-                            client_key: Berkshelf::Config.instance.chef.client_key
-                          )
-                        else
-                          APIClient.new(uri,
-                            timeout: api_timeout,
-                            open_timeout: [(api_timeout / 10), 3].max,
-                            ssl: Berkshelf::Config.instance.ssl
-                                       )
-                        end
-                      end
+       @api_client ||= case type
+                       when :chef_server
+                         APIClient.chef_server(server_url: uri.to_s, **options)
+                       when :artifactory
+                         # Don't accidentally mutate the options.
+                         client_options = options.dup
+                         api_key = client_options.delete(:api_key)
+                         APIClient.new(uri, headers: {'X-Jfrog-Art-Api' => api_key}, **client_options)
+                       else
+                         APIClient.new(uri, **options)
+                       end
     end
 
     def uri
-      @uri ||= if source == :chef_server
-                 SourceURI.parse(Berkshelf::Config.instance.chef.chef_server_url)
-               else
-                 SourceURI.parse(source)
-               end
+      @uri ||= SourceURI.parse(uri_string)
     end
 
     # Forcefully obtain the universe from the API endpoint and assign it to {#universe}. This
@@ -116,20 +133,24 @@ module Berkshelf
     end
 
     def to_s
-      "#{uri}"
+      if type == :supermarket
+        "#{uri}"
+      else
+        "#{type}: #{uri}"
+      end
     end
 
     def inspect
-      "#<#{self.class.name} uri: #{@uri.to_s.inspect}>"
+      "#<#{self.class.name} #{type}: #{uri.to_s.inspect}, #{options.map {|k, v| "#{k}: #{v.inspect}" }.join(', ')}>"
     end
 
     def hash
-      @uri.host.hash
+      [type, uri_string, options].hash
     end
 
     def ==(other)
       return false unless other.is_a?(self.class)
-      uri == other.uri
+      type == other.type && uri == other.uri
     end
 
     private

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "5.6.5"
+  VERSION = "6.0.0"
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ BERKS_SPEC_DATA = File.expand_path("../data", __FILE__)
 require "rspec"
 require "cleanroom/rspec"
 require "webmock/rspec"
+require "rspec/its"
 require "berkshelf/api/rspec" unless windows?
 
 Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }

data/spec/support/matchers/file_system_matchers.rb

@@ -23,11 +23,12 @@ module Berkshelf
         end
 
         def matches?(root)
-          unless root.join(@name).exist?
+          path = Pathname.glob(root.join(@name)).first
+          unless path.exist?
             throw :failure, root.join(@name)
           end
 
-          contents = File.read(root.join(@name))
+          contents = File.read(path)
 
           @contents.each do |string|
             unless contents.include?(string)

data/spec/unit/berkshelf/downloader_spec.rb

@@ -38,23 +38,49 @@ module Berkshelf
       let(:version) { "1.0.0" }
 
       it "supports the 'opscode' location type" do
+        allow(source).to receive(:type) { :supermarket }
         allow(remote_cookbook).to receive(:location_type) { :opscode }
         allow(remote_cookbook).to receive(:location_path) { "http://api.opscode.com" }
         rest = double("community-rest")
-        expect(CommunityREST).to receive(:new).with("http://api.opscode.com") { rest }
+        expect(CommunityREST).to receive(:new).with("http://api.opscode.com", {}) { rest }
         expect(rest).to receive(:download).with(name, version)
         subject.try_download(source, name, version)
       end
 
       it "supports the 'supermarket' location type" do
+        allow(source).to receive(:type) { :supermarket }
         allow(remote_cookbook).to receive(:location_type) { :supermarket }
         allow(remote_cookbook).to receive(:location_path) { "http://api.supermarket.com" }
         rest = double("community-rest")
-        expect(CommunityREST).to receive(:new).with("http://api.supermarket.com") { rest }
+        expect(CommunityREST).to receive(:new).with("http://api.supermarket.com", {}) { rest }
         expect(rest).to receive(:download).with(name, version)
         subject.try_download(source, name, version)
       end
 
+      context "with an artifactory source" do
+        it "supports the 'opscode' location type" do
+          allow(source).to receive(:type) { :artifactory }
+          allow(source).to receive(:options) { {api_key: 'secret'} }
+          allow(remote_cookbook).to receive(:location_type) { :opscode }
+          allow(remote_cookbook).to receive(:location_path) { "http://artifactory/" }
+          rest = double("community-rest")
+          expect(CommunityREST).to receive(:new).with("http://artifactory/", {headers: {'X-Jfrog-Art-Api' => 'secret'}}) { rest }
+          expect(rest).to receive(:download).with(name, version)
+          subject.try_download(source, name, version)
+        end
+
+        it "supports the 'supermarket' location type" do
+          allow(source).to receive(:type) { :artifactory }
+          allow(source).to receive(:options) { {api_key: 'secret'} }
+          allow(remote_cookbook).to receive(:location_type) { :supermarket }
+          allow(remote_cookbook).to receive(:location_path) { "http://artifactory/" }
+          rest = double("community-rest")
+          expect(CommunityREST).to receive(:new).with("http://artifactory/", {headers: {'X-Jfrog-Art-Api' => 'secret'}}) { rest }
+          expect(rest).to receive(:download).with(name, version)
+          subject.try_download(source, name, version)
+        end
+      end
+
       describe "chef_server location type" do
         let(:chef_server_url) { "http://configured-chef-server/" }
         let(:ridley_client) do
@@ -91,6 +117,7 @@ module Berkshelf
           allow(subject).to receive(:ssl_policy).and_return(ssl_policy)
           allow(remote_cookbook).to receive(:location_type) { :chef_server }
           allow(remote_cookbook).to receive(:location_path) { chef_server_url }
+          allow(source).to receive(:options) { {read_timeout: 30, open_timeout: 3, ssl: {verify: true, cert_store: cert_store}} }
         end
 
         it "uses the berkshelf config and provides a custom cert_store" do
@@ -106,6 +133,44 @@ module Berkshelf
           expect(Ridley).to receive(:open).with(credentials) { ridley_client }
           subject.try_download(source, name, version)
         end
+
+        context "with a source option for client_name" do
+          before do
+            allow(source).to receive(:options) { {client_name: "other-client", read_timeout: 30, open_timeout: 3, ssl: {verify: true, cert_store: cert_store}} }
+          end
+          it "uses the override" do
+            credentials = {
+              server_url: chef_server_url,
+              client_name: "other-client",
+              client_key: chef_config.client_key,
+              ssl: {
+                verify: berkshelf_config.ssl.verify,
+                cert_store: cert_store,
+              },
+            }
+            expect(Ridley).to receive(:open).with(credentials) { ridley_client }
+            subject.try_download(source, name, version)
+          end
+        end
+
+        context "with a source option for client_key" do
+          before do
+            allow(source).to receive(:options) { {client_key: "other-key", read_timeout: 30, open_timeout: 3, ssl: {verify: true, cert_store: cert_store}} }
+          end
+          it "uses the override" do
+            credentials = {
+              server_url: chef_server_url,
+              client_name: chef_config.node_name,
+              client_key: "other-key",
+              ssl: {
+                verify: berkshelf_config.ssl.verify,
+                cert_store: cert_store,
+              },
+            }
+            expect(Ridley).to receive(:open).with(credentials) { ridley_client }
+            subject.try_download(source, name, version)
+          end
+        end
       end
 
       it "supports the 'file_store' location type" do

data/spec/unit/berkshelf/source_spec.rb

@@ -2,9 +2,152 @@ require "spec_helper"
 
 module Berkshelf
   describe Source do
-    describe "#universe"
-    describe "#cookbook"
-    describe "#versions"
+    let(:arguments) { [] }
+    let(:config) { Config.new }
+    subject(:instance) { described_class.new(*arguments) }
+    before do
+      allow(Berkshelf::Config).to receive(:instance).and_return(config)
+    end
+
+    describe "#type" do
+      subject { instance.type }
+
+      context "with a string argument" do
+        let(:arguments) { ['https://example.com'] }
+        it { is_expected.to eq :supermarket }
+      end
+
+      context "with a string argument and options" do
+        let(:arguments) { ['https://example.com', {key: 'value'}] }
+        it { is_expected.to eq :supermarket }
+      end
+
+      context "with a symbol argument" do
+        let(:arguments) { [:chef_server] }
+        it { is_expected.to eq :chef_server }
+      end
+
+      context "with a symbol argument and options" do
+        let(:arguments) { [:chef_server, {key: 'value'}] }
+        it { is_expected.to eq :chef_server }
+      end
+
+      context "with a hash argument" do
+        let(:arguments) { [{artifactory: 'https://example.com/api/chef/chef-virtual'}] }
+        it { is_expected.to eq :artifactory }
+      end
+
+      context "with a hash argument and connected options" do
+        let(:arguments) { [{artifactory: 'https://example.com/api/chef/chef-virtual', key: 'value'}] }
+        it { is_expected.to eq :artifactory }
+      end
+
+      context "with a hash argument and disconnected options" do
+        let(:arguments) { [{artifactory: 'https://example.com/api/chef/chef-virtual'}, {key: 'value'}] }
+        it { is_expected.to eq :artifactory }
+      end
+    end
+
+    describe "#uri" do
+      subject { instance.uri.to_s }
+
+      context "with a string argument" do
+        let(:arguments) { ['https://example.com'] }
+        it { is_expected.to eq 'https://example.com' }
+      end
+
+      context "with a string argument and options" do
+        let(:arguments) { ['https://example.com', {key: 'value'}] }
+        it { is_expected.to eq 'https://example.com' }
+      end
+
+      context "with a symbol argument" do
+        let(:arguments) { [:chef_server] }
+        before { config.chef.chef_server_url = 'https://chefserver/' }
+        it { is_expected.to eq 'https://chefserver/' }
+      end
+
+      context "with a symbol argument and options" do
+        let(:arguments) { [:chef_server, {key: 'value'}] }
+        before { config.chef.chef_server_url = 'https://chefserver/' }
+        it { is_expected.to eq 'https://chefserver/' }
+      end
+
+      context "with a hash argument" do
+        let(:arguments) { [{artifactory: 'https://example.com/api/chef/chef-virtual'}] }
+        it { is_expected.to eq 'https://example.com/api/chef/chef-virtual' }
+      end
+
+      context "with a hash argument and connected options" do
+        let(:arguments) { [{artifactory: 'https://example.com/api/chef/chef-virtual', key: 'value'}] }
+        it { is_expected.to eq 'https://example.com/api/chef/chef-virtual' }
+      end
+
+      context "with a hash argument and disconnected options" do
+        let(:arguments) { [{artifactory: 'https://example.com/api/chef/chef-virtual'}, {key: 'value'}] }
+        it { is_expected.to eq 'https://example.com/api/chef/chef-virtual' }
+      end
+
+      context "with an invalid URI" do
+        let(:arguments) { ['ftp://example.com'] }
+        it { expect { subject }.to raise_error InvalidSourceURI }
+      end
+    end
+
+    describe "#options" do
+      subject { instance.options }
+
+      context "with a string argument" do
+        let(:arguments) { ['https://example.com'] }
+
+        it { is_expected.to be_a(Hash) }
+        # Check all baseline values.
+        its([:timeout]) { is_expected.to eq 30 }
+        its([:open_timeout]) { is_expected.to eq 3 }
+        its([:ssl, :verify]) { is_expected.to be true }
+        its([:ssl, :ca_file]) { is_expected.to be_nil }
+        its([:ssl, :ca_path]) { is_expected.to be_nil }
+        its([:ssl, :client_cert]) { is_expected.to be_nil }
+        its([:ssl, :client_key]) { is_expected.to be_nil }
+        its([:ssl, :cert_store]) { is_expected.to be_a(OpenSSL::X509::Store) }
+      end
+
+      context "with a string argument and options" do
+        let(:arguments) { ['https://example.com', {key: 'value'}] }
+        its([:key]) { is_expected.to eq 'value' }
+      end
+
+      context "with a symbol argument" do
+        let(:arguments) { [:chef_server] }
+        it { is_expected.to be_a(Hash) }
+      end
+
+      context "with a symbol argument and options" do
+        let(:arguments) { [:chef_server, {key: 'value'}] }
+        its([:key]) { is_expected.to eq 'value' }
+      end
+
+      context "with a hash argument" do
+        let(:arguments) { [{artifactory: 'https://example.com/api/chef/chef-virtual'}] }
+        it { is_expected.to be_a(Hash) }
+      end
+
+      context "with a hash argument and connected options" do
+        let(:arguments) { [{artifactory: 'https://example.com/api/chef/chef-virtual', key: 'value'}] }
+        its([:key]) { is_expected.to eq 'value' }
+      end
+
+      context "with a hash argument and disconnected options" do
+        let(:arguments) { [{artifactory: 'https://example.com/api/chef/chef-virtual'}, {key: 'value'}] }
+        its([:key]) { is_expected.to eq 'value' }
+      end
+
+      context "with an artifactory source and the API key in the Chef config" do
+        let(:arguments) { [{artifactory: 'https://example.com/api/chef/chef-virtual'}] }
+        before { config.chef.artifactory_api_key = 'secret' }
+        its([:api_key]) { is_expected.to eq 'secret' }
+      end
+    end
 
     describe "#==" do
       it "is the same if the uri matches" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 5.6.5
+  version: 6.0.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -284,6 +284,7 @@ files:
 - berkshelf.gemspec
 - bin/berks
 - docs/berkshelf_for_newcomers.md
+- features/artifactory.feature
 - features/berksfile.feature
 - features/commands/apply.feature
 - features/commands/contingent.feature
@@ -471,7 +472,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -479,11 +480,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
+- features/artifactory.feature
 - features/berksfile.feature
 - features/commands/apply.feature
 - features/commands/contingent.feature