cheffish 0.5.beta → 0.5.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 119b0502e35e57dd3580bcbeb00dba88f64be3f5
-  data.tar.gz: eb28bbbc909edce3f303cf9783a591fd957c35c9
+  metadata.gz: fbb58577cfee92cbd7ef6d37539b9f400ba8bdff
+  data.tar.gz: 336b434a5558e161c1d554c25d8ad4bbe4bad981
 SHA512:
-  metadata.gz: c7cce6bb368c8c1efcabcd26f315d4b7cbee59f5956370efa2e60331086b3d0c6d0236c4585d5d3915dc1c37ece13d12b50a2543d72c04b7cde4f213ea49e2f1
-  data.tar.gz: 6e6522c74eee08367fd73d063af1d57b18ec2d017617a1ef62bbaccf87b18decf3e75788f6c3743847ee7f1eaf720f2df84e8ad8bdeb217c4c382f09a9cfcb5a
+  metadata.gz: 81b68668a3e3b3bcef775768121b52576d10d758999a6d59d9aaaf36dd1aade4f03d04e1fb2229c61cc50f5fd09721ca74f83b91496b7b973a1674b0fbcd872a
+  data.tar.gz: 3332ae787bb68204a1637857e0ca065b1b4773bface77b3b3df940299507684c5d4493d1ce53618c936fc543bb3b2135e5c187204feca2bc6412e215d823780e

data/lib/cheffish/chef_provider_base.rb

@@ -5,7 +5,7 @@ require 'chef/provider/lwrp_base'
 module Cheffish
   class ChefProviderBase < Chef::Provider::LWRPBase
     def rest
-      @rest ||= Cheffish.chef_server_api(new_resource.chef_server, run_context.config)
+      @rest ||= Cheffish.chef_server_api(new_resource.chef_server)
     end
 
     def current_resource_exists?

data/lib/cheffish/key_formatter.rb

@@ -56,6 +56,9 @@ module Cheffish
         hexes = Digest::MD5.hexdigest(data)
         hexes.scan(/../).join(':')
       when :pkcs8sha1fingerprint
+        if RUBY_VERSION.to_f >= 2.0
+          raise "PKCS8 SHA1 not supported in Ruby #{RUBY_VERSION}"
+        end
         pkcs8_pem = key.to_pem_pkcs8
         pkcs8_base64 = pkcs8_pem.split("\n").reject { |l| l =~ /^-----/ }
         pkcs8_data = Base64.decode64(pkcs8_base64.join)

data/lib/cheffish/merged_config.rb

@@ -5,6 +5,8 @@ module Cheffish
       @merge_arrays = {}
     end
 
+    include Enumerable
+
     attr_reader :configs
     def merge_arrays(*symbols)
       symbols.each do |symbol|

data/lib/cheffish/recipe_dsl.rb

@@ -31,7 +31,7 @@ class Chef
       def with_chef_local_server(options, &block)
         options[:host] ||= '127.0.0.1'
         options[:log_level] ||= Chef::Log.level
-        options[:port] ||= 8900
+        options[:port] ||= 8901
 
         # Create the data store chef-zero will use
         options[:data_store] ||= begin

data/lib/cheffish/server_api.rb

@@ -0,0 +1,42 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/http'
+require 'chef/http/authenticator'
+require 'chef/http/cookie_manager'
+require 'chef/http/decompressor'
+require 'chef/http/json_input'
+require 'chef/http/json_output'
+require 'chef/http/remote_request_id'
+
+module Cheffish
+  # Exactly like Chef::ServerAPI, but requires you to pass in what keys you want (no defaults)
+  class ServerAPI < Chef::HTTP
+
+    def initialize(url, options = {})
+      super(url, options)
+    end
+
+    use Chef::HTTP::JSONInput
+    use Chef::HTTP::JSONOutput
+    use Chef::HTTP::CookieManager
+    use Chef::HTTP::Decompressor
+    use Chef::HTTP::Authenticator
+    use Chef::HTTP::RemoteRequestID
+  end
+end

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '0.5.beta'
+  VERSION = '0.5.beta.2'
 end

data/lib/cheffish.rb

@@ -1,6 +1,6 @@
 require 'chef/run_list/run_list_item'
 require 'cheffish/basic_chef_client'
-require 'chef/server_api'
+require 'cheffish/server_api'
 require 'chef/knife'
 require 'chef/config_fetcher'
 require 'chef/log'
@@ -23,8 +23,8 @@ module Cheffish
     }
   end
 
-  def self.chef_server_api(chef_server_hash = default_chef_server, config = Chef::Config)
-    Chef::ServerAPI.new(config[:chef_server_url], :client_name => config[:node_name], :signing_key_filename => config[:client_key])
+  def self.chef_server_api(chef_server = default_chef_server)
+    Cheffish::ServerAPI.new(chef_server[:chef_server_url], chef_server[:options] || {})
   end
 
   def self.profiled_config(config = Chef::Config)
@@ -59,7 +59,7 @@ module Cheffish
 
   def self.honor_local_mode(local_mode_default = true)
     if !Chef::Config.has_key?(:local_mode) && !local_mode_default.nil?
-      Chef::Config.local_mode = default
+      Chef::Config.local_mode = local_mode_default
     end
     if Chef::Config.local_mode && !Chef::Config.has_key?(:cookbook_path) && !Chef::Config.has_key?(:chef_repo_path)
       Chef::Config.chef_repo_path = Chef::Config.find_chef_repo_path(Dir.pwd)
@@ -74,6 +74,28 @@ module Cheffish
     end
   end
 
+  def self.get_private_key(name, config = profiled_chef_config)
+    if config[:private_keys] && config[:private_keys][name]
+      if config[:private_keys][name].is_a?(String)
+        IO.read(config[:private_keys][name])
+      else
+        config[:private_keys][name].to_pem
+      end
+    elsif config[:private_key_paths]
+      config[:private_key_paths].each do |private_key_path|
+        Dir.entries(private_key_path).each do |key|
+          ext = File.extname(key)
+          if ext == '' || ext == '.pem'
+            key_name = key[0..-(ext.length+1)]
+            if key_name == name
+              return IO.read("#{private_key_path}/#{key}")
+            end
+          end
+        end
+      end
+    end
+  end
+
   NOT_PASSED=Object.new
 
   def self.node_attributes(klass)

data/spec/functional/fingerprint_spec.rb

@@ -39,7 +39,7 @@ EOF
 
   context 'when computing key fingperprints' do
 
-    it 'computes the PKCS#8 SHA1 private key fingerprint correctly' do
+    it 'computes the PKCS#8 SHA1 private key fingerprint correctly', :pending => (RUBY_VERSION.to_f >= 2.0) do
       expect(key_to_format(sample_private_key, :pkcs8sha1fingerprint)).to eq(
         '88:7e:3a:bd:26:9f:b5:c5:d8:ae:52:f9:df:0b:64:a4:5c:17:0a:87')
     end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 0.5.beta
+  version: 0.5.beta.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   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: openssl_pkcs8
   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: 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: 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'
 description: A library to manipulate Chef in Chef.
@@ -74,9 +74,9 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- Rakefile
 - LICENSE
 - README.md
+- Rakefile
 - lib/chef/provider/chef_client.rb
 - lib/chef/provider/chef_data_bag.rb
 - lib/chef/provider/chef_data_bag_item.rb
@@ -96,6 +96,7 @@ files:
 - lib/chef/resource/in_parallel.rb
 - lib/chef/resource/private_key.rb
 - lib/chef/resource/public_key.rb
+- lib/cheffish.rb
 - lib/cheffish/actor_provider_base.rb
 - lib/cheffish/basic_chef_client.rb
 - lib/cheffish/chef_provider_base.rb
@@ -104,9 +105,9 @@ files:
 - lib/cheffish/key_formatter.rb
 - lib/cheffish/merged_config.rb
 - lib/cheffish/recipe_dsl.rb
+- lib/cheffish/server_api.rb
 - lib/cheffish/version.rb
 - lib/cheffish/with_pattern.rb
-- lib/cheffish.rb
 - spec/functional/fingerprint_spec.rb
 - spec/integration/chef_client_spec.rb
 - spec/integration/chef_node_spec.rb
@@ -124,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A library to manipulate Chef in Chef.