rhc 1.4.7 → 1.4.8

data/lib/rhc/config.rb

@@ -76,7 +76,7 @@ module RHC
       when :integer, :boolean
         value.nil? ? "<#{type}>" : value
       else
-        "\"#{value.nil? ? "<#{type || 'string'}>" : value}\""
+        value.nil? ? "<#{type || 'string'}>" : value
       end
     end
 

data/lib/rhc/rest.rb

@@ -95,5 +95,7 @@ module RHC
     class SelfSignedCertificate < CertificateVerificationFailed; end
 
     class SSLVersionRejected < SSLConnectionFailed; end
+
+    class MultipleCartridgeCreationNotSupported < Exception; end
   end
 end

data/lib/rhc/rest/domain.rb

@@ -13,9 +13,16 @@ module RHC
         debug "Adding application #{name} to domain #{id}"
 
         payload = {:name => name}
-        options.each do |key, value|
-          payload[key] = value
+        options.each{ |key, value| payload[key.to_sym] = value }
+
+        cartridges = Array(payload.delete(:cartridge)).concat(Array(payload.delete(:cartridges))).compact.uniq
+        if (client.api_version_negotiated >= 1.3)
+          payload[:cartridges] = cartridges
+        else
+          raise RHC::Rest::MultipleCartridgeCreationNotSupported, "The server only supports creating an application with a single web cartridge." if cartridges.length > 1
+          payload[:cartridge] = cartridges.first
         end
+
         options = {:timeout => options[:scale] && 0 || nil}
         rest_method "ADD_APPLICATION", payload, options
       end

data/lib/rhc/rest/mock.rb

@@ -37,6 +37,15 @@ module RHC::Rest::Mock
           }.to_json
         })
     end
+    def stub_api_v12(auth=false)
+      stub_api_request(:get, 'broker/rest/api', auth).
+        to_return({
+          :body => {
+            :data => mock_response_links(mock_real_client_links),
+            :supported_api_versions => [1.0, 1.1, 1.2],
+          }.to_json
+        })
+    end
     def stub_user(auth=mock_user_auth)
       stub_api_request(:get, 'broker/rest/user', auth).to_return(simple_user(username))
     end
@@ -103,7 +112,8 @@ module RHC::Rest::Mock
           :body => {
             :type => 'domains',
             :data => [{:id => name, :links => mock_response_links([
-              ['LIST_APPLICATIONS', "broker/rest/domains/#{name}/applications", 'get']
+              ['LIST_APPLICATIONS', "broker/rest/domains/#{name}/applications", 'get'],
+              ['ADD_APPLICATION', "broker/rest/domains/#{name}/applications", 'post'],
             ])}],
           }.to_json
         })

data/spec/rhc/rest_spec.rb

@@ -29,6 +29,46 @@ describe RHC::Rest::Cartridge do
   end
 end
 
+describe RHC::Rest::Domain do
+  subject{ RHC::Rest::Client.new(:server => mock_uri) }
+  let(:user_auth){ nil }
+  let(:domain) { subject.domains.first }
+  context "against a 1.2 server" do
+    before{ stub_api_v12; stub_one_domain('bar') }
+    before do 
+      stub_api_request(:post, 'broker/rest/domains/bar/applications', false).
+        with(:body => {:name => 'foo', :cartridge => 'bar'}.to_json).
+        to_return(:status => 201, :body => {:type => 'application', :data => {:id => '1'}}.to_json)
+    end
+
+    it{ domain.add_application('foo', :cartridges => ['bar']).should be_true }
+    it{ expect{ domain.add_application('foo', :cartridges => ['bar', 'other']) }.to raise_error(RHC::Rest::MultipleCartridgeCreationNotSupported) }
+    it{ domain.add_application('foo', :cartridges => 'bar').should be_true }
+    it{ domain.add_application('foo', :cartridge => 'bar').should be_true }
+    it{ domain.add_application('foo', :cartridge => ['bar']).should be_true }
+  end
+  context "against a server newer than 1.3" do
+    let(:cartridges){ ['bar'] }
+    before{ stub_api; stub_one_domain('bar') }
+    before do 
+      stub_api_request(:post, 'broker/rest/domains/bar/applications', false).
+        with(:body => {:name => 'foo', :cartridges => cartridges}.to_json).
+        to_return(:status => 201, :body => {:type => 'application', :data => {:id => '1'}}.to_json)
+    end
+
+    it{ domain.add_application('foo', :cartridges => ['bar']).should be_true }
+    it{ domain.add_application('foo', :cartridges => 'bar').should be_true }
+    it{ domain.add_application('foo', :cartridge => 'bar').should be_true }
+    it{ domain.add_application('foo', :cartridge => ['bar']).should be_true }
+
+    context "with multiple cartridges" do
+      let(:cartridges){ ['bar'] }
+      it{ domain.add_application('foo', :cartridges => cartridges).should be_true }
+      it{ domain.add_application('foo', :cartridge => cartridges).should be_true }
+    end
+  end
+end
+
 module RHC
 
   describe Rest do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhc
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -233,141 +233,141 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rhc/cartridge_helpers.rb
-- lib/rhc/exceptions.rb
-- lib/rhc/rest/user.rb
-- lib/rhc/rest/application.rb
-- lib/rhc/rest/base.rb
-- lib/rhc/rest/mock.rb
-- lib/rhc/rest/domain.rb
-- lib/rhc/rest/gear_group.rb
-- lib/rhc/rest/key.rb
-- lib/rhc/rest/api.rb
-- lib/rhc/rest/attributes.rb
-- lib/rhc/rest/client.rb
-- lib/rhc/rest/cartridge.rb
-- lib/rhc/auth.rb
-- lib/rhc/version.rb
-- lib/rhc/output_helpers.rb
 - lib/rhc/core_ext.rb
-- lib/rhc/autocomplete.rb
-- lib/rhc/coverage_helper.rb
-- lib/rhc/config.rb
-- lib/rhc/json.rb
-- lib/rhc/commands.rb
-- lib/rhc/commands/server.rb
-- lib/rhc/commands/base.rb
-- lib/rhc/commands/domain.rb
+- lib/rhc/help_formatter.rb
+- lib/rhc/vendor/zliby.rb
+- lib/rhc/vendor/sshkey.rb
+- lib/rhc/vendor/parseconfig.rb
+- lib/rhc/vendor/okjson.rb
 - lib/rhc/commands/apps.rb
+- lib/rhc/commands/port_forward.rb
 - lib/rhc/commands/threaddump.rb
-- lib/rhc/commands/account.rb
+- lib/rhc/commands/sshkey.rb
+- lib/rhc/commands/setup.rb
 - lib/rhc/commands/snapshot.rb
+- lib/rhc/commands/account.rb
 - lib/rhc/commands/git_clone.rb
-- lib/rhc/commands/port_forward.rb
-- lib/rhc/commands/cartridge.rb
-- lib/rhc/commands/setup.rb
+- lib/rhc/commands/domain.rb
+- lib/rhc/commands/alias.rb
+- lib/rhc/commands/server.rb
 - lib/rhc/commands/app.rb
+- lib/rhc/commands/base.rb
 - lib/rhc/commands/tail.rb
-- lib/rhc/commands/sshkey.rb
-- lib/rhc/commands/alias.rb
-- lib/rhc/vendor/zliby.rb
-- lib/rhc/vendor/okjson.rb
-- lib/rhc/vendor/parseconfig.rb
-- lib/rhc/vendor/sshkey.rb
-- lib/rhc/tar_gz.rb
-- lib/rhc/command_runner.rb
-- lib/rhc/ssh_helpers.rb
+- lib/rhc/commands/cartridge.rb
+- lib/rhc/helpers.rb
+- lib/rhc/auth/basic.rb
+- lib/rhc/exceptions.rb
+- lib/rhc/context_helper.rb
+- lib/rhc/commands.rb
+- lib/rhc/config.rb
 - lib/rhc/git_helpers.rb
+- lib/rhc/coverage_helper.rb
+- lib/rhc/json.rb
+- lib/rhc/version.rb
+- lib/rhc/autocomplete.rb
+- lib/rhc/auth.rb
 - lib/rhc/wizard.rb
 - lib/rhc/cli.rb
-- lib/rhc/auth/basic.rb
-- lib/rhc/context_helper.rb
-- lib/rhc/help_formatter.rb
+- lib/rhc/output_helpers.rb
+- lib/rhc/tar_gz.rb
 - lib/rhc/rest.rb
-- lib/rhc/helpers.rb
+- lib/rhc/command_runner.rb
+- lib/rhc/cartridge_helpers.rb
+- lib/rhc/ssh_helpers.rb
+- lib/rhc/rest/key.rb
+- lib/rhc/rest/mock.rb
+- lib/rhc/rest/api.rb
+- lib/rhc/rest/attributes.rb
+- lib/rhc/rest/application.rb
+- lib/rhc/rest/client.rb
+- lib/rhc/rest/domain.rb
+- lib/rhc/rest/user.rb
+- lib/rhc/rest/base.rb
+- lib/rhc/rest/cartridge.rb
+- lib/rhc/rest/gear_group.rb
 - lib/rhc.rb
+- lib/rhc/usage_templates/options_help.erb
 - lib/rhc/usage_templates/command_syntax_help.erb
-- lib/rhc/usage_templates/help.erb
-- lib/rhc/usage_templates/missing_help.erb
 - lib/rhc/usage_templates/command_help.erb
-- lib/rhc/usage_templates/options_help.erb
+- lib/rhc/usage_templates/missing_help.erb
+- lib/rhc/usage_templates/help.erb
 - lib/rhc/autocomplete_templates/rhc.erb
 - conf/express.conf
 - LICENSE
 - COPYRIGHT
 - README.md
 - Rakefile
-- spec/spec_helper.rb
-- spec/coverage_helper.rb
-- spec/rhc/json_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_client_spec.rb
 - spec/rhc/wizard_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/cli_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/tail_spec.rb
+- spec/rhc/commands/alias_spec.rb
+- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/domain_spec.rb
-- spec/rhc/commands/apps_spec.rb
-- spec/rhc/commands/git_clone_spec.rb
-- spec/rhc/commands/server_spec.rb
 - spec/rhc/commands/app_spec.rb
-- spec/rhc/commands/setup_spec.rb
-- spec/rhc/commands/port_forward_spec.rb
-- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
-- spec/rhc/commands/alias_spec.rb
 - spec/rhc/commands/cartridge_spec.rb
 - spec/rhc/commands/sshkey_spec.rb
+- spec/rhc/commands/server_spec.rb
+- spec/rhc/commands/port_forward_spec.rb
 - spec/rhc/commands/threaddump_spec.rb
+- spec/rhc/commands/apps_spec.rb
+- spec/rhc/commands/git_clone_spec.rb
+- spec/rhc/auth_spec.rb
+- spec/rhc/json_spec.rb
+- spec/rhc/config_spec.rb
+- spec/rhc/helpers_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/context_spec.rb
 - spec/rhc/assets/foo.txt
 - spec/rhc/assets/targz_corrupted.tar.gz
 - spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/command_spec.rb
+- spec/rhc/rest_client_spec.rb
+- spec/rhc/cli_spec.rb
 - spec/rhc/rest_application_spec.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/context_spec.rb
-- spec/rhc/auth_spec.rb
+- spec/rhc/command_spec.rb
+- spec/spec.opts
+- spec/rest_spec_helper.rb
+- spec/spec_helper.rb
+- spec/coverage_helper.rb
 - spec/wizard_spec_helper.rb
-- spec/keys/example.pem
-- spec/keys/server.pem
 - spec/keys/example_private.pem
-- spec/rest_spec_helper.rb
-- spec/spec.opts
-- features/multiple_cartridge.feature
-- features/domain.feature
-- features/verify.feature
-- features/cartridge.feature
+- spec/keys/server.pem
+- spec/keys/example.pem
 - features/client.feature
-- features/support/env.rb
+- features/verify.feature
+- features/README.md
+- features/geared_application.feature
+- features/support/before_hooks.rb
 - features/support/key2.pub
-- features/support/key1
+- features/support/assumptions.rb
 - features/support/key1.pub
-- features/support/before_hooks.rb
+- features/support/key1
+- features/support/env.rb
 - features/support/key3.pub
 - features/support/key2
-- features/support/assumptions.rb
-- features/application.feature
+- features/lib/rhc_helper/sshkey.rb
+- features/lib/rhc_helper/api.rb
+- features/lib/rhc_helper/commandify.rb
+- features/lib/rhc_helper/persistable.rb
+- features/lib/rhc_helper/loggable.rb
+- features/lib/rhc_helper/domain.rb
+- features/lib/rhc_helper/runnable.rb
+- features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/httpify.rb
+- features/lib/rhc_helper/cartridge.rb
+- features/lib/rhc_helper.rb
 - features/sshkey.feature
-- features/geared_application.feature
+- features/domain.feature
+- features/cartridge.feature
 - features/scaled_application.feature
 - features/step_definitions/cartridge_steps.rb
+- features/step_definitions/sshkey_steps.rb
 - features/step_definitions/application_steps.rb
 - features/step_definitions/client_steps.rb
 - features/step_definitions/domain_steps.rb
-- features/step_definitions/sshkey_steps.rb
-- features/lib/rhc_helper.rb
-- features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/domain.rb
-- features/lib/rhc_helper/runnable.rb
-- features/lib/rhc_helper/loggable.rb
-- features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/api.rb
-- features/lib/rhc_helper/cartridge.rb
-- features/lib/rhc_helper/app.rb
-- features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/sshkey.rb
-- features/README.md
+- features/application.feature
+- features/multiple_cartridge.feature
 - bin/rhc
 homepage: https://github.com/openshift/rhc
 licenses: []
@@ -400,74 +400,74 @@ signing_key:
 specification_version: 3
 summary: OpenShift Client Tools
 test_files:
-- spec/spec_helper.rb
-- spec/coverage_helper.rb
-- spec/rhc/json_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_client_spec.rb
 - spec/rhc/wizard_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/cli_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/tail_spec.rb
+- spec/rhc/commands/alias_spec.rb
+- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/domain_spec.rb
-- spec/rhc/commands/apps_spec.rb
-- spec/rhc/commands/git_clone_spec.rb
-- spec/rhc/commands/server_spec.rb
 - spec/rhc/commands/app_spec.rb
-- spec/rhc/commands/setup_spec.rb
-- spec/rhc/commands/port_forward_spec.rb
-- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
-- spec/rhc/commands/alias_spec.rb
 - spec/rhc/commands/cartridge_spec.rb
 - spec/rhc/commands/sshkey_spec.rb
+- spec/rhc/commands/server_spec.rb
+- spec/rhc/commands/port_forward_spec.rb
 - spec/rhc/commands/threaddump_spec.rb
+- spec/rhc/commands/apps_spec.rb
+- spec/rhc/commands/git_clone_spec.rb
+- spec/rhc/auth_spec.rb
+- spec/rhc/json_spec.rb
+- spec/rhc/config_spec.rb
+- spec/rhc/helpers_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/context_spec.rb
 - spec/rhc/assets/foo.txt
 - spec/rhc/assets/targz_corrupted.tar.gz
 - spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/command_spec.rb
+- spec/rhc/rest_client_spec.rb
+- spec/rhc/cli_spec.rb
 - spec/rhc/rest_application_spec.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/context_spec.rb
-- spec/rhc/auth_spec.rb
+- spec/rhc/command_spec.rb
+- spec/spec.opts
+- spec/rest_spec_helper.rb
+- spec/spec_helper.rb
+- spec/coverage_helper.rb
 - spec/wizard_spec_helper.rb
-- spec/keys/example.pem
-- spec/keys/server.pem
 - spec/keys/example_private.pem
-- spec/rest_spec_helper.rb
-- spec/spec.opts
-- features/multiple_cartridge.feature
-- features/domain.feature
-- features/verify.feature
-- features/cartridge.feature
+- spec/keys/server.pem
+- spec/keys/example.pem
 - features/client.feature
-- features/support/env.rb
+- features/verify.feature
+- features/README.md
+- features/geared_application.feature
+- features/support/before_hooks.rb
 - features/support/key2.pub
-- features/support/key1
+- features/support/assumptions.rb
 - features/support/key1.pub
-- features/support/before_hooks.rb
+- features/support/key1
+- features/support/env.rb
 - features/support/key3.pub
 - features/support/key2
-- features/support/assumptions.rb
-- features/application.feature
+- features/lib/rhc_helper/sshkey.rb
+- features/lib/rhc_helper/api.rb
+- features/lib/rhc_helper/commandify.rb
+- features/lib/rhc_helper/persistable.rb
+- features/lib/rhc_helper/loggable.rb
+- features/lib/rhc_helper/domain.rb
+- features/lib/rhc_helper/runnable.rb
+- features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/httpify.rb
+- features/lib/rhc_helper/cartridge.rb
+- features/lib/rhc_helper.rb
 - features/sshkey.feature
-- features/geared_application.feature
+- features/domain.feature
+- features/cartridge.feature
 - features/scaled_application.feature
 - features/step_definitions/cartridge_steps.rb
+- features/step_definitions/sshkey_steps.rb
 - features/step_definitions/application_steps.rb
 - features/step_definitions/client_steps.rb
 - features/step_definitions/domain_steps.rb
-- features/step_definitions/sshkey_steps.rb
-- features/lib/rhc_helper.rb
-- features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/domain.rb
-- features/lib/rhc_helper/runnable.rb
-- features/lib/rhc_helper/loggable.rb
-- features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/api.rb
-- features/lib/rhc_helper/cartridge.rb
-- features/lib/rhc_helper/app.rb
-- features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/sshkey.rb
-- features/README.md
+- features/application.feature
+- features/multiple_cartridge.feature