chef-ssl-client 1.0.4 → 1.0.5

data/lib/chef-ssl/client.rb

@@ -29,10 +29,25 @@ module ChefSSL
       chef_server_url = Chef::Config.chef_server_url
       chef_server_url.gsub!(/\/$/, '')
 
+      if Chef::Config.ssl_verify_mode == :verify_none
+        verify_mode = OpenSSL::SSL::VERIFY_NONE
+      else
+        verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
+
       Spice.setup do |s|
         s.server_url = chef_server_url
         s.client_name = Chef::Config.node_name
         s.client_key = Spice.read_key_file(File.expand_path(Chef::Config.client_key))
+        s.connection_options = {
+          :ssl => {
+            :verify_mode => verify_mode,
+            :client_cert => Chef::Config.ssl_client_cert,
+            :client_key => Chef::Config.ssl_client_key,
+            :ca_path => Chef::Config.ssl_ca_path,
+            :ca_file => Chef::Config.ssl_ca_file,
+          }
+        }
       end
     end
 

data/lib/chef-ssl/client.rb~

@@ -4,6 +4,7 @@ require 'json'
 require 'openssl'
 require 'digest/sha2'
 require 'active_support/hash_with_indifferent_access'
+require 'chef/knife'
 require 'chef/config'
 require 'chef/node'
 
@@ -16,11 +17,20 @@ module ChefSSL
   class Client
 
     def initialize
-      path = File.expand_path('knife.rb', '~/.chef')
-      Chef::Config.from_file(path)
+      Chef::Knife.new.tap do |knife|
+        # Set the log-level, knife style. This equals :error level
+        Chef::Config[:verbosity] = knife.config[:verbosity] ||= 0
+        knife.configure_chef
+      end
+
       Spice.reset
+
+      # avoid Spice issue if chef_server_url has a trailing slash.
+      chef_server_url = Chef::Config.chef_server_url
+      chef_server_url.gsub!(/\/$/, '')
+
       Spice.setup do |s|
-        s.server_url = Chef::Config.chef_server_url
+        s.server_url = chef_server_url
         s.client_name = Chef::Config.node_name
         s.client_key = Spice.read_key_file(File.expand_path(Chef::Config.client_key))
       end

data/lib/chef-ssl/client/version.rb

@@ -1,5 +1,5 @@
 module ChefSSL
   class Client
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-ssl-client
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -223,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1808698484037623876
+      hash: -3989254952748401307
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1808698484037623876
+      hash: -3989254952748401307
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24