berkshelf 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e042c41f6e111456d8c709b6d32a321a6ed1932
-  data.tar.gz: 46a8cb9c386f424b175ffb865b8be0efd0bf8a8b
+  metadata.gz: f3af5dee0897d2bd3bab1e43ed463ddf49de5e7d
+  data.tar.gz: 345cc6d30d16d004d56d4cf129e7ebfdbfb8336a
 SHA512:
-  metadata.gz: dbb46bb7460503678d2b272fb9b9be7d954dcdbd531d02c7856da72ab32a816861493458249937b248dcd684d7a5d210ac977f5b439a56b7d1a9a00cb18605e9
-  data.tar.gz: 222e26dd8a1e99687403824bd81e6320fbc3e6f5288385e6d1cdd995c26bdca3dffc0ccef7070fa191801e3e3d16a86534d4c4ac35cad06e7e20baaa482f7bbd
+  metadata.gz: f822b150ce8ba9a45c5d471ac6432ba88c6585c0883a98501397fcbe0e65decaef4e25c52a9b46ce2493a3831ed4e00ac5cbcc8cafa5fe96a5e2178465e69bbc
+  data.tar.gz: 7795f3dbd3c70e456214c2e7c5b9b6163bc542a35dd70c50c421dd1317fc499d7bfecb6df2d4e5a07cb4a254a959f4a9d8af65b84ad6aa4793343f256d32d29e

data/Gemfile.lock

@@ -20,9 +20,9 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (6.1.1)
+    berkshelf (6.2.0)
       addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (>= 2.0.2, < 4.0)
+      berkshelf-api-client (>= 4.0.0)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
       cleanroom (~> 1.0)
@@ -62,10 +62,8 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    berkshelf-api-client (3.0.0)
-      faraday (~> 0.9)
-      httpclient (~> 2.7)
-      ridley (>= 4.5, < 6.0)
+    berkshelf-api-client (4.0.0)
+      chef (>= 12.0)
     buff-config (2.0.0)
       buff-extensions (~> 2.0)
       varia_model (~> 0.6)
@@ -80,6 +78,36 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
+    chef (13.1.31)
+      addressable
+      bundler (>= 1.10)
+      chef-config (= 13.1.31)
+      chef-zero (>= 13.0)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      ffi-yajl (~> 2.2)
+      highline (~> 1.6, >= 1.6.9)
+      iniparse (~> 1.4)
+      iso8601 (~> 0.9.1)
+      mixlib-archive (~> 0.4)
+      mixlib-authentication (~> 1.4)
+      mixlib-cli (~> 1.7)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 2.0)
+      net-sftp (~> 2.1, >= 2.1.2)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-multi (~> 1.2, >= 1.2.1)
+      ohai (~> 13.0)
+      plist (~> 3.2)
+      proxifier (~> 1.0)
+      rspec-core (~> 3.5)
+      rspec-expectations (~> 3.5)
+      rspec-mocks (~> 3.5)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+      uuidtools (~> 2.1.5)
     chef-config (13.1.31)
       addressable
       fuzzyurl
@@ -129,7 +157,7 @@ GEM
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
     ffi (1.9.18)
-    ffi-yajl (2.3.0)
+    ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuubar (2.2.0)
       rspec-core (~> 3.0)
@@ -159,6 +187,7 @@ GEM
       msgpack (>= 0.7.4)
     hashdiff (0.3.4)
     hashie (3.5.5)
+    highline (1.7.8)
     hitimes (1.2.5)
     http (2.2.2)
       addressable (~> 2.3)
@@ -172,6 +201,9 @@ GEM
     httpclient (2.8.3)
     i18n (0.8.4)
     ice_nine (0.11.2)
+    iniparse (1.4.3)
+    ipaddress (0.8.3)
+    iso8601 (0.9.1)
     json (2.1.0)
     libyajl2 (1.2.0)
     minitar (0.6.1)
