ridley 0.11.0.rc1 → 0.11.1

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

@@ -11,7 +11,7 @@ describe Ridley::DataBagResource do
       subject.should be_a(Ridley::DataBagItemResource)
     end
 
-    its(:data_bag_secret) { should eql(secret) }
+    its(:encrypted_data_bag_secret) { should eql(secret) }
   end
 
   describe "#find" do

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

@@ -95,8 +95,9 @@ describe Ridley::SearchResource do
         start: 0
       })
     end
+    let(:registry) { double("registry", :[] => nil) }
 
-    let(:run) { subject.run(index, query_string) }
+    let(:run) { subject.run(index, query_string, registry) }
 
     before do
       connection.stub(:get).and_return(response)
@@ -143,6 +144,15 @@ describe Ridley::SearchResource do
         result.should be_a(Array)
         result.should each be_a(Ridley::NodeObject)
       end
+
+      context "after the search has executed and results are returned" do
+        let(:search_results) { subject.run(index, query_string, registry) }
+
+        it "Ridley::NodeObject instances contain the results" do
+          first_result = search_results.first
+          first_result.name.should eq("ridley-one")
+        end
+      end
     end
 
     context "when :role is the given index" do
@@ -172,6 +182,15 @@ describe Ridley::SearchResource do
         result.should be_a(Array)
         result.should each be_a(Ridley::RoleObject)
       end
+
+      context "after the search has executed and results are returned" do
+        let(:search_results) { subject.run(index, query_string, registry) }
+
+        it "Ridley::RoleObject instances contain the results" do
+          first_result = search_results.first
+          first_result.name.should eq("ridley-role-one")
+        end
+      end
     end
 
     context "when :environment is the given index" do
@@ -200,6 +219,15 @@ describe Ridley::SearchResource do
         result.should be_a(Array)
         result.should each be_a(Ridley::EnvironmentObject)
       end
+
+      context "after the search has executed and results are returned" do
+        let(:search_results) { subject.run(index, query_string, registry) }
+
+        it "Ridley::EnvironmentObject instances contain the results" do
+          first_result = search_results.first
+          first_result.name.should eq("ridley-env-test")
+        end
+      end
     end
 
     context "when :client is the given index" do
@@ -209,7 +237,7 @@ describe Ridley::SearchResource do
           rows: [
             {
               chef_type: "client",
-              name: nil,
+              name: "ridley-client-test",
               admin: false,
               validator: false,
               certificate: "-----BEGIN CERTIFICATE-----\nMIIDOjCCAqOgAwIBAgIE47eOmDANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC\nVVMxEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAUBgNV\nBAoMDU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZpY2Ux\nMjAwBgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2NvZGUu\nY29tMCAXDTEyMTAwOTAwMTUxNVoYDzIxMDExMTA0MDAxNTE1WjCBnTEQMA4GA1UE\nBxMHU2VhdHRsZTETMBEGA1UECBMKV2FzaGluZ3RvbjELMAkGA1UEBhMCVVMxHDAa\nBgNVBAsTE0NlcnRpZmljYXRlIFNlcnZpY2UxFjAUBgNVBAoTDU9wc2NvZGUsIElu\nYy4xMTAvBgNVBAMUKFVSSTpodHRwOi8vb3BzY29kZS5jb20vR1VJRFMvY2xpZW50\nX2d1aWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqB9KEGzl7Wcm/\nwz/x8HByZANCn6WQC+R12qQso5I6nLbTNkRP668jXG3j0R5/F5i/KearAB9ePzL/\nQe3iHtwW6u1qLI1hVNFNB+I1fGu1p6fZyIOjnLn3bqsbOkBplHOIqHsp4GVSsHKb\nD32UXZDa9S9ZFXnR4iT6hUGm5895ReZG9TDiHvBpi9NJFDZXz+AQ6JuQY8UgYMMA\nm80KbO8/NJlXbRW+siRuvr+LIsi9Mx4i63pBWAN46my291rQU31PF3IB+btfGtR/\nyDWDgMSB37bTzZeOf1Dg9fpl2vIXyu3PoHER0oYmrMQbrdwAt7qCHZNuNWn51WPb\n1PHxXL1rAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAGnJUVAv951fUhGyPOrl+LbQG\nqgchMwIn7oDLE863e66BYTDj7koK3jjhx3EBkrT2vt/xS4yW0ZRV1BNqfnNKWbBq\nMNQiKkYdTr+oq2O3plOg/q/M1eG1B5pxGXqvH0O76DVWQcV/svO+HQEi1n8y5UQd\n+pBJCygpuv78wPCM+c4=\n-----END CERTIFICATE-----\n",
@@ -229,6 +257,15 @@ describe Ridley::SearchResource do
         result.should be_a(Array)
         result.should each be_a(Ridley::ClientObject)
       end
+
+      context "after the search has executed and results are returned" do
+        let(:search_results) { subject.run(index, query_string, registry) }
+
+        it "Ridley::ClientObject instances contain the results" do
+          first_result = search_results.first
+          first_result.name.should eq("ridley-client-test")
+        end
+      end
     end
   end
 end

data/spec/unit/ridley/sandbox_uploader_spec.rb

@@ -48,6 +48,10 @@ describe Ridley::SandboxUploader do
     let(:chk_id) { "oGCPHrQ+5MylEL+V+NIJ9w==" }
     let(:path) { fixtures_path.join('reset.pem').to_s }
 
+    before do
+      connection.stub(foss?: false)
+    end
+
     context "when the checksum needs uploading" do
       let(:checksums) do
         {
@@ -82,5 +86,26 @@ describe Ridley::SandboxUploader do
         subject.upload(sandbox, chk_id, path).should be_nil
       end
     end
+
+    context "when the connection is an open source server connection with a non-80 port" do
+      before do
+        connection.stub(foss?: true, server_url: "http://localhost:8889")
+      end
+
+      let(:checksums) do
+        {
+          chk_id => {
+            url: "http://localhost/sandboxes/bd091b150b0a4578b97771af6abf3e05",
+            needs_upload: true
+          }
+        }
+      end
+
+      it "does not strip the port from the target to upload to" do
+        stub_request(:put, "http://localhost:8889/sandboxes/bd091b150b0a4578b97771af6abf3e05")
+
+        subject.upload(sandbox, chk_id, path)
+      end
+    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.11.0.rc1
-  prerelease: 7
+  version: 0.11.1
+  prerelease: 
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -308,6 +308,7 @@ files:
 - lib/ridley/bootstrapper/context.rb
 - lib/ridley/chain_link.rb
 - lib/ridley/chef.rb
+- lib/ridley/chef/chefignore.rb
 - lib/ridley/chef/cookbook.rb
 - lib/ridley/chef/cookbook/metadata.rb
 - lib/ridley/chef/cookbook/syntax_check.rb
@@ -361,6 +362,7 @@ files:
 - ridley.gemspec
 - spec/acceptance/bootstrapping_spec.rb
 - spec/acceptance/client_resource_spec.rb
+- spec/acceptance/cookbook_resource_spec.rb
 - spec/acceptance/data_bag_item_resource_spec.rb
 - spec/acceptance/data_bag_resource_spec.rb
 - spec/acceptance/environment_resource_spec.rb
@@ -368,6 +370,7 @@ files:
 - spec/acceptance/role_resource_spec.rb
 - spec/acceptance/sandbox_resource_spec.rb
 - spec/acceptance/search_resource_spec.rb
+- spec/fixtures/chefignore
 - spec/fixtures/encrypted_data_bag_secret
 - spec/fixtures/example_cookbook/README.md
 - spec/fixtures/example_cookbook/attributes/default.rb
@@ -385,6 +388,7 @@ files:
 - spec/fixtures/reset.pem
 - spec/spec_helper.rb
 - spec/support/actor_mocking.rb
+- spec/support/chef_server.rb
 - spec/support/each_matcher.rb
 - spec/support/filepath_matchers.rb
 - spec/support/shared_examples/ridley_resource.rb
@@ -393,6 +397,7 @@ files:
 - spec/unit/ridley/bootstrap_bindings/windows_template_binding_spec.rb
 - spec/unit/ridley/bootstrapper/context_spec.rb
 - spec/unit/ridley/bootstrapper_spec.rb
+- spec/unit/ridley/chef/chefignore_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
 - spec/unit/ridley/chef_object_spec.rb
@@ -446,9 +451,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 2982737321566508752
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -458,6 +466,7 @@ summary: A reliable Chef API client with a clean syntax
 test_files:
 - spec/acceptance/bootstrapping_spec.rb
 - spec/acceptance/client_resource_spec.rb
+- spec/acceptance/cookbook_resource_spec.rb
 - spec/acceptance/data_bag_item_resource_spec.rb
 - spec/acceptance/data_bag_resource_spec.rb
 - spec/acceptance/environment_resource_spec.rb
@@ -465,6 +474,7 @@ test_files:
 - spec/acceptance/role_resource_spec.rb
 - spec/acceptance/sandbox_resource_spec.rb
 - spec/acceptance/search_resource_spec.rb
+- spec/fixtures/chefignore
 - spec/fixtures/encrypted_data_bag_secret
 - spec/fixtures/example_cookbook/README.md
 - spec/fixtures/example_cookbook/attributes/default.rb
@@ -482,6 +492,7 @@ test_files:
 - spec/fixtures/reset.pem
 - spec/spec_helper.rb
 - spec/support/actor_mocking.rb
+- spec/support/chef_server.rb
 - spec/support/each_matcher.rb
 - spec/support/filepath_matchers.rb
 - spec/support/shared_examples/ridley_resource.rb
@@ -490,6 +501,7 @@ test_files:
 - spec/unit/ridley/bootstrap_bindings/windows_template_binding_spec.rb
 - spec/unit/ridley/bootstrapper/context_spec.rb
 - spec/unit/ridley/bootstrapper_spec.rb
+- spec/unit/ridley/chef/chefignore_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
 - spec/unit/ridley/chef_object_spec.rb