ridley 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ddf15cf964bec841b6ddf37a9fed6456f349bcd
-  data.tar.gz: 66bb125b1b2ff3f751cb3ba5bac8488986eaccf6
+  metadata.gz: 27b40a345544eb449674ad567eaead7152ede778
+  data.tar.gz: e3497d278e48998c2ac805cc851e3cc3561c0b84
 SHA512:
-  metadata.gz: 11576d2916237550f0f5cc9e67f784ccb0c095c2d4908bce318d8c397c4d3031dac3be5cb603968b036d6e9917811658328b30f04c2bc904cef71fc897d3dead
-  data.tar.gz: 6a3b1c1ec0d470cd8f2a31cdce148aa8e09ea976d5d1843a720f9b41421ca6dd549e4781191a7853759aa1ae3cb8e65db00aa01525cdf45747a824e47fd5e42e
+  metadata.gz: aba56e71a839b5343a3fdca96dd56ad10ff855f80ba3821cbee5c53bc3539d2e5e3547004139947b5f1353b72361ebadfbd086c7c4d3fc655ccae56bda8b4abc
+  data.tar.gz: 0d38cd57cd4c756c10af5be8a3d036d4658adb2596a37c90477d01e049b38d9ff5490552cae7427c14de58dc9b320d8385eeb1e22a015c6c0c717ede99e874c2

data/README.md

@@ -42,6 +42,15 @@ Creating a new instance of Ridley requires the following options:
 - client_name
 - client_key
 
+client_key can be either a file path or the client key as a string. You can also optionally supply an encrypted data bag secret for decrypting encrypted data bags. The option is "encrypted_data_bag_secret" This can be a file name or the key itself as a string.
+
+    ridley = Ridley.new(
+      server_url: "https://api.opscode.com/organizations/ridley",
+      client_name: "reset",
+      client_key: "some key data",
+      encrypted_data_bag_secret: "File path or key as a string"
+    )
+
 Ridley exposes a number of functions that return resources which you can use to retrieve or create objects on your Chef server. Here is a simple example of getting a list of all the roles on your Chef server.
 
 ```ruby

data/lib/ridley/client.rb

@@ -124,8 +124,8 @@ module Ridley
     # @option options [Integer] :pool_size (4)
     #   size of the connection pool
     #
-    # @raise [Errors::ClientKeyFileNotFound] if the option for :client_key does not contain
-    #   a file path pointing to a readable client key
+    # @raise [Errors::ClientKeyFileNotFoundOrInvalid] if the option for :client_key does not contain
+    #   a file path pointing to a readable client key, or is a string containing a valid key
     def initialize(options = {})
       @options = options.reverse_merge(
         ssh: Hash.new,
@@ -139,22 +139,23 @@ module Ridley
       @chef_version     = @options[:chef_version]
       @validator_client = @options[:validator_client]
 
-      @options[:client_key] = File.expand_path(@options[:client_key])
-
       if @options[:validator_path]
         @validator_path = File.expand_path(@options[:validator_path])
       end
 
-      if @options[:encrypted_data_bag_secret_path]
-        @encrypted_data_bag_secret_path = File.expand_path(@options[:encrypted_data_bag_secret_path])
-      end
-
-      @options[:encrypted_data_bag_secret] = encrypted_data_bag_secret
+      @options[:encrypted_data_bag_secret] ||= begin
+        if @options[:encrypted_data_bag_secret_path]
+          @encrypted_data_bag_secret_path = File.expand_path(@options[:encrypted_data_bag_secret_path])
+        end
 
-      unless @options[:client_key].present? && File.exist?(@options[:client_key])
-        raise Errors::ClientKeyFileNotFound, "client key not found at: '#{@options[:client_key]}'"
+        encrypted_data_bag_secret
       end
 
+      unless verify_client_key(@options[:client_key])
+        @options[:client_key] = File.expand_path(@options[:client_key])
+        raise Errors::ClientKeyFileNotFoundOrInvalid, "client key is invalid or not found at: '#{@options[:client_key]}'" unless File.exist?(@options[:client_key]) && verify_client_key(::IO.read(@options[:client_key]))
+      end
+      
       @connection_registry   = Celluloid::Registry.new
       @resources_registry    = Celluloid::Registry.new
       @connection_supervisor = ConnectionSupervisor.new(@connection_registry, @options)
@@ -273,6 +274,13 @@ module Ridley
 
     private
 
+      def verify_client_key(key)
+        OpenSSL::PKey::RSA.new(key)
+        true
+      rescue
+        false
+      end
+
       def connection
         @connection_registry[:connection_pool]
       end

data/lib/ridley/errors.rb

@@ -44,7 +44,7 @@ module Ridley
     end
 
     class BootstrapError < RidleyError; end
-    class ClientKeyFileNotFound < BootstrapError; end
+    class ClientKeyFileNotFoundOrInvalid < BootstrapError; end
     class EncryptedDataBagSecretNotFound < BootstrapError; end
 
     class HostConnectionError < RidleyError; end

data/lib/ridley/resources/cookbook_resource.rb

@@ -1,5 +1,7 @@
 module Ridley
   class CookbookResource < Ridley::Resource
+    task_class TaskThread
+
     set_resource_path "cookbooks"
     represented_by Ridley::CookbookObject
 

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/spec/unit/ridley/client_spec.rb

@@ -87,18 +87,24 @@ describe Ridley::Client do
         }.to raise_error(ArgumentError, "Missing required option(s): 'client_key'")
       end
 
-      it "raises a ClientKeyFileNotFound if the filepath for client_key is not found" do
+      it "raises a ClientKeyFileNotFound if the client_key is not found or an invalid key" do
         config[:client_key] = "/tmp/nofile.xxsa"
 
         expect {
           described_class.new(config)
-        }.to raise_error(Ridley::Errors::ClientKeyFileNotFound)
+        }.to raise_error(Ridley::Errors::ClientKeyFileNotFoundOrInvalid)
       end
 
       it "expands the path of the client_key" do
-        config[:client_key] = "~/"
+        config[:client_key] = "spec/fixtures/reset.pem"
 
-        described_class.new(config).client_key.should_not == "~/"
+        described_class.new(config).client_key[0..4].should_not == "spec/"
+      end
+
+      it "accepts a client key as a string" do
+        key = File.read(fixtures_path.join("reset.pem").to_s)
+        config[:client_key] = key.dup
+        described_class.new(config).client_key.should == key
       end
 
       it "assigns a 'ssh' attribute from the given 'ssh' option" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable