ridley 0.7.0.beta → 0.7.0.rc1

data/spec/unit/ridley/connection_spec.rb

@@ -4,235 +4,22 @@ describe Ridley::Connection do
   let(:server_url) { "https://api.opscode.com" }
   let(:client_name) { "reset" }
   let(:client_key) { fixtures_path.join("reset.pem").to_s }
-  let(:organization) { "vialstudios" }
-  let(:encrypted_data_bag_secret_path) { fixtures_path.join("reset.pem").to_s }
-
-  let(:config) do
-    {
-      server_url: server_url,
-      client_name: client_name,
-      client_key: client_key,
-      organization: organization,
-      encrypted_data_bag_secret_path: encrypted_data_bag_secret_path
-    }
-  end
-
-  it "exposes its options publicly" do
-    described_class::OPTIONS.should be_a Array
-  end
-
-  describe "ClassMethods" do
-    subject { Ridley::Connection }
-
-    describe "::initialize" do
-      let(:server_url) { "https://api.opscode.com/some_path" }
-
-      describe "parsing the 'server_url' option" do
-        before(:each) do
-          @conn = subject.new(
-            server_url: server_url,
-            client_name: client_name,
-            client_key: client_key
-          )
-        end
-
-        it "assigns a 'host' attribute from the given 'server_url' option" do
-          @conn.host.should eql("api.opscode.com")
-        end
-
-        it "assigns a 'scheme' attribute from the given 'server_url' option" do
-          @conn.scheme.should eql("https")
-        end
-
-        it "sets a 'path_prefix' to the root of the given 'server_url' option" do
-          @conn.path_prefix.should eql("/")
-        end
-      end
-
-      describe "specifying an 'organization' option" do
-        before(:each) do
-          @conn = subject.new(
-            server_url: server_url,
-            client_name: client_name,
-            client_key: client_key,
-            organization: organization
-          )
-        end
-
-        it "assigns the value of the 'organization' option to an 'organization' attribute" do
-          @conn.organization.should eql(organization)
-        end
-
-        it "sets the 'path_prefix' of the connection the organization sub URI" do
-          @conn.path_prefix.should eql("/organizations/#{organization}")
-        end
-      end
-
-      describe "with a server_url containing an organization" do
-        before(:each) do
-          @conn = subject.new(
-            server_url: "#{server_url}/organizations/#{organization}",
-            client_name: client_name,
-            client_key: client_key
-          )
-        end
-
-        it "gets the host data from the server_url" do
-          @conn.host.should eql("api.opscode.com")
-          @conn.scheme.should eql("https")
-        end
-
-        it "assigns the value of the 'organization' option to an 'organization' attribute" do
-          @conn.organization.should eql(organization)
-        end
-
-        it "sets the 'path_prefix' of the connection the organization sub URI" do
-          @conn.path_prefix.should eql("/organizations/#{organization}")
-        end
-      end
-
-      it "raises 'ArgumentError' if a value for server_url is not given" do
-        lambda {
-          subject.new(
-            client_name: client_name,
-            client_key: client_key
-          )
-        }.should raise_error(ArgumentError, "Missing required option(s): 'server_url'")
-      end
-
-      it "raises if a value for client_name is not given" do
-        lambda {
-          subject.new(
-            server_url: server_url,
-            client_key: client_key
-          )
-        }.should raise_error(ArgumentError, "Missing required option(s): 'client_name'")
-      end
-
-      it "raises if a value for client_key is not given" do
-        lambda {
-          subject.new(
-            server_url: server_url,
-            client_name: client_name
-          )
-        }.should raise_error(ArgumentError, "Missing required option(s): 'client_key'")
-      end
-
-      it "raises a ClientKeyFileNotFound if the filepath for client_key is not found" do
-        config[:client_key] = "/tmp/nofile.xxsa"
-
-        lambda {
-          subject.new(config)
-        }.should raise_error(Ridley::Errors::ClientKeyFileNotFound)
-      end
-
-      it "expands the path of the client_key" do
-        config[:client_key] = "~/"
-
-        subject.new(config).client_key.should_not == "~/"
-      end
-    end
-
-    describe "::sync" do
-      it "raises a Ridley::Errors::InternalError if no block is given" do
-        lambda {
-          subject.sync(config)
-        }.should raise_error(Ridley::Errors::InternalError)
-      end
-    end
-  end
 
   subject do
-    Ridley::Connection.new(config)
+    described_class.new(server_url, client_name, client_key)
   end
 
