spice 0.6.0 → 0.7.0

data/Gemfile

@@ -1,18 +1,20 @@
 source "http://rubygems.org"
 
-gem 'rest-client'
-gem 'mixlib-authentication'
-gem 'yajl-ruby'
+gemspec
 
 group :development, :test do
-  gem "yard", "~> 0.6.4"
   gem 'rspec', '>= 2.6.0'
   gem "webmock", ">= 1.6.2"
   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 'rb-fsevent', '>= 0.4.3.1'
   gem 'growl', '>= 1.0.3'
+end
+
+group :doc do
+  gem 'yard'
 end

data/Rakefile

@@ -1,26 +1,26 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
-require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+task :default => :spec
+desc "Run specs"
+RSpec::Core::RakeTask.new do |task|
+  task.pattern = "spec/**/*_spec.rb"
+end
+  
+desc "Run guard"
+task :guard do
+  sh %{bundle exec guard start}
 end
 
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new(:cucumber)
-
-task :default => :spec
+desc "Run spork"
+task :spork do
+  sh %{bundle exec spork}
+end
 
-require 'yard'
-YARD::Rake::YardocTask.new
 
-desc "Run watchr"
-task :watchr do
-  sh %{bundle exec watchr .watchr}
+Bundler.require(:doc)
+desc "Generate documentation"
+YARD::Rake::YardocTask.new do |t|
+  t.files = [ 'lib/**/*.rb' ]
 end

data/lib/spice.rb

@@ -23,34 +23,19 @@ require 'spice/mock'
 module Spice
 
   class << self
-    attr_writer :host, :port, :scheme, :url_path, :client_name, :connection, :key_file, :raw_key, :chef_version
+    attr_writer :server_url, :client_name, :connection, 
+                :key_file, :raw_key, :chef_version
 
-    def default_host
-      @default_host || "localhost"
-    end
-
-    def default_port
-      @default_port || "4000"
-    end
-
-    def default_scheme
-      @default_scheme || "http"
+    def default_server_url
+      @default_server_url || "http://localhost:4000"
     end
 
     def default_url_path
       @default_url_path || ""
     end
 
-    def host
-      @host || default_host
-    end
-
-    def port
-      @port || default_port
-    end
-
-    def scheme
-      @scheme || default_scheme
+    def server_url
+      @server_url || default_server_url
     end
 
     def client_name
@@ -73,16 +58,12 @@ module Spice
     end
 
     def default_chef_version
-      @default_chef_version || "0.9.14"
+      @default_chef_version || "0.10.4"
     end
     
     def chef_version
       @chef_version || default_chef_version
     end
-    
-    def url_path
-      @url_path || default_url_path
-    end
 
     def connection
       @connection
@@ -90,17 +71,14 @@ module Spice
 
     def connect!
       @connection = Connection.new(
-        :url => "#{scheme}://#{host}:#{port}#{url_path}",
+        :server_url => server_url,
         :client_name => client_name,
         :key_file => key_file
       )
     end
 
     def reset!
-      @host = default_host
-      @port = default_port
-      @scheme = default_scheme
-      @url_path = default_url_path
+      @server_url = default_server_url
       @chef_version = default_chef_version
       @key_file = nil
       @client_name = nil
@@ -108,13 +86,39 @@ module Spice
     end
 
     def setup
-      yield self
+      if block_given?
+        yield self
+      end
+      connect!
     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
+    
     private
 
     def assert_valid_key_format!(raw_key)
@@ -125,5 +129,9 @@ module Spice
         raise ArgumentError, msg
       end
     end
+    
+    def parse_line(line)
+      line.strip.split.last.gsub("'", "")
+    end
   end
 end

data/lib/spice/connection.rb

@@ -1,15 +1,14 @@
-require 'yajl/json_gem'
+require 'yajl'
 
 module Spice
   class Connection
-    attr_accessor :client_name, :key_file, :auth_credentials, :url, :path, :port, :scheme, :host
+    attr_accessor :client_name, :key_file, :auth_credentials, :server_url, :url_path
     
     def initialize(options={})
-      endpoint          = URI.parse(options[:url])
-      @url              = options[:url]
-      @host             = endpoint.host
-      @scheme           = endpoint.scheme
+      endpoint          = URI.parse(options[:server_url])
+      @server_url       = options[:server_url]
       @port             = endpoint.port
+      @scheme           = endpoint.scheme
       @url_path         = endpoint.path
       @auth_credentials = Authentication.new(options[:client_name], options[:key_file])
       @sign_on_redirect, @sign_request = true, true
@@ -18,10 +17,11 @@ module Spice
     def get(path, headers={})
       begin
         response = RestClient.get(
-          "#{@url}#{path}", 
+          "#{@server_url}#{path}", 
           build_headers(:GET, "#{@url_path}#{path}", headers)
         )
-        response
+        puts "#{@server_url}#{path}"
+        return Yajl.load(response.body)
        
       rescue => e
         e.response
@@ -31,10 +31,12 @@ module Spice
     def post(path, payload, headers={})
       begin
         response = RestClient.post(
-          "#{@url}#{path}",
-          JSON.generate(payload),
-          build_headers(:POST, "#{@url_path}#{path}", headers, JSON.generate(payload))
-        )        
+          "#{@server_url}#{path}",
+          Yajl.dump(payload),
+          build_headers(:POST, "#{@url_path}#{path}", headers, Yajl.dump(payload))
+        )      
+        return Yajl.load(response.body)
+          
       rescue => e
         e.response
       end
@@ -43,11 +45,12 @@ module Spice
     def put(path, payload, headers={})
       begin
         response = RestClient.put(
-          "#{@url}#{path}",
-          JSON.generate(payload),
-          build_headers(:PUT, "#{@url_path}#{path}", headers, JSON.generate(payload))
+        "#{@server_url}#{path}",
+          Yajl.dump(payload),
+          build_headers(:PUT, "#{@url_path}#{path}", headers, Yajl.dump(payload))
         )
-        response
+        return Yajl.load(response.body)
+        
       rescue => e
         e.response
       end
@@ -56,10 +59,11 @@ module Spice
     def delete(path, headers={})
       begin
         response = RestClient.delete(
-          "#{@url}#{path}",
+        "#{@server_url}#{path}",
           build_headers(:DELETE, "#{@url_path}#{path}", headers)
         )
-        response
+        return Yajl.load(response.body)
+        
       rescue => e
         e.response
       end

data/lib/spice/core_ext/hash.rb

@@ -1,11 +1,21 @@
-class Hash
-  def symbolize_keys!
-    keys.each do |key|
-      self[(key.to_sym rescue key) || key] = delete(key)
+module Spice
+  module CoreExt
+    module Hash
+
+      def symbolize_keys!
+        keys.each do |key|
+          self[(key.to_sym rescue key) || key] = delete(key)
+        end
+        self
+      end
+      def symbolize_keys
+        dup.symbolize_keys!
+      end
+      
     end
-    self
-  end
-  def symbolize_keys
-    dup.symbolize_keys!
   end
+end
+
+class Hash
+  extend Spice::CoreExt::Hash
 end

data/lib/spice/mock.rb

@@ -3,10 +3,10 @@ module Spice
     class << self
       def setup_mock_client
         self.setup_authentication
-        Spice.host = 'localhost'
+        Spice.server_url = 'http://localhost:4000'
         Spice.client_name = "testclient"
         Spice.key_file = "/tmp/keyfile.pem"
-        Spice.chef_version = "0.9.14"
+        Spice.chef_version = "0.10.4"
         Spice.connect!
       end
 

data/lib/spice/version.rb

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

data/spec/spec_helper.rb

@@ -11,19 +11,25 @@ Spork.prefork do
   require 'webmock/rspec'
   require 'timecop'
   require 'rest-client'
-
+  require 'fakefs'
+  require 'fileutils'
+  
   require 'spice'
+  
   # Requires supporting files with custom matchers and macros, etc,
   # in ./support/ and its subdirectories.
-  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
   RSpec.configure do |config|
     config.before do
+      Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+      
       Timecop.freeze
       Spice.mock
+      FakeFS.activate!
     end
     config.after do
       Timecop.return
+      FakeFS.deactivate!
     end
   end
 end

data/spec/spice_spec.rb

@@ -1,95 +1,37 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Spice" do
-  describe ".default_host" do
-    it "should default to 'localhost'" do
-      Spice.default_host.should == "localhost"
+  describe ".default_server_url" do
+    it "should default to 'http://localhost:4000'" do
+      Spice.default_server_url.should == "http://localhost:4000"
     end
     it "should not be settable" do
-      lambda { Spice.default_host = "chef.example.com" }.should raise_error
-    end
-    # @default_host || "localhost"
-  end
-  
-  describe ".default_port" do
-    it "should default to '4000'" do
-      Spice.default_port.should == "4000"
-    end
-    it "should not be settable" do
-      lambda { Spice.default_port = "9000" }.should raise_error
-    end
-  end
-  
-  describe ".default_scheme" do
-    it "should default to 'http'" do
-      Spice.default_scheme.should == "http"
-    end
-    it "should not be settable" do
-      lambda { Spice.default_scheme = "ftp" }.should raise_error
-    end
-  end
-
-  describe ".default_url_path" do
-    it "should default to ''" do
-      Spice.default_url_path.should == ""
-    end
-    it "should not be settable" do
-      lambda { Spice.default_url_path = "/woohah" }.should raise_error
+      lambda { Spice.default_server_url = "chef.example.com" }.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"
+    it "should default to '0.10.4'" do
+      Spice.default_chef_version.should == "0.10.4"
     end
     it "should not be settable" do
       lambda { Spice.default_chef_version = "0.9.12" }.should raise_error
     end
   end
     
-  describe ".host" do
+  describe ".server_url" do
     it "should default to 'localhost' if not set" do
-      Spice.host.should == "localhost"
-    end
-    it "should be settable" do
-      Spice.host = "chef.example.com"
-      Spice.host.should == "chef.example.com"
-    end
-  end
-  
-  describe ".port" do
-    it "should default to '4000' if not set" do
-      Spice.port.should == "4000"
-    end
-    it "should be settable" do
-      Spice.port = "9000"
-      Spice.port.should == "9000"
-    end
-  end
-  
-  describe ".scheme" do
-    it "should default to 'http' if not set" do
-      Spice.scheme.should == "http"
+      Spice.server_url.should == "http://localhost:4000"
     end
     it "should be settable" do
-      Spice.scheme = 'https'
-      Spice.scheme.should == 'https'
-    end
-  end
-  
-  describe ".url_path" do
-    it "should default to '' if not set" do
-      Spice.url_path.should == ""
-    end
-    it "should be settable" do
-      Spice.url_path = "/woohah"
-      Spice.url_path.should == "/woohah"
+      Spice.server_url = "https://chef.example.com:4000"
+      Spice.server_url.should == "https://chef.example.com:4000"
     end
   end
   
   describe ".chef_version" do
-    it "should default to '0.9.14' if not set" do
-      Spice.chef_version.should == "0.9.14"
+    it "should default to '0.10.4' if not set" do
+      Spice.chef_version.should == "0.10.4"
     end
     it "should be settable" do
       Spice.chef_version = "0.9.12"
@@ -131,33 +73,20 @@ describe "Spice" do
     end
   end
   
+  
   describe ".reset!" do
     before do 
-      Spice.host = "chef.example.com"
-      Spice.port = "9000"
-      Spice.scheme = "https"
+      Spice.server_url = "chef.example.com"
       Spice.key_file = "/tmp/keyfile.pem"
       Spice.client_name = "testduder"
     end
-    it "should reset Spice.host" do
-      Spice.reset!
-      Spice.host.should == "localhost"
-    end
-    it "should reset Spice.port" do
+    it "should reset Spice.server_url" do
       Spice.reset!
-      Spice.port.should == "4000"
-    end
-    it "should reset Spice.scheme" do
-      Spice.reset!
-      Spice.scheme.should == "http"
+      Spice.server_url.should == "http://localhost:4000"
     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 == ""
+      Spice.chef_version.should == "0.10.4"
     end
     it "should unset Spice.key_file" do
       Spice.reset!
@@ -174,8 +103,19 @@ describe "Spice" do
       Spice.connect!
       Spice.connection.should be_a_kind_of(Spice::Connection)
     end
-    it "connection should contain a host" do
-      Spice.connection.host.should == "localhost"
+    it "connection should contain a server_url" do
+      Spice.connection.server_url.should == "http://localhost:4000"
+    end
+  end
+  
+  describe ".autoconfigure!" do
+    it "should locate /etc/chef/client.rb and create a connection object" do
+    end
+    
+    it "should locate ~/.chef/client.rb and create a connection object" do
+    end
+    
+    it "should locate ~/.chef/knife.rb and create a connection object" do
     end
   end
 end

data/spice.gemspec

@@ -14,15 +14,20 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "spice"
   
-  s.add_dependency "rest-client"
-  s.add_dependency "mixlib-authentication"
-  s.add_dependency "yajl-ruby"
+  s.add_dependency "rake", ">= 0.9.2"
+  s.add_dependency "rest-client", '>= 1.6.6'
+  s.add_dependency "mixlib-authentication", '>= 1.1.4'
+  s.add_dependency "yajl-ruby", '>= 0.8.3'
   
-  s.add_development_dependency "yard", "~> 0.6.4"
-  s.add_development_dependency "rspec", "~> 2.5.0"
-  s.add_development_dependency "webmock", "~> 1.6.2"
-  s.add_development_dependency "timecop", "~> 0.3.5"
-  s.add_development_dependency "webmock", "~> 1.6.2"
+  s.add_development_dependency 'rspec', '>= 2.6.0'
+  s.add_development_dependency "webmock", ">= 1.6.2"
+  s.add_development_dependency "timecop", ">= 0.3.5"
+  s.add_development_dependency 'guard', '>= 0.6.2'
+  s.add_development_dependency 'guard-rspec', '>= 0.4.2'
+  s.add_development_dependency 'guard-spork', '>= 0.2.1'
+  s.add_development_dependency 'spork', '>= 0.9.0.rc8'
+  s.add_development_dependency 'rb-fsevent', '>= 0.4.3.1'
+  s.add_development_dependency 'growl', '>= 1.0.3'
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spice
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,96 +9,151 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-28 00:00:00.000000000Z
+date: 2011-09-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &70110849680300 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70138046296360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70110849680300
+  version_requirements: *70138046296360
 - !ruby/object:Gem::Dependency
-  name: mixlib-authentication
-  requirement: &70110849679800 !ruby/object:Gem::Requirement
+  name: rest-client
+  requirement: &70138046295740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70110849679800
+  version_requirements: *70138046295740
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &70110849679320 !ruby/object:Gem::Requirement
+  name: mixlib-authentication
+  requirement: &70138046295180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70110849679320
+  version_requirements: *70138046295180
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70110849678760 !ruby/object:Gem::Requirement
+  name: yajl-ruby
+  requirement: &70138046294600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
-  type: :development
+        version: 0.8.3
+  type: :runtime
   prerelease: false
-  version_requirements: *70110849678760
+  version_requirements: *70138046294600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70110849678260 !ruby/object:Gem::Requirement
+  requirement: &70138046294020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70110849678260
+  version_requirements: *70138046294020
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70110849677800 !ruby/object:Gem::Requirement
+  requirement: &70138046293460 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70110849677800
+  version_requirements: *70138046293460
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70110849677300 !ruby/object:Gem::Requirement
+  requirement: &70138046292880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70110849677300
+  version_requirements: *70138046292880
 - !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &70110849676800 !ruby/object:Gem::Requirement
+  name: guard
+  requirement: &70138046292360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 0.6.2
+  type: :development
+  prerelease: false
+  version_requirements: *70138046292360
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70138046291860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :development
+  prerelease: false
+  version_requirements: *70138046291860
+- !ruby/object:Gem::Dependency
+  name: guard-spork
+  requirement: &70138046291280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :development
+  prerelease: false
+  version_requirements: *70138046291280
+- !ruby/object:Gem::Dependency
+  name: spork
+  requirement: &70138046290720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0.rc8
+  type: :development
+  prerelease: false
+  version_requirements: *70138046290720
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70138046290160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *70138046290160
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: &70138046289700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
   type: :development
   prerelease: false
-  version_requirements: *70110849676800
+  version_requirements: *70138046289700
 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
@@ -152,7 +207,6 @@ files:
 - 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
 - spice.gemspec
@@ -168,12 +222,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3716504645551320101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3716504645551320101
 requirements: []
 rubyforge_project: spice
 rubygems_version: 1.8.8
@@ -200,6 +260,5 @@ test_files:
 - 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

data/spec/support/requests.rb

@@ -1,97 +0,0 @@
-# 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