ridley 0.7.0.beta → 0.7.0.rc1

data/lib/ridley/ssh.rb

@@ -8,7 +8,7 @@ module Ridley
     autoload :Worker, 'ridley/ssh/worker'
 
     class << self
-      # @param [Ridley::Node, Array<Ridley::Node>] nodes
+      # @param [Ridley::NodeResource, Array<Ridley::NodeResource>] nodes
       # @param [Hash] options
       def start(nodes, options = {}, &block)
         runner = new(nodes, options)
@@ -25,7 +25,7 @@ module Ridley
     attr_reader :nodes
     attr_reader :options
 
-    # @param [Ridley::Node, Array<Ridley::Node>] nodes
+    # @param [Ridley::NodeResource, Array<Ridley::NodeResource>] nodes
     # @param [Hash] options
     #   @see Net::SSH
     def initialize(nodes, options = {})

data/lib/ridley/ssh/worker.rb

@@ -8,11 +8,12 @@ module Ridley
 
       attr_reader :sudo
       attr_reader :user
+      # @return [Hashie::Mash]
       attr_reader :options
       
       # @param [Hash] options
       def initialize(options = {})
-        @options = options.dup
+        @options = options.deep_symbolize_keys
         @sudo    = @options[:sudo]
         @user    = @options[:user]
 

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.7.0.beta"
+  VERSION = "0.7.0.rc1"
 end

data/ridley.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'mixlib-log'
   s.add_runtime_dependency 'mixlib-authentication'
   s.add_runtime_dependency 'addressable'
-  s.add_runtime_dependency 'faraday'
+  s.add_runtime_dependency 'faraday', '>= 0.8.4'
   s.add_runtime_dependency 'activesupport', '>= 3.2.0'
   s.add_runtime_dependency 'celluloid'
   s.add_runtime_dependency 'net-ssh'

data/spec/acceptance/bootstrapping_spec.rb

@@ -7,7 +7,7 @@ describe "Bootstrapping a node", type: "acceptance" do
   let(:organization) { "vialstudios" }
 
   let(:connection) do