-  describe "#sync" do
-    it "raises a Ridley::Errors::InternalError if no block is given" do
-      lambda {
-        subject.sync
-      }.should raise_error(Ridley::Errors::InternalError)
-    end
-
-    describe "HTTP Request" do
-      describe "#get" do
-        it "appends the given path to the connection's server_uri path and sends a get request to it" do
-          stub_request(:get, subject.build_url("cookbooks")).
-            to_return(status: 200, body: "{}")
-
-          subject.get("cookbooks")
-        end
-      end
-
-      describe "#put" do
-        it "appends the given path to the connection's server_uri path and sends a put request to it" do
-          stub_request(:put, subject.build_url("cookbooks")).
-            with(body: "content").
-            to_return(status: 200, body: "{}")
-
-          subject.put("cookbooks", "content")
-        end
-      end
-
-      describe "#post" do
-        it "appends the given path to the connection's server_uri path and sends a post request to it" do
-          stub_request(:post, subject.build_url("cookbooks")).
-            with(body: "content").
-            to_return(status: 200, body: "{}")
-
-          subject.post("cookbooks", "content")
-        end
-      end
-
-      describe "#delete" do
-        it "appends the given path to the connection's server_uri path and sends a delete request to it" do
-          stub_request(:delete, subject.build_url("cookbooks/nginx")).
-            to_return(status: 200, body: "{}")
-
-          subject.delete("cookbooks/nginx")
-        end
-      end
-    end
-
-    describe "api_type" do
-      it "returns :foss if the organization is not set" do
-        subject.stub(:organization).and_return(nil)
-
-        subject.api_type.should eql(:foss)
-      end
-
-      it "returns :hosted if the organization is set" do
-        subject.stub(:organization).and_return("vialstudios")
-
-        subject.api_type.should eql(:hosted)
-      end
-    end
-  end
-
-  describe "#encrypted_data_bag_secret" do
-    it "returns a string" do
-      subject.encrypted_data_bag_secret.should be_a(String)
-    end
-
-    context "when a encrypted_data_bag_secret_path is not provided" do
-      before(:each) do
-        subject.stub(:encrypted_data_bag_secret_path) { nil }
-      end
+  describe "#api_type" do
+    it "returns :foss if the organization is not set" do
+      subject.stub(:organization).and_return(nil)
 
-      it "returns nil" do
-        subject.encrypted_data_bag_secret.should be_nil
-      end
+      subject.api_type.should eql(:foss)
     end
 
-    context "when the file is not found at the given encrypted_data_bag_secret_path" do
-      before(:each) do
-        subject.stub(:encrypted_data_bag_secret_path) { fixtures_path.join("not.txt").to_s }
-      end
+    it "returns :hosted if the organization is set" do
+      subject.stub(:organization).and_return("vialstudios")
 
-      it "raises an EncryptedDataBagSecretNotFound erorr" do
-        lambda {
-          subject.encrypted_data_bag_secret
-        }.should raise_error(Ridley::Errors::EncryptedDataBagSecretNotFound)
-      end
+      subject.api_type.should eql(:hosted)
     end
   end
 end

data/spec/unit/ridley/resources/{client_spec.rb → client_resource_spec.rb}

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Ridley::Client do
-  it_behaves_like "a Ridley Resource", Ridley::Client
+describe Ridley::ClientResource do
+  it_behaves_like "a Ridley Resource", Ridley::ClientResource
 
   let(:connection) { double('connection') }
 
   describe "ClassMethods" do
-    subject { Ridley::Client }
+    subject { Ridley::ClientResource }
 
     describe "::regenerate_key" do
       let(:client) { double('client', name: "ridley-test") }
@@ -28,7 +28,7 @@ describe Ridley::Client do
   end
 
   subject do
-    Ridley::Client.new(connection, name: "ridley-test", admin: false)
+    Ridley::ClientResource.new(connection, name: "ridley-test", admin: false)
   end
 
   describe "#regenerate_key" do

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

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Ridley::CookbookResource do
+  pending
+end

data/spec/unit/ridley/resources/{data_bag_item_spec.rb → data_bag_item_resource_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Ridley::DataBagItem do
+describe Ridley::DataBagItemResource do
   let(:connection) { double('connection') }
   let(:data_bag) { double('data_bag') }
 
-  subject { Ridley::DataBagItem.new(connection, data_bag) }
+  subject { Ridley::DataBagItemResource.new(connection, data_bag) }
 
   describe "::from_hash" do
     context "when JSON has a 'raw_data' field" do

data/spec/unit/ridley/resources/{data_bag_spec.rb → data_bag_resource_spec.rb}

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Ridley::DataBag do
-  it_behaves_like "a Ridley Resource", Ridley::DataBag
+describe Ridley::DataBagResource do
+  it_behaves_like "a Ridley Resource", Ridley::DataBagResource
 
   let(:connection) { double('connection') }
 
   describe "ClassMethods" do
-    subject { Ridley::DataBag }
+    subject { Ridley::DataBagResource }
 
     describe "::create_item" do
       pending

data/spec/unit/ridley/resources/{environment_spec.rb → environment_resource_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Ridley::Environment do
-  it_behaves_like "a Ridley Resource", Ridley::Environment
+describe Ridley::EnvironmentResource do
+  it_behaves_like "a Ridley Resource", Ridley::EnvironmentResource
 
   let(:connection) { double("connection") }
 
@@ -34,7 +34,7 @@ describe Ridley::Environment do
   end
 
   describe "ClassMethods" do
-    subject { Ridley::Environment }
+    subject { Ridley::EnvironmentResource }
 
     describe "::initialize" do
       before(:each) do
@@ -73,7 +73,7 @@ describe Ridley::Environment do
 
   let(:connection) { double('connection') }
 
-  subject { Ridley::Environment.new(connection) }
+  subject { Ridley::EnvironmentResource.new(connection) }
 
   describe "#set_override_attribute" do
     it "sets an override node attribute at the nested path" do

data/spec/unit/ridley/resources/{node_spec.rb → node_resource_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Ridley::Node do
-  it_behaves_like "a Ridley Resource", Ridley::Node
+describe Ridley::NodeResource do
+  it_behaves_like "a Ridley Resource", Ridley::NodeResource
 
   let(:connection) do
     double('conn',
@@ -15,7 +15,7 @@ describe Ridley::Node do
   end
 
   describe "ClassMethods" do
-    subject { Ridley::Node }
+    subject { Ridley::NodeResource }
 
     describe "::bootstrap" do
       let(:boot_options) do
@@ -48,7 +48,7 @@ describe Ridley::Node do
     end
   end
 
-  subject { Ridley::Node.new(connection) }
+  subject { Ridley::NodeResource.new(connection) }
 
   describe "#set_chef_attribute" do
     it "sets an normal node attribute at the nested path" do

data/spec/unit/ridley/resources/{role_spec.rb → role_resource_spec.rb}

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Ridley::Role do
-  it_behaves_like "a Ridley Resource", Ridley::Role
+describe Ridley::RoleResource do
+  it_behaves_like "a Ridley Resource", Ridley::RoleResource
 
   let(:connection) { double("connection") }
 
-  subject { Ridley::Role.new(connection) }
+  subject { Ridley::RoleResource.new(connection) }
 
   describe "#set_override_attribute" do
     it "sets an override node attribute at the nested path" do

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

@@ -0,0 +1,172 @@
+require 'spec_helper'
+
+describe Ridley::SandboxResource do
+  let(:server_url) { "https://api.opscode.com/organizations/vialstudios" }
+  let(:client_name) { "reset" }
+  let(:client_key) { "/Users/reset/.chef/reset.pem" }
+
+  let(:sandbox) do
+    Ridley.new(
+      server_url: server_url,
+      client_name: client_name,
+      client_key: client_key
+    ).sandbox
+  end
+
+  describe "ClassMethods" do
+    describe "::create" do
+      let(:checksums) { Hash.new }
+
+      before(:each) do
+        stub_request(:post, File.join(server_url, "sandboxes")).
+          with(body: MultiJson.encode(checksums: checksums)).
+          to_return(status: 200, body: {
+            uri: "https://api.opscode.com/organizations/vialstudios/sandboxes/bd091b150b0a4578b97771af6abf3e05",
+            checksums: {},
+            sandbox_id: "bd091b150b0a4578b97771af6abf3e05"
+          })
+      end
+
+      subject { sandbox.create }
+
+      it "returns a SandboxResource" do
+        subject.should be_a(Ridley::SandboxResource)
+      end
+
+      it "has an 'is_completed' value of false" do
+        subject.is_completed.should be_false
+      end
+
+      it "has an empty Hash of checksums" do
+        subject.checksums.should be_a(Hash)
+        subject.checksums.should be_empty
+      end
+
+      it "has a value for 'uri'" do
+        subject.uri.should eql("https://api.opscode.com/organizations/vialstudios/sandboxes/bd091b150b0a4578b97771af6abf3e05")
+      end
+
+      it "has a sandbox_id" do
+        subject.sandbox_id.should eql("bd091b150b0a4578b97771af6abf3e05")
+      end
+
+      context "when given an array of checksums" do
+        let(:checksums) do
+          {
+            "385ea5490c86570c7de71070bce9384a" => nil,
+            "f6f73175e979bd90af6184ec277f760c" => nil,
+            "2e03dd7e5b2e6c8eab1cf41ac61396d5" => nil
+          }
+        end
+        let(:checksum_array) { checksums.keys }
+
+        before(:each) do
+          stub_request(:post, File.join(server_url, "sandboxes")).
+            with(body: MultiJson.encode(checksums: checksums)).
+            to_return(status: 200, body: {
+              "uri" => "https://api.opscode.com/organizations/vialstudios/sandboxes/bd091b150b0a4578b97771af6abf3e05",
+              "checksums" => {
+                "385ea5490c86570c7de71070bce9384a" => {
+                  "url" => "https://s3.amazonaws.com/opscode-platform-production-data/organization",
+                  "needs_upload" => true
+                },
+                "f6f73175e979bd90af6184ec277f760c" => {
+                  "url" => "https://s3.amazonaws.com/opscode-platform-production-data/organization",
+                  "needs_upload" => true
+                },
+                "2e03dd7e5b2e6c8eab1cf41ac61396d5" => {
+                  "url" => "https://s3.amazonaws.com/opscode-platform-production-data/organization",
+                  "needs_upload" => true
+                },
+              },
+              "sandbox_id" => "bd091b150b0a4578b97771af6abf3e05"
+            })
+        end
+
+        subject { sandbox.create(checksum_array) }
+
+        it "has a Hash of checksums with each of the given checksum ids" do
+          subject.checksums.should have(checksum_array.length).checksums
+        end
+      end
+    end
+  end
+
+  subject do
+    sandbox.new(
+      "uri" => "https://api.opscode.com/organizations/vialstudios/sandboxes/bd091b150b0a4578b97771af6abf3e05",
+      "checksums" => {
+        "385ea5490c86570c7de71070bce9384a" => {
+          "url" => "https://s3.amazonaws.com/opscode-platform-production-data/organization",
+          "needs_upload" => true
+        },
+        "f6f73175e979bd90af6184ec277f760c" => {
+          "url" => "https://s3.amazonaws.com/opscode-platform-production-data/organization",
+          "needs_upload" => true
+        },
+        "2e03dd7e5b2e6c8eab1cf41ac61396d5" => {
+          "url" => "https://s3.amazonaws.com/opscode-platform-production-data/organization",
+          "needs_upload" => true
+        },
+      },
+      "sandbox_id" => "bd091b150b0a4578b97771af6abf3e05"
+    )
+  end
+
+  describe "#commit" do
+    context "on successful commit" do
+      before(:each) do
+        stub_request(:put, File.join(server_url, "sandboxes", "bd091b150b0a4578b97771af6abf3e05")).
+          with(body: MultiJson.encode(is_completed: true)).
+          to_return(status: 200, body: {
+            is_completed: true,
+            _rev: "1-bbc8a96f7486aeba2b562d382142fd68",
+            create_time: "2013-01-16T01:43:43+00:00",
+            guid: "bd091b150b0a4578b97771af6abf3e05",
+            json_class: "Chef::Sandbox",
+            name: "bd091b150b0a4578b97771af6abf3e05",
+            checksums: [],
+            chef_type: "sandbox"
+          })
+      end
+
+      it "has an 'is_completed' value of true" do
+        subject.commit
+
+        subject.is_completed.should be_true
+      end
+    end
+
+    context "on commit failure" do
+      before(:each) do
+        stub_request(:put, File.join(server_url, "sandboxes", "bd091b150b0a4578b97771af6abf3e05")).
+          with(body: MultiJson.encode(is_completed: true)).
+          to_return(status: 200, body: {
+            is_completed: false,
+            _rev: "1-bbc8a96f7486aeba2b562d382142fd68",
+            create_time: "2013-01-16T01:43:43+00:00",
+            guid: "bd091b150b0a4578b97771af6abf3e05",
+            json_class: "Chef::Sandbox",
+            name: "bd091b150b0a4578b97771af6abf3e05",
+            checksums: [],
+            chef_type: "sandbox"
+          })
+      end
+
+      it "has an 'is_completed' value of false" do
+        subject.commit
+
+        subject.is_completed.should be_false
+      end
+    end
+  end
+
+  describe "#upload" do
+    it "delegates self to SandboxUploader.upload" do
+      checksums = double('checksums')
+      Ridley::SandboxUploader.should_receive(:upload).with(subject, checksums)
+
+      subject.upload(checksums)
+    end
+  end
+end