spice 0.5.0 → 0.6.0

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# Release Notes - Spice - Version 0.5.0
+
+## Bug
+
+* url_path was not being reset
+* added `chef_version` config variable to fix some people's issues with require `chef/version`
+
+## Improvement
+
+* Node support!
+
+
+
 # Release Notes - Spice - Version 0.3.0
 
 ## Bug

data/Gemfile

@@ -6,11 +6,13 @@ gem 'yajl-ruby'
 
 group :development, :test do
   gem "yard", "~> 0.6.4"
-  gem "rspec", "~> 2.5.0"
-  gem "cucumber", "~> 0.10.0"
-  gem "webmock", "~> 1.6.2"
-  gem "timecop", "~> 0.3.5"
-  gem 'watchr'
-  gem 'spork', '~> 0.9.0.rc'
-  gem 'webmock', '~> 1.6.2'
+  gem 'rspec', '>= 2.6.0'
+  gem "webmock", ">= 1.6.2"
+  gem "timecop", ">= 0.3.5"
+  gem 'guard', '>= 0.6.2'
+  gem 'guard-rspec', '>= 0.4.2'
+  gem 'guard-spork', '>= 0.2.1'
+  gem 'spork', '>= 0.9.0.rc8'
+  gem 'rb-fsevent', '>= 0.4.3.1'
+  gem 'growl', '>= 1.0.3'
 end

data/Guardfile

@@ -0,0 +1,9 @@
+guard 'rspec', :version => 2, :cli => "--format documentation" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+
+guard 'spork' do
+  watch('spec/spec_helper.rb')
+end

data/lib/spice/environment.rb

@@ -0,0 +1,85 @@
+module Spice
+  class Environment < Spice::Chef
+    # Get a list of all data bags in the following syntax
+    #     Spice::Environment.all
+    #    
+    # @param [Hash] options the options hash. Currently does nothing
+    def self.all(options={})
+      connection.get("/environments")
+    end
+    
+    # An alternative format for showing the contents of a data bag
+    # @example Retrieve the id and uri of items in a data bag called "users"
+    #   Spice::Environment["users"] # => {"adam":"http://localhost:4000/data/users/adam"}
+    def self.[](name)
+      connection.get("/environments/#{name}")
+    end
+    
+    # Show the contents of a data bag
+    # @example Retrieve the id and uri of items in a data bag called "users"
+    #   Spice::Environment.show(:name => "users") # => {"adam":"http://localhost:4000/data/users/adam"}
+    # 
+    # @param [Hash] options The options hash
+    # @option options [String] :name The name of your data bag
+    def self.show(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
+      name = options.delete(:name)
+      connection.get("/environments/#{name}")
+    end
+    
+    # Create a a new data bag
+    # 
+    # @example 
+    #   Spice::Environment.create(:name => "users")
+    #
+    # @param [Hash] options the options hash from which to create a data bag
+    # @option options [String] :name The name of your data bag    
+    
+    def self.create(options={})
+      options[:chef_type] ||= "environment"
+      options[:json_class] ||= "Chef::Environment"
+      options[:attributes] ||= {}
+      options[:description] ||= ""
+      options[:cookbook_versions] ||= {}
+      connection.post("/environments", options)
+    end
+
+    # Delete a data bag
+    # 
+    # @example 
+    #   Spice::Environment.delete(:name => "users")
+    #
+    # @param [Hash] options the options hash from which to delete a data bag
+    # @option options [String] :name The name of your data bag    
+
+    def self.delete(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
+      name = options.delete(:name)
+      connection.delete("/environments/#{name}", options)
+    end
+    
+    # Shows a data bag item
+    # 
+    # @example 
+    #   Spice::Environment.show_item(:name => "users", :id => "adam")
+    #
+    # @param [Hash] options the options hash from which to create a data bag
+    # @option options [String] :name The name of your data bag    
+    # @option options [String] :id The id of the data bag item
+    
+    def self.show_cookbook(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
+      raise ArgumentError, "Option :cookbook must be present" unless options[:cookbook]
+      name = options.delete(:name)
+      cookbook = options.delete(:cookbook)
+      connection.get("/environments/#{name}/cookbooks/#{cookbook}", options)
+    end
+    
+    def self.list_cookbooks(options={})
+      raise ArgumentError, "Option :name must be present" unless options[:name]
+      name = options.delete(:name)
+      connection.get("/environments/#{name}/cookbooks", options)
+    end
+
+  end
+end

data/lib/spice/mock.rb

@@ -6,6 +6,7 @@ module Spice
         Spice.host = 'localhost'
         Spice.client_name = "testclient"
         Spice.key_file = "/tmp/keyfile.pem"
+        Spice.chef_version = "0.9.14"
         Spice.connect!
       end
 

data/lib/spice/version.rb

@@ -1,3 +1,3 @@
 module Spice
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/spice.rb

@@ -13,6 +13,7 @@ require 'spice/client'
 require 'spice/cookbook'
 require 'spice/data_bag'
 require 'spice/node'
+require 'spice/environment'
 require 'spice/search'
 require 'spice/connection'
 
@@ -22,7 +23,7 @@ require 'spice/mock'
 module Spice
 
   class << self
-    attr_writer :host, :port, :scheme, :url_path, :client_name, :connection, :key_file, :raw_key
+    attr_writer :host, :port, :scheme, :url_path, :client_name, :connection, :key_file, :raw_key, :chef_version
 
     def default_host
       @default_host || "localhost"
@@ -71,12 +72,12 @@ module Spice
       @raw_key = raw_key
     end
 
-    def chef_version
-      @chef_version || "0.9.14"
+    def default_chef_version
+      @default_chef_version || "0.9.14"
     end
     
-    def chef_version=(version)
-      @chef_version = version
+    def chef_version
+      @chef_version || default_chef_version
     end
     
     def url_path
@@ -100,6 +101,7 @@ module Spice
       @port = default_port
       @scheme = default_scheme
       @url_path = default_url_path
+      @chef_version = default_chef_version
       @key_file = nil
       @client_name = nil
       @connection = nil

data/spec/spice/environment_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+module Spice
+  describe Environment do
+    describe ".all" do
+      before { stub_environment_list }
+      subject { Environment.all }
+
+      it { should have_body(environment_list_response) }
+      it { should respond_with(200) }
+    end
+    
+    describe ".show" do
+      context "if the environment is found" do
+        before { stub_environment_show }
+        subject { Environment.show(:name => "dev") }
+    
+        it { should have_body(environment_show_response) }
+        it { should respond_with(200) } 
+      end
+      
+      context "if the environment is not found" do
+        before { stub_environment_show(404) }
+        subject { Environment.show(:name => "dev") }
+        
+        it { should_not have_body(environment_show_response) }
+        it { should respond_with(404) }
+      end
+    end
+    
+    describe ".create" do
+      context "if the environment can be created" do
+        before { stub_environment_create }
+        subject { Environment.create(:name => "dev") }
+        
+        it { should have_body(environment_create_response) }
+        it { should respond_with(201) }
+      end
+      
+      context "if the environment already exists" do
+        before { stub_environment_create(409) }
+        subject { Environment.create(:name => "dev") }
+        
+        it { should have_body(environment_conflict) }
+        it { should respond_with(409) }
+      end      
+    end
+    
+    describe ".delete" do
+      context "if the environment can be deleted" do
+        before { stub_environment_delete }
+        subject { Environment.delete(:name => "dev") }
+        
+        it { should have_body(environment_delete_response) }
+        it { should respond_with(200) }
+      end
+    
+      context "if the environment cannot be deleted" do
+        before { stub_environment_delete(404) }
+        subject { Environment.delete(:name => "dev") }
+        
+        it { should have_body(environment_not_found) }
+        it { should respond_with(404) }
+      end
+    end
+    
+    describe ".list_cookbooks" do
+      context "if cookbooks exists" do
+        before { stub_environment_cookbooks_list }
+        subject { Environment.list_cookbooks(:name => "dev") }
+        
+        it { should have_body(environment_cookbooks_list_response) }
+        it { should respond_with(200) }
+      end
+    end
+     
+    describe ".show_cookbook" do
+      context "if the cookbook exists" do
+        before { stub_environment_cookbook_show }
+        subject { Environment.show_cookbook(:name => "dev", :cookbook => "apache") }
+        
+        it { should have_body(environment_cookbook_show_response) }
+        it { should respond_with(200) }
+      end
+       
+      context "if the cookbook does not exist" do
+        before { stub_environment_cookbook_show(404) }
+        subject { Environment.show_cookbook(:name => "dev", :cookbook => "apache") }
+        
+        it { should have_body(environment_not_found) }
+        it { should respond_with(404) }
+      end
+    end
+     
+  end
+end

data/spec/spice_spec.rb

@@ -37,6 +37,15 @@ describe "Spice" do
       lambda { Spice.default_url_path = "/woohah" }.should raise_error
     end
   end
+  
+  describe ".default_chef_version" do
+    it "should default to '0.9.14'" do
+      Spice.default_chef_version.should == "0.9.14"
+    end
+    it "should not be settable" do
+      lambda { Spice.default_chef_version = "0.9.12" }.should raise_error
+    end
+  end
     
   describe ".host" do
     it "should default to 'localhost' if not set" do
@@ -78,6 +87,16 @@ describe "Spice" do
     end
   end
   
+  describe ".chef_version" do
+    it "should default to '0.9.14' if not set" do
+      Spice.chef_version.should == "0.9.14"
+    end
+    it "should be settable" do
+      Spice.chef_version = "0.9.12"
+      Spice.chef_version.should == "0.9.12"
+    end
+  end
+  
   describe ".client_name" do
     before { Spice.reset! }
     it "should not have a default" do
@@ -132,6 +151,10 @@ describe "Spice" do
       Spice.reset!
       Spice.scheme.should == "http"
     end
+    it "should reset Spice.chef_version" do
+      Spice.reset!
+      Spice.chef_version.should == "0.9.14"
+    end
     it "should reset Spice.url_path" do
       Spice.reset!
       Spice.url_path.should == ""

data/spec/support/environment_requests.rb

@@ -0,0 +1,221 @@
+def stub_environment_list
+  stub_request(:get, "http://localhost:4000/environments").
+  to_return(
+    :status => 200,
+    :body => environment_list_response
+  )
+end
+
+def stub_environment_show(status=200)
+  case status
+  when 200
+    stub_request(:get, "http://localhost:4000/environments/dev").
+      to_return(
+        :status => status,
+        :body => environment_show_response
+      )
+  when 404
+    stub_request(:get, "http://localhost:4000/environments/dev").
+      to_return(
+        :status => status,
+        :body => environment_not_found
+      )
+  end
+end
+
+def stub_environment_create(status=201)
+  case status
+  when 201
+    stub_request(:post, "http://localhost:4000/environments").
+      with(
+        :body => environment_create_payload ).
+      to_return(
+        :status => status, 
+        :body => environment_create_response
+      )
+  when 409
+    stub_request(:post, "http://localhost:4000/environments").
+      with(
+        :body => environment_create_payload ).
+      to_return(
+        :status => status, 
+        :body => environment_conflict
+      )
+  end
+end
+
+def stub_environment_update(status=200)
+  case status
+  when 200
+    stub_request(:post, "http://localhost:4000/environments/dev").
+      with(
+        :body => environment_udpate_payload ).
+      to_return(
+        :status => status, 
+        :body => environment_update_response
+      )
+  when 404
+    stub_request(:post, "http://localhost:4000/environments/dev").
+      with(
+        :body => environment_update_payload ).
+      to_return(
+        :status => status, 
+        :body => environment_not_found
+      )
+  end
+end
+
+def stub_environment_delete(status=200)
+  case status
+  when 200
+    stub_request(:delete, "http://localhost:4000/environments/dev").
+      with(:body => "").
+      to_return(
+        :status => status,
+        :body => environment_delete_response
+      )
+  when 404
+    stub_request(:delete, "http://localhost:4000/environments/dev").
+      with(:body => "").
+      to_return(
+        :status => status,
+        :body => environment_not_found
+      )
+  end
+end
+
+def stub_environment_cookbooks_list
+  stub_request(:get, "http://localhost:4000/environments/dev/cookbooks").
+  to_return(
+    :status => 200,
+    :body => environment_cookbooks_list_response
+  )
+end
+
+def stub_environment_cookbook_show(status=200)
+  case status
+  when 200
+    stub_request(:get, "http://localhost:4000/environments/dev/cookbooks/apache").
+      to_return(
+        :status => status,
+        :body => environment_cookbook_show_response
+      )
+  when 404
+    stub_request(:get, "http://localhost:4000/environments/dev/cookbooks/apache").
+      to_return(
+        :status => status,
+        :body => environment_not_found
+      )
+  end
+end
+
+
+# payloads and responses
+
+def environment_list_response
+  { "webserver" => "http://localhost:4000/environments/webserver" }
+end
+
+def environment_show_response
+  {
+    "name" => "dev",
+    "attributes" => {
+    },
+    "json_class" => "Chef::Environment",
+    "description" => "",
+    "cookbook_versions" => {
+    },
+    "chef_type" => "environment"
+  }
+end
+
+def environment_create_response
+  { "uri" => "http://localhost:4000/environments/dev" }
+end
+
+def environment_delete_response
+  {
+    "name" => "dev",
+    "attributes" => {
+    },
+    "json_class" => "Chef::Environment",
+    "description" => "",
+    "cookbook_versions" => {
+    },
+    "chef_type" => "environment"
+  }
+end
+
+def environment_update_response  
+  {
+    "name" => "dev",
+    "attributes" => {
+    },
+    "json_class" => "Chef::Environment",
+    "description" => "The Dev Environment",
+    "cookbook_versions" => {
+    },
+    "chef_type" => "environment"
+  }
+end
+
+
+def environment_cookbooks_list_response
+  {
+    "apache2" => {
+      "url" => "http://localhost:4000/cookbooks/apache2",
+      "versions" => [
+        { "url" => "http://localhost:4000/cookbooks/apache2/5.1.0", "version" => "5.1.0" },
+        { "url" => "http://localhost:4000/cookbooks/apache2/4.2.0", "version" => "4.2.0" }
+      ]
+    },
+    "nginx" => {
+      "url" => "http://localhost:4000/cookbooks/nginx",
+      "versions" => [
+        { "url" => "http://localhost:4000/cookbooks/nginx/1.0.0", "version" => "1.0.0" },
+        { "url" => "http://localhost:4000/cookbooks/nginx/0.3.0", "version" => "0.3.0" }
+      ]
+    }
+  }
+end
+
+def environment_cookbook_show_response
+  {
+    "apache2" => {
+      "url" => "http://localhost:4000/cookbooks/apache2",
+      "versions" => [
+        { "url" => "http://localhost:4000/cookbooks/apache2/5.1.0", "version" => "5.1.0" },
+        {"url" => "http://localhost:4000/cookbooks/apache2/4.2.0", "version" => "4.2.0" }
+      ]
+    }
+  }
+end
+
+def environment_not_found
+  { "error" => [ "Could not load environment env" ] }
+end
+
+def environment_cookbook_not_found
+  { "error" => [ "Could not load environment env cookbook apache" ] }
+end
+
+def environment_conflict
+ { "error" => [ "environments bag already exists" ] }
+end
+
+def environment_create_payload
+  {
+    "name" => "dev",
+    "attributes" => {
+    },
+    "json_class" => "Chef::Environment",
+    "description" => "",
+    "cookbook_versions" => {
+    },
+    "chef_type" => "environment"
+  }
+end
+
+def environment_update_payload
+  { "description" => "The Dev Environment" }
+end

metadata

@@ -1,121 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spice
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Dan Ryan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70110849680300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mixlib-authentication
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70110849680300
+- !ruby/object:Gem::Dependency
+  name: mixlib-authentication
+  requirement: &70110849679800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70110849679800
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70110849679320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70110849679320
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70110849678760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.4
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70110849678760
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70110849678260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70110849678260
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70110849677800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70110849677800
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &70110849677300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.5
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70110849677300
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70110849676800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
-  version_requirements: *id008
-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: 
+  prerelease: false
+  version_requirements: *70110849676800
+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: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .rspec
 - .watchr
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -128,6 +127,7 @@ files:
 - lib/spice/cookbook.rb
 - lib/spice/core_ext/hash.rb
 - lib/spice/data_bag.rb
+- lib/spice/environment.rb
 - lib/spice/mock.rb
 - lib/spice/node.rb
 - lib/spice/role.rb
@@ -140,6 +140,7 @@ files:
 - spec/spice/connection_spec.rb
 - spec/spice/cookbook_spec.rb
 - spec/spice/data_bag_spec.rb
+- spec/spice/environment_spec.rb
 - spec/spice/node_spec.rb
 - spec/spice/role_spec.rb
 - spec/spice/search_spec.rb
@@ -149,6 +150,7 @@ files:
 - spec/support/cookbook_requests.rb
 - spec/support/data_bag_item_requests.rb
 - spec/support/data_bag_requests.rb
+- spec/support/environment_requests.rb
 - spec/support/node_requests.rb
 - spec/support/requests.rb
 - spec/support/respond_with_matcher.rb
@@ -156,32 +158,29 @@ files:
 - spice.gemspec
 homepage: http://github.com/danryan/spice
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: spice
-rubygems_version: 1.7.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Chef API wrapper
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/spice/authentication_spec.rb
 - spec/spice/chef_spec.rb
@@ -189,6 +188,7 @@ test_files:
 - spec/spice/connection_spec.rb
 - spec/spice/cookbook_spec.rb
 - spec/spice/data_bag_spec.rb
+- spec/spice/environment_spec.rb
 - spec/spice/node_spec.rb
 - spec/spice/role_spec.rb
 - spec/spice/search_spec.rb
@@ -198,8 +198,8 @@ test_files:
 - spec/support/cookbook_requests.rb
 - spec/support/data_bag_item_requests.rb
 - spec/support/data_bag_requests.rb
+- spec/support/environment_requests.rb
 - spec/support/node_requests.rb
 - spec/support/requests.rb
 - spec/support/respond_with_matcher.rb
 - spec/support/role_requests.rb
-has_rdoc: