berkshelf-api-client 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb9c9893aad0bb70543e6ba21dc3732f96e309d4
-  data.tar.gz: 96d75a8777c7eb87a5d81176b6ed7fce66d3956c
+  metadata.gz: 1c6cca0ab5fbcdaf780a643ffd05bf882111e71c
+  data.tar.gz: a1c9e7d31d5a5a2812ed74ad40c146735ca84fc8
 SHA512:
-  metadata.gz: 491641676bda8db8174d5d8076ffc22ce082589892d5f9fbd1404d5e3317535423adf1afd4e33787acc944cc79571a70fb80aa066bbc2d141d49688d86fe27c0
-  data.tar.gz: f6071fd364d0c83851f847551cdc02d62d73a1eef928e582094020af687933d97cf104e6d843ff81a9fea5f134cbb084b2b3555aeb73a1df899c422a3e3e24ce
+  metadata.gz: '056878d2fb9267c2b4f1c1c72da60e22f05312ff323ff1f38b469af5afd753b22118d226db832433c33f523ef71427c46a188fc1764940e38c09cf8b947c9c27'
+  data.tar.gz: 96c8e8364cd7cf9b39685b051b71e3524c2c11ef87f3ed3e5d59f24b19f92a786b005ed9155d0cb906d5451c60133328dbec3eda1eff1384205cfd03e2f52080

data/.travis.yml

@@ -12,7 +12,7 @@ addons:
     - libarchive-dev
 matrix:
   include:
-    - rvm: 2.2.5
-    - rvm: 2.3.1
+    - rvm: 2.3.4
+    - rvm: 2.4.1
     - rvm: ruby-head
 script: bundle exec rake spec

data/Gemfile

@@ -2,35 +2,9 @@ source 'https://rubygems.org'
 
 gemspec
 
-group :guard do
-  gem 'coolline'
-  gem 'guard'
-  gem 'guard-cucumber'
-  gem 'guard-rspec'
-  gem 'guard-spork'
-
-  require 'rbconfig'
-
-  if RbConfig::CONFIG['target_os'] =~ /darwin/i
-    gem 'growl', require: false
-    gem 'rb-fsevent', require: false
-
-    if `uname`.strip == 'Darwin' && `sw_vers -productVersion`.strip >= '10.8'
-      gem 'terminal-notifier-guard', '~> 1.5.3', require: false
-    end rescue Errno::ENOENT
-
-  elsif RbConfig::CONFIG['target_os'] =~ /linux/i
-    gem 'libnotify',  '~> 0.8.0', require: false
-    gem 'rb-inotify', require: false
-
-  elsif RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
-    gem 'rb-notifu', '>= 0.0.4', require: false
-    gem 'wdm', require: false
-    gem 'win32console', require: false
-  end
-end
-
-group :test do
-  gem "berkshelf-api"
-  gem "reel"
+group :test, :development do
+  gem "rake"
+  gem "rspec"
+  gem "rspec-its"
+  gem "webmock"
 end

data/README.md

@@ -1,5 +1,6 @@
 # Berkshelf::APIClient
-[![Build Status](https://travis-ci.org/berkshelf/berkshelf-api-client.png?branch=master)](https://travis-ci.org/berkshelf/berkshelf-api-client)
+
+[![Build Status](https://travis-ci.org/berkshelf/berkshelf-api-client.svg?branch=master)](https://travis-ci.org/berkshelf/berkshelf-api-client) [![Gem Version](https://badge.fury.io/rb/berkshelf-api-client.svg)](https://badge.fury.io/rb/berkshelf-api-client)
 
 A Ruby library for communicating with the [Berkshelf API server](https://github.com/berkshelf/berkshelf-api)
 
@@ -7,19 +8,27 @@ A Ruby library for communicating with the [Berkshelf API server](https://github.
 
 Add this line to your application's Gemfile:
 
-    gem 'berkshelf-api-client'
+```ruby
+gem 'berkshelf-api-client'
+```
 
 And then execute:
 
-    $ bundle
+```shell
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install berkshelf-api-client
+```shell
+$ gem install berkshelf-api-client
+```
 
 ## Usage
 
-    require 'berkshelf/api-client'
+```ruby
+require 'berkshelf/api-client'
+```
 
 ## Contributing
 
@@ -28,4 +37,3 @@ Or install it yourself as:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-

data/berkshelf-api-client.gemspec

@@ -20,22 +20,12 @@ Gem::Specification.new do |spec|
   spec.summary                   = spec.description
   spec.homepage                  = "http://berkshelf.com"
   spec.license                   = "Apache 2.0"
-  spec.required_ruby_version     = ">= 2.2"
+  spec.required_ruby_version     = ">= 2.3"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 0.9"
-  spec.add_dependency "httpclient", "~> 2.7"
-  spec.add_dependency "ridley", ">= 4.5", "< 6.0"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "fuubar"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec-its"
-  spec.add_development_dependency "spork"
-  spec.add_development_dependency "yard"
+  spec.add_dependency "chef", ">= 12.0"
 end

data/lib/berkshelf/api_client/chef_server_connection.rb

@@ -1,3 +1,4 @@
+require 'berkshelf/ridley_compat'
 
 module Berkshelf::APIClient
   require_relative 'errors'
@@ -6,12 +7,12 @@ module Berkshelf::APIClient
     attr_reader :client
 
     def initialize(*args)
-      @client = Ridley.new(*args)
+      @client = Berkshelf::RidleyCompat.new(*args)
       @url = args[0][:server_url]
     end
 
     def universe
-      response = client.universe
+      response = client.get("universe")
 
       [].tap do |cookbooks|
         response.each do |name, versions|

data/lib/berkshelf/api_client/connection.rb

@@ -1,9 +1,9 @@
-require 'faraday'
+require 'berkshelf/ridley_compat'
 
 module Berkshelf::APIClient
   require_relative 'errors'
 
-  class Connection < Faraday::Connection
+  class Connection
     # @return [String]
     attr_reader :url
 
@@ -26,29 +26,15 @@ module Berkshelf::APIClient
     # @option options [Float] :retry_interval (0.5)
     #   how long to wait (in seconds) between each retry
     def initialize(url, options = {})
+      # it looks like Faraday mutates the URI argument it is given, when we ripped Faraday out of this
+      # API it stopped doing that.  this may or may not be a breaking change (it broke some fairly
+      # brittle berkshelf tests).  if it causes too much berkshelf chaos we could revert by uncommenting
+      # the next line.  as it is removing this behavior feels more like fixing a bug.
+      #@url = url.normalize! if url.is_a?(Addressable::URI)
       options         = {retries: 3, retry_interval: 0.5, open_timeout: 30, timeout: 30}.merge(options)
-      @url            = url
-      @retries        = options.delete(:retries)
-      @retry_interval = options.delete(:retry_interval)
+      options[:server_url] = url
 
-      options[:builder] ||= Faraday::RackBuilder.new do |b|
-        b.response :parse_json
-        b.request :retry,
-          max: self.retries,
-          interval: self.retry_interval,
-          exceptions: [
-            Faraday::Error::TimeoutError,
-            Errno::ETIMEDOUT
-          ]
-
-        b.adapter :httpclient
-      end
-
-      open_timeout = options.delete(:open_timeout)
-      timeout      = options.delete(:timeout)
-      super(self.url, options)
-      @options[:open_timeout] = open_timeout
-      @options[:timeout]      = timeout
+      @client = Berkshelf::RidleyCompatJSON.new(**options)
     end
 
     # Retrieves the entire universe of known cookbooks from the API source
@@ -57,26 +43,13 @@ module Berkshelf::APIClient
     #
     # @return [Array<APIClient::RemoteCookbook>]
     def universe
-      response = get("universe")
+      response = @client.get("universe")
 
-      case response.status
-      when 200
-        [].tap do |cookbooks|
-          response.body.each do |name, versions|
-            versions.each { |version, attributes| cookbooks << RemoteCookbook.new(name, version, attributes) }
-          end
+      [].tap do |cookbooks|
+        response.each do |name, versions|
+          versions.each { |version, attributes| cookbooks << RemoteCookbook.new(name, version, attributes) }
         end
-      when 404
-        raise ServiceNotFound, "service not found at: #{url}"
-      when 500..504
-        raise ServiceUnavaiable, "service unavailable at: #{url}"
-      else
-        raise BadResponse, "bad response #{response.inspect}"
       end
-    rescue Faraday::Error::TimeoutError, Errno::ETIMEDOUT
-      raise TimeoutError, "Unable to connect to: #{url}"
-    rescue Faraday::Error::ConnectionFailed => ex
-      raise ServiceUnavaiable, ex
     end
   end
 end

data/lib/berkshelf/api_client/errors.rb

@@ -4,7 +4,7 @@ module Berkshelf
   module APIClient
     class TimeoutError < APIClientError; end
     class BadResponse < APIClientError; end
-    class ServiceUnavaiable < APIClientError; end
+    class ServiceUnavailable < APIClientError; end
     class ServiceNotFound < APIClientError; end
   end
 end

data/lib/berkshelf/api_client/remote_cookbook.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'chef/mash'
 
 module Berkshelf::APIClient
   # A representation of cookbook metadata indexed by a Berkshelf API Server. Returned
@@ -16,7 +17,7 @@ module Berkshelf::APIClient
     def initialize(name, version, attributes = {})
       @name       = name
       @version    = version
-      @attributes = attributes
+      @attributes = ::Mash.new(attributes)
     end
 
     # @return [Hash]

data/lib/berkshelf/api_client/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module APIClient
-    VERSION = "3.0.0"
+    VERSION = "4.0.0"
   end
 end

data/lib/berkshelf/ridley_compat.rb

@@ -0,0 +1,73 @@
+require 'chef/server_api'
+require 'chef/http/simple_json'
+require 'chef/http/simple'
+require 'berkshelf/api_client/errors'
+
+module Berkshelf
+  module RidleyCompatAPI
+    def initialize(**opts)
+      opts = opts.dup
+      opts[:ssl] ||= {}
+      chef_opts = {
+        rest_timeout: opts[:timeout], # opts[:open_timeout] is ignored on purpose
+        client_name: opts[:client_name],
+        signing_key_filename: opts[:client_key],
+        ssl_verify_mode: opts[:verify] ? :verify_none : :verify_peer,
+        ssl_ca_path: opts[:ssl][:ca_path],
+        ssl_ca_file: opts[:ssl][:ca_file],
+        ssl_client_cert: opts[:ssl][:client_cert],
+        ssl_client_key: opts[:ssl][:client_key],
+      }
+      super(opts[:server_url].to_s, **chef_opts)
+    end
+
+    def get(url)
+      super(url)
+    rescue Net::HTTPExceptions => e
+      case e.response.code
+      when "404"
+        raise Berkshelf::APIClient::ServiceNotFound, "service not found at: #{url}"
+      when /^5/
+        raise Berkshelf::APIClient::ServiceUnavailable, "service unavailable at: #{url}"
+      else
+        raise Berkshelf::APIClient::BadResponse, "bad response #{e.response}"
+      end
+    rescue Errno::ETIMEDOUT, Timeout::Error
+      raise Berkshelf::APIClient::TimeoutError, "Unable to connect to: #{url}"
+    rescue Errno::EHOSTUNREACH, Errno::ECONNREFUSED => e
+      raise Berkshelf::APIClient::ServiceUnavailable, e
+    end
+  end
+
+  class RidleyCompatSimple < Chef::ServerAPI
+    use Chef::HTTP::Decompressor
+    use Chef::HTTP::CookieManager
+    use Chef::HTTP::ValidateContentLength
+
+    include RidleyCompatAPI
+  end
+
+  class RidleyCompatJSON < Chef::HTTP::SimpleJSON
+    use Chef::HTTP::JSONInput
+    use Chef::HTTP::JSONOutput
+    use Chef::HTTP::CookieManager
+    use Chef::HTTP::Decompressor
+    use Chef::HTTP::RemoteRequestID
+    use Chef::HTTP::ValidateContentLength
+
+    include RidleyCompatAPI
+  end
+
+  class RidleyCompat < Chef::HTTP::Simple
+    use Chef::HTTP::JSONInput
+    use Chef::HTTP::JSONOutput
+    use Chef::HTTP::CookieManager
+    use Chef::HTTP::Decompressor
+    use Chef::HTTP::Authenticator
+    use Chef::HTTP::RemoteRequestID
+    use Chef::HTTP::APIVersions
+    use Chef::HTTP::ValidateContentLength
+
+    include RidleyCompatAPI
+  end
+end

data/spec/spec_helper.rb

@@ -1,28 +1,16 @@
-require 'bundler'
 require 'rspec'
 require 'rspec/its'
-require 'spork'
-require 'berkshelf/api/rspec'
+require 'webmock/rspec'
+require 'berkshelf/api-client'
 
-Spork.prefork do
-  Dir[File.join(File.expand_path("../../spec/support/**/*.rb", __FILE__))].each { |f| require f }
+WebMock.disable_net_connect!(allow_localhost: false)
 
-  RSpec.configure do |config|
-    config.include Berkshelf::API::RSpec
-
-    config.expect_with :rspec do |c|
-      c.syntax = :expect
-    end
-
-    config.mock_with :rspec
-    config.filter_run focus: true
-    config.run_all_when_everything_filtered = true
-
-    config.before(:suite) { Berkshelf::API::RSpec::Server.start }
-    config.before(:all) { Berkshelf::API::Logging.init(location: '/dev/null') }
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
   end
-end
 
-Spork.each_run do
-  require 'berkshelf/api-client'
+  config.mock_with :rspec
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
 end

data/spec/unit/berkshelf/api_client/connection_spec.rb

@@ -1,13 +1,14 @@
 require 'spec_helper'
 
 describe Berkshelf::APIClient::Connection do
-  let(:instance) { described_class.new("http://localhost:26210") }
+  let(:instance) { described_class.new("http://supermarket.getchef.com") }
 
   describe "#universe" do
     before do
-      berks_dependency("ruby", "1.2.3", dependencies: { "build-essential" => ">= 1.2.2" })
-      berks_dependency("ruby", "2.0.0", dependencies: { "build-essential" => ">= 1.2.2" })
-      berks_dependency("elixir", "1.0.0", platforms: { "CentOS" => "6.0" })
+      body_response = %Q{{"ruby":{"1.2.3":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"},"2.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}},"elixir":{"1.0.0":{"endpoint_priority":0,"platforms":{"CentOS":"= 6.0.0"},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}}}}
+
+       stub_request(:get, "http://supermarket.getchef.com/universe")
+         .to_return(status: 200, body: body_response, headers: { "Content-Type" => "application/json; charset=utf-8" })
     end
 
     subject { instance.universe }
@@ -53,15 +54,47 @@ describe Berkshelf::APIClient::Connection do
         expect(remote.location_type).to_not be_nil
       end
     end
+  end
 
-    context "when the connection to the service fails" do
-      before do
-        expect(instance).to receive(:get).and_raise(Faraday::Error::ConnectionFailed.new(StandardError))
-      end
+  describe "non-200s" do
+    before do
+      Chef::Config[:http_retry_delay] = 0.001
+      Chef::Config[:http_retry_count] = 0
+    end
 
-      it "raises a Berkshelf::APIClient::ServiceUnavaiable" do
-        expect { subject }.to raise_error(Berkshelf::APIClient::ServiceUnavaiable)
-      end
+    subject { instance.universe }
+
+    it "follows 301 redirects correctly" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(:status => 301, :headers => { 'Location' => "http://arglebargle.com/universe" })
+      body_response = %Q{{"ruby":{"1.2.3":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"},"2.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}},"elixir":{"1.0.0":{"endpoint_priority":0,"platforms":{"CentOS":"= 6.0.0"},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}}}}
+      stub_request(:get, "http://arglebargle.com/universe")
+        .to_return(status: 200, body: body_response, headers: { "Content-Type" => "application/json; charset=utf-8" })
+      expect(subject.size).to eq(3)
+    end
+
+    it "raises Berkshelf::APIClient::ServiceUnavailable for 500s" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(:status => [500, "Internal Server Error"])
+      expect { subject }.to raise_error(Berkshelf::APIClient::ServiceUnavailable)
+    end
+
+    it "raises Berkshelf::APIClient::ServiceNotFound for 404s" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(:status => [404, "Not Found"])
+      expect { subject }.to raise_error(Berkshelf::APIClient::ServiceNotFound)
+    end
+
+    it "raises Net::HTTPBadRequest for 400s" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(:status => [400, "Bad Request"])
+      expect { subject }.to raise_error(Berkshelf::APIClient::BadResponse)
+    end
+
+    it "raises Berkshelf::APIClient::TimeoutError for timeouts" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_timeout
+      expect { subject }.to raise_error(Berkshelf::APIClient::TimeoutError)
+    end
+
+    it "raises Berkshelf::APIClient::TimeoutError for timeouts" do
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_raise(Errno::ECONNREFUSED)
+      expect { subject }.to raise_error(Berkshelf::APIClient::ServiceUnavailable)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api-client
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,154 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: ridley
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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: 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: fuubar
-  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: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  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: spork
-  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: yard
-  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'
+        version: '12.0'
 description: API Client for communicating with a Berkshelf API server
 email:
 - jamie@vialstudios.com
@@ -170,7 +38,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -182,6 +49,7 @@ files:
 - lib/berkshelf/api_client/errors.rb
 - lib/berkshelf/api_client/remote_cookbook.rb
 - lib/berkshelf/api_client/version.rb
+- lib/berkshelf/ridley_compat.rb
 - spec/spec_helper.rb
 - spec/unit/berkshelf/api_client/connection_spec.rb
 - spec/unit/berkshelf/api_client/remote_cookbook_spec.rb
@@ -198,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -206,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: API Client for communicating with a Berkshelf API server

data/Guardfile

@@ -1,10 +0,0 @@
-guard 'spork' do
-  watch('Gemfile')
-  watch('spec/spec_helper.rb')  { :rspec }
-end
-
-guard 'rspec', cli: '--color --drb --format Fuubar', all_on_start: false, all_after_pass: false do
-  watch(%r{^spec/unit/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})          { |m| "spec/unit/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')       { 'spec' }
-end