spice 0.3.0 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spice (0.2.0)
+    spice (0.4.0)
       mixlib-authentication
       rest-client
       yajl-ruby
@@ -9,8 +9,24 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
     addressable (2.2.2)
     builder (3.0.0)
+    bunny (0.6.0)
+    chef (0.9.12)
+      bunny (>= 0.6.0)
+      erubis
+      extlib
+      highline
+      json (>= 1.4.4, <= 1.4.6)
+      mixlib-authentication (>= 1.1.0)
+      mixlib-cli (>= 1.1.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.2.0)
+      moneta
+      ohai (>= 0.5.7)
+      rest-client (>= 1.0.4, < 1.7.0)
+      uuidtools
     crack (0.1.8)
     cucumber (0.10.0)
       builder (>= 2.1.2)
@@ -19,40 +35,57 @@ GEM
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    extlib (0.9.15)
     gherkin (2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
+    highline (1.6.1)
     json (1.4.6)
     mime-types (1.16)
     mixlib-authentication (1.1.4)
       mixlib-log
+    mixlib-cli (1.2.0)
+    mixlib-config (1.1.2)
     mixlib-log (1.2.0)
+    moneta (0.6.0)
+    ohai (0.5.8)
+      extlib
+      json (>= 1.4.4, <= 1.4.6)
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      systemu
     rcov (0.9.9)
     rest-client (1.6.1)
       mime-types (>= 1.16)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.5.0)
+    systemu (1.2.0)
     term-ansicolor (1.0.5)
     timecop (0.3.5)
+    uuidtools (2.1.1)
     webmock (1.6.1)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
