spice 0.4.1 → 0.4.2

data/README.md

@@ -17,6 +17,7 @@ Spice has five configuration variables:
     Spice.host          # default: localhost
     Spice.port          # default: 4000
     Spice.scheme        # default: http
+	Spice.chef_version	# default: 0.9.14. Should be set to the version you have
     Spice.client_name   # default: nil. Must be set to a valid admin Chef client
     Spice.key_file      # default: nil. Must be set to a file path
 
@@ -28,7 +29,7 @@ To connect to a Chef server at https://chef.example.com:5000 with the "admin" AP
     Spice.client_name = "admin"
     Spice.key_file = "/path/to/keyfile.pem"
 
-Say you had a Chef server (or Chef solo) running locally on port 4000 over HTTP, you only need to set your `client_name` and `key_file` path:
+Say you had a Chef server v0.9.14 (or Chef solo) running locally on port 4000 over HTTP, you only need to set your `client_name` and `key_file` path:
 
     Spice.client_name = "admin"
     Spice.key_file = "/path/to/keyfile.pem"

data/lib/spice.rb

@@ -1,10 +1,13 @@
 require 'rest-client'
 require 'mixlib/authentication'
 require 'yajl'
+require 'cgi'
 
 require 'spice/authentication'
 require 'spice/chef'
 
+require 'spice/core_ext/hash'
+
 require 'spice/role'
 require 'spice/client'
 require 'spice/cookbook'
@@ -17,70 +20,77 @@ require 'spice/version'
 require 'spice/mock'
 
 module Spice
-  
+
   class << self
     attr_writer :host, :port, :scheme, :url_path, :client_name, :connection, :key_file, :raw_key
-    
+
     def default_host
       @default_host || "localhost"
     end
-    
+
     def default_port
       @default_port || "4000"
     end
-    
+
     def default_scheme
       @default_scheme || "http"
     end
-    
+
     def default_url_path
       @default_url_path || ""
     end
-    
+
     def host
       @host || default_host
     end
-    
+
     def port
       @port || default_port
     end
-    
+
     def scheme
       @scheme || default_scheme
     end
-    
+
     def client_name
       @client_name
     end
-    
+
     def key_file
       @key_file
     end
-    
+
     def raw_key
       @raw_key
     end
-    
+
     def key_file=(new_key_file)
       raw_key = File.read(new_key_file)
       assert_valid_key_format!(raw_key)
       @key_file = new_key_file
       @raw_key = raw_key
     end
+
+    def chef_version
+      @chef_version || "0.9.14"
+    end
     
+    def chef_version=(version)
+      @chef_version = version
+    end
     
     def url_path
       @url_path || default_url_path
     end
-    
+
     def connection
       @connection
     end
 
     def connect!
       @connection = Connection.new(
-        :url => "#{scheme}://#{host}:#{port}/#{url_path}", 
-        :client_name => client_name, 
+        :url => "#{scheme}://#{host}:#{port}/#{url_path}",
+        :client_name => client_name,
         :key_file => key_file
       )
     end
@@ -93,17 +103,17 @@ module Spice
       @client_name = nil
       @connection = nil
     end
-    
+
     def setup
       yield self
     end
-    
+
     def mock
       Spice::Mock.setup_mock_client
     end
-    
+
     private
-    
+
     def assert_valid_key_format!(raw_key)
       unless (raw_key =~ /\A-----BEGIN RSA PRIVATE KEY-----$/) &&
          (raw_key =~ /^-----END RSA PRIVATE KEY-----\Z/)

data/lib/spice/authentication.rb

@@ -1,6 +1,5 @@
 require 'openssl'
 require 'mixlib/authentication/signedheaderauth'
-require 'chef/version'
 
 module Spice
   class Authentication
@@ -25,7 +24,7 @@ module Spice
       signed = sign_obj.sign(key).merge({:host => host})
       signed.inject({}){|memo, kv| memo["#{kv[0].to_s.upcase}"] = kv[1];memo}
       # Platform requires X-Chef-Version header
-      version = { "X-Chef-Version" => ::Chef::VERSION }
+      version = { "X-Chef-Version" => Spice.chef_version }
       signed.merge!(version)      
     end
     

data/lib/spice/core_ext/hash.rb

@@ -0,0 +1,11 @@
+class Hash
+  def symbolize_keys!
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+    self
+  end
+  def symbolize_keys
+    dup.symbolize_keys!
+  end
+end

data/lib/spice/search.rb

@@ -1,20 +1,23 @@
 module Spice
   class Search < Spice::Chef
-    INDEXES = %w(node role client users)
-    
-    INDEXES.each do |index|
-      define_method index do |options|
-        options ||= {}
-        options.symbolize_keys!
-        
-        type = index
-        query = options[:q] || '*:*'
-        sort = options[:sort] || "X_CHEF_id_CHEF_X asc"
-        start = options[:start] || 0
-        rows = options[:rows] || 1000
-        
-        connection.get("/search/#{index}?q=#{escape(query)}&sort=#{escape(sort)}&start=#{escape(start)}&rows=#{escape(rows)}")
-      end
+    def self.search(index, options={})
+      options = {:q => options} if options.is_a? String
+      options.symbolize_keys!
+
+      options[:q] ||= '*:*'
+      options[:sort] ||= "X_CHEF_id_CHEF_X asc"
+      options[:start] ||= 0
+      options[:rows] ||= 1000
+
+      # clean up options hash
+      options.delete_if{|k,v| !%w(q sort start rows).include?(k.to_s)}
+
+      params = options.collect{ |k, v| "#{k}=#{CGI::escape(v.to_s)}"}.join("&")
+      connection.get("/search/#{CGI::escape(index.to_s)}?#{params}")
+    end
+
+    def self.method_missing(*args, &block)
+      self.search(*args, &block)
     end
   end
-end
+end

data/lib/spice/version.rb

@@ -1,3 +1,3 @@
 module Spice
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/spec_helper.rb

@@ -7,8 +7,8 @@ require 'rspec'
 require 'webmock/rspec'
 require 'timecop'
 require 'rest-client'
-require 'spice'
 
+require 'spice'
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spice.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["hi@iamdanryan.com"]
   s.homepage    = "http://github.com/danryan/spice"
   s.summary     = %q{Chef API wrapper}
-  s.description = %q{Spice is a zesty Chef API wrapper. It's primary purpose is to let you easily integrate your apps with a Chef server easily.  Spice provides support for the entire released Chef API}
+  s.description = %q{Spice is a zesty Chef API wrapper. Its primary purpose is to let you easily integrate your apps with a Chef server easily.  Spice provides support for the entire released Chef API}
 
   s.rubyforge_project = "spice"
   

metadata

@@ -2,7 +2,7 @@
 name: spice
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Dan Ryan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -07:00
+date: 2011-03-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,7 +123,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id010
-description: Spice is a zesty Chef API wrapper. It's primary purpose is to let you easily integrate your apps with a Chef server easily.  Spice provides support for the entire released Chef API
+description: Spice is a zesty Chef API wrapper. Its primary purpose is to let you easily integrate your apps with a Chef server easily.  Spice provides support for the entire released Chef API
 email: 
 - hi@iamdanryan.com
 executables: []
@@ -154,6 +154,7 @@ files:
 - lib/spice/client.rb
 - lib/spice/connection.rb
 - lib/spice/cookbook.rb
+- lib/spice/core_ext/hash.rb
 - lib/spice/data_bag.rb
 - lib/spice/mock.rb
 - lib/spice/node.rb
@@ -203,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: spice
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Chef API wrapper