spice 0.8.0 → 1.0.0.pre

data/.gitignore

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

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Release Notes - Spice - Version 1.0.0
+
+## Removed
+
+* Old-style connections are no longer supported. Please use the connection string like Chef uses (ex. http://chef.example.com:4000)
+
 # Release Notes - Spice - Version 0.5.0
 
 ## Bug

data/Gemfile

@@ -3,14 +3,14 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'rspec', '>= 2.6.0'
-  gem "webmock", ">= 1.6.2"
+  gem 'rspec', '>= 2.8.0'
+  gem "webmock", ">= 1.7.10"
   gem "timecop", ">= 0.3.5"
   gem 'fakefs', '>= 0.3.2'
-  gem 'guard', '>= 0.6.2'
-  gem 'guard-rspec', '>= 0.4.2'
-  gem 'guard-spork', '>= 0.2.1'
-  gem 'spork', '>= 0.9.0.rc8'
+  gem 'guard', '>= 0.10.0'
+  gem 'guard-rspec', '>= 0.6.0'
+  gem 'guard-spork', '>= 0.5.1'
+  gem 'spork', '>= 0.9.0.rc9'
   gem 'rb-fsevent', '>= 0.4.3.1'
   gem 'growl', '>= 1.0.3'
 end

data/README.md

@@ -10,71 +10,9 @@ Install this beast via Rubygems:
     
 Of course, You can always grab the source from http://github.com/danryan/spice.
 
-## Configuration
-
-Spice has four configuration variables: 
-
-    Spice.server_url    # default: http://localhost:4000
-	  Spice.chef_version	# default: 0.10.4. Should be set to the version you have
-    Spice.client_name   # default: nil. Must be set to a valid admin Chef client
-    Spice.key_file      # default: nil. Must be set to a file path
-
-To connect to a Chef server at https://chef.example.com:5000 with the "admin" API client, throw this somewhere your app can initialize:
-
-    Spice.server_url = "http://chef.example.com:4000"
-    Spice.client_name = "admin"
-    Spice.key_file = "/path/to/keyfile.pem"
-
-Say you had a Chef server v0.10.4 running locally on port 4000 over HTTP, you only need to set your `client_name` and `key_file` path:
-
-    Spice.client_name = "admin"
-    Spice.key_file = "/path/to/keyfile.pem"
-
-
-You can also use the Spice.setup block if you prefer this style:
-
-    Spice.setup do |s|
-      s.server_url = "http://chef.example.com:4000"
-      s.client_name = "admin"
-      s.key_file = "/path/to/keyfile.pem"
-    end
-
-Next, we need to create the connection object you'll use to sign your requests and pass them to the Chef server. Previous versions of Spice required you to explicitly call `Spice.connect!` to set up the connection object. If you use the `Spice.setup` block, it will call `.connect!` for you:
-
-    Spice.connect!
-    
-If you want to reset your config to their default values:
-
-    Spice.reset!
-    
 ### Deprecation notice
 
-Explicitly setting a `host`, `port`, and `scheme` value has been deprecated in favor of setting a single variable, `server_url`, which matches the format of Chef's client config parameter, `chef_server_url`. The old way of defining `host`, `port`, and `scheme` are still currently available but will be removed from future versions.
-
-## Usage
-
-### Low-level use
-
-Setting up spice and running `Spice.connect!` creates a connection object that can then be used to send requests to your Chef server, accessed via `Spice.connection`.  
-
-Get a list of all clients:
-
-    Spice.connection.get("/clients")
-
-Get a specific node by the name "slappypants":
-
-    Spice.connection.get("/nodes/slappypants")
-    
-Create a new role called "awesome":
-
-    Spice.connection.post("/roles", :name => "awesome")
-
-Make the client "sweet" an admin:
-    
-    Spice.connection.put("/clients/sweet", :admin => true)
-
-Read the wiki for more examples.
-
+Explicitly setting a `host`, `port`, and `scheme` value has been deprecated in favor of setting a single variable, `server_url`, which matches the format of Chef's client config parameter, `chef_server_url`. The old way of defining `host`, `port`, and `scheme` has been removed.
 
 ### Contributors
 
@@ -82,6 +20,10 @@ Read the wiki for more examples.
 * [Holger Just](https://github.com/meineerde) - Search functionality
 * [Sean Porter](https://github.com/portertech) - Platform bug fixes
 
+### Hat tip
+
+Spice is very heavily inspired by the [Twitter gem](http://github.com/jnunemaker/twitter). Mad props to those folks.
+
 ## 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,174 +1,79 @@
-require 'rest-client'
+require 'toystore'
+require 'adapter/memory'
 require 'mixlib/authentication'
-require 'yajl'
-require 'cgi'
 
+require 'spice/config'
+require 'spice/error'
 require 'spice/authentication'
 require 'spice/chef'
 
-require 'spice/core_ext/hash'
-
 require 'spice/role'
 require 'spice/client'
 require 'spice/cookbook'
+require 'spice/cookbook_version'
 require 'spice/data_bag'
+require 'spice/data_bag_item'
 require 'spice/node'
 require 'spice/environment'
-require 'spice/search'
 require 'spice/connection'
 
+require 'spice/connection/clients'
+require 'spice/connection/cookbooks'
+require 'spice/connection/data_bags'
+require 'spice/connection/environments'
+require 'spice/connection/nodes'
+require 'spice/connection/roles'
+require 'spice/connection/search'
+
 require 'spice/version'
 require 'spice/mock'
 
 module Spice
-
-  class << self
-    attr_writer :server_url, :client_name, :connection, :host, :port, :scheme,
-                :key_file, :raw_key, :chef_version, :url_path
-
-    def default_server_url
-      @default_server_url ||= "http://localhost:4000"
-    end
-
-    def default_url_path
-      @default_url_path ||= ""
-    end
-
-    def default_host
-      @default_host ||= "localhost"
-    end
-    
-    def default_port
-      @default_port ||= "4000"
-    end
-    
-    def default_scheme
-      @default_scheme ||= "http"
-    end
-    
-    def server_url
-      @server_url || default_server_url
-    end
-    
-    def url_path
-      @url_path || default_url_path
-    end
-    
-    def host
-      @host || default_host
-    end
-    
-    def port
-      @port || default_port
-    end
-    
-    def scheme
-      @scheme || default_scheme
-    end
+  extend Config
+  extend self
+  
+  extend Spice::Connection::Clients
+  extend Spice::Connection::Cookbooks
+  extend Spice::Connection::DataBags
+  extend Spice::Connection::Environments
+  extend Spice::Connection::Nodes
+  extend Spice::Connection::Roles
+  extend Spice::Connection::Search
     
-    def client_name
-      @client_name
-    end
-
-    def key_file
-      @key_file
-    end
-
-    def raw_key
-      @raw_key
-    end
-
-    def key_file=(new_key_file)
-      raw_key = File.read(new_key_file)
-      assert_valid_key_format!(raw_key)
-      @key_file = new_key_file
-      @raw_key = raw_key
-    end
-
-    def default_chef_version
-      @default_chef_version ||= "0.10.4"
-    end
-    
-    def chef_version
-      @chef_version || default_chef_version
-    end
-
-    def connection
-      @connection
-    end
-
-    def connect!
-      # allow old-style connection setup
-      if host != default_host || port != default_port || scheme != default_scheme || url_path != default_url_path
-        url = "#{scheme}://#{host}:#{port}#{url_path}"
-      else
-        url = server_url
-      end
-      @connection = Connection.new(
-        :server_url => url,
-        :client_name => client_name,
-        :key_file => key_file
-      )
-    end
-
-    def reset!
-      @server_url = default_server_url
-      @host = default_host
-      @port = default_port
-      @scheme = default_scheme
-      @chef_version = default_chef_version
-      @key_file = nil
-      @client_name = nil
-      @connection = nil
-    end
-
-    def setup
-      if block_given?
-        yield self
-      end
-      connect!
-    end
+  def connection
+    @connection ||= Connection.new(
+      :server_url => server_url,
+      :client_name => client_name,
+      :key_file => key_file
+    )
+  end
 
-    def mock
-      Spice::Mock.setup_mock_client
-    end
+  def mock
+    Spice::Mock.setup_mock_client
+  end
 
-    # def autoconfigure!(path=nil)
-    #   path ||= "~/.chef/"
-    #   knife = File.exist?("~/.chef/knife.rb") && File.expand_path(path + "~/.chef/knife.rb")
-    #   client = File.exist?("/etc/chef/client.rb") && File.expand_path("/etc/chef/client.rb")
-    #   
-    #   if knife
-    #     raw_config = IO.read(knife)
-    #   elsif
-    #     raw_config = IO.read(client)
-    #   end
-    #   
-    #   @values = {}
-    #   raw_config.each_line do |line|
-    #     if line =~ /^chef_server_url.*/
-    #       @values[:chef_server_url] = parse_line(line)
-    #     elsif line =~ /^node_name.*/
-    #       @values[:node_name] = parse_line(line)
-    #     elsif line =~ /^client_key.*/
-    #       @values[:client_key] = parse_line(line)
-    #     end
-    #   end
-    # end
+  # def autoconfigure!(path=nil)
+  #   path ||= "~/.chef/"
+  #   knife = File.exist?("~/.chef/knife.rb") && File.expand_path(path + "~/.chef/knife.rb")
+  #   client = File.exist?("/etc/chef/client.rb") && File.expand_path("/etc/chef/client.rb")
+  #   
+  #   if knife
+  #     raw_config = IO.read(knife)
+  #   elsif
+  #     raw_config = IO.read(client)
+  #   end
+  #   
+  #   @values = {}
+  #   raw_config.each_line do |line|
+  #     if line =~ /^chef_server_url.*/
+  #       @values[:chef_server_url] = parse_line(line)
+  #     elsif line =~ /^node_name.*/
+  #       @values[:node_name] = parse_line(line)
+  #     elsif line =~ /^client_key.*/
+  #       @values[:client_key] = parse_line(line)
+  #     end
+  #   end
+  # end
     
-    private
 
-    def assert_valid_key_format!(raw_key)
-      unless (raw_key =~ /\A-----BEGIN RSA PRIVATE KEY-----$/) &&
-         (raw_key =~ /^-----END RSA PRIVATE KEY-----\Z/)
-        msg = "The file #{key_file} does not contain a correctly formatted private key.\n"
-        msg << "The key file should begin with '-----BEGIN RSA PRIVATE KEY-----' and end with '-----END RSA PRIVATE KEY-----'"
-        raise ArgumentError, msg
-      end
-    end
-    
-    def parse_line(line)
-      line.strip.split.last.gsub("'", "")
-    end
-  end
 end

data/lib/spice/client.rb

@@ -1,42 +1,29 @@
+require 'spice/persistence'
+
 module Spice
-  class Client < Spice::Chef    
-    def self.all(options={})
-      if options[:complete]
-        results = []
-        connection.get("clients").map { |c| c[0] }.each do |client|
-          results << connection.get("/clients/#{client}")
-        end
-        results
-      else
-        connection.get("/clients")
-      end
-    end
-    
-    def self.[](name)
-      connection.get("/clients/#{name}")
-    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
+  class Client
+    include Toy::Store
+    include Spice::Persistence
+    extend Spice::Persistence
+    store :memory, {}
+    endpoint "clients"
     
-    def self.update(options={})
-      raise ArgumentError, "Option :name must be present" unless options[:name]
-      name = options.delete(:name)
-      connection.put("/clients/#{name}", options)
-    end
+    attribute :name, String
+    attribute :public_key, String
+    attribute :private_key, String
+    attribute :_rev, String
+    attribute :json_class, String, :default => "Chef::ApiClient"
+    attribute :admin, Boolean, :default => false
+    attribute :chef_type, String, :default => "client"
     
-    def self.delete(options={})
-      raise ArgumentError, "Option :name must be present" unless options[:name]
-      name = options.delete(:name)
-      connection.delete("/clients/#{name}", options)
+    validates_presence_of :name, :json_class, :chef_type
+
+
+    def do_post
+      response = connection.post("/clients", :name => name)
+      update_attributes(response.body)
+      response = connection.get("/clients/#{name}")
+      update_attributes(response.body)
     end
   end
 end

data/lib/spice/config.rb

@@ -0,0 +1,52 @@
+require 'spice/version'
+
+module Spice
+  module Config
+    DEFAULT_SERVER_URL = "http://localhost:4000"
+    
+    DEFAULT_CHEF_VERSION = "0.10.8"
+        
+    DEFAULT_USER_AGENT = "Spice #{Spice::VERSION}"
+    
+    DEFAULT_CONNECTION_OPTIONS = {}
+    
+    VALID_OPTIONS_KEYS = [
+      :server_url,
+      :client_name,
+      :key_file,
+      :raw_key,
+      :chef_version,
+      :adapter,
+      :user_agent,
+      :connection_options
+    ]
+    
+    attr_accessor *VALID_OPTIONS_KEYS
+    
+    def self.extended(base)
+      base.reset
+    end
+    
+    def setup
+      yield self
+      self
+    end
+    
+    def options
+      options = {}
+      VALID_OPTIONS_KEYS.each{|k| options[k] = send(k)}
+      options
+    end
+    
+    def reset
+      self.user_agent = DEFAULT_USER_AGENT
+      self.server_url = DEFAULT_SERVER_URL
+      self.chef_version = DEFAULT_CHEF_VERSION
+      self.client_name = nil
+      self.key_file = nil
+      self.raw_key = nil
+      self.connection_options = DEFAULT_CONNECTION_OPTIONS
+    end
+    
+  end
+end