-    Ridley.connection(
+    Ridley.new(
       server_url: server_url,
       client_name: client_name,
       client_key: client_key,

data/spec/acceptance/client_resource_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe "Client API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com" }
+  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
-  let(:organization) { "ridley" }
 
   let(:connection) do
-    Ridley.connection(
+    Ridley.new(
       server_url: server_url,
       client_name: client_name,
-      client_key: client_key,
-      organization: organization
+      client_key: client_key
     )
   end
 
@@ -24,7 +22,7 @@ describe "Client API operations", type: "acceptance" do
 
   describe "finding a client" do
     let(:target) do
-      Ridley::Client.new(
+      Ridley::ClientResource.new(
         connection,
         name: "motherbrain-test",
         admin: false
@@ -35,11 +33,11 @@ describe "Client API operations", type: "acceptance" do
       connection.client.create(target)
     end
 
-    it "returns a valid Ridley::Client" do
+    it "returns a valid Ridley::ClientResource" do
       connection.sync do
         obj = client.find(target)
 
-        obj.should be_a(Ridley::Client)
+        obj.should be_a(Ridley::ClientResource)
         obj.should be_valid
       end
     end
@@ -47,15 +45,15 @@ describe "Client API operations", type: "acceptance" do
 
   describe "creating a client" do
     let(:target) do
-      Ridley::Client.new(
+      Ridley::ClientResource.new(
         connection,
         name: "motherbrain_test"
       )
     end
 
-    it "returns a Ridley::Client object" do
+    it "returns a Ridley::ClientResource object" do
       connection.sync do
-        client.create(target).should be_a(Ridley::Client)
+        client.create(target).should be_a(Ridley::ClientResource)
       end
     end
 
@@ -68,7 +66,7 @@ describe "Client API operations", type: "acceptance" do
 
   describe "deleting a client" do
     let(:target) do
-      Ridley::Client.new(
+      Ridley::ClientResource.new(
         connection,
         name: "motherbrain-test",
         admin: false
@@ -79,8 +77,8 @@ describe "Client API operations", type: "acceptance" do
       connection.client.create(target)
     end
 
-    it "returns a Ridley::Client object" do
-      connection.client.delete(target).should be_a(Ridley::Client)
+    it "returns a Ridley::ClientResource object" do
+      connection.client.delete(target).should be_a(Ridley::ClientResource)
     end
   end
 
@@ -92,8 +90,8 @@ describe "Client API operations", type: "acceptance" do
       end
     end
 
-    it "returns an array of Ridley::Client objects" do
-      connection.client.delete_all.should each be_a(Ridley::Client)
+    it "returns an array of Ridley::ClientResource objects" do
+      connection.client.delete_all.should each be_a(Ridley::ClientResource)
     end
 
     it "deletes all clients from the remote" do
@@ -106,14 +104,14 @@ describe "Client API operations", type: "acceptance" do
   end
 
   describe "listing all clients" do
-    it "returns an array of Ridley::Client objects" do
-      connection.client.all.should each be_a(Ridley::Client)
+    it "returns an array of Ridley::ClientResource objects" do
+      connection.client.all.should each be_a(Ridley::ClientResource)
     end
   end
 
   describe "regenerating a client's private key" do
     let(:target) do
-      Ridley::Client.new(
+      Ridley::ClientResource.new(
         connection,
         name: "motherbrain-test",
         admin: false
@@ -124,7 +122,7 @@ describe "Client API operations", type: "acceptance" do
       connection.client.create(target)
     end
 
-    it "returns a Ridley::Client object with a value for 'private_key'" do
+    it "returns a Ridley::ClientResource object with a value for 'private_key'" do
       connection.sync do
         obj = client.regenerate_key(target)
 

data/spec/acceptance/cookbook_resource_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe "Cookbook API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com" }
+  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
-  let(:organization) { "ridley" }
 
   let(:connection) do
-    Ridley.connection(
+    Ridley.new(
       server_url: server_url,
       client_name: client_name,
-      client_key: client_key,
-      organization: organization
+      client_key: client_key
     )
   end
 
@@ -22,25 +20,9 @@ describe "Cookbook API operations", type: "acceptance" do
     pending
   end
 
-  describe "creating a cookbook" do
-    pending
-  end
-
-  describe "deleting a cookbook" do
-    pending
-  end
-
-  describe "deleting all cookbooks" do
-    pending
-  end
-
   describe "listing all cookbooks" do
     it "should return an array of environment objects" do
-      connection.cookbook.all.should each be_a(Ridley::Cookbook)
+      connection.cookbook.all.should each be_a(Ridley::CookbookResource)
     end
   end
-
-  describe "updating a cookbook" do
-    pending
-  end
 end

data/spec/acceptance/data_bag_item_resource_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe "DataBag API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com" }
+  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
-  let(:organization) { "ridley" }
 
   let(:connection) do
-    Ridley.connection(
+    Ridley.new(
       server_url: server_url,
       client_name: client_name,
-      client_key: client_key,
-      organization: organization
+      client_key: client_key
     )
   end
 
@@ -98,7 +96,7 @@ describe "DataBag API operations", type: "acceptance" do
     it "returns the deleted data bag item" do
       dbi = @databag.item.delete(attributes["id"])
 
-      dbi.should be_a(Ridley::DataBagItem)
+      dbi.should be_a(Ridley::DataBagItemResource)
       dbi.attributes.should eql(attributes)
     end
 
@@ -116,7 +114,7 @@ describe "DataBag API operations", type: "acceptance" do
     end
 
     it "returns the array of deleted data bag items" do
-      @databag.item.delete_all.should each be_a(Ridley::DataBagItem)
+      @databag.item.delete_all.should each be_a(Ridley::DataBagItemResource)
     end
 
     it "removes all data bag items from the data bag" do

data/spec/acceptance/data_bag_resource_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe "DataBag API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com" }
+  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
-  let(:organization) { "ridley" }
 
   let(:connection) do
-    Ridley.connection(
+    Ridley.new(
       server_url: server_url,
       client_name: client_name,
-      client_key: client_key,
-      organization: organization
+      client_key: client_key
     )
   end
 
@@ -36,7 +34,7 @@ describe "DataBag API operations", type: "acceptance" do
       end
 
       it "returns an array of data bags" do
-        connection.data_bag.all.should each be_a(Ridley::DataBag)
+        connection.data_bag.all.should each be_a(Ridley::DataBagResource)
       end
 
       it "returns all of the data bags on the server" do

data/spec/acceptance/environment_resource_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe "Environment API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com" }
+  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
-  let(:organization) { "ridley" }
 
   let(:connection) do
-    Ridley.connection(
+    Ridley.new(
       server_url: server_url,
       client_name: client_name,
-      client_key: client_key,
-      organization: organization
+      client_key: client_key
     )
   end
 
@@ -24,7 +22,7 @@ describe "Environment API operations", type: "acceptance" do
 
   describe "finding an environment" do
     let(:target) do
-      Ridley::Environment.new(
+      Ridley::EnvironmentResource.new(
         connection,
         name: "ridley-test-env"
       )
@@ -34,11 +32,11 @@ describe "Environment API operations", type: "acceptance" do
       connection.environment.create(target)
     end
 
-    it "returns a valid Ridley::Environment object" do
+    it "returns a valid Ridley::EnvironmentResource object" do
       connection.sync do
         obj = environment.find(target)
 
-        obj.should be_a(Ridley::Environment)
+        obj.should be_a(Ridley::EnvironmentResource)
         obj.should be_valid
       end
     end
@@ -46,18 +44,18 @@ describe "Environment API operations", type: "acceptance" do
 
   describe "creating an environment" do
     let(:target) do
-      Ridley::Environment.new(
+      Ridley::EnvironmentResource.new(
         connection,
         name: "ridley-test-env",
         description: "a testing environment for ridley"
       )
     end
 
-    it "returns a valid Ridley::Environment object" do
+    it "returns a valid Ridley::EnvironmentResource object" do
       connection.sync do
         obj = environment.create(target)
 
-        obj.should be_a(Ridley::Environment)
+        obj.should be_a(Ridley::EnvironmentResource)
         obj.should be_valid
       end
     end
@@ -79,8 +77,8 @@ describe "Environment API operations", type: "acceptance" do
       end
     end
 
-    it "returns an array of Ridley::Environment objects" do
-      connection.environment.delete_all.should each be_a(Ridley::Environment)
+    it "returns an array of Ridley::EnvironmentResource objects" do
+      connection.environment.delete_all.should each be_a(Ridley::EnvironmentResource)
     end
 
     it "deletes all environments but '_default' from the remote" do
@@ -94,14 +92,14 @@ describe "Environment API operations", type: "acceptance" do
   end
 
   describe "listing all environments" do
-    it "should return an array of Ridley::Environment objects" do
-      connection.environment.all.should each be_a(Ridley::Environment)
+    it "should return an array of Ridley::EnvironmentResource objects" do
+      connection.environment.all.should each be_a(Ridley::EnvironmentResource)
     end
   end
 
   describe "updating an environment" do
     let(:target) do
-      Ridley::Environment.new(
+      Ridley::EnvironmentResource.new(
         connection,
         name: "ridley-env-test"
       )

data/spec/acceptance/node_resource_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe "Node API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com" }
+  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
-  let(:organization) { "ridley" }
 
   let(:connection) do
-    Ridley.connection(
+    Ridley.new(
       server_url: server_url,
       client_name: client_name,
-      client_key: client_key,
-      organization: organization
+      client_key: client_key
     )
   end
 
@@ -24,7 +22,7 @@ describe "Node API operations", type: "acceptance" do
 
   describe "finding a node" do
     let(:target) do
-      Ridley::Node.new(
+      Ridley::NodeResource.new(
         connection,
         name: "ridley-one"
       )
@@ -34,20 +32,20 @@ describe "Node API operations", type: "acceptance" do
       connection.node.create(target)
     end
 
-    it "returns a Ridley::Node object" do
+    it "returns a Ridley::NodeResource object" do
       connection.node.find(target.name).should eql(target)
     end
   end
 
   describe "creating a node" do
     let(:target) do
-      Ridley::Node.new(
+      Ridley::NodeResource.new(
         connection,
         name: "ridley-one"
       )
     end
     
-    it "returns a new Ridley::Node object" do
+    it "returns a new Ridley::NodeResource object" do
       connection.node.create(target).should eql(target)
     end
 
@@ -62,7 +60,7 @@ describe "Node API operations", type: "acceptance" do
 
   describe "deleting a node" do
     let(:target) do
-      Ridley::Node.new(
+      Ridley::NodeResource.new(
         connection,
         name: "ridley-one"
       )
@@ -90,7 +88,7 @@ describe "Node API operations", type: "acceptance" do
       connection.sync do
         node.delete_all
 
-        connection.node.all.should have(0).nodes
+        node.all.should have(0).nodes
       end
     end
   end
@@ -103,11 +101,11 @@ describe "Node API operations", type: "acceptance" do
       end
     end
 
-    it "returns an array of Ridley::Node objects" do
+    it "returns an array of Ridley::NodeResource objects" do
       connection.sync do
         obj = node.all
         
-        obj.should each be_a(Ridley::Node)
+        obj.should each be_a(Ridley::NodeResource)
         obj.should have(2).nodes
       end
     end
@@ -115,7 +113,7 @@ describe "Node API operations", type: "acceptance" do
 
   describe "updating a node" do
     let(:target) do
-      Ridley::Node.new(
+      Ridley::NodeResource.new(
         connection,
         name: "ridley-one"
       )