-    yajl-ruby (0.7.9)
+    yajl-ruby (0.8.1)
     yard (0.6.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  chef
   cucumber (~> 0.10.0)
   rcov
-  rspec (~> 2.4.0)
+  rspec (~> 2.5.0)
   spice!
   timecop (~> 0.3.5)
   webmock (~> 1.6.1)

data/README.md

@@ -1,6 +1,6 @@
 # spice
 
-Spice is a zesty Chef API wrapper. It's primary purpose is to let you easily integrate your apps with a (Chef)[http://opscode.com/chef] server easily.  Spice provides support for the [entire released Chef API](http://wiki.opscode.com/display/chef/Server+API)
+Spice is a zesty Chef API wrapper. Its primary purpose is to let you easily integrate your apps with a (Chef)[http://opscode.com/chef] server easily.  Spice provides support for the [Chef API](http://wiki.opscode.com/display/chef/Server+API)
 
 ## Installation
 
@@ -81,6 +81,10 @@ Scope out [the official Chef API docs](http://wiki.opscode.com/display/chef/Serv
 TODO
 
 
+### Contributors
+
+* Ian Meyer (https://github.com/imeyer), added Opscode Platform support
+
 ## Contributing to spice
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/lib/spice.rb

@@ -1,7 +1,7 @@
-require 'bundler'
-Bundler.require
-
 require 'rest-client'
+require 'mixlib/authentication'
+require 'yajl'
+
 require 'spice/authentication'
 require 'spice/chef'
 require 'spice/role'
@@ -12,12 +12,13 @@ require 'spice/data_bag'
 require 'spice/node'
 require 'spice/connection'
 
+require 'spice/version'
 require 'spice/mock'
 
 module Spice
   
   class << self
-    attr_writer :host, :port, :scheme, :client_name, :connection, :key_file, :raw_key
+    attr_writer :host, :port, :scheme, :url_path, :client_name, :connection, :key_file, :raw_key
     
     def default_host
       @default_host || "localhost"
@@ -31,6 +32,10 @@ module Spice
       @default_scheme || "http"
     end
     
+    def default_url_path
+      @default_url_path || ""
+    end
+    
     def host
       @host || default_host
     end
@@ -62,6 +67,11 @@ module Spice
       @raw_key = raw_key
     end
     
+    
+    def url_path
+      @url_path || default_url_path
+    end
+    
     def connection
       @connection
     end
@@ -82,7 +92,6 @@ module Spice
       @key_file = nil
       @client_name = nil
       @connection = nil
-      puts "Spice is reset"
     end
     
     def setup

data/lib/spice/authentication.rb

@@ -1,5 +1,6 @@
 require 'openssl'
 require 'mixlib/authentication/signedheaderauth'
+require 'chef/version'
 
 module Spice
   class Authentication
@@ -23,6 +24,9 @@ module Spice
       sign_obj = Mixlib::Authentication::SignedHeaderAuth.signing_object(request_params)
       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 }
+      signed.merge!(version)      
     end
     
     private

data/lib/spice/connection.rb

@@ -10,8 +10,7 @@ module Spice
       @host             = endpoint.host
       @scheme           = endpoint.scheme
       @port             = endpoint.port
-      @path             = endpoint.path
-      @path = URI.parse(@url).path
+      @url_path         = endpoint.path
       @auth_credentials = Authentication.new(options[:client_name], options[:key_file])
       @sign_on_redirect, @sign_request = true, true
     end
@@ -20,7 +19,7 @@ module Spice
       begin
         RestClient.get(
           "#{@url}#{path}", 
-          build_headers(:GET, path, headers)
+          build_headers(:GET, "#{@url_path}#{path}", headers)
         )
       rescue => e
         e.response
@@ -32,7 +31,7 @@ module Spice
         RestClient.post(
           "#{@url}#{path}",
           JSON.generate(payload),
-          build_headers(:POST, path, headers, JSON.generate(payload))
+          build_headers(:POST, "#{@url_path}#{path}", headers, JSON.generate(payload))
         )
       rescue => e
         e.response
@@ -44,7 +43,7 @@ module Spice
         RestClient.put(
           "#{@url}#{path}",
           JSON.generate(payload),
-          build_headers(:PUT, path, headers, JSON.generate(payload))
+          build_headers(:PUT, "#{@url_path}#{path}", headers, JSON.generate(payload))
         )
       rescue => e
         e.response
@@ -55,7 +54,7 @@ module Spice
       begin
         RestClient.delete(
           "#{@url}#{path}",
-          build_headers(:DELETE, path, headers)
+          build_headers(:DELETE, "#{@url_path}#{path}", headers)
         )
       rescue => e
         e.response
@@ -73,7 +72,7 @@ module Spice
         :http_method => method, 
         :path => path,
         :body => json_body, 
-        :host => "#{@scheme}://#{@host}:#{@port}#{@path}"
+        :host => "#{@host}:#{@port}"
       }
       request_params[:body] ||= ""
       auth_credentials.signature_headers(request_params)

data/lib/spice/version.rb

@@ -1,3 +1,3 @@
 module Spice
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/spice/chef_spec.rb

@@ -21,10 +21,10 @@ module Spice
             :headers => {})
       end
       it "should return a list of all clients" do
-        clients.length.should == 2
+        JSON.parse(clients).length.should == 2
       end
       it "should provide valid client" do
-        clients["testclient"].should == "http://localhost:4000/clients/testclient"
+        clients["testclient"].should == "testclient"
       end
     end
     
@@ -40,11 +40,11 @@ module Spice
           )
       end
       it "should return a list of all nodes" do
-        nodes.length.should == 1
+        JSON.parse(nodes).length.should == 1
         # nodes.first["testnode"].should == "http://localhost:4000/nodes/testnode"
       end
       it "should provide valid node" do
-        nodes["testnode"].should == "http://localhost:4000/nodes/testnode"
+        nodes["testnode"].should == "testnode"
       end
     end
     
@@ -59,10 +59,10 @@ module Spice
           )
       end
       it "should return a list of all data bags" do
-        data_bags.length.should == 1
+        JSON.parse(data_bags).length.should == 1
       end
       it "should provide valid data" do
-        data_bags["testdata"].should == "http://localhost:4000/data/testdata"
+        data_bags["testdata"].should == "testdata"
       end
     end
     
@@ -72,15 +72,15 @@ module Spice
         stub_request(:get, "http://localhost:4000/roles").
           to_return(
             :status => 200,
-            :body => '{"testrole":"http://localhost:4000/roles/testrole"}',
+            :body => '{"testrole":"testrole"}',
             :headers => {}
           )
       end
       it "should return a list of all roles" do
-        roles.length.should == 1
+        JSON.parse(roles).length.should == 1
       end
       it "should provide valid role" do
-        roles["testrole"].should == "http://localhost:4000/roles/testrole"
+        roles["testrole"].should == "testrole"
       end
     end
     
@@ -95,10 +95,10 @@ module Spice
           )
       end
       it "should return a list of all cookbooks" do
-        cookbooks.length.should == 1
+        JSON.parse(cookbooks).length.should == 1
       end
       it "should provide valid cookbook" do
-        cookbooks["testcookbook"].should == "http://localhost:4000/cookbooks/testcookbook"
+        cookbooks["testcookbook"].should == "testcookbook"
       end
     end
   end

data/spec/spice_spec.rb

@@ -28,7 +28,16 @@ describe "Spice" do
       lambda { Spice.default_scheme = "ftp" }.should raise_error
     end
   end
-  
+
+  describe ".default_url_path" do
+    it "should default to ''" do
+      Spice.default_url_path.should == ""
+    end
+    it "should not be settable" do
+      lambda { Spice.default_url_path = "/woohah" }.should raise_error
+    end
+  end
+    
   describe ".host" do
     it "should default to 'localhost' if not set" do
       Spice.host.should == "localhost"
@@ -59,7 +68,18 @@ describe "Spice" do
     end
   end
   
+  describe ".url_path" do
+    it "should default to '' if not set" do
+      Spice.url_path.should == ""
+    end
+    it "should be settable" do
+      Spice.url_path = "/woohah"
+      Spice.url_path.should == "/woohah"
+    end
+  end
+  
   describe ".client_name" do
+    before { Spice.reset! }
     it "should not have a default" do
       Spice.client_name.should be_nil
     end
@@ -70,12 +90,14 @@ describe "Spice" do
   end
   
   describe ".key_file" do
+    before { Spice.reset! }
+    
     it "should not have a default" do
       Spice.key_file.should be_nil
     end
     it "should be settable" do
       Spice.key_file = "/tmp/keyfile.pem"
-      Spice.key_file.should == File.read("/tmp/keyfile.pem")
+      Spice.key_file.should == "/tmp/keyfile.pem"
     end
     it "should raise exception if it does not exist" do
       lambda { Spice.key_file = "/tmp/badkey.pem" }.should raise_error(Errno::ENOENT)
@@ -83,6 +105,8 @@ describe "Spice" do
   end
   
   describe ".connection" do
+    before { Spice.reset! }
+    
     it "should not have a default" do
       Spice.connection.should be_nil
     end

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)[http://opscode.com/chef] server easily.  Spice provides support for the [entire released Chef API](http://wiki.opscode.com/display/chef/Server+API)}
+  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.rubyforge_project = "spice"
   
@@ -19,11 +19,12 @@ Gem::Specification.new do |s|
   s.add_dependency "yajl-ruby"
   
   s.add_development_dependency "yard", "~> 0.6.4"
-  s.add_development_dependency "rspec", "~> 2.4.0"
+  s.add_development_dependency "rspec", "~> 2.5.0"
   s.add_development_dependency "cucumber", "~> 0.10.0"
   s.add_development_dependency "webmock", "~> 1.6.1"
   s.add_development_dependency "timecop", "~> 0.3.5"
   s.add_development_dependency "rcov"
+  s.add_development_dependency "chef"
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Dan Ryan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -05:00
+date: 2011-02-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,9 +81,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 4
+        - 5
         - 0
-        version: 2.4.0
+        version: 2.5.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -144,7 +144,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
-description: Spice is a zesty Chef API wrapper. It's primary purpose is to let you easily integrate your apps with a (Chef)[http://opscode.com/chef] server easily.  Spice provides support for the [entire released Chef API](http://wiki.opscode.com/display/chef/Server+API)
+- !ruby/object:Gem::Dependency 
+  name: chef
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        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
 email: 
 - hi@iamdanryan.com
 executables: []