berkshelf 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bc1d114a16270012c8e6554bdeeef10c8daeb60
-  data.tar.gz: 097633f8a8909d0e1d2a3c5d68c17576723aa62f
+  metadata.gz: 5089b7006471b9e1a535ab4fc5f3ee1b83ae6114
+  data.tar.gz: 15c5ac0f94f60ea0d741975e13ed4af81fa5ef70
 SHA512:
-  metadata.gz: 9d600075727841156d0ef1fb24c5f0577b7f657acd299d7743901b499db08a83ff482f9c937b3d026609fa53a67d619c1a826a2705676ce3cd3697739404bb69
-  data.tar.gz: f845e6cd2bb95e7e90dd3b267d4c9d06f7692c09d299b4b2068b945c1c68fdc2f0caba8bc740c4378e1999ccf7280456f0335a805940ab659ecc6965607c3604
+  metadata.gz: a6a0945ca8000eb04ae6d381c04235ad9c9657635ba6eda6453134207421a8054df09407972988750ff89b5d93d183e2f2a966933eabc977471672ffd07ab530
+  data.tar.gz: ae1cfadeee18dda60605775d86d31720524636eb4e600a13d1802a75e4fa955621ba37463af8dc5b41c9537b5028d2274eda88e3a4c398dfae75a59c71dfafe3

data/.travis.yml

@@ -41,21 +41,24 @@ matrix:
     - rvm: 2.2.5
     - rvm: 2.3.1
     - rvm: ruby-head
-    - rvm: 2.2.5
-      before_install:
-        # Failures in the berkshelf-api gemspec were happening with bundler 1.8
-        - gem install bundler --version=1.10.6
-        # Needed until https://github.com/travis-ci/apt-package-whitelist/pull/1820 is merged
-        - sudo apt-get update
-        - sudo apt-get -y install squid3
-      sudo: required
-      env:
-        - PROXY_TESTS_DIR=/tmp/proxy_tests
-        - PROXY_TESTS_REPO=$PROXY_TESTS_DIR/repo
-        - rvmsudo_secure_path=1
-      script:
-        - git clone https://github.com/chef/proxy_tests.git
-        - cd proxy_tests && chef-client -z -o proxy_tests::render && cd ..
-        - rvmsudo -E bundle exec bash $PROXY_TESTS_DIR/run_tests.sh berkshelf \* \* /tmp/out.txt
-      after_script: cat /tmp/out.txt
+#    - rvm: 2.2.5
+#      before_install:
+#        # Failures in the berkshelf-api gemspec were happening with bundler 1.8
+#        - gem install bundler --version=1.10.6
+#        # Needed until https://github.com/travis-ci/apt-package-whitelist/pull/1820 is merged
+#        - sudo apt-get update
+#        - sudo apt-get -y install squid3
+#      sudo: required
+#      env:
+#        - PROXY_TESTS_DIR=/tmp/proxy_tests
+#        - PROXY_TESTS_REPO=$PROXY_TESTS_DIR/repo
+#        - rvmsudo_secure_path=1
+#      script:
+#        - git clone https://github.com/chef/proxy_tests.git
+#        - cd proxy_tests && chef-client -z -o proxy_tests::render && cd ..
+#        - rvmsudo -E bundle exec bash $PROXY_TESTS_DIR/run_tests.sh berkshelf \* \* /tmp/out.txt
+#      after_script: cat /tmp/out.txt
+  allow_failures:
+    - rvm: ruby-head
+
 script: bundle exec thor spec:ci

data/CHANGELOG.md

@@ -1,10 +1,20 @@
 # Change Log
 
-## [5.1.0](https://github.com/berkshelf/berkshelf/tree/5.1.0) (2016-09-16)
-[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.0.0...5.1.0)
+## [5.2.0](https://github.com/berkshelf/berkshelf/tree/5.2.0) (2016-11-07)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.1.0...5.2.0)
 
 **Merged pull requests:**
 
+- pin berkshelf-api, bump deps, remove failing matrix tests [\#1623](https://github.com/berkshelf/berkshelf/pull/1623) ([lamont-granquist](https://github.com/lamont-granquist))
+- Community site error message missing URL [\#1621](https://github.com/berkshelf/berkshelf/pull/1621) ([tkling](https://github.com/tkling))
+- Pass all ssl/X509 parameters to configuration [\#1600](https://github.com/berkshelf/berkshelf/pull/1600) ([thommay](https://github.com/thommay))
+
+## [v5.1.0](https://github.com/berkshelf/berkshelf/tree/v5.1.0) (2016-09-16)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.0.0...v5.1.0)
+
+**Merged pull requests:**
+
+- Update version to 5.1.0 [\#1615](https://github.com/berkshelf/berkshelf/pull/1615) ([jkeiser](https://github.com/jkeiser))
 - Disable caching of bundler since it's broken [\#1612](https://github.com/berkshelf/berkshelf/pull/1612) ([thommay](https://github.com/thommay))
 - Update cli.rb [\#1611](https://github.com/berkshelf/berkshelf/pull/1611) ([martinmosegaard](https://github.com/martinmosegaard))
 - fix cucumber tests [\#1609](https://github.com/berkshelf/berkshelf/pull/1609) ([mwrock](https://github.com/mwrock))

data/Gemfile

@@ -52,5 +52,5 @@ group :changelog do
 end
 
 group :test do
-  gem "berkshelf-api", git: "https://github.com/berkshelf/berkshelf-api.git"
+  gem "berkshelf-api", git: "https://github.com/berkshelf/berkshelf-api.git", ref: "9fb3d95779c4ff72b0074072105caaf70b978bf0"
 end

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GIT
   remote: https://github.com/berkshelf/berkshelf-api.git
   revision: 9fb3d95779c4ff72b0074072105caaf70b978bf0
+  ref: 9fb3d95779c4ff72b0074072105caaf70b978bf0
   specs:
     berkshelf-api (3.0.0)
       archive (= 0.0.6)
@@ -19,7 +20,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (5.1.0)
+    berkshelf (5.2.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -48,7 +49,7 @@ GEM
     addressable (2.4.0)
     archive (0.0.6)
       ffi (~> 1.9.3)
-    artifactory (2.4.0)
+    artifactory (2.5.0)
     aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
@@ -79,7 +80,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.14.60)
+    chef-config (12.15.19)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -120,9 +121,8 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    domain_name (0.5.20160826)
+    domain_name (0.5.20161021)
       unf (>= 0.0.5, < 1.0.0)
-    enumerable-lazy (0.0.1)
     equalizer (0.0.11)
     erubis (2.7.0)
     faraday (0.9.2)
@@ -150,13 +150,13 @@ GEM
       rake (>= 10.0)
       rspec (>= 3.2)
       rubocop (>= 0.31)
-    grape (0.17.0)
+    grape (0.18.0)
       activesupport
       builder
       hashie (>= 2.1.0)
       multi_json (>= 1.3.2)
       multi_xml (>= 0.5.2)
-      mustermann19 (~> 0.4.3)
+      mustermann-grape (~> 0.4.0)
       rack (>= 1.3.0)
       rack-accept
       virtus (>= 1.0.0)
@@ -188,14 +188,14 @@ GEM
       guard-compat (~> 1.0)
       spork (>= 0.8.4)
     hashdiff (0.3.0)
-    hashie (3.4.4)
+    hashie (3.4.6)
     hitimes (1.2.4)
     http (2.0.3)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
       http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
     http-form_data (1.0.1)
     http_parser.rb (0.6.0)
@@ -204,7 +204,7 @@ GEM
     ice_nine (0.11.2)
     iniparse (1.4.2)
     json (1.8.3)
-    jwt (1.5.4)
+    jwt (1.5.6)
     libyajl2 (1.2.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -213,27 +213,30 @@ GEM
     lumberjack (1.0.10)
     method_source (0.8.2)
     minitar (0.5.4)
-    minitest (5.9.0)
+    minitest (5.9.1)
     mixlib-archive (0.2.0)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-config (2.2.4)
-    mixlib-install (1.1.0)
+    mixlib-install (2.1.6)
       artifactory
       mixlib-shellout
       mixlib-versioning
+      thor
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.1)
-    msgpack (1.0.0)
+    molinillo (0.5.3)
+    msgpack (1.0.2)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mustermann19 (0.4.4)
-      enumerable-lazy
+    mustermann (0.4.0)
+      tool (~> 0.2)
+    mustermann-grape (0.4.0)
+      mustermann (= 0.4.0)
     nenv (0.3.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -250,12 +253,12 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.3.0)
+    octokit (4.4.1)
       sawyer (~> 0.7.0, >= 0.5.3)
-    overcommit (0.36.0)
+    overcommit (0.37.0)
       childprocess (~> 0.5.8)
       iniparse (~> 1.4)
-    parser (2.3.1.2)
+    parser (2.3.1.4)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -266,8 +269,8 @@ GEM
     rack-accept (0.4.5)
       rack (>= 0.4)
     rainbow (2.1.0)
-    rake (11.2.2)
-    rb-fsevent (0.9.7)
+    rake (11.3.0)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     reel (0.6.1)
@@ -299,7 +302,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.3)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -308,14 +311,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.42.0)
+    rubocop (0.45.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    ruby_dep (1.4.0)
+    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
@@ -327,8 +330,8 @@ GEM
       molinillo (~> 0.4)
       semverse (>= 1.1, < 3.0)
     spork (0.9.2)
-    test-kitchen (1.12.0)
-      mixlib-install (~> 1.0, >= 1.0.4)
+    test-kitchen (1.13.2)
+      mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 4.0)
@@ -339,6 +342,7 @@ GEM
     thread_safe (0.3.5)
     timers (4.0.4)
       hitimes
+    tool (0.2.3)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
@@ -392,4 +396,4 @@ DEPENDENCIES
   yard (>= 0.8)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/lib/berkshelf/community_rest.rb

@@ -67,7 +67,7 @@ module Berkshelf
     # @option options [Float] :retry_interval (0.5)
     #   how often we should pause between retries
     def initialize(uri = V1_API, options = {})
-      options         = options.reverse_merge(retries: 5, retry_interval: 0.5, ssl: { verify: Berkshelf::Config.instance.ssl.verify })
+      options         = options.reverse_merge(retries: 5, retry_interval: 0.5, ssl: Berkshelf::Config.instance.ssl)
       @api_uri        = uri
       @retries        = options.delete(:retries)
       @retry_interval = options.delete(:retry_interval)

data/lib/berkshelf/config.rb

@@ -1,4 +1,5 @@
 require 'buff/config/json'
+require 'openssl'
 
 module Berkshelf
   class Config < Buff::Config::JSON
@@ -45,6 +46,7 @@ module Berkshelf
         else
           new
         end
+        coerce_ssl
       end
 
       # Reload the currently instantiated Berkshelf configuration
@@ -54,6 +56,17 @@ module Berkshelf
         @instance = nil
         self.instance
       end
+    
+      # force proper X509 types from any configuration strings
+      #
+      # @return [Config]
+      def coerce_ssl
+        ssl = @instance.ssl
+        ssl[:ca_cert] = OpenSSL::X509::Certificate.new(File.read(ssl[:ca_cert])) if ssl[:ca_cert] && ssl[:ca_cert].is_a?(String)
+        ssl[:client_cert] = OpenSSL::X509::Certificate.new(File.read(ssl[:client_cert])) if ssl[:client_cert] && ssl[:client_cert].is_a?(String)
+        ssl[:client_key] = OpenSSL::PKey::RSA.new(File.read(ssl[:client_key])) if ssl[:client_key] && ssl[:client_key].is_a?(String)
+        @instance
+      end
     end
 
     # @param [String] path
@@ -134,6 +147,26 @@ module Berkshelf
       type: Buff::Boolean,
       default: true,
       required: true
+    attribute 'ssl.cert_store',
+      type: Buff::Boolean,
+      default: false,
+      required: false
+    attribute 'ssl.ca_file',
+      type: String,
+      default: nil,
+      required: false
+    attribute 'ssl.ca_path',
+      type: String,
+      default: nil,
+      required: false
+    attribute 'ssl.client_cert',
+      type: String,
+      default: nil,
+      required: false
+    attribute 'ssl.client_key',
+      type: String,
+      default: nil,
+      required: false
     attribute 'github',
       type: Array,
       default: [],

data/lib/berkshelf/downloader.rb

@@ -65,9 +65,7 @@ module Berkshelf
           server_url: remote_cookbook.location_path,
           client_name: Berkshelf::Config.instance.chef.node_name,
           client_key: Berkshelf::Config.instance.chef.client_key,
-          ssl: {
-            verify: Berkshelf::Config.instance.ssl.verify
-          }
+          ssl: Berkshelf::Config.instance.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/errors.rb

@@ -222,7 +222,7 @@ module Berkshelf
     set_status_code(123)
 
     def initialize(uri, message)
-      @uri     = uri
+      @api_uri = uri
       @message = message
     end
 

data/lib/berkshelf/source.rb

@@ -16,7 +16,7 @@ module Berkshelf
       @api_client ||= begin
                         if source == :chef_server
                           APIClient.chef_server(
-                            ssl: {verify: Berkshelf::Config.instance.ssl.verify},
+                            ssl: Berkshelf::Config.instance.ssl,
                             timeout: api_timeout,
                             open_timeout: [(api_timeout / 10), 3].max,
                             client_name: Berkshelf::Config.instance.chef.node_name,
@@ -25,9 +25,10 @@ module Berkshelf
                           )
                         else
                           APIClient.new(uri,
-                                        timeout: api_timeout,
-                                        open_timeout: [(api_timeout / 10), 3].max,
-                                        ssl: {verify: Berkshelf::Config.instance.ssl.verify})
+                            timeout: api_timeout,
+                            open_timeout: [(api_timeout / 10), 3].max,
+                            ssl: Berkshelf::Config.instance.ssl
+                                       )
                         end
                       end
     end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "5.1.0"
+  VERSION = "5.2.0"
 end

data/spec/unit/berkshelf/errors_spec.rb

@@ -3,3 +3,18 @@ require 'spec_helper'
 describe Berkshelf::BerkshelfError do
   skip
 end
+
+describe Berkshelf::CommunitySiteError do
+  let(:api_uri) { 'https://infra.as.code' }
+  let(:message) { 'Cookbook name' }
+
+  subject { described_class.new(api_uri, message) }
+
+  it "includes the supplied uri in the error message" do
+    expect(subject.message).to include api_uri
+  end
+
+  it "includes the supplied message in the error message" do
+    expect(subject.message).to include message
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -469,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies