ridley 0.7.0.beta → 0.7.0.rc1

data/spec/unit/ridley/resources/search_spec.rb

@@ -1,7 +1,11 @@
 require 'spec_helper'
 
-describe Ridley::Search do
-  let(:connection) { double('connection') }
+describe Ridley::Search do\
+  let(:client) do
+    double('client',
+      connection: double('connection')
+    )
+  end
   let(:index) { :role }
   let(:query) { "*:*" }
   let(:response) do
@@ -19,21 +23,21 @@ describe Ridley::Search do
     subject { Ridley::Search }
 
     describe "::indexes" do
-      it "sends a get request to the connection to receive the indexes" do
-        connection.should_receive(:get).with("search").and_return(response)
+      it "sends a get request to the client to receive the indexes" do
+        client.connection.should_receive(:get).with("search").and_return(response)
 
-        subject.indexes(connection)
+        subject.indexes(client)
       end
     end
   end
 
   describe "#run" do
     subject do
-      Ridley::Search.new(connection, index, query)
+      Ridley::Search.new(client, index, query)
     end
 
-    it "sends a get request to the connection to the index's location with the given query" do
-      connection.should_receive(:get).with("search/#{index}", q: query).and_return(response)
+    it "sends a get request to the client to the index's location with the given query" do
+      client.connection.should_receive(:get).with("search/#{index}", q: query).and_return(response)
 
       subject.run
     end
@@ -42,8 +46,8 @@ describe Ridley::Search do
       let(:sort) { "DESC" }
       before(:each) { subject.sort = sort }
 
-      it "sends a get request to the connection with a query parameter for 'set'" do
-        connection.should_receive(:get).with("search/#{index}", q: query, sort: sort).and_return(response)
+      it "sends a get request to the client with a query parameter for 'set'" do
+        client.connection.should_receive(:get).with("search/#{index}", q: query, sort: sort).and_return(response)
 
         subject.run
       end
@@ -53,8 +57,8 @@ describe Ridley::Search do
       let(:start) { 1 }
       before(:each) { subject.start = start }
 
-      it "sends a get request to the connection with a query parameter for 'start'" do
-        connection.should_receive(:get).with("search/#{index}", q: query, start: start).and_return(response)
+      it "sends a get request to the client with a query parameter for 'start'" do
+        client.connection.should_receive(:get).with("search/#{index}", q: query, start: start).and_return(response)
 
         subject.run
       end
@@ -64,8 +68,8 @@ describe Ridley::Search do
       let(:rows) { 1 }
       before(:each) { subject.rows = rows }
 
-      it "sends a get request to the connection with a query parameter for 'rows'" do
-        connection.should_receive(:get).with("search/#{index}", q: query, rows: rows).and_return(response)
+      it "sends a get request to the client with a query parameter for 'rows'" do
+        client.connection.should_receive(:get).with("search/#{index}", q: query, rows: rows).and_return(response)
 
         subject.run
       end
@@ -99,14 +103,14 @@ describe Ridley::Search do
         )
       end
 
-      subject { Ridley::Search.new(connection, index, query) }
+      subject { Ridley::Search.new(client, index, query) }
 
-      it "returns an array of Ridley::Node" do
-        connection.should_receive(:get).with("search/#{index}", q: query).and_return(response)
+      it "returns an array of Ridley::NodeResource" do
+        client.connection.should_receive(:get).with("search/#{index}", q: query).and_return(response)
         result = subject.run
 
         result.should be_a(Array)
-        result.should each be_a(Ridley::Node)
+        result.should each be_a(Ridley::NodeResource)
       end
     end
 
@@ -134,14 +138,14 @@ describe Ridley::Search do
         )
       end
 
-      subject { Ridley::Search.new(connection, index, query) }
+      subject { Ridley::Search.new(client, index, query) }
 
-      it "returns an array of Ridley::Role" do
-        connection.should_receive(:get).with("search/#{index}", q: query).and_return(response)
+      it "returns an array of Ridley::RoleResource" do
+        client.connection.should_receive(:get).with("search/#{index}", q: query).and_return(response)
         result = subject.run
 
         result.should be_a(Array)
-        result.should each be_a(Ridley::Role)
+        result.should each be_a(Ridley::RoleResource)
       end
     end
 
@@ -168,14 +172,14 @@ describe Ridley::Search do
         )
       end
 
-      subject { Ridley::Search.new(connection, index, query) }
+      subject { Ridley::Search.new(client, index, query) }
 
-      it "returns an array of Ridley::Environment" do
-        connection.should_receive(:get).with("search/#{index}", q: query).and_return(response)
+      it "returns an array of Ridley::EnvironmentResource" do
+        client.connection.should_receive(:get).with("search/#{index}", q: query).and_return(response)
         result = subject.run
 
         result.should be_a(Array)
-        result.should each be_a(Ridley::Environment)
+        result.should each be_a(Ridley::EnvironmentResource)
       end
     end
 
@@ -203,14 +207,14 @@ describe Ridley::Search do
         )
       end
 
-      subject { Ridley::Search.new(connection, index, query) }
+      subject { Ridley::Search.new(client, index, query) }
 
-      it "returns an array of Ridley::Client" do
-        connection.should_receive(:get).with("search/#{index}", q: query).and_return(response)
+      it "returns an array of Ridley::ClientResource" do
+        client.connection.should_receive(:get).with("search/#{index}", q: query).and_return(response)
         result = subject.run
 
         result.should be_a(Array)
-        result.should each be_a(Ridley::Client)
+        result.should each be_a(Ridley::ClientResource)
       end
     end
   end

data/spec/unit/ridley/sandbox_uploader_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe Ridley::SandboxUploader do
+  let(:client) do
+    double('client',
+      client_name: 'reset',
+      client_key: fixtures_path.join('reset.pem')
+    )
+  end
+
+  let(:checksums) do
+    {
+      "oGCPHrQ+5MylEL+V+NIJ9w==" => {
+        needs_upload: true,
+        url: "https://api.opscode.com/organizations/vialstudios/sandboxes/bd091b150b0a4578b97771af6abf3e05"
+      }
+    }
+  end
+
+  let(:sandbox) do
+    Ridley::SandboxResource.new(client, checksums: checksums)
+  end
+
+  describe "ClassMethods" do
+    subject { described_class }
+    describe "::upload" do
+      it "terminates the uploader after upload" do
+        uploader = double('uploader', alive?: true)
+        Ridley::SandboxUploader.should_receive(:pool).with(size: 12, args: [sandbox]).and_return(uploader)
+        uploader.should_receive(:multi_upload).with(checksums)
+        uploader.should_receive(:terminate)
+
+        subject.upload(sandbox, checksums)
+      end
+    end
+
+    describe "::checksum" do
+      it "returns a string" do
+        subject.checksum(fixtures_path.join('reset.pem')).should be_a(String)
+      end
+    end
+
+    describe "::checksum64" do
+      it "returns a string" do
+        subject.checksum64(fixtures_path.join('reset.pem')).should be_a(String)
+      end
+    end
+  end
+
+  subject { described_class.new(sandbox) }
+
+  describe "#multi_upload" do
+    it "sends an upload command for each pair of checksum/path" do
+      subject.should_receive(:upload).with(checksums.first[0], checksums.first[1])
+
+      subject.multi_upload(checksums)
+    end
+  end
+
+  describe "#upload" do
+    let(:chk_id) { "oGCPHrQ+5MylEL+V+NIJ9w==" }
+    let(:path) { fixtures_path.join('reset.pem').to_s }
+
+    context "when the checksum needs uploading" do
+      let(:checksums) do
+        {
+          chk_id => {
+            url: "https://api.opscode.com/organizations/vialstudios/sandboxes/bd091b150b0a4578b97771af6abf3e05",
+            needs_upload: true
+          }
+        }
+      end
+
+      it "uploads each checksum to their target URL" do
+        stub_request(:put, checksums[chk_id][:url])
+
+        subject.upload(chk_id, path)
+      end
+    end
+
+    context "when the checksum doesn't need uploading" do
+      let(:checksums) do
+        {
+          chk_id => {
+            needs_upload: false
+          }
+        }
+      end
+
+      let(:sandbox) do
+        Ridley::SandboxResource.new(client, checksums: checksums)
+      end
+
+      it "returns nil" do
+        subject.upload(chk_id, path).should be_nil
+      end
+    end
+  end
+end

data/spec/unit/ridley/ssh_spec.rb

@@ -4,11 +4,11 @@ describe Ridley::SSH do
   let(:connection) { double('conn', ssh: { user: "vagrant", password: "vagrant" }) }
 
   let(:node_one) do
-    Ridley::Node.new(connection, automatic: { cloud: { public_hostname: "33.33.33.10" } })
+    Ridley::NodeResource.new(connection, automatic: { cloud: { public_hostname: "33.33.33.10" } })
   end
 
   let(:node_two) do
-    Ridley::Node.new(connection, automatic: { cloud: { public_hostname: "33.33.33.11" } })
+    Ridley::NodeResource.new(connection, automatic: { cloud: { public_hostname: "33.33.33.11" } })
   end
 
   describe "ClassMethods" do

data/spec/unit/ridley_spec.rb

@@ -6,20 +6,12 @@ describe Ridley do
   describe "ClassMethods" do
     subject { Ridley }
 
-    describe "::sync" do
-      it "delegates to Ridley::Connection.sync" do
-        Ridley::Connection.should_receive(:sync).with(config)
-
-        subject.sync(config) do; end
-      end
-    end
-
-    describe "::connection" do
+    describe "::new" do
       it "creates a new Ridley::Connection" do
-        conn = double('conn')
-        Ridley::Connection.should_receive(:new).with(config).and_return(conn)
+        client = double('client')
+        Ridley::Client.should_receive(:new).with(config).and_return(client)
 
-        subject.connection(config).should eql(conn)
+        subject.new(config).should eql(client)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta
+  version: 0.7.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -223,8 +223,8 @@ files:
 - lib/ridley/bootstrapper.rb
 - lib/ridley/bootstrapper/context.rb
 - lib/ridley/chain_link.rb
+- lib/ridley/client.rb
 - lib/ridley/connection.rb
-- lib/ridley/dsl.rb
 - lib/ridley/errors.rb
 - lib/ridley/log.rb
 - lib/ridley/logging.rb
@@ -233,16 +233,18 @@ files:
 - lib/ridley/middleware/chef_response.rb
 - lib/ridley/middleware/parse_json.rb
 - lib/ridley/resource.rb
-- lib/ridley/resources/client.rb
-- lib/ridley/resources/cookbook.rb
-- lib/ridley/resources/data_bag.rb
-- lib/ridley/resources/data_bag_item.rb
-- lib/ridley/resources/encrypted_data_bag_item.rb
-- lib/ridley/resources/environment.rb
-- lib/ridley/resources/node.rb
-- lib/ridley/resources/role.rb
-- lib/ridley/resources/sandbox.rb
+- lib/ridley/resources.rb
+- lib/ridley/resources/client_resource.rb
+- lib/ridley/resources/cookbook_resource.rb
+- lib/ridley/resources/data_bag_item_resource.rb
+- lib/ridley/resources/data_bag_resource.rb
+- lib/ridley/resources/encrypted_data_bag_item_resource.rb
+- lib/ridley/resources/environment_resource.rb
+- lib/ridley/resources/node_resource.rb
+- lib/ridley/resources/role_resource.rb
+- lib/ridley/resources/sandbox_resource.rb
 - lib/ridley/resources/search.rb
+- lib/ridley/sandbox_uploader.rb
 - lib/ridley/ssh.rb
 - lib/ridley/ssh/response.rb
 - lib/ridley/ssh/response_set.rb
@@ -270,20 +272,23 @@ files:
 - spec/support/spec_helpers.rb
 - spec/unit/ridley/bootstrapper/context_spec.rb
 - spec/unit/ridley/bootstrapper_spec.rb
+- spec/unit/ridley/client_spec.rb
 - spec/unit/ridley/connection_spec.rb
 - spec/unit/ridley/errors_spec.rb
 - spec/unit/ridley/middleware/chef_auth_spec.rb
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
 - spec/unit/ridley/resource_spec.rb
-- spec/unit/ridley/resources/client_spec.rb
-- spec/unit/ridley/resources/cookbook_spec.rb
-- spec/unit/ridley/resources/data_bag_item_spec.rb
-- spec/unit/ridley/resources/data_bag_spec.rb
-- spec/unit/ridley/resources/environment_spec.rb
-- spec/unit/ridley/resources/node_spec.rb
-- spec/unit/ridley/resources/role_spec.rb
+- spec/unit/ridley/resources/client_resource_spec.rb
+- spec/unit/ridley/resources/cookbook_resource_spec.rb
+- spec/unit/ridley/resources/data_bag_item_resource_spec.rb
+- spec/unit/ridley/resources/data_bag_resource_spec.rb
+- spec/unit/ridley/resources/environment_resource_spec.rb
+- spec/unit/ridley/resources/node_resource_spec.rb
+- spec/unit/ridley/resources/role_resource_spec.rb
+- spec/unit/ridley/resources/sandbox_resource_spec.rb
 - spec/unit/ridley/resources/search_spec.rb
+- spec/unit/ridley/sandbox_uploader_spec.rb
 - spec/unit/ridley/ssh/response_set_spec.rb
 - spec/unit/ridley/ssh/worker_spec.rb
 - spec/unit/ridley/ssh_spec.rb
@@ -335,20 +340,23 @@ test_files:
 - spec/support/spec_helpers.rb
 - spec/unit/ridley/bootstrapper/context_spec.rb
 - spec/unit/ridley/bootstrapper_spec.rb
+- spec/unit/ridley/client_spec.rb
 - spec/unit/ridley/connection_spec.rb
 - spec/unit/ridley/errors_spec.rb
 - spec/unit/ridley/middleware/chef_auth_spec.rb
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
 - spec/unit/ridley/resource_spec.rb
-- spec/unit/ridley/resources/client_spec.rb
-- spec/unit/ridley/resources/cookbook_spec.rb
-- spec/unit/ridley/resources/data_bag_item_spec.rb
-- spec/unit/ridley/resources/data_bag_spec.rb
-- spec/unit/ridley/resources/environment_spec.rb
-- spec/unit/ridley/resources/node_spec.rb
-- spec/unit/ridley/resources/role_spec.rb
+- spec/unit/ridley/resources/client_resource_spec.rb
+- spec/unit/ridley/resources/cookbook_resource_spec.rb
+- spec/unit/ridley/resources/data_bag_item_resource_spec.rb
+- spec/unit/ridley/resources/data_bag_resource_spec.rb
+- spec/unit/ridley/resources/environment_resource_spec.rb
+- spec/unit/ridley/resources/node_resource_spec.rb
+- spec/unit/ridley/resources/role_resource_spec.rb
+- spec/unit/ridley/resources/sandbox_resource_spec.rb
 - spec/unit/ridley/resources/search_spec.rb
+- spec/unit/ridley/sandbox_uploader_spec.rb
 - spec/unit/ridley/ssh/response_set_spec.rb
 - spec/unit/ridley/ssh/worker_spec.rb
 - spec/unit/ridley/ssh_spec.rb

data/lib/ridley/dsl.rb

@@ -1,58 +0,0 @@
-module Ridley
-  # @api public
-  # @author Jamie Winsor <jamie@vialstudios.com>
-  #
-  # A DSL to be included into Ridley::Connection. Instance functions of the same name as
-  # Chef a resource are coerced into class functions of a class of the same name.
-  #
-  # This is accomplished by returning a Ridley::Context object and coercing any messages sent
-  # to it into a message to the Chef resource's class in Ridley.
-  #
-  # @example
-  #   class Connection
-  #     include Ridley::DSL
-  #   end
-  #
-  #   connection = Ridley::Connection.new
-  #   connection.role.all
-  #
-  #   The 'role' function is made available to the instance of Ridley::Connection by including
-  #   Ridley::DSL. This function returns a Ridley::Context object which receives the 'all' message.
-  #   The Ridley::Context coerces the 'all' message into a message to the Ridley::Role class and
-  #   sends along the instance of Ridley::Connection that is chaining 'role.all'
-  #
-  #   connection.role.all => Ridley::Role.all(connection)
-  #
-  #   Any additional arguments will also be passed to the class function of the Chef resource's class
-  #
-  #   connection.role.find("reset") => Ridley::Role.find(connection, "reset")
-  #
-  # @example instantiating new resources
-  #   class connection
-  #     include Ridley::DSL
-  #   end
-  #
-  #   connection = Ridley::Connection.new
-  #   connection.role.new(name: "hello") => <#Ridley::Role: @name="hello">
-  #
-  #   New instances of resources can be instantiated by calling new on the Ridley::Context. These messages
-  #   will be send to the Chef resource's class in Ridley and can be treated as a normal Ruby object. Each
-  #   instantiated object will have the connection information contained within so you can do things like
-  #   save a role after changing it's attributes.
-  #
-  #   r = connection.role.new(name: "new-role")
-  #   r.name => "new-role"
-  #   r.name = "other-name"
-  #   r.save
-  #
-  #   connection.role.find("new-role") => <#Ridley::Role: @name="new-role">
-  #
-  # @see Ridley::Context
-  # @see Ridley::Role
-  # @see Ridley::Connection
-  module DSL; end
-end
-
-Dir["#{File.dirname(__FILE__)}/resources/*.rb"].sort.each do |path|
-  require "ridley/resources/#{File.basename(path, '.rb')}"
-end