@@ -180,6 +212,7 @@ GEM
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
+    mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
@@ -192,13 +225,38 @@ GEM
     mustermann (1.0.0)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (4.1.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    net-telnet (0.1.1)
     nio4r (2.1.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
+    ohai (13.1.0)
+      chef-config (>= 12.5.0.alpha.1, < 14)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
+      ipaddress
+      mixlib-cli
+      mixlib-config (~> 2.0)
+      mixlib-log (>= 1.7.1, < 2.0)
+      mixlib-shellout (~> 2.0)
+      plist (~> 3.1)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
     parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
+    plist (3.3.0)
     powerpack (0.1.1)
+    proxifier (1.0.3)
     public_suffix (2.0.5)
     rack (2.0.3)
     rack-accept (0.4.5)
@@ -248,6 +306,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -261,9 +322,22 @@ GEM
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
+    serverspec (2.39.1)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.68)
+    sfl (2.3)
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
+    specinfra (2.68.0)
+      net-scp
+      net-ssh (>= 2.7, < 5.0)
+      net-telnet
+      sfl
+    syslog-logger (1.6.8)
+    systemu (2.6.5)
     thor (0.19.1)
     thread_safe (0.3.6)
     timers (4.0.4)
@@ -290,6 +364,7 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
+    wmi-lite (1.0.0)
     yard (0.9.9)
 
 PLATFORMS

data/README.md

@@ -33,9 +33,13 @@ $ gem install berkshelf
 
 See [docs.chef.io](https://docs.chef.io/berkshelf.html) for up-to-date usage instructions.
 
+## CLI Usage
+
+Berkshelf is intended to be used as a CLI tool.  It is not intended to be used as a library.  Other ruby code should shell out to the command line tool to use it.
+
 ## Supported Platforms
 
-Berkshelf is tested and supported on Ruby 2.2 and 2.3.
+Berkshelf is tested and supported on Ruby 2.3 and 2.4.
 
 ## Configuration
 

data/berkshelf.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 2.0.0"
 
   s.add_dependency "addressable",          "~> 2.3", ">= 2.3.4"
-  s.add_dependency "berkshelf-api-client", ">= 2.0.2", "< 4.0"
+  s.add_dependency "berkshelf-api-client", ">= 4.0.0"
   s.add_dependency "buff-config",          "~> 2.0"
   s.add_dependency "buff-extensions",      "~> 2.0"
   s.add_dependency "mixlib-shellout",      "~> 2.0"

data/features/json_formatter.feature

@@ -18,7 +18,7 @@ Feature: --format json
       {
         "cookbooks": [
           {
-            "api_source": "http://127.0.0.1:26210/",
+            "api_source": "http://127.0.0.1:26210",
             "location_path": "http://localhost:26310/",
             "version": "1.0.0",
             "name": "berkshelf"
@@ -149,7 +149,7 @@ Feature: --format json
           {
             "local": "0.1.0",
             "remote": {
-              "http://127.0.0.1:26210/": "0.2.9"
+              "http://127.0.0.1:26210": "0.2.9"
             },
             "name": "seth"
           }

data/lib/berkshelf.rb

@@ -29,6 +29,15 @@ require_relative "berkshelf/thor_ext"
 module Berkshelf
   Encoding.default_external = Encoding::UTF_8
 
+  def self.fix_proxies
+    ENV["http_proxy"] = ENV["HTTP_PROXY"] if ENV["HTTP_PROXY"] && !ENV["http_proxy"]
+    ENV["https_proxy"] = ENV["HTTPS_PROXY"] if ENV["HTTPS_PROXY"] && !ENV["https_proxy"]
+    ENV["ftp_proxy"] = ENV["FTP_PROXY"] if ENV["FTP_PROXY"] && !ENV["ftp_proxy"]
+    ENV["no_proxy"] = ENV["NO_PROXY"] if ENV["NO_PROXY"] && !ENV["no_proxy"]
+  end
+
+  fix_proxies
+
   require_relative "berkshelf/version"
   require_relative "berkshelf/errors"
 

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "6.1.1"
+  VERSION = "6.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -40,20 +40,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement