spice 1.0.0.rc → 1.0.0

data/lib/spice/connection.rb

@@ -1,8 +1,10 @@
-require 'yajl'
-require 'uri'
-
+require 'spice/config'
 require 'spice/request'
-require 'spice/connection/authentication'
+require 'spice/authentication'
+require 'spice/error'
+
+require 'spice/core_ext/enumerable'
+
 require 'spice/connection/search'
 require 'spice/connection/clients'
 require 'spice/connection/cookbooks'
@@ -10,15 +12,18 @@ require 'spice/connection/data_bags'
 require 'spice/connection/environments'
 require 'spice/connection/nodes'
 require 'spice/connection/roles'
-require 'spice/connection/search'
-
 
+require 'spice/client'
+require 'spice/cookbook'
+require 'spice/cookbook_version'
+require 'spice/data_bag'
+require 'spice/data_bag_item'
+require 'spice/environment'
+require 'spice/node'
+require 'spice/role'
 
 module Spice
   class Connection
-    include Virtus
-    include Aequitas
-    
     include Spice::Connection::Clients
     include Spice::Connection::Cookbooks
     include Spice::Connection::DataBags
@@ -26,118 +31,29 @@ module Spice
     include Spice::Connection::Nodes
     include Spice::Connection::Roles
     include Spice::Connection::Search
-    include Spice::Connection::Authentication
-    include Spice::Connection::Search
     include Spice::Request
-        
-    # @macro [attach] attribute
-    # @attribute [rw]
-    # @return [$2] the $1 attribute
-    attribute :client_name, String
-    attribute :key_file, String
-    attribute :key, String
-    attribute :server_url, String
-    attribute :sign_on_redirect, Boolean, :default => true
-    attribute :sign_request, Boolean, :default => true
-    attribute :endpoint, String
-    
-    validates_presence_of :client_name, :key_file, :server_url
+    include Spice::Authentication
+      
+    # @private
     
-    def connection
-      self
+    Config::VALID_OPTIONS_KEYS.each do |key|
+      attr_accessor key
     end
     
-    def parsed_url
-      URI.parse(server_url)
-    end
-
-    # Perform an HTTP GET request
-    # @param [String] path The relative path
-    # @return [Faraday::Response]
-    # @example Get a list of all nodes
-    #   Spice.connection.get("/nodes")
-    def get(path)
-      response = request(:headers => build_headers(
-        :GET, 
-        "#{parsed_url.path}#{path}")
-      ).get(
-        "#{server_url}#{path}"
-      )
-      return response
-    end # def get
-    
-    # Perform an HTTP POST request
-    # @param [String] path The relative path
-    # @param [Hash] payload The payload to send with the POST request
-    # @return [Faraday::Response]
-    # @example Create a new client named "foo"
-    #   Spice.connection.post("/clients", :name => "foo")
-    def post(path, payload)
-      response = request(:headers => build_headers(
-        :POST, 
-        "#{parsed_url.path}#{path}", 
-        Yajl.dump(payload))
-      ).post(
-        "#{server_url}#{path}", 
-        Yajl.dump(payload)
-      )
-      return response
-    end # def post
-    
-    # Perform an HTTP PUT request
-    # @param [String] path The relative path
-    # @param [Hash] payload The payload to send with the PUT request
-    # @return [Faraday::Response]
-    # @example Make an existing client "foo" an admin
-    #   Spice.connection.put("/clients/foo", :admin => true)
-    def put(path, payload)
-      response = request(:headers => build_headers(
-        :PUT, 
-        "#{parsed_url.path}#{path}", 
-        Yajl.dump(payload))
-      ).put(
-        "#{server_url}#{path}", 
-        Yajl.dump(payload)
-      )
-      return response
-    end # def put
+    def initialize(attrs=Mash.new)
+      attrs = Spice.options.merge(attrs)
+      Config::VALID_OPTIONS_KEYS.each do |key|
+        instance_variable_set("@#{key}".to_sym, attrs[key])
+      end
+    end # def initialize
+            
+    def sign_on_redirect
+      @sign_on_redirect ||= true
+    end # def sign_on_redirect
+    
+    def sign_request
+      @sign_request ||= true
+    end # def sign_request
     
-    # Perform an HTTP DELETE request
-    # @param [String] path The relative path
-    # @return [Faraday::Response]
-    # @example Delete the client "foo"
-    #   Spice.connection.delete("/clients/foo")
-    def delete(path)
-      response = request(:headers => build_headers(
-        :DELETE, 
-        "#{parsed_url.path}#{path}")
-      ).delete(
-        "#{server_url}#{path}"
-      )
-      return response
-    end # def delete
-    
-    private
-    
-    def authentication_headers(method, path, json_body=nil)
-      request_params = {
-        :http_method => method, 
-        :path => path.gsub(/\?.*$/, ''),
-        :body => json_body, 
-        :host => "#{parsed_url.host}:#{parsed_url.port}"
-      }
-      request_params[:body] ||= ""
-      signature_headers(request_params)
-    end # def authentication_headers
-    
-    def build_headers(method, path, json_body=nil)
-      headers={}
-      # headers['Accept']       = "application/json"
-      # headers["Content-Type"] = 'application/json' if json_body
-      headers['Content-Length'] = json_body.bytesize.to_s if json_body
-      headers.merge!(authentication_headers(method, path, json_body)) if sign_requests?
-      headers
-    end # def build_headers
-
   end # class Connection
 end # module Spice

data/lib/spice/connection/clients.rb

@@ -7,9 +7,9 @@ module Spice
       # @see Search#search
       # @example Retrieve all clients with names that begin with "app"
       #   Spice.clients(:q => "name:app*")
-      def clients(options={})
-        connection.search('client', options)
-      end
+      def clients(options=Mash.new)
+        search('client', options)
+      end # def clients
 
       # Retrieve a single client
       # @param [String] name The client name
@@ -18,10 +18,30 @@ module Spice
       # @example Retrieve the client named "admin"
       #   Spice.client("name")
       def client(name)
-        attributes = connection.get("/clients/#{name}").body
-        Spice::Client.new(attributes)
-      end
+        attributes = get("/clients/#{name}")
+        Spice::Client.get_or_new(attributes)
+      end # def client
+      
+      def create_client(params=Mash.new)
+        attributes = post("/clients", params)
+        Spice::Client.get_or_new(attributes)
+      end # def create_client
+      
+      def update_client(name, params=Mash.new)
+        attributes = put("/clients/#{name}", params)
+        Spice::Client.get_or_new(attributes)
+      end # def update_client
+      
+      def delete_client(name)
+        client = delete("/clients/#{name}")
+        nil
+      end # def delete_client
 
+      def reregister_client(name)
+        attributes = put("/clients/#{name}", :private_key => true)
+        Spice::Client.get_or_new(attributes)
+      end # def reregister_client
+      
     end # module Clients
   end # class Connection
 end # module Spice

data/lib/spice/connection/cookbooks.rb

@@ -8,18 +8,18 @@ module Spice
       def cookbooks
         if Gem::Version.new(Spice.chef_version) >= Gem::Version.new("0.10.0")
           cookbooks = []
-          connection.get("/cookbooks").body.each_pair do |key, value|
+          get("/cookbooks?num_versions=all").each_pair do |key, value|
             versions = value['versions'].map{ |v| v['version'] }
-            cookbooks << Spice::Cookbook.new(:name => key, :versions => versions)
+            cookbooks << Spice::Cookbook.get_or_new(:name => key, :versions => versions)
           end
           cookbooks
         else
-          connection.get("/cookbooks").body.keys.map do |cookbook|
-            attributes = connection.get("/cookbooks/#{cookbook}").body.to_a[0]
-            Spice::Cookbook.new(:name => attributes[0], :versions => attributes[1])
+          get("/cookbooks").keys.map do |cookbook|
+            cb = get("/cookbooks/#{cookbook}")
+            Spice::Cookbook.get_or_new(:name => cookbook, :versions => cb[cookbook])
           end
         end
-      end
+      end # def cookbooks
 
       # Retrieve a single cookbook
       # @param [String] name The name of the cookbook
@@ -27,15 +27,15 @@ module Spice
       # @raise [Spice::Error::NotFound] raised when cookbook does not exist
       def cookbook(name)
         if Gem::Version.new(Spice.chef_version) >= Gem::Version.new("0.10.0")
-          cookbook = connection.get("/cookbooks/#{name}").body
+          cookbook = get("/cookbooks/#{name}")
           versions = cookbook[name]['versions'].map{ |v| v['version'] }
 
-          Spice::Cookbook.new(:name => name, :versions => versions)
+          Spice::Cookbook.get_or_new(:name => name, :versions => versions)
         else
-          cookbook = connection.get("/cookbooks/#{name}").body
-          Spice::Cookbook.new(:name => name, :versions => cookbook[name])
+          cookbook = get("/cookbooks/#{name}")
+          Spice::Cookbook.get_or_new(:name => name, :versions => cookbook[name])
         end
-      end
+      end # def cookbook
       
       # Retrieve a single cookbook version
       # @param [String] name The cookbook name
@@ -43,11 +43,16 @@ module Spice
       # @return [Spice::CookbookVersion]
       # @raise [Spice::Error::NotFound] raised when cookbook version does not exist
       def cookbook_version(name, version)
-        attributes = connection.get("/cookbooks/#{name}/#{version}").body
+        attributes = get("/cookbooks/#{name}/#{version}")
         duped_attributes = attributes.dup
         duped_attributes[:_attributes] = attributes['attributes']
-        Spice::CookbookVersion.new(duped_attributes)
-      end
+        Spice::CookbookVersion.get_or_new(duped_attributes)
+      end # def cookbook_version
+      
+      def delete_cookbook_version(name, version)
+        delete("/cookbooks/#{name}/#{version}")
+        nil
+      end # def delete_cookbook_version
       
     end # module Cookbooks
   end # class Connection

data/lib/spice/connection/data_bags.rb

@@ -6,11 +6,11 @@ module Spice
       # @example Retrieve all data bags
       #   Spice.data_bags
       def data_bags
-        connection.get("/data").body.keys.map do |data_bag|
-          items = connection.search(data_bag)
-          Spice::DataBag.new(:name => data_bag, :items => items)
+        get("/data").keys.map do |data_bag|
+          items = search(data_bag)
+          Spice::DataBag.get_or_new(:name => data_bag, :items => items)
         end
-      end
+      end # def data_bags
 
       alias :data :data_bags
       
@@ -19,9 +19,9 @@ module Spice
       # @return [Spice::DataBag]
       # @raise [Spice::Error::NotFound] raised when data bag does not exist
       def data_bag(name)
-        items = connection.search(name)
-        Spice::DataBag.new(:name => name, :items => items)
-      end
+        items = search(name)
+        Spice::DataBag.get_or_new(:name => name, :items => items)
+      end # def data_bag
 
       # Retrieve a single data bag item
       # @param [String] name The data bag name
@@ -29,20 +29,31 @@ module Spice
       # @return [Spice::DataBagItem]
       # @raise [Spice::Error::NotFound] raised when data bag item does not exist
       def data_bag_item(name, id)
-        data = connection.get("/data/#{name}/#{id}")
-        data.delete('id')
-        Spice::DataBagItem.new(:_id => id, :data => data, :name => name)
-      end
-
-      private
-
-      def get_data_bag_items(name)
-        connection.get("/data/#{name}").body.keys.map do |id|
-          data = connection.get("/data/#{name}/#{id}").body
-          Spice::DataBagItem.new(:_id => id, :data => data, :name => name)
-        end
-      end
+        data_bag_item = get("/data/#{name}/#{id}")
+        Spice::DataBagItem.get_or_new(data_bag_item)
+      end # def data_bag_item
 
+      def create_data_bag(name)
+        attributes = post("/data", :name => name)
+        Spice::DataBag.get_or_new(:name => name, :items => [])
+      end # def create_data_bag
+      
+      def create_data_bag_item(name, params=Mash.new)
+        attributes = post("/data/#{name}", params)
+        Spice::DataBagItem.get_or_new(attributes)
+      end # def create_data_bag_item
+      
+      def update_data_bag_item(name, id, params=Mash.new)
+        params.merge!(:id => id)
+        attributes = put("/data/#{name}/#{id}", params)
+        Spice::DataBagItem.get_or_new(attributes)
+      end # update_data_bag_item
+      
+      def delete_data_bag_item(name, id)
+        delete("/data/#{name}/#{id}")
+        nil
+      end # def delete_data_bag_item
+      
     end # module DataBags
   end # class Connection
 end # module Spice

data/lib/spice/connection/environments.rb

@@ -7,9 +7,9 @@ module Spice
       # @see Search#search
       # @example Retrieve all environments with names that begin with "prod"
       #   Spice.environments(:q => "name:prod*")
-      def environments(options={})
-        connection.search('environment', options)
-      end
+      def environments(options=Mash.new)
+        search('environment', options)
+      end # def environment
 
       # Retrieve a single environment
       # @param [String] name The environment name
@@ -18,10 +18,9 @@ module Spice
       # @example Retrieve the environment named "production"
       #   Spice.environment("production")
       def environment(name)
-        attributes = connection.get("/environments/#{name}").body
-        attributes['attrs'] = attributes.delete('attributes')
-        Spice::Environment.new(attributes)
-      end
+        attributes = get("/environments/#{name}")
+        Spice::Environment.get_or_new(attributes)
+      end # def environment
 
     end # module Environments
   end # class Connection

data/lib/spice/connection/nodes.rb

@@ -9,9 +9,9 @@ module Spice
       #   Spice.nodes(:q => "roles:base")
       # @example Retrieve nodes with role "base" in the "production" environment
       #   Spice.nodes(:q => "roles:base AND environment:production")
-      def nodes(options={})
-        connection.search('node', options)
-      end
+      def nodes(options=Mash.new)
+        search('node', options)
+      end # def nodes
 
       # Retrieve a  single client
       # @param [String] name The node name
@@ -20,10 +20,27 @@ module Spice
       # @example Retrieve the node named "app.example.com"
       #   Spice.node("app.example.com")
       def node(name)
-        node_attributes = connection.get("/nodes/#{name}").body
-        Spice::Node.new(node_attributes)
-      end
+        attributes = get("/nodes/#{name}")
+        Spice::Node.get_or_new(attributes)
+      end # def node
 
+      alias :get_node :node
+      
+      def create_node(params=Mash.new)
+        node = Spice::Node.new(params)
+        node_attributes = post("/nodes", node.to_hash)
+        get_node("/nodes/#{node.name}")
+        Spice::Node.get_or_new(attributes)
+      end # def create_node
+
+      # TODO(dryan): be able to update a node
+      # def update_node(params=Mash.new)
+      #   node = Spice::Node.new(params)
+      #   node.attrs.update get_node(node.name)
+      #   attributes = put("/nodes/#{node.name}", node.attrs)
+      #   Spice::Node.get_or_new(attributes)
+      # end
+      
     end # module Nodes
   end # class Connection
 end # module Spice

data/lib/spice/connection/roles.rb

@@ -7,9 +7,9 @@ module Spice
       # @see Search#search
       # @example Retrieve all roles that start with "app_"
       #   Spice.roles(:q => "name:app_*")
-      def roles(options={})
-        connection.search('role', options)
-      end
+      def roles(options=Mash.new)
+        search('role', options)
+      end # def roles
 
       # Retrieve a single role
       # @param [String] name The role name
@@ -18,9 +18,9 @@ module Spice
       # @example Retrieve the role "app_server"
       #   Spice.role("app_server")
       def role(name)
-        attributes = connection.get("/roles/#{name}").body
+        attributes = get("/roles/#{name}")
         Spice::Role.new(attributes)
-      end
+      end # def role
 
     end # module Roles
   end # class Connection