rhc 1.14.7 → 1.15.6

data/spec/rhc/commands/tail_spec.rb

@@ -78,4 +78,4 @@ describe RHC::Commands::Tail do
     end
 
   end
-end
+end

data/spec/rhc/helpers_spec.rb

@@ -181,6 +181,11 @@ describe AllRhcHelpers do
       it{ expect{ run }.to exit_with_code(1) }
       it{ run_output.should match("invalid argument: --timeout=string") }
     end
+    context "that is a negative integer" do
+      let(:arguments){ ['help', '--timeout=0'] }
+      it{ expect{ run }.to exit_with_code(1) }
+      it{ run_output.should match("must be a positive integer") }
+    end
     context "via the config" do
       before{ base_config{ |c, d| d.add 'timeout', 'string' } }
       let(:arguments){ ['help'] }
@@ -255,6 +260,10 @@ describe AllRhcHelpers do
     end
   end
 
+  describe "#exec" do
+    it{ subject.send(:exec, 'echo foo').should == [0, "foo\n"] }
+  end
+
   context "Git Helpers" do
     subject{ Class.new(Object){ include RHC::Helpers; include RHC::GitHelpers; def debug?; false; end }.new }
     before{ subject.stub(:git_version){ raise "Fake Exception" } }

data/spec/rhc/rest_client_spec.rb

@@ -154,12 +154,20 @@ module RHC
           it "returns a domain object" do
             domain = client.add_domain('mock_domain')
             domain.class.should == RHC::Rest::Domain
-            domain.id.should == 'mock_domain'
+            domain.name.should == 'mock_domain'
             domain.send(:links).should ==
               mock_response_links(mock_domain_links('mock_domain'))
           end
         end
 
+        context "#update_members" do
+          subject{ RHC::Rest::Application.new }
+          it "raises when the update link is disabled" do
+            subject.should_receive(:supports_members?).and_return(true)
+            expect{ subject.update_members([]) }.to raise_error(RHC::ChangeMembersOnResourceNotSupported)
+          end
+        end
+
         context "#domains" do
           before(:each) do
             stub_api_request(:any, api_links['LIST_DOMAINS']['relative']).
@@ -187,7 +195,7 @@ module RHC
             domains.length.should equal(2)
             (0..1).each do |idx|
               domains[idx].class.should == RHC::Rest::Domain
-              domains[idx].id.should    == "mock_domain_#{idx}"
+              domains[idx].name.should    == "mock_domain_#{idx}"
               domains[idx].send(:links).should ==
                 mock_response_links(mock_domain_links("mock_domain_#{idx}"))
             end
@@ -221,13 +229,13 @@ module RHC
             it "returns a domain object for matching domain IDs" do
               match = nil
               expect { match = client.find_domain('mock_domain_0') }.to_not raise_error
-              match.id.should == 'mock_domain_0'
+              match.name.should == 'mock_domain_0'
               match.class.should == RHC::Rest::Domain
             end
             it "returns a domain object for matching case-insensitive domain IDs" do
               match = nil
               expect { match = client.find_domain('MOCK_DOMAIN_0') }.to_not raise_error
-              match.id.should == 'mock_domain_0'
+              match.name.should == 'mock_domain_0'
               match.class.should == RHC::Rest::Domain
             end
             it "raise an error when no matching domain IDs can be found" do
@@ -266,13 +274,13 @@ module RHC
             it "returns a domain object for matching domain IDs" do
               match = nil
               expect { match = client.find_domain('mock_domain_0') }.to_not raise_error
-              match.id.should == 'mock_domain_0'
+              match.name.should == 'mock_domain_0'
               match.class.should == RHC::Rest::Domain
             end
             it "encodes special characters" do
               match = nil
               expect { match = client.find_domain('mock_domain_%^&') }.to_not raise_error
-              match.id.should == 'mock_domain_%^&'
+              match.name.should == 'mock_domain_%^&'
               match.class.should == RHC::Rest::Domain
             end
             it "raise an error when no matching domain IDs can be found" do
@@ -299,7 +307,7 @@ module RHC
             match = nil
             expect { match = client.owned_domains }.to_not raise_error
             match.length.should == 1
-            match.first.id.should == 'mock_domain_0'
+            match.first.name.should == 'mock_domain_0'
             match.first.class.should == RHC::Rest::Domain
           end
         end
@@ -349,6 +357,66 @@ module RHC
           end
         end
 
+        context "#find_application_by_id" do
+          context "when server does not support SHOW_APPLICATION" do
+            let(:server){ mock_uri }
+            let(:endpoint){ "https://#{server}/broker/rest/api"}
+            before do
+              stub_api
+              stub_one_domain('test')
+              stub_one_application('test', 'app1')
+            end
+            it "returns an app object for matching IDs" do
+              match = nil
+              expect { match = client.find_application_by_id(1) }.to_not raise_error
+              match.id.should == 1
+              match.class.should == RHC::Rest::Application
+            end
+            it "raise an error when no matching app IDs can be found" do
+              expect { client.find_application_by_id('2') }.to raise_error(RHC::Rest::ApplicationNotFoundException)
+            end
+          end
+
+          context "when server supports SHOW_APPLICATION" do
+            let(:api_links){ mock_response_links([['SHOW_APPLICATION', 'application/:id', 'get']]) }
+            before do
+              stub_api_request(:any, api_links['SHOW_APPLICATION']['relative'].gsub(/:id/, 'app_0')).
+                to_return({ :body   => {
+                              :type => 'application',
+                              :data =>
+                              { :id    => 'app_0',
+                                :links => mock_response_links(mock_app_links('app_0')),
+                               }
+                            }.to_json,
+                            :status => 200
+                          })
+              stub_api_request(:any, api_links['SHOW_APPLICATION']['relative'].gsub(/:id/, 'app_1')).
+                to_return({ :body => {:messages => [{:exit_code => 101}]}.to_json,
+                            :status => 404
+                          })
+            end
+            it "returns an app object for matching IDs" do
+              match = nil
+              expect { match = client.find_application_by_id('app_0') }.to_not raise_error
+              match.id.should == 'app_0'
+              match.class.should == RHC::Rest::Application
+            end
+            it "raise an error when no matching IDs can be found" do
+              expect { client.find_application_by_id('app_1') }.to raise_error(RHC::Rest::ApplicationNotFoundException)
+            end
+            it "should fetch application ids" do
+              client.api
+              client.should_receive(:request).with(:url => "#{api_links['SHOW_APPLICATION']['href'].gsub(/:id/, 'app_2')}", :method => "GET", :payload => {}).and_return(1)
+              client.find_application_by_id('app_2').should == 1
+            end
+            it "should fetch application gear groups" do
+              client.api
+              client.should_receive(:request).with(:url => "#{api_links['SHOW_APPLICATION']['href'].gsub(/:id/, 'app_2')}/gear_groups", :method => "GET", :payload => {}).and_return(1)
+              client.find_application_by_id_gear_groups('app_2').should == 1
+            end
+          end
+        end
+
         describe RHC::Rest::Cartridge do
           subject do
             RHC::Rest::Cartridge.new({

data/spec/rhc/rest_spec.rb

@@ -511,7 +511,7 @@ module RHC
         it("raises not authenticated"){ response.should raise_error(RHC::Rest::UnAuthorizedException, 'Not authenticated') }
 
         context "when auth will retry forever" do
-          let(:auth){ stub('auth', :to_request => nil) }
+          let(:auth){ double('auth', :to_request => nil) }
           before{ subject.stub(:auth).and_return(auth); auth.should_receive(:retry_auth?).exactly(4).times.and_return(true) }
           it("raises not authenticated"){ response.should raise_error(RHC::Rest::UnAuthorizedException, 'Not authenticated') }
           after{ WebMock.should have_requested(:get, mock_href).times(RHC::Rest::Client::MAX_RETRIES) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: 
   segments: 
   - 1
-  - 14
-  - 7
-  version: 1.14.7
+  - 15
+  - 6
+  version: 1.15.6
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-17 00:00:00 Z
+date: 2013-10-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -34,9 +34,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
+  name: net-ssh-multi
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: archive-tar-minitar
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,11 +62,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: commander
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,11 +77,11 @@ dependencies:
         - 0
         version: "4.0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,11 +93,11 @@ dependencies:
         - 11
         version: 1.6.11
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: httpclient
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,11 +108,11 @@ dependencies:
         - 2
         version: "2.2"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,11 +122,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,11 +138,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -137,11 +153,11 @@ dependencies:
         - 12
         version: "1.12"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -153,11 +169,11 @@ dependencies:
         - 0
         version: 2.8.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: fakefs
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,11 +184,11 @@ dependencies:
         - 4
         version: "0.4"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,11 +198,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,11 +212,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -211,7 +227,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 description: The client tools for the OpenShift platform that allow for application management.
 email: dev@lists.openshift.redhat.com
 executables: 
@@ -252,6 +268,7 @@ files:
 - lib/rhc/commands/domain.rb
 - lib/rhc/commands/cartridge.rb
 - lib/rhc/commands/authorization.rb
+- lib/rhc/commands/member.rb
 - lib/rhc/commands/sshkey.rb
 - lib/rhc/commands/snapshot.rb
 - lib/rhc/commands/server.rb
@@ -277,6 +294,7 @@ files:
 - lib/rhc/rest/domain.rb
 - lib/rhc/rest/key.rb
 - lib/rhc/rest/cartridge.rb
+- lib/rhc/rest/membership.rb
 - lib/rhc/rest/authorization.rb
 - lib/rhc/rest/gear_group.rb
 - lib/rhc/rest/mock.rb
@@ -313,7 +331,6 @@ files:
 - spec/rhc/assets/targz_corrupted.tar.gz
 - spec/rhc/assets/cert.crt
 - spec/rhc/assets/foo.txt
-- spec/rhc/context_spec.rb
 - spec/rhc/highline_extensions_spec.rb
 - spec/rhc/command_spec.rb
 - spec/rhc/cli_spec.rb
@@ -327,6 +344,7 @@ files:
 - spec/rhc/commands/server_spec.rb
 - spec/rhc/commands/ssh_spec.rb
 - spec/rhc/commands/logout_spec.rb
+- spec/rhc/commands/member_spec.rb
 - spec/rhc/commands/alias_spec.rb
 - spec/rhc/commands/authorization_spec.rb
 - spec/rhc/commands/account_spec.rb
@@ -340,47 +358,13 @@ files:
 - spec/rhc/rest_application_spec.rb
 - spec/spec_helper.rb
 - spec/coverage_helper.rb
+- spec/direct_execution_helper.rb
 - spec/keys/server.pem
 - spec/keys/example.pem
 - spec/keys/example_private.pem
-- features/application.feature
-- features/client.feature
-- features/step_definitions/application_steps.rb
-- features/step_definitions/client_steps.rb
-- features/step_definitions/cartridge_steps.rb
-- features/step_definitions/domain_steps.rb
-- features/step_definitions/sshkey_steps.rb
-- features/step_definitions/env_steps.rb
-- features/cartridge.feature
-- features/README.md
-- features/support/before_hooks.rb
-- features/support/key1.pub
-- features/support/key2.pub
-- features/support/key1
-- features/support/key2
-- features/support/assumptions.rb
-- features/support/platform_support.rb
-- features/support/key3.pub
-- features/support/env.rb
-- features/sshkey.feature
-- features/multiple_cartridge.feature
-- features/scaled_application.feature
-- features/verify.feature
-- features/geared_application.feature
-- features/env.feature
-- features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/api.rb
-- features/lib/rhc_helper/domain.rb
-- features/lib/rhc_helper/cartridge.rb
-- features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/runnable.rb
-- features/lib/rhc_helper/sshkey.rb
-- features/lib/rhc_helper/loggable.rb
-- features/lib/rhc_helper/app.rb
-- features/lib/rhc_helper/env.rb
-- features/lib/rhc_helper.rb
-- features/domain.feature
+- features/core_feature.rb
+- features/domains_feature.rb
+- features/members_feature.rb
 - bin/rhc
 homepage: https://github.com/openshift/rhc
 licenses: []
@@ -437,7 +421,6 @@ test_files:
 - spec/rhc/assets/targz_corrupted.tar.gz
 - spec/rhc/assets/cert.crt
 - spec/rhc/assets/foo.txt
-- spec/rhc/context_spec.rb
 - spec/rhc/highline_extensions_spec.rb
 - spec/rhc/command_spec.rb
 - spec/rhc/cli_spec.rb
@@ -451,6 +434,7 @@ test_files:
 - spec/rhc/commands/server_spec.rb
 - spec/rhc/commands/ssh_spec.rb
 - spec/rhc/commands/logout_spec.rb
+- spec/rhc/commands/member_spec.rb
 - spec/rhc/commands/alias_spec.rb
 - spec/rhc/commands/authorization_spec.rb
 - spec/rhc/commands/account_spec.rb
@@ -464,44 +448,10 @@ test_files:
 - spec/rhc/rest_application_spec.rb
 - spec/spec_helper.rb
 - spec/coverage_helper.rb
+- spec/direct_execution_helper.rb
 - spec/keys/server.pem
 - spec/keys/example.pem
 - spec/keys/example_private.pem
-- features/application.feature
-- features/client.feature
-- features/step_definitions/application_steps.rb
-- features/step_definitions/client_steps.rb
-- features/step_definitions/cartridge_steps.rb
-- features/step_definitions/domain_steps.rb
-- features/step_definitions/sshkey_steps.rb
-- features/step_definitions/env_steps.rb
-- features/cartridge.feature
-- features/README.md
-- features/support/before_hooks.rb
-- features/support/key1.pub
-- features/support/key2.pub
-- features/support/key1
-- features/support/key2
-- features/support/assumptions.rb
-- features/support/platform_support.rb
-- features/support/key3.pub
-- features/support/env.rb
-- features/sshkey.feature
-- features/multiple_cartridge.feature
-- features/scaled_application.feature
-- features/verify.feature
-- features/geared_application.feature
-- features/env.feature
-- features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/api.rb
-- features/lib/rhc_helper/domain.rb
-- features/lib/rhc_helper/cartridge.rb
-- features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/runnable.rb
-- features/lib/rhc_helper/sshkey.rb
-- features/lib/rhc_helper/loggable.rb
-- features/lib/rhc_helper/app.rb
-- features/lib/rhc_helper/env.rb
-- features/lib/rhc_helper.rb
-- features/domain.feature
+- features/core_feature.rb
+- features/domains_feature.rb
+- features/members_feature.rb