RubyGems - rhc - Versions diffs - 1.0.4 → 1.1.11 - Mend

rhc 1.0.4 → 1.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (37) hide show

data/bin/rhc-chk +7 -2
data/bin/rhc-user-info +0 -2
data/features/cartridge.feature +10 -0
data/features/lib/rhc_helper/cartridge.rb +9 -2
data/features/lib/rhc_helper/commandify.rb +2 -3
data/features/step_definitions/cartridge_steps.rb +10 -0
data/lib/rhc-common.rb +1 -3
data/lib/rhc/{cartridge_helper.rb → cartridge_helpers.rb} +1 -0
data/lib/rhc/command_runner.rb +9 -15
data/lib/rhc/commands.rb +4 -1
data/lib/rhc/commands/app.rb +62 -30
data/lib/rhc/commands/base.rb +1 -1
data/lib/rhc/commands/cartridge.rb +29 -12
data/lib/rhc/commands/sshkey.rb +3 -2
data/lib/rhc/help_formatter.rb +3 -0
data/lib/rhc/helpers.rb +34 -5
data/lib/rhc/output_helpers.rb +2 -0
data/lib/rhc/rest.rb +36 -13
data/lib/rhc/rest/cartridge.rb +1 -1
data/lib/rhc/rest/client.rb +9 -9
data/lib/rhc/usage_templates/command_help.erb +1 -1
data/lib/rhc/usage_templates/command_syntax_help.erb +11 -0
data/lib/rhc/version.rb +2 -2
data/lib/rhc/wizard.rb +1 -1
data/spec/rest_spec_helper.rb +7 -3
data/spec/rhc/cli_spec.rb +5 -1
data/spec/rhc/command_spec.rb +4 -5
data/spec/rhc/commands/app_spec.rb +25 -16
data/spec/rhc/commands/cartridge_spec.rb +13 -6
data/spec/rhc/commands/setup_spec.rb +13 -0
data/spec/rhc/commands/sshkey_spec.rb +9 -8
data/spec/rhc/helpers_spec.rb +31 -0
data/spec/rhc/rest_application_spec.rb +0 -4
data/spec/rhc/rest_client_spec.rb +3 -8
data/spec/rhc/rest_spec.rb +138 -72
data/spec/spec_helper.rb +6 -0
metadata +26 -9

data/spec/rhc/helpers_spec.rb CHANGED

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'rhc/helpers'
 require 'rhc/ssh_key_helpers'
+require 'rhc/cartridge_helpers'
 require 'rhc/core_ext'
 require 'highline/import'
 require 'rhc/config'
@@ -294,3 +295,33 @@ describe HighLine do
     output.should match "Ant\nidi\nses\ntab\nlis\nhme\nnta\nria\nnis\nm"
   end
 end
+describe RHC::CartridgeHelpers do
+  before(:each) do
+    mock_terminal
+    @tests = HelperTests.new
+  end
+  subject do
+    Class.new(Object) do
+      include RHC::CartridgeHelpers
+      def config
+        @config ||= RHC::Config.new
+      end
+    end.new
+  end
+  describe '#find_cartridge' do
+    let(:cartridges){ [] }
+    let(:find_cartridges){ [] }
+    let(:rest_obj) do
+      Object.new.tap do |o|
+        o.stub(:find_cartridges).and_return(find_cartridges)
+        o.stub(:cartridges).and_return(cartridges)
+      end
+    end
+    it { expect{ subject.find_cartridge(rest_obj, 'foo') }.should raise_error(RHC::CartridgeNotFoundException, 'Invalid cartridge specified: \'foo\'. No cartridges have been added to this app.') }
+  end
+end

data/spec/rhc/rest_application_spec.rb CHANGED

@@ -2,10 +2,6 @@ require 'spec_helper'
 require 'rest_spec_helper'
 require 'base64'
-Spec::Runner.configure do |configuration|
-  include(RestSpecHelper)
-end
 module RHC
   module Rest
     describe Application do

data/spec/rhc/rest_client_spec.rb CHANGED

@@ -4,10 +4,6 @@ require 'stringio'
 require 'rest_spec_helper'
 require 'rhc/rest/client'
-Spec::Runner.configure do |configuration|
-  include(RestSpecHelper)
-end
 # This object is used in a few cases where we need to inspect
 # the logged output.
 class MockClient < RHC::Rest::Client
@@ -445,8 +441,8 @@ module RHC
               capture do
                 @client = MockClient.new(mock_href, mock_user, mock_pass, true)
                 @client.send logout_method.to_sym
-                $stderr.rewind
-                $stderr.read.should =~ /Logout\/Close client$/
+                stderr.should match(/Logout\/Close client$/)
               end
             end
           end
@@ -455,8 +451,7 @@ module RHC
               capture do
                 @client = MockClient.new(mock_href, mock_user, mock_pass, false)
                 @client.send logout_method.to_sym
-                $stderr.rewind
-                $stderr.read.should == ''
+                stderr.should be_empty
               end
             end
           end

data/spec/rhc/rest_spec.rb CHANGED

@@ -2,26 +2,16 @@ require 'spec_helper'
 require 'rest_spec_helper'
 require 'rhc/rest'
-Spec::Runner.configure do |configuration|
-  include(RestSpecHelper)
-end
 # We have to make an object to test the RHC::Rest module
 class RHCRest
   include RHC::Rest
 end
 module MockRestResponse
-  def set_code(error_code)
-    @error_code = error_code
-  end
-  def code
-    @error_code
-  end
+  attr_accessor :code, :read
 end
 module RHC
-  include RestSpecHelper
   describe Rest do
     subject{ RHCRest.new }
@@ -313,6 +303,17 @@ module RHC
         end
       end
+      context "with a socket errort" do
+        before{ stub_request(:get, mock_href).to_raise(SocketError) }
+        it "raises a resource access exception error" do
+          request = RestClient::Request.new(:url     => mock_href,
+                                            :method  => 'get',
+                                            :headers => {:accept => :json}
+                                            )
+          lambda { subject.request(request) }.should raise_error(RHC::Rest::ConnectionException, /unable to connect to the server/i)
+        end
+      end
       context "with a generic exception error" do
         before do
           stub_request(:get, mock_href).to_raise(Exception.new('Generic Error'))
@@ -349,104 +350,169 @@ module RHC
     # process_error_response function
     describe "#process_error_response" do
+      let(:json){ nil }
+      let(:body){ "<html><body>Something failed</body></html>" }
+      let(:code){ nil }
+      def response
+        (response = {}).extend(MockRestResponse)
+        response.code = code
+        response.read = json ? RHC::Json.encode(json) : body
+        response
+      end
       context "with a 400 response" do
-        it "raises a client error" do
-          mock_resp  = { :messages => [{ :severity => 'error', :text => 'mock error message' }] }
-          json_data = RHC::Json.encode(mock_resp)
-          json_data.extend(MockRestResponse)
-          json_data.set_code(400)
-          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ClientErrorException, 'mock error message')
+        let(:code){ 400 }
+        it "raises a generic server error" do
+          lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ServerErrorException)
+        end
+        context "with a formatted JSON response" do
+          let(:json){ {:messages => [{ :severity => 'error', :text => 'mock error message' }] } }
+          it "raises a client error" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ClientErrorException, 'mock error message')
+          end
         end
       end
       context "with a 401 response" do
+        let(:code){ 401 }
+        let(:json){ {} }
         it "raises an 'unauthorized exception' error" do
-          json_data = RHC::Json.encode({})
-          json_data.extend(MockRestResponse)
-          json_data.set_code(401)
-          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::UnAuthorizedException, 'Not authenticated')
+          lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::UnAuthorizedException, 'Not authenticated')
         end
       end
       context "with a 403 response" do
-        it "raises a 'request denied' error" do
-          mock_resp  = { :messages => [{ :severity => 'error', :text => 'mock error message' }] }
-          json_data  = RHC::Json.encode(mock_resp)
-          json_data.extend(MockRestResponse)
-          json_data.set_code(403)
-          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::RequestDeniedException, 'mock error message')
+        let(:code){ 403 }
+        it "raises a request denied error" do
+          lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::RequestDeniedException)
+        end
+        context "with a formatted JSON response" do
+          let(:json){ { :messages => [{ :severity => 'error', :text => 'mock error message' }] } }
+          it "raises a 'request denied' error" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::RequestDeniedException, 'mock error message')
+          end
         end
       end
       context "with a 404 response" do
