ridley 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 531224a1d42a7dd8d9945c1f096fbe18260d33b5
-  data.tar.gz: 4e91e3700b180e136ee36071f2c7296da865adf8
+  metadata.gz: 32e1dbb729d85a4c08c66b4b7d07a5fd26b0bdb9
+  data.tar.gz: 6f3c4bee09d4a1bff4e2260a2c66c35b39fdf9d5
 SHA512:
-  metadata.gz: ae4f2904466cce0a7cd08d3716ebf53bc18c895e853edf67ded955e93aec49284a8fca8601e6c0f5c8f100226843cc61773d72c60a96708bd003481773269bd8
-  data.tar.gz: 97970ba2a5368760cdb8fb32df2546da2775f5cf833fd6359d64801086bbccf783a48df2a7f0407078d544ffe8ddfea5d31aad048ce8a61942da475889b63ee7
+  metadata.gz: bc76d74cd487011835a6fb0b698d58d977393e826c3d0c56f68e26a1278e901e35898f211e618d7babcbf7070291c8ce0b03a0a38e5ece4acb2527a1d1fb9991
+  data.tar.gz: 15f8611da50402f310681d3f1c4cae1cdea4aad2fe9a79eb8d0d683c0e49b2cb26c14ad017d7a0cec6cd5a6e7cf572806879d1eb7ae512b10d94ab9b9019219f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.4.1
+
+* Revert 4.4.0 while we figure out a regression
+
 # 4.4.0
 
 * Enhancements

data/lib/ridley/chef/config.rb

@@ -1,23 +1,86 @@
-require 'chef-config/config'
-require 'chef-config/workstation_config_loader'
+require 'buff/config/ruby'
 require 'socket'
 
 module Ridley::Chef
-  class Config
+  class Config < Buff::Config::Ruby
+    class << self
+      # Return the most sensible path to the Chef configuration file. This can
+      # be configured by setting a value for the 'RIDLEY_CHEF_CONFIG' environment
+      # variable.
+      #
+      # @return [String, nil]
+      def location
+        possibles = []
+
+        possibles << ENV['RIDLEY_CHEF_CONFIG'] if ENV['RIDLEY_CHEF_CONFIG']
+        possibles << File.join(ENV['KNIFE_HOME'], 'knife.rb') if ENV['KNIFE_HOME']
+        possibles << File.join(working_dir, 'knife.rb') if working_dir
+
+        # Ascending search for .chef directory siblings
+        Pathname.new(working_dir).ascend do |file|
+          sibling_chef = File.join(file, '.chef')
+          possibles << File.join(sibling_chef, 'knife.rb')
+        end if working_dir
+
+        possibles << File.join(ENV['HOME'], '.chef', 'knife.rb') if ENV['HOME']
+        possibles.compact!
+
+        location = possibles.find { |loc| File.exists?(File.expand_path(loc)) }
+
+        File.expand_path(location) unless location.nil?
+      end
+
+      private
+
+        # The current working directory
+        #
+        # @return [String]
+        def working_dir
+          ENV['PWD'] || Dir.pwd
+        end
+    end
+
+    set_assignment_mode :carefree
+
+    attribute :node_name,
+      default: -> { Socket.gethostname }
+    attribute :chef_server_url,
+      default: 'http://localhost:4000'
+    attribute :client_key,
+      default: -> { platform_specific_path('/etc/chef/client.pem') }
+    attribute :validation_key,
+      default: -> { platform_specific_path('/etc/chef/validation.pem') }
+    attribute :validation_client_name,
+      default: 'chef-validator'
+
+    attribute :cookbook_copyright,
+      default: 'YOUR_NAME'
+    attribute :cookbook_email,
+      default: 'YOUR_EMAIL'
+    attribute :cookbook_license,
+      default: 'reserved'
+
+    attribute :knife,
+      default: {}
+
+    # Prior to Chef 11, the cache implementation was based on
+    # moneta and configured via cache_options[:path]. Knife configs
+    # generated with Chef 11 will have `syntax_check_cache_path`, but older
+    # configs will have `cache_options[:path]`. `cache_options` is marked
+    # deprecated in chef/config.rb but doesn't currently trigger a warning.
+    # See also: CHEF-3715
+    attribute :syntax_check_cache_path,
+      default: -> { Dir.mktmpdir }
+    attribute :cache_options,
+      default: -> { { path: defined?(syntax_check_cache_path) ? syntax_check_cache_path : Dir.mktmpdir } }
+
     # Create a new Chef Config object.
     #
     # @param [#to_s] path
     #   the path to the configuration file
     # @param [Hash] options
     def initialize(path, options = {})
-      ChefConfig::WorkstationConfigLoader.new(path).load
-      ChefConfig::Config.merge!(options)
-      ChefConfig::Config.export_proxies # Set proxy settings as environment variables
-    end
-
-    # The configuration as a hash
-    def to_hash
-      ChefConfig::Config.save(true)
+      super(path || self.class.location, options)
     end
   end
 end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "4.4.0"
+  VERSION = "4.4.1"
 end

data/ridley.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'buff-shell_out',          '~> 0.1'
   s.add_dependency 'celluloid',               '~> 0.16.0'
   s.add_dependency 'celluloid-io',            '~> 0.16.1'
-  s.add_dependency 'chef-config'
   s.add_dependency 'erubis'
   s.add_dependency 'faraday',                 '~> 0.9.0'
   s.add_dependency 'hashie',                  '>= 2.0.2', '< 4.0.0'

data/spec/unit/ridley_spec.rb

@@ -37,29 +37,43 @@ describe Ridley do
       end
 
       it "creates a Ridley connection from the Chef config" do
-        expect(Ridley::Client).to receive(:new).with(hash_including(
+        expect(Ridley::Client).to receive(:new).with({
           client_key: 'username.pem',
           client_name: 'username',
           validator_client: 'validator',
           validator_path: 'validator.pem',
           server_url: 'https://api.opscode.com',
+
+          cookbook_copyright: 'YOUR_NAME',
+          cookbook_email: 'YOUR_EMAIL',
+          cookbook_license: 'reserved',
+
+          knife: {},
+
           syntax_check_cache_path: "/foo/bar",
           cache_options: { path: "~/.chef/checksums" },
-        )).and_return(nil)
+        }).and_return(nil)
 
         subject.from_chef_config(path)
       end
 
       it "allows the user to override attributes" do
-        expect(Ridley::Client).to receive(:new).with(hash_including(
+        expect(Ridley::Client).to receive(:new).with({
           client_key: 'bacon.pem',
           client_name: 'bacon',
           validator_client: 'validator',
           validator_path: 'validator.pem',
           server_url: 'https://api.opscode.com',
+
+          cookbook_copyright: 'YOUR_NAME',
+          cookbook_email: 'YOUR_EMAIL',
+          cookbook_license: 'reserved',
+
+          knife: {},
+
           syntax_check_cache_path: "/foo/bar",
           cache_options: { path: "~/.chef/checksums" },
-        ))
+        })
 
         subject.from_chef_config(path, client_key: 'bacon.pem', client_name: 'bacon')
       end
@@ -74,15 +88,22 @@ describe Ridley do
         end
 
         it "does a knife.rb search" do
-          expect(Ridley::Client).to receive(:new).with(hash_including(
+          expect(Ridley::Client).to receive(:new).with({
             client_key: 'username.pem',
             client_name: 'username',
             validator_client: 'validator',
             validator_path: 'validator.pem',
             server_url: 'https://api.opscode.com',
+
+            cookbook_copyright: 'YOUR_NAME',
+            cookbook_email: 'YOUR_EMAIL',
+            cookbook_license: 'reserved',
+
+            knife: {},
+
             syntax_check_cache_path: "/foo/bar",
             cache_options: { path: "~/.chef/checksums" },
-          )).and_return(nil)
+          }).and_return(nil)
 
           Dir.chdir(tmp_path) do
             ENV['PWD'] = Dir.pwd

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -123,20 +123,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.1
-- !ruby/object:Gem::Dependency
-  name: chef-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement