spice 0.4.0 → 0.4.1

data/.gitignore

@@ -4,3 +4,4 @@ doc/*
 doc/**/*
 .yardoc/**/*
 .yardoc/*
+Gemfile.lock

data/README.md

@@ -83,7 +83,9 @@ TODO
 
 ### Contributors
 
-* Ian Meyer (https://github.com/imeyer), added Opscode Platform support
+* [Ian Meyer](https://github.com/imeyer) - Opscode Platform support
+* [Holger Just](https://github.com/meineerde) - Search functionality
+* [Sean Porter](https://github.com/portertech) - Platform bug fixes
 
 ## Contributing to spice
  

data/lib/spice.rb

@@ -4,12 +4,13 @@ require 'yajl'
 
 require 'spice/authentication'
 require 'spice/chef'
-require 'spice/role'
 
+require 'spice/role'
 require 'spice/client'
 require 'spice/cookbook'
 require 'spice/data_bag'
 require 'spice/node'
+require 'spice/search'
 require 'spice/connection'
 
 require 'spice/version'
@@ -78,13 +79,12 @@ module Spice
 
     def connect!
       @connection = Connection.new(
-        :url => "#{scheme}://#{host}:#{port}", 
+        :url => "#{scheme}://#{host}:#{port}/#{url_path}", 
         :client_name => client_name, 
         :key_file => key_file
       )
     end
-    
-    
+
     def reset!
       @host = default_host
       @port = default_port

data/lib/spice/chef.rb

@@ -8,23 +8,23 @@ module Spice
     
     class << self
       def clients
-        Client.all
+        @clients ||= Client.all
       end
     
       def nodes
-        Node.all
+        @nodes ||= Node.all
       end
     
       def data_bags
-        DataBag.all
+        @data_bags ||= DataBag.all
       end
       
       def roles
-        Role.all
+        @roles ||= Role.all
       end
       
       def cookbooks
-        Cookbook.all
+        @cookbooks ||= Cookbook.all
       end
     end
   end

data/lib/spice/connection.rb

@@ -70,7 +70,7 @@ module Spice
     def authentication_headers(method, path, json_body=nil)
       request_params = {
         :http_method => method, 
-        :path => path,
+        :path => path.gsub(/\?.*$/, ''),
         :body => json_body, 
         :host => "#{@host}:#{@port}"
       }

data/lib/spice/search.rb

@@ -0,0 +1,20 @@
+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
+    end
+  end
+end

data/lib/spice/version.rb

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

data/spec/spice/client_spec.rb

@@ -12,7 +12,6 @@ module Spice
     end
 
     describe ".show" do
-      before { setup_chef_client }
       
       context "valid" do
         it "returns a valid client" do

data/spec/spice/cookbook_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 module Spice
   describe Cookbook do
     describe ".all" do
-      before { setup_chef_cookbook }
 
       it "returns a list of cookbooks" do
         stub_cookbook_list
@@ -12,7 +11,6 @@ module Spice
     end
 
     describe ".show" do
-      before { setup_chef_cookbook }
       
       context "valid" do
         it "returns a valid cookbook" do
@@ -38,7 +36,6 @@ module Spice
     end
 
     describe ".create" do
-      before { setup_chef_cookbook }
 
       context "valid" do
         it "creates a valid non-admin cookbook" do
@@ -70,7 +67,6 @@ module Spice
     end
 
     describe ".update" do
-      before { setup_chef_cookbook }
 
       context "valid" do
         it "makes a cookbook an admin" do
@@ -86,7 +82,6 @@ module Spice
     end
 
     describe ".delete" do
-      before { setup_chef_cookbook }
 
       context "valid" do
         it "deletes a cookbook" do

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: spice
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors: 
 - Dan Ryan
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 -05:00
+date: 2011-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -51,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -64,10 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 4
         version: 0.6.4
   type: :development
   version_requirements: *id004
@@ -79,10 +65,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id005
@@ -94,10 +76,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 0
         version: 0.10.0
   type: :development
   version_requirements: *id006
@@ -109,10 +87,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
         version: 1.6.1
   type: :development
   version_requirements: *id007
@@ -124,10 +98,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 5
         version: 0.3.5
   type: :development
   version_requirements: *id008
@@ -139,8 +109,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -152,8 +120,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id010
@@ -173,7 +139,6 @@ files:
 - .rspec
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - Notes.md
 - README.md
@@ -193,6 +158,7 @@ files:
 - lib/spice/mock.rb
 - lib/spice/node.rb
 - lib/spice/role.rb
+- lib/spice/search.rb
 - lib/spice/version.rb
 - pkg/spice-0.0.1.alpha.1.gem
 - spec/spec_helper.rb
@@ -227,21 +193,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: spice
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Chef API wrapper

data/Gemfile.lock

@@ -1,92 +0,0 @@
-PATH
-  remote: .
-  specs:
-    spice (0.4.0)
-      mixlib-authentication
-      rest-client
-      yajl-ruby
-
-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)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      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.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.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.8.1)
-    yard (0.6.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  chef
-  cucumber (~> 0.10.0)
-  rcov
-  rspec (~> 2.5.0)
-  spice!
-  timecop (~> 0.3.5)
-  webmock (~> 1.6.1)
-  yard (~> 0.6.4)