ridley 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32e1dbb729d85a4c08c66b4b7d07a5fd26b0bdb9
-  data.tar.gz: 6f3c4bee09d4a1bff4e2260a2c66c35b39fdf9d5
+  metadata.gz: 35e51257c60219defc486be0fc9d2929a6305cd2
+  data.tar.gz: db145d26c5db49f2a27d9e29085f79c746738d7c
 SHA512:
-  metadata.gz: bc76d74cd487011835a6fb0b698d58d977393e826c3d0c56f68e26a1278e901e35898f211e618d7babcbf7070291c8ce0b03a0a38e5ece4acb2527a1d1fb9991
-  data.tar.gz: 15f8611da50402f310681d3f1c4cae1cdea4aad2fe9a79eb8d0d683c0e49b2cb26c14ad017d7a0cec6cd5a6e7cf572806879d1eb7ae512b10d94ab9b9019219f
+  metadata.gz: 358d50fb89876c479ee20e1d23ba0ba9584a3cb779bea73be43fe9c6a9c088ab320634df555a4c3a8e1c8626e82da942f7ce85ea78bc1dbbc5f4fc224c0804a3
+  data.tar.gz: d9758949f47a21e33b7a5c2f042e9dcd65cf21f88cf558ce63012439e4a696243d3903b992237f21fd0cad263c0d0e15523b4251426119753ae16838d222d866

data/.travis.yml

@@ -1,13 +1,46 @@
-script: "bundle exec thor spec:$TEST_SUITE"
+sudo: false
 language: ruby
+addons:
+  apt:
+    packages:
+      - chef
+      - git
+      - graphviz
+      - libarchive12
+      - libarchive-dev
+      - libgecode-dev
+    sources:
+      - chef-stable-precise
+cache:
+  - apt
+  - bundler
+dist: precise
+
+script: "bundle exec thor spec:$TEST_SUITE"
+before_install:
+  - gem update --system
+  - gem install bundler
 env:
   - TEST_SUITE=unit
   - TEST_SUITE=acceptance
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 1.9
+  - 2.0
   - 2.1
-  - jruby-19mode
+#  - jruby-19mode
 matrix:
-  allow_failures:
-    - rvm: jruby-19mode
+  # allow_failures:
+  #   - rvm: jruby-19mode
+  include:
+    # Test against master of berkshelf
+    - rvm: 2.2
+      gemfile: berkshelf/Gemfile
+      before_install:
+        - gem update --system
+        - gem install bundler
+        - git clone --depth 1 https://github.com/berkshelf/berkshelf
+        - cd berkshelf
+        - echo "gem 'ridley', :path => '..'" >> Gemfile
+      install: bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+      env:
+      script: bundle exec thor spec:ci

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.4.2
+
+* Bring back 4.4.0 with backcompat fixes!
+
 # 4.4.1
 
 * Revert 4.4.0 while we figure out a regression

data/lib/ridley/chef/config.rb

@@ -1,86 +1,46 @@
-require 'buff/config/ruby'
+require 'chef-config/config'
+require 'chef-config/workstation_config_loader'
 require 'socket'
 
 module Ridley::Chef
-  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 } }
-
+  class Config
     # Create a new Chef Config object.
     #
     # @param [#to_s] path
     #   the path to the configuration file
     # @param [Hash] options
     def initialize(path, options = {})
-      super(path || self.class.location, options)
+      ChefConfig::WorkstationConfigLoader.new(path).load
+      ChefConfig::Config.merge!(options)
+      ChefConfig::Config.export_proxies # Set proxy settings as environment variables
+    end
+
+    # Keep defaults that aren't in ChefConfig::Config
+    def cookbook_copyright(*args, &block)
+      ChefConfig::Config.cookbook_copyright(*args, &block) || 'YOUR_NAME'
+    end
+    def cookbook_email(*args, &block)
+      ChefConfig::Config.cookbook_email(*args, &block) || 'YOUR_EMAIL'
+    end
+    def cookbook_license(*args, &block)
+      ChefConfig::Config.cookbook_license(*args, &block) || 'reserved'
+    end
+
+    # The configuration as a hash
+    def to_hash
+      ChefConfig::Config.save(true)
+    end
+    # Load from a file
+    def self.from_file(file)
+      new(file)
+    end
+
+    # Behave just like ChefConfig::Config in general
+    def method_missing(name, *args, &block)
+      ChefConfig::Config.send(name, *args, &block)
+    end
+    def respond_to_missing?(name)
+      ChefConfig::Config.respond_to?(name)
     end
   end
 end

data/lib/ridley/version.rb

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

data/ridley.gemspec

@@ -25,6 +25,7 @@ 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,43 +37,29 @@ describe Ridley do
       end
 
       it "creates a Ridley connection from the Chef config" do
-        expect(Ridley::Client).to receive(:new).with({
+        expect(Ridley::Client).to receive(:new).with(hash_including(
           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({
+        expect(Ridley::Client).to receive(:new).with(hash_including(
           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
@@ -88,22 +74,15 @@ describe Ridley do
         end
 
         it "does a knife.rb search" do
-          expect(Ridley::Client).to receive(:new).with({
+          expect(Ridley::Client).to receive(:new).with(hash_including(
             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.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -123,6 +123,20 @@ 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