rhc 1.0.4 → 1.1.11

data/lib/rhc/output_helpers.rb

@@ -174,6 +174,8 @@ module RHC
           date(value)
         when :scales_from,:scales_to
           (value == -1 ? "available gears" : value)
+        when :aliases
+          value.join ' '
         else
           value
         end

data/lib/rhc/rest.rb

@@ -16,7 +16,7 @@ module RHC
       attr_reader :code
       def initialize(message=nil, code=nil)
         super(message)
-        @code = code
+        @code = (Integer(code) rescue code)
       end
     end
 
@@ -150,11 +150,12 @@ module RHC
     def new_request(options)
       # user specified timeout takes presidence
       options[:timeout] = $rest_timeout || options[:timeout]
+      options[:open_timeout] ||= 4
 
       RestClient::Request.new options
     end
 
-    def request(request)
+    def request(request, &block)
       begin
         response = request.execute
         #set cookie
@@ -162,25 +163,44 @@ module RHC
         if not rh_sso.nil?
           @@headers["cookie"] = "rh_sso=#{rh_sso}"
         end
-        return parse_response(response) unless response.nil? or response.code == 204
+        if block_given? 
+          yield response
+        else
+          parse_response(response) unless response.nil? or response.code == 204
+        end
       rescue RestClient::RequestTimeout => e
         raise TimeoutException.new("Connection to server timed out. It is possible the operation finished without being able to report success. Use 'rhc domain show' or 'rhc app status' to check the status of your applications.") 
       rescue RestClient::ServerBrokeConnection => e
         raise ConnectionException.new("Connection to server got interrupted: #{e.message}")
       rescue RestClient::ExceptionWithResponse => e
-        process_error_response(e.response)
+        process_error_response(e.response, request.url)
+      rescue SocketError => e
+        raise ConnectionException.new("Unable to connect to the server (#{e.message})."\
+                                      "#{RestClient.proxy.present? ? " Check that you have correctly specified your proxy server '#{RestClient.proxy}' as well as your OpenShift server '#{request.url}'." : " Check that you have correctly specified your OpenShift server '#{request.url}'."}")
       rescue => e
+        logger.debug e.backtrace.join("\n  ") if @debug
         raise ResourceAccessException.new("Failed to access resource: #{e.message}")
       end
     end
 
-    def process_error_response(response)
-      messages = Array.new
+    def generic_error(url)
+      ServerErrorException.new(
+        "The server did not respond correctly. This may be an issue "\
+        "with the server configuration or with your connection to the "\
+        "server (such as a Web proxy or firewall)."\
+        "#{RestClient.proxy.present? ? " Please verify that your proxy server is working correctly (#{RestClient.proxy}) and that you can access the OpenShift server #{url}" : "Please verify that you can access the OpenShift server #{url}"}",
+        129)
+    end
+
+    def process_error_response(response, url=nil)
+      messages = []
+      parse_error = nil
       begin
         result = RHC::Json.decode(response)
-        messages = result['messages']
+        messages = Array(result['messages'])
       rescue => e
-        logger.debug "Response did not include a message from server" if @mydebug
+        logger.debug "Response did not include a message from server: #{e.message}" if @debug
+        parse_error = generic_error(url)
       end
       case response.code
       when 401
@@ -191,29 +211,30 @@ module RHC
             raise RequestDeniedException, message['text']
           end
         end
+        raise RequestDeniedException.new("Forbidden")
       when 404
         messages.each do |message|
           if message['severity'].upcase == "ERROR"
             raise ResourceNotFoundException, message['text']
           end
         end
+        raise ResourceNotFoundException.new(url)
       when 409
         messages.each do |message|
           if message['severity'] and message['severity'].upcase == "ERROR"
-            raise ValidationException, message['text']
+            raise ValidationException.new(message['text'], message['field'], message['exit_code'])
           end
         end
       when 422
-        #puts response
         e = nil
         messages.each do |message|
           if e and e.field == message["field"]
             e.message << " #{message["text"]}"
           else
-            e = ValidationException.new(message["text"], message["field"], message["code"])
+            e = ValidationException.new(message["text"], message["field"], message["exit_code"])
           end
         end
-        raise e
+        raise e || parse_error || ValidationException.new('Not valid')
       when 400
         messages.each do |message|
           if message['severity'].upcase == "ERROR"
@@ -232,9 +253,11 @@ module RHC
             raise ServiceUnavailableException, message['text']
           end
         end
+        raise ServiceUnavailableException
       else
-        raise ResourceAccessException, "Server returned error code with no output: #{response.code}"
+        raise ServerErrorException, "Server returned an unexpected error code: #{response.code}"
       end
+      raise parse_error || generic_error(url)
     end
   end
 end

data/lib/rhc/rest/cartridge.rb

@@ -3,7 +3,7 @@ require 'rhc/rest/base'
 module RHC
   module Rest
     class Cartridge < Base
-      attr_reader :type, :name, :properties, :status_messages, :scales_to, :scales_from, :scales_with, :current_scale
+      attr_reader :type, :name, :display_name, :properties, :status_messages, :scales_to, :scales_from, :scales_with, :current_scale
       def initialize(args, use_debug=false)
         @properties = {}
         props = args[:properties] || args["properties"] || []

data/lib/rhc/rest/client.rb

@@ -14,7 +14,7 @@ module RHC
       # The list may not necessarily be sorted; we will select the last
       # matching one supported by the server.
       # See #api_version_negotiated
-      CLIENT_API_VERSIONS = [1.0, 1.1, 1.2]
+      CLIENT_API_VERSIONS = [1.1, 1.2, 1.3]
       
       def initialize(end_point, username, password, use_debug=false, preferred_api_versions = CLIENT_API_VERSIONS)
         @debug = use_debug
@@ -33,8 +33,8 @@ module RHC
         # :nocov:
         @@headers["Authorization"] = "Basic #{credentials}"
         @@headers["User-Agent"] = RHC::Helpers.user_agent rescue nil
-        RestClient.proxy = ENV['http_proxy']
-        
+        RestClient.proxy = URI.parse(ENV['http_proxy']).to_s if ENV['http_proxy']
+
         # API version negotiation
         begin
           debug "Client supports API versions #{preferred_api_versions.join(', ')}"
@@ -42,7 +42,7 @@ module RHC
           default_request = new_request(:url => @end_point, :method => :get, :headers => @@headers)
           @server_api_versions, links = api_info(default_request)
           debug "Server supports API versions #{@server_api_versions.join(', ')}"
-        
+
           if api_version_negotiated
             unless server_api_version_current?
               debug "Client API version #{api_version_negotiated} is not current. Refetching API"
@@ -54,8 +54,6 @@ module RHC
           else
             warn_about_api_versions
           end
-        rescue Exception => e
-          raise ResourceAccessException.new("Failed to access resource: #{e.message}")
         end
 
         super({:links => links}, use_debug)
@@ -73,7 +71,7 @@ module RHC
 
       def cartridges
         debug "Getting all cartridges"
-        rest_method "LIST_CARTRIDGES"
+        rest_method("LIST_CARTRIDGES")
       end
 
       def user
@@ -192,8 +190,10 @@ server at #{URI.parse(@end_point).host} supports #{@server_api_versions.join(',
       private
       # execute +req+ with RestClient, and return [server_api_versions, links]
       def api_info(req)
-        json_response = ::RHC::Json.decode(req.execute)
-        [ json_response['supported_api_versions'], json_response['data'] ]
+        request(req) do |response|
+          json_response = ::RHC::Json.decode(response)
+          [ json_response['supported_api_versions'], json_response['data'] ]
+        end
       end
     end
   end

data/lib/rhc/usage_templates/command_help.erb

@@ -8,7 +8,7 @@ List of Actions
   <%= "%-18s %s\n" % [action[:name], action[:summary]] -%>
 <% end -%>
 <% end -%>
-<% unless @command.options.nil? or @command.options.empty? or @command.options.all?{ |o| o[:hide] } -%>
+<% unless @command.options.blank? or @command.options.all?{ |o| o[:hide] } -%>
 
 Options for <%= @command.name %>
 <% for option in @command.options -%><% next if option[:hide] -%>

data/lib/rhc/usage_templates/command_syntax_help.erb

@@ -0,0 +1,11 @@
+Usage: rhc <%= @command.name %> <%= @command.syntax %>
+<% unless @command.options.blank? or @command.options.all?{ |o| o[:hide] } -%>
+Pass '--help' to see the full list of options
+<% end -%>
+<% unless @actions.nil? or @actions.empty? -%>
+
+List of Actions
+<% for action in @actions -%>
+  <%= "%-18s %s\n" % [action[:name], action[:summary]] -%>
+<% end -%>
+<% end -%>

data/lib/rhc/version.rb

@@ -1,8 +1,8 @@
 module RHC
   module VERSION #:nocov:
     MAJOR = 1
-    MINOR = 0
-    MICRO = 4
+    MINOR = 1
+    MICRO = 11
     #PRE  = ''
     STRING = [MAJOR,MINOR,MICRO].compact.join('.')
   end

data/lib/rhc/wizard.rb

@@ -34,7 +34,7 @@ module RHC
         @libra_server = @libra_server ?  @libra_server : "openshift.redhat.com"
       end
       @config.config_user opts.rhlogin if opts && opts.rhlogin
-      @debug = opts.debug if opts.respond_to? :debug
+      @debug = opts.debug if opts
     end
 
     # Public: Runs the setup wizard to make sure ~/.openshift and ~/.ssh are correct

data/spec/rest_spec_helper.rb

@@ -157,11 +157,11 @@ module RestSpecHelper
     end
 
     def cartridges
-      [MockRestCartridge.new("mock_standalone_cart-1", "standalone"),
+      [MockRestCartridge.new("mock_cart-1", "embedded"), # code should sort this to be after standalone
+       MockRestCartridge.new("mock_standalone_cart-1", "standalone"),
        MockRestCartridge.new("mock_standalone_cart-2", "standalone"),
        MockRestCartridge.new("mock_unique_standalone_cart-1", "standalone"),
        MockRestCartridge.new("jenkins-1.4", "standalone"),
-       MockRestCartridge.new("mock_cart-1", "embedded"),
        MockRestCartridge.new("mock_cart-2", "embedded"),
        MockRestCartridge.new("unique_mock_cart-1", "embedded"),
        MockRestCartridge.new("jenkins-client-1.4", "embedded")]
@@ -324,7 +324,7 @@ module RestSpecHelper
   end
 
   class MockRestCartridge < RHC::Rest::Cartridge
-    attr_accessor :scales_to, :scales_from, :current_scale, :scales_with
+    attr_accessor :scales_to, :scales_from, :current_scale, :scales_with, :display_name
     def initialize(name, type, app=nil, properties={:cart_data => {:connection_url => {'name' => 'connection_url', 'value' => "http://fake.url" }}})
       @name = name
       @type = type
@@ -379,3 +379,7 @@ module RestSpecHelper
     end
   end
 end
+
+Spec::Runner.configure do |configuration|
+  include(RestSpecHelper)
+end

data/spec/rhc/cli_spec.rb

@@ -78,7 +78,11 @@ describe RHC::CLI do
 
   describe '#set_terminal' do
     before(:each) { mock_terminal }
-    it('should update $terminal.wrap_at') { expect { RHC::CLI.set_terminal }.to change($terminal, :wrap_at) }
+    it('should update $terminal.wrap_at') do 
+      $stdin.should_receive(:tty?).and_return(true)
+      HighLine::SystemExtensions.should_receive(:terminal_size).and_return([5])
+      expect { RHC::CLI.set_terminal }.to change($terminal, :wrap_at)
+    end
   end
 
 end

data/spec/rhc/command_spec.rb

@@ -55,7 +55,9 @@ describe RHC::Commands::Base do
           end
 
           expects_running('test').should call(:run).on(instance).with(no_args)
-          wizard_run.should be_true
+          wizard_run.should be_false
+
+          stderr.should match("You have not yet configured the OpenShift client tools")
         end
       end
     end
@@ -151,10 +153,7 @@ describe RHC::Commands::Base do
       context 'and when deprecated alias is called' do
         it do
           expects_running('static', 'exe', "arg").should call(:execute).on(instance).with('arg')
-          $stderr.seek(0)
-          # some systems might redirect warnings to stderr
-          output = "#{$stderr.read} #{$terminal.read}"
-          output.should match("Warning: This command is deprecated. Please use 'rhc static execute' instead.")
+          stderr.should match("Warning: This command is deprecated. Please use 'rhc static execute' instead.")
         end
       end
 

data/spec/rhc/commands/app_spec.rb

@@ -18,7 +18,7 @@ describe RHC::Commands::App do
         raise RHC::GitException, "Error in git clone" if repo_dir == "giterrorapp"
         Dir::mkdir(repo_dir)
       end
-      @instance.stub(:host_exist?) do |host|
+      @instance.stub(:host_exists?) do |host|
         host.match("dnserror") ? false : true
       end
       @instance
@@ -42,28 +42,37 @@ describe RHC::Commands::App do
   end
 
   describe 'app create' do
-    let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+    before(:each) do
+      @rc = MockRestClient.new
+      domain = @rc.add_domain("mockdomain")
+    end
 
-    context 'when run' do
-      before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
-      end
+    context 'when run without a cart' do
+      before{ FakeFS.deactivate! }
+      let(:arguments) { ['app', 'create', 'app1', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+      it { run_output.should match(/mock_standalone_cart-1.*Every application needs a web cartridge/m) }
+    end
+
+    context 'when run with a valid cart' do
+      let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
       it { expect { run }.should exit_with_code(0) }
       it { run_output.should match("Success") }
     end
-  end
-
-  describe 'app create no cart found error' do
-    let(:arguments) { ['app', 'create', 'app1', 'nomatch_cart', '--trace', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
-    context 'when run' do
+    context 'when no cartridges are returned' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
+        domain = @rc.domains.first
         @rc.stub(:cartridges) { [] }
+        domain.stub(:add_application).and_raise(RHC::Rest::ValidationException.new('Each application needs a web cartridge', '', '109'))
+      end
+      context 'without trace' do
+        let(:arguments) { ['app', 'create', 'app1', 'nomatch_cart', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+        it { run_output.should match(/Valid cartridge types:.*Each application needs a web cartridge/m) }
+      end
+      context 'with trace' do
+        let(:arguments) { ['app', 'create', 'app1', 'nomatch_cart', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password', '--trace'] }
+        it { expect { run }.should raise_error(RHC::Rest::ValidationException) }
       end
-      it { expect { run }.should raise_error(RHC::CartridgeNotFoundException) }
     end
   end
 
@@ -188,10 +197,10 @@ describe RHC::Commands::App do
         @instance.stub(:setup_jenkins_client) { raise RHC::Rest::ServerErrorException.new("Server error", 157) }
       end
       it "should fail embedding jenkins cartridge" do
+        Kernel.should_receive(:sleep).and_return(true)
         run_output.should match("Jenkins client failed to install")
       end
     end
-
   end
 
   describe 'dns app create warnings' do

data/spec/rhc/commands/cartridge_spec.rb

@@ -34,9 +34,18 @@ describe RHC::Commands::Cartridge do
       before(:each) do
         @rc = MockRestClient.new
       end
-      it {
-        succeed_with_message "mock_cart-1, mock_cart-2, unique_mock_cart-1"
-      }
+      it { succeed_with_message /mock_cart-1.*mock_cart-2.*unique_mock_cart-1/m }
+    end
+  end
+
+  describe 'run without password' do
+    let(:arguments) { ['cartridge', '--trace', '--noprompt', '--config', 'test.conf'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+      end
+      it { succeed_with_message /mock_cart-1.*mock_cart-2.*unique_mock_cart-1/m }
     end
   end
 
@@ -47,9 +56,7 @@ describe RHC::Commands::Cartridge do
       before(:each) do
         @rc = MockRestClient.new
       end
-      it {
-        succeed_with_message "mock_cart-1, mock_cart-2, unique_mock_cart-1"
-      }
+      it { succeed_with_message /mock_cart-1.*mock_cart-2.*unique_mock_cart-1/m }
     end
   end
 

data/spec/rhc/commands/setup_spec.rb

@@ -32,6 +32,19 @@ describe RHC::Commands::Setup do
     end
   end
 
+  context 'when -d is passed' do
+    let(:arguments) { ['setup', '-d', '-l', 'test@test.foo'] }
+    # 'y' for the password prompt
+    let(:input) { ['', 'y', '', ''] }
+
+    before(:each){ @rc = MockRestClient.new }
+
+    it("succeeds"){ FakeFS{ expect { run input }.should exit_with_code 0 } }
+    it("the output includes debug output") do
+      FakeFS{ run_output( input ).should match 'DEBUG' }
+    end
+  end
+
   context 'when -l is used to specify the user name' do
     let(:arguments) { ['setup', '-l', 'test@test.foo'] }
     # 'y' for the password prompt

data/spec/rhc/commands/sshkey_spec.rb

@@ -112,17 +112,18 @@ describe RHC::Commands::Sshkey do
     context "when attempting to add an existing but inaccessible key" do
       let(:arguments) { %w[sshkey add --noprompt --config test.conf -l test@test.foo -p password foobar inaccessible_key.pub] }
       
-      before :all do
-        @inaccessible_key = 'inaccessible_key.pub'
-        File.new(@inaccessible_key, 'w+')
-        File.chmod(0000, @inaccessible_key)
-      end
+      #before :all do
+      #  @inaccessible_key = 'inaccessible_key.pub'
+      #  File.new(@inaccessible_key, 'w+')
+      #  File.chmod(0000, @inaccessible_key)
+      #end
       
-      after :all do
-        File.delete @inaccessible_key
-      end
+      #after :all do
+      #  File.delete @inaccessible_key
+      #end
     
       it "exits with status code Errno::EACCES::Errno" do
+        File.should_receive(:open).and_raise(Errno::EACCES)
         expect { run }.should exit_with_code(128)
       end