-        it "raises a 'resource not found' error" do
-          mock_resp  = { :messages => [{ :severity => 'error', :text => 'mock error message' }] }
-          json_data  = RHC::Json.encode(mock_resp)
-          json_data.extend(MockRestResponse)
-          json_data.set_code(404)
-          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ResourceNotFoundException, 'mock error message')
+        let(:code){ 404 }
+        it "raises a Not Found error" do
+          lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ResourceNotFoundException)
+        end
+        context "with a formatted JSON response" do
+          let(:json){ { :messages => [{ :severity => 'error', :text => 'mock error message' }] } }
+          it "raises a 'resource not found' error" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ResourceNotFoundException, 'mock error message')
+          end
         end
       end
       context "with a 409 response" do
-        it "raises a validation error" do
-          mock_resp  = { :messages => [{ :severity => 'error', :text => 'mock error message' }] }
-          json_data  = RHC::Json.encode(mock_resp)
-          json_data.extend(MockRestResponse)
-          json_data.set_code(409)
-          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ValidationException, 'mock error message')
+        let(:code){ 409 }
+        it "raises a generic server error" do
+          lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ServerErrorException)
+        end
+        context "with a formatted JSON response" do
+          let(:json){ { :messages => [{ :severity => 'error', :text => 'mock error message' }] } }
+          it "raises a validation error" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ValidationException, 'mock error message')
+          end
         end
       end
       context "with a 422 response" do
-        it "raises a validation error" do
-          mock_resp  = { :messages => [{ :severity => 'error', :text => 'mock error message' }] }
-          json_data  = RHC::Json.encode(mock_resp)
-          json_data.extend(MockRestResponse)
-          json_data.set_code(422)
-          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ValidationException, 'mock error message')
+        let(:code){ 422 }
+        it "raises a generic server error" do
+          lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ServerErrorException)
         end
-      end
-      context "with multiple 422 responses" do
-        it "raises a validation error with concatenated messages" do
-          mock_resp  = { :messages => [{ :field => 'error', :text => 'mock error message 1' },
-                                       { :field => 'error', :text => 'mock error message 2' }] }
-          json_data  = RHC::Json.encode(mock_resp)
-          json_data.extend(MockRestResponse)
-          json_data.set_code(422)
-          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ValidationException, 'mock error message 1 mock error message 2')
+        context "with a single JSON message" do
+          let(:json){ { :messages => [{ :severity => 'error', :text => 'mock error message' }] } }
+          it "raises a validation error" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ValidationException, 'mock error message')
+          end
+        end
+        context "with an empty JSON response" do
+          let(:json){ {} }
+          it "raises a validation error" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ValidationException, 'Not valid')
+          end
+        end
+        context "with multiple JSON messages" do
+          let(:json){ { :messages => [{ :field => 'error', :text => 'mock error message 1' },
+                                       { :field => 'error', :text => 'mock error message 2' }] } }
+          it "raises a validation error with concatenated messages" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ValidationException, 'mock error message 1 mock error message 2')
+          end
         end
       end
       context "with a 500 response" do
-        it "raises a server error" do
-          mock_resp  = { :messages => [{ :severity => 'error', :text => 'mock error message' }] }
-          json_data  = RHC::Json.encode(mock_resp)
-          json_data.extend(MockRestResponse)
-          json_data.set_code(500)
-          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ServerErrorException, 'mock error message')
+        let(:code){ 500 }
+        it "raises a generic server error" do
+          lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ServerErrorException, /server did not respond correctly.*verify that you can access the OpenShift server/i)
+        end
+        context "when proxy is set" do
+          before{ RestClient.should_receive(:proxy).twice.and_return('http://foo.com') }
+          it "raises a generic server error with the proxy URL" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ServerErrorException, /foo\.com/i)
+          end
+        end
+        context "when request url is present" do
+          it "raises a generic server error with the request URL" do
+            lambda { subject.process_error_response(response, 'foo.bar') }.should raise_error(RHC::Rest::ServerErrorException, /foo\.bar/i)
+          end
+        end
+        context "with a formatted JSON response" do
+          let(:json){ { :messages => [{ :severity => 'error', :text => 'mock error message' }] } }
+          it "raises a server error" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ServerErrorException, 'mock error message')
+          end
         end
       end
       context "with a 503 response" do
+        let(:code){ 503 }
         it "raises a 'service unavailable' error" do
-          mock_resp  = { :messages => [{ :severity => 'error', :text => 'mock error message' }] }
-          json_data  = RHC::Json.encode(mock_resp)
-          json_data.extend(MockRestResponse)
-          json_data.set_code(503)
-          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ServiceUnavailableException, 'mock error message')
+          lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ServiceUnavailableException)
+        end
+        context "with a formatted JSON response" do
+          let(:json){ { :messages => [{ :severity => 'error', :text => 'mock error message' }] } }
+          it "raises a 'service unavailable' error" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ServiceUnavailableException, 'mock error message')
+          end
         end
       end
       context "with an unhandled response code" do
-        it "raises a resource access error" do
-          mock_resp  = { :messages => [{ :severity => 'error', :text => 'mock error message' }] }
-          json_data  = RHC::Json.encode(mock_resp)
-          json_data.extend(MockRestResponse)
-          json_data.set_code(999)
-          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ResourceAccessException, 'Server returned error code with no output: 999')
+        let(:code){ 999 }
+        it "raises a generic server error" do
+          lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ServerErrorException)
+        end
+        context "with a formatted JSON response" do
+          let(:json){ { :messages => [{ :severity => 'error', :text => 'mock error message' }] } }
+          it "raises a resource access error" do
+            lambda { subject.process_error_response(response) }.should raise_error(RHC::Rest::ServerErrorException, 'Server returned an unexpected error code: 999')
+          end
         end
       end
     end

data/spec/spec_helper.rb CHANGED

@@ -25,6 +25,12 @@ require 'rhc/cli'
 include WebMock::API
+def stderr
+  $stderr.rewind
+  # some systems might redirect warnings to stderr
+  [$stderr,$terminal].map(&:read).delete_if{|x| x.strip.empty?}.join(' ')
+end
 module Commander::UI
   alias :enable_paging_old :enable_paging
   def enable_paging

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rhc
 version: !ruby/object:Gem::Version
-  hash: 31
+  hash: 5
   prerelease: false
   segments:
   - 1
-  - 0
-  - 4
-  version: 1.0.4
+  - 1
+  - 11
+  version: 1.1.11
 platform: ruby
 authors:
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00 -05:00
+date: 2012-11-26 00:00:00 -06:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -130,10 +130,21 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 3
+        hash: 49
         segments:
         - 0
-        version: "0"
+        - 8
+        - 7
+        version: 0.8.7
+    - - <=
+      - !ruby/object:Gem::Version
+        hash: 11
+        segments:
+        - 0
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency
@@ -287,6 +298,7 @@ files:
 - lib/rhc/vendor/parseconfig.rb
 - lib/rhc/vendor/sshkey.rb
 - lib/rhc/vendor/okjson.rb
+- lib/rhc/cartridge_helpers.rb
 - lib/rhc/command_runner.rb
 - lib/rhc/context_helper.rb
 - lib/rhc/rest.rb
@@ -305,8 +317,8 @@ files:
 - lib/rhc/helpers.rb
 - lib/rhc/config.rb
 - lib/rhc/coverage_helper.rb
-- lib/rhc/cartridge_helper.rb
 - lib/rhc-common.rb
+- lib/rhc/usage_templates/command_syntax_help.erb
 - lib/rhc/usage_templates/missing_help.erb
 - lib/rhc/usage_templates/command_help.erb
 - lib/rhc/usage_templates/help.erb
@@ -396,7 +408,12 @@ has_rdoc: true
 homepage: https://github.com/openshift/rhc
 licenses: []
-post_install_message:
+post_install_message: |-
+  ===========================================================================
+  If this is your first time installing the RHC tools, please run 'rhc setup'
+  ===========================================================================
 rdoc_options: []
 require_paths: