spice 0.0.2.beta → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spice (0.0.1.beta1)
+    spice (0.0.2.beta)
       mixlib-authentication
       rest-client
       yajl-ruby
@@ -9,24 +9,8 @@ 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)
@@ -35,29 +19,14 @@ 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)
-    forgery (0.3.6)
     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)
@@ -69,11 +38,8 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
-    systemu (1.2.0)
     term-ansicolor (1.0.5)
     timecop (0.3.5)
-    uuidtools (2.1.1)
-    vcr (1.4.0)
     webmock (1.6.1)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
@@ -84,16 +50,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  chef (= 0.9.12)
   cucumber (~> 0.10.0)
-  forgery (~> 0.3.6)
   mixlib-authentication
   rcov
   rest-client
   rspec (~> 2.4.0)
   spice!
   timecop (~> 0.3.5)
-  vcr (~> 1.4.0)
   webmock (~> 1.6.1)
   yajl-ruby
   yard (~> 0.6.4)

data/README.md

@@ -1,6 +1,6 @@
 # spice
 
-Spice is a zesty Chef API wrapper. It's primary purpose is to let you integrate your apps with a (Chef)[http://opscode.com/chef] server easily and succinctly.  Spice provides support for the (entire released Chef API)[http://wiki.opscode.com/display/chef/Server+API]
+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)
 
 ## Installation
 
@@ -74,9 +74,9 @@ Make the client "sweet" an admin:
     
     Spice.connection.put("/clients/sweet", :admin => true)
     
-Scope out (the official Chef API docs)[http://wiki.opscode.com/display/chef/Server+API] for a full list of wicked awesome things you can do.
+Scope out [the official Chef API docs](http://wiki.opscode.com/display/chef/Server+API) for a full list of wicked awesome things you can do.
 
-## High-level use
+### High-level use
 
 TODO
 

data/lib/spice/client.rb

@@ -17,20 +17,24 @@ module Spice
     end
     
     def self.show(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.get("/clients/#{name}")
     end
     
     def self.create(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       connection.post("/clients", options)
     end
     
     def self.update(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.put("/clients/#{name}", options)
     end
     
     def self.delete(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.delete("/clients/#{name}", options)
     end

data/lib/spice/cookbook.rb

@@ -9,6 +9,7 @@ module Spice
     end
     
     def self.show(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.get("/cookbooks/#{name}")
     end
@@ -18,11 +19,13 @@ module Spice
     end
     
     def self.update(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.put("/cookbooks/#{name}", options)
     end
     
     def self.delete(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.delete("/cookbooks/#{name}", options)
     end

data/lib/spice/data_bag.rb

@@ -9,6 +9,7 @@ module Spice
     end
     
     def self.show(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.get("/data/#{name}")
     end
@@ -18,11 +19,13 @@ module Spice
     end
     
     def self.update(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.put("/data/#{name}", options)
     end
     
     def self.delete(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.delete("/data/#{name}", options)
     end

data/lib/spice/node.rb

@@ -9,6 +9,7 @@ module Spice
     end
     
     def self.show(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.get("/nodes/#{name}")
     end
@@ -18,11 +19,13 @@ module Spice
     end
     
     def self.update(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.put("/nodes/#{name}", options)
     end
     
     def self.delete(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
       name = options.delete(:name)
       connection.delete("/nodes/#{name}", options)
     end

data/lib/spice/version.rb

@@ -1,3 +1,3 @@
 module Spice
-  VERSION = "0.0.2.beta"
+  VERSION = "0.2.0"
 end

data/spec/spec_helper.rb

@@ -6,9 +6,7 @@ Bundler.require
 require 'rspec'
 require 'webmock/rspec'
 require 'timecop'
-require 'forgery'
 require 'spice'
-require 'chef'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/spec/spice/client_spec.rb

@@ -2,68 +2,111 @@ require 'spec_helper'
 
 module Spice
   describe Client do
-    describe ".list" do
-      # setup_authentication
-      let(:chef) { setup_chef_client }
+    describe ".all" do
+      before { setup_chef_client }
+
       it "returns a list of clients" do
-        VCR.use_cassette 'client/list', :record => :new_episodes do
-          # chef.get_rest("/clients")
-        end
+        stub_client_list
+        Client.all.length.should == 1
       end
     end
-    
+
     describe ".show" do
-      # VCR.use_cassette 'client/show', :record => :new_episodes do
-      #   Client.show(:name => "testclient")
-      # end
-      let(:chef) { setup_chef_client }
-      it "returns a valid client" do
-        VCR.use_cassette 'client/show', :record => :new_episodes do
-          # chef.get_rest("/clients/admin")
+      before { setup_chef_client }
+      
+      context "valid" do
+        it "returns a valid client" do
+          stub_client_show("monkeypants")
+          client = Client.show(:name => "monkeypants")
+          client["name"].should == "monkeypants"
+          client["admin"].should == true
         end
       end
-      it "returns nothing when a client is not found" do
-        VCR.use_cassette 'client/show_not_found', :record => :new_episodes do
-          # chef.get_rest("/clients/badclient")
+      
+      context "errors" do
+        it "return a 404 when a client is not found" do
+          stub_client_show("applesauce", 404)
+          lambda { Client.show(:name => "applesauce") }.
+            should raise_error(RestClient::ResourceNotFound)
+        end
+        
+        it "raises ArgumentError if option :name not present" do
+          stub_client_show("pizza")
+          lambda {Client.show() }.should raise_error ArgumentError
         end
       end
     end
-    
+
     describe ".create" do
-      let(:chef) { setup_chef_client }      
-      it "creates a valid non-admin client" do
-        VCR.use_cassette 'client/create_nonadmin', :record => :new_episodes do
-          # chef.post_rest("/clients", JSON.generate(:name => "lkjasdf", :admin => false))
-          Client.create(:name => "kijasf", :admin => false)
+      before { setup_chef_client }
+
+      context "valid" do
+        it "creates a valid non-admin client" do
+          stub_client_create("spork")
+          client = Client.create(:name => "spork", :admin => false)
+          client["private_key"].should == "RSA PRIVATE KEY"
+          client["uri"].should == "http://http://localhost:4000/clients/spork"
+        end
+        
+        it "creates a valid admin client" do
+          stub_client_create("pants", true)
+          response = Client.create(:name => "pants", :admin => true)
+          response["private_key"].should == "RSA PRIVATE KEY"
+          response["uri"].should == "http://http://localhost:4000/clients/pants"
+
+          stub_client_show("pants")
+          client = Client.show(:name => "pants")
+          client["admin"].should == true
+        end
+      end
+      
+      context "errors" do
+        it "does not create a client that already exists" do
+          stub_client_create("pants", false, 409)
+          lambda { Client.create(:name => "pants", :admin => false) }.
+            should raise_error(RestClient::Conflict)
+        end
+      end
+    end
+
+    describe ".update" do
+      before { setup_chef_client }
+
+      context "valid" do
+        it "makes a client an admin" do
+          stub_client_update("awesome", true, false, 200)
+          Client.update(:name => "awesome", :admin => true, :private_key => false)
+        end
+        
+        it "regenerates the client private key" do
+          stub_client_update("awesome", false, true, 200)
+          Client.update(:name => "awesome", :admin => false, :private_key => true)
+        end
+      end
+    end
+
+    describe ".delete" do
+      before { setup_chef_client }
+
+      context "valid" do
+        it "deletes a client" do
+          stub_client_delete("spork")
+          Client.delete(:name => "spork")
+        end
+      end
+      
+      context "errors" do
+        it "raises ArgumentError if option :name not present" do
+          stub_client_delete("pizza")
+          lambda {Client.delete }.should raise_error ArgumentError
+        end
+        
+        it "does not delete a non-existent client" do
+          stub_client_delete("spork", 404)
+          lambda { Client.delete(:name => "spork") }.
+            should raise_error(RestClient::ResourceNotFound)
         end
       end
-      # it "creates a valid admin client" do
-      #         VCR.use_cassette 'client/create', :record => :new_episodes do
-      #           chef.post_rest("/clients", JSON.parse(:name => "testclient", :admin => true))
-      #         end
-      #       end
-      it "does not create a client that already exists"
     end
-    #     
-    #     describe ".update" do
-    #       setup_authentication
-    #       
-    #       let(:name) { Forgery::Name.first_name.downcase.to_s }
-    #       before { Client.create(:name => name) }
-    #       VCR.use_cassette 'client/update', :record => :new_episodes do
-    #         Client.update(:name => "name")
-    #       end
-    #     end
-    #     
-    #     describe ".delete" do
-    #       setup_authentication
-    #       
-    #       let(:name) { Forgery::Name.first_name.downcase.to_s }
-    #       before { Client.create(:name => name) }
-    #       
-    #       VCR.use_cassette 'client/delete', :record => :new_episodes do
-    #         Client.delete(:name => name)
-    #       end
-    #     end
   end
 end

data/spec/spice/cookbook_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spice
   describe Cookbook do
-    describe ".list" do
+    describe ".all" do
       VCR.use_cassette 'cookbook/list', :record => :new_episodes do
         Cookbook.list
       end

data/spec/spice/data_bag_spec.rb

@@ -2,34 +2,24 @@ require 'spec_helper'
 
 module Spice
   describe DataBag do
-    describe ".list" do
-      VCR.use_cassette 'data/list', :record => :new_episodes do
-        DataBag.list
-      end
+    describe ".all" do
+      DataBag.list
     end
-    
+
     describe ".show" do
-      VCR.use_cassette 'data/show', :record => :new_episodes do
-        DataBag.show(:name => "testdata")
-      end
+      DataBag.show(:name => "testdata")
     end
-    
+
     describe ".create" do
-      VCR.use_cassette 'data/create', :record => :new_episodes do
-        DataBag.create(:name => "testdata")
-      end
+      DataBag.create(:name => "testdata")
     end
-    
+
     describe ".update" do
-      VCR.use_cassette 'data/update', :record => :new_episodes do
-        DataBag.update(:name => "testdata")
-      end
+      DataBag.update(:name => "testdata")
     end
-    
+
     describe ".delete" do
-      VCR.use_cassette 'data/delete', :record => :new_episodes do
-        DataBag.delete(:name => "testdata")
-      end
+      DataBag.delete(:name => "testdata")
     end
   end
 end

data/spec/spice/node_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spice
   describe Node do
-    describe ".list" do
+    describe ".all" do
       VCR.use_cassette 'node/list', :record => :new_episodes do
         Node.list
       end

data/spec/spice/role_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spice
   describe Role do
-    describe ".list" do
+    describe ".all" do
       VCR.use_cassette 'role/list', :record => :new_episodes do
         Role.list
       end

data/spec/support/requests.rb

@@ -0,0 +1,97 @@
+def stub_client_list(name="testclient")
+  stub_request(:get, "http://localhost:4000/clients").
+  to_return(
+    :status => 200,
+    :body => "{\"#{name}\":\"http://localhost:4000/clients/#{name}\"}",
+    :headers => {})
+end
+
+def stub_client_show(name, status=200)
+  case status
+  when 200
+    stub_request(:get, "http://localhost:4000/clients/#{name}").
+      to_return(
+        :status => status,
+        :body => %Q{{"name": "#{name}",
+          "chef_type": "client",
+          "json_class": "Chef::ApiClient",
+          "public_key": "RSA PUBLIC KEY",
+          "_rev": "1-68532bf2122a54464db6ad65a24e2225",
+          "admin": true}
+        }
+      )
+  when 404
+    stub_request(:get, "http://localhost:4000/clients/#{name}").
+    to_return(
+      :status => status,
+      :body => "{\"error\":[\"Cannot load client #{name}\"]}")
+  end
+end
+
+def stub_client_create(name, admin=false, status=201)
+  case status
+  when 201
+    stub_request(:post, "http://localhost:4000/clients").
+      with(
+        :body => "{\"name\":\"#{name}\",\"admin\":#{admin}}").
+      to_return(
+        :status => status, 
+        :body => %Q{
+          {
+          "private_key":"RSA PRIVATE KEY",
+          "uri":"http://http://localhost:4000/clients/#{name}"}
+        }, 
+        :headers => {}
+      )
+  when 409
+    stub_request(:post, "http://localhost:4000/clients").
+      with(
+        :body => "{\"name\":\"#{name}\",\"admin\":#{admin}}").
+      to_return(
+        :status => status, 
+        :body => %Q{
+          {
+          "private_key":"RSA PRIVATE KEY",
+          "uri":"http://http://localhost:4000/clients/#{name}"}
+        }, 
+        :headers => {}
+      )
+  end
+end
+
+def stub_client_update(name, admin=false, private_key=false, status=200)
+  case status
+  when 200
+    stub_request(:put, "http://localhost:4000/clients/#{name}").
+      with(:body => "{\"admin\":#{admin},\"private_key\":#{private_key}}").
+      to_return(
+        :status => status,
+        :body => %Q{{#{"\"private_key\":\"RSA PRIVATE KEY\"," if private_key}\"admin\": true}
+        }
+      )
+  # when 404
+  #     stub_request(:get, "http://localhost:4000/clients/#{name}").
+  #     to_return(
+  #       :status => status,
+  #       :body => "{\"error\":[\"Cannot load client #{name}\"]}")
+  end
+end
+
+def stub_client_delete(name, status=200)
+  case status
+  when 200
+    stub_request(:delete, "http://localhost:4000/clients/#{name}").
+      with(:body => "").
+      to_return(
+        :status => status,
+        :body => ""
+      )
+  when 404
+    stub_request(:delete, "http://localhost:4000/clients/#{name}").
+      with(:body => "").
+      to_return(
+        :status => status,
+        :body => "{\"error\":[\"Cannot load client sasdasdf\"]}"
+      )
+  end
+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{A zesty 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.rubyforge_project = "spice"
   
@@ -22,10 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 2.4.0"
   s.add_development_dependency "cucumber", "~> 0.10.0"
   s.add_development_dependency "webmock", "~> 1.6.1"
-  s.add_development_dependency "vcr", "~> 1.4.0"
   s.add_development_dependency "timecop", "~> 0.3.5"
-  s.add_development_dependency "forgery", "~> 0.3.6"
-  s.add_development_dependency "chef", "0.9.12"
   s.add_development_dependency "rcov"
   
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spice
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
-  - 0
   - 2
-  - beta
-  version: 0.0.2.beta
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dan Ryan
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -05:00
+date: 2011-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,25 +116,10 @@ dependencies:
         version: 1.6.1
   type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: vcr
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -146,41 +130,11 @@ dependencies:
         - 5
         version: 0.3.5
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: forgery
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 6
-        version: 0.3.6
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: chef
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 12
-        version: 0.9.12
-  type: :development
-  version_requirements: *id011
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -189,8 +143,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
-description: A zesty Chef API wrapper
+  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)
 email: 
 - hi@iamdanryan.com
 executables: []
@@ -236,7 +190,7 @@ files:
 - spec/spice/role_spec.rb
 - spec/spice_spec.rb
 - spec/support/authentication.rb
-- spec/support/headers.rb
+- spec/support/requests.rb
 - spec/support/vcr.rb
 - spice.gemspec
 has_rdoc: true
@@ -259,13 +213,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: spice
@@ -288,5 +240,5 @@ test_files:
 - spec/spice/role_spec.rb
 - spec/spice_spec.rb
 - spec/support/authentication.rb
-- spec/support/headers.rb
+- spec/support/requests.rb
 - spec/support/vcr.rb

data/spec/support/headers.rb

@@ -1,18 +0,0 @@
-def get_clients_headers
-  {
-    'Accept'=>'application/json', 
-    'Accept-Encoding'=>'gzip, deflate', 
-    'Host'=>'http://localhost:4000', 
-    'User-Agent'=>'Ruby',
-    'X-Ops-Authorization-1'=>'TwH5yBkqfvYolI+yQu6xcCLXWnoN3a8y8fwJ2gDF0AKVkYZQPIYi+gVHEMyW',  
-    'X-Ops-Authorization-2'=>'fAgDhLE251LbJxixFo53P7E7IH5US0RiIwqNCekUn/R9oHHvk+Et4+HpxCcd', 
-    'X-Ops-Authorization-3'=>'79BMWKB9so9Ob1ozfwljkSEd/eHxas7GAR/M9RgATGV/mL1v065/tScqFm8g', 
-    'X-Ops-Authorization-4'=>'oNdYRwPkmZi+dPRp2ulQnY7HMiyber+QqQwkhnNsrreyh3gS1ANdj+L8djOS', 
-    'X-Ops-Authorization-5'=>'Cb7zZAVq3AVclngCH1sjrOOO5Y/6tW+d7RBJrPutKoSWwhTZs0JWMJS+kyNP', 
-    'X-Ops-Authorization-6'=>'1gIk63ATNnfc4vrmRRUl/SgY6s+exL3sxg5g2+CPJw==', 
-    'X-Ops-Content-Hash'=>'2jmj7l5rSw0yVb/vlWAYkK/YBwk=', 
-    'X-Ops-Sign'=>'version=1.0', 
-    'X-Ops-Timestamp'=>'0000-01-01T05:00:00Z', 
-    'X-Ops-Userid'=>'testclient'
-  }
-end