rhc 1.9.6 → 1.10.7

data/lib/rhc/rest.rb

@@ -97,7 +97,22 @@ module RHC
 
     #I/O Exceptions Connection timeouts, etc
     class ConnectionException < Exception; end
-    class TimeoutException < ConnectionException; end
+    class TimeoutException < ConnectionException
+      def initialize(message, nested=nil)
+        super(message)
+        @nested = nested
+      end
+
+      def on_receive?
+        @nested.is_a? HTTPClient::ReceiveTimeoutError
+      end
+      def on_connect?
+        @nested.is_a? HTTPClient::ConnectTimeoutError
+      end
+      def on_send?
+        @nested.is_a? HTTPClient::SendTimeoutError
+      end
+    end
 
     class SSLConnectionFailed < ConnectionException
       attr_reader :reason

data/lib/rhc/rest/application.rb

@@ -63,11 +63,15 @@ module RHC
         rest_method "GET_GEAR_GROUPS"
       end
 
+      def gears
+        gear_groups.map{ |group| group.gears }.flatten
+      end
+
       def gear_ssh_url(gear_id)
-        gear = gear_groups.map { |group| group.gears }.flatten.find { |g| g['id'] == gear_id }
+        gear = gears.find{ |g| g['id'] == gear_id }
 
-        raise ArgumentError.new("Gear #{gear_id} not found") if gear.nil?
-        gear['ssh_url'] or raise OperationNotSupportedException.new("The server does not support per gear operations")
+        raise ArgumentError, "Gear #{gear_id} not found" if gear.nil?
+        gear['ssh_url'] or raise NoPerGearOperations
       end
 
       def tidy

data/lib/rhc/rest/base.rb

@@ -23,11 +23,16 @@ module RHC
         url = url.gsub(/:\w+/) { |s| options[:params][s] } if options[:params]
         method = options[:method] || link['method']
 
-        client.request(options.merge({
+        result = client.request(options.merge({
           :url => url,
           :method => method,
           :payload => payload,
         }))
+        if result.is_a?(Hash) && (result['messages'] || result['errors'])
+          attributes['messages'] = Array(result['messages'])
+          result = self
+        end
+        result
       end
 
       def links
@@ -60,4 +65,4 @@ module RHC
         end
     end
   end
-end
+end

data/lib/rhc/rest/client.rb

@@ -175,7 +175,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.1, 1.2, 1.3, 1.4]
+      CLIENT_API_VERSIONS = [1.1, 1.2, 1.3, 1.4, 1.5]
 
       def initialize(*args)
         options = args[0].is_a?(Hash) && args[0] || {}
@@ -207,8 +207,6 @@ module RHC
         self.headers.merge!(options.delete(:headers)) if options[:headers]
         self.options.merge!(options)
 
-        update_http_proxy_env
-
         debug "Connecting to #{@end_point}"
       end
 
@@ -262,7 +260,7 @@ module RHC
               "Connection to server timed out. "\
               "It is possible the operation finished without being able "\
               "to report success. Use 'rhc domain show' or 'rhc app show' "\
-              "to see the status of your applications.")
+              "to see the status of your applications.", e)
           rescue EOFError => e
             raise ConnectionException.new(
               "Connection to server got interrupted: #{e.message}")
@@ -306,6 +304,9 @@ module RHC
             raise ConnectionException.new(
               "Unable to connect to the server (#{e.message})."\
               "#{client.proxy.present? ? " Check that you have correctly specified your proxy server '#{client.proxy}' as well as your OpenShift server '#{args[1]}'." : " Check that you have correctly specified your OpenShift server '#{args[1]}'."}")
+          rescue Errno::ECONNRESET => e
+            raise ConnectionException.new(
+              "The server has closed the connection unexpectedly (#{e.message}). Your last operation may still be running on the server; please check before retrying your last request.")
           rescue RHC::Rest::Exception
             raise
           rescue => e
@@ -438,11 +439,11 @@ module RHC
         def parse_response(response)
           result = RHC::Json.decode(response)
           type = result['type']
-          data = result['data']
+          data = result['data'] || {}
 
           # Copy messages to each object
           messages = Array(result['messages']).map do |m|
-            m['text'] if m['field'].nil? or m['field'] == 'result'
+            m['text'] if m['field'].nil? or m['field'] == 'result' or m['severity'] == 'result'
           end.compact
           data.each{ |d| d['messages'] = messages } if data.is_a?(Array)
           data['messages'] = messages if data.is_a?(Hash)
@@ -559,14 +560,6 @@ module RHC
           keys = messages.group_by{ |m| m['field'] }.keys.compact.sort.map(&:to_sym) rescue []
           [messages_to_error(messages), keys]
         end
-
-        def update_http_proxy_env
-          # Set the http_proxy env variable, read by
-          # HTTPClient, being sure to add the http protocol
-          # if not specified already
-          proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-          ENV['http_proxy'] = "http://#{proxy}" if proxy.present? && proxy !~ /^(\w+):\/\//
-        end
     end
   end
 end

data/lib/rhc/rest/gear_group.rb

@@ -1,7 +1,16 @@
 module RHC
   module Rest
     class GearGroup < Base
-      define_attr :gears, :cartridges, :gear_profile
+      define_attr :gears, :cartridges, :gear_profile, :additional_gear_storage, :base_gear_storage
+
+      def name(gear)
+        gear['name'] ||= "#{group.cartridges.collect{ |c| c['name'] }.join('+')}:#{gear['id']}"
+      end
+
+      def quota
+        return nil unless base_gear_storage
+        ((additional_gear_storage || 0) + base_gear_storage) * 1024 * 1024 * 1024
+      end
     end
   end
 end

data/lib/rhc/rest/mock.rb

@@ -52,7 +52,7 @@ module RHC::Rest::Mock
         to_return({
           :body => {
             :data => mock_response_links(authorizations ? mock_api_with_authorizations : mock_real_client_links),
-            :supported_api_versions => [1.0, 1.1, 1.2, 1.3, 1.4],
+            :supported_api_versions => [1.0, 1.1, 1.2, 1.3, 1.4, 1.5],
           }.to_json
         })
     end
@@ -208,6 +208,21 @@ module RHC::Rest::Mock
         })
     end
 
+    def stub_application_cartridges(domain_name, app_name, cartridges, status = 200)
+      url = client_links['LIST_DOMAINS']['relative'] rescue "broker/rest/domains"
+      stub_api_request(:any, "#{url}/#{domain_name}/applications/#{app_name}/cartridges").
+        to_return({
+          :body   => {
+            :type => 'cartridges',
+            :data => cartridges.map{ |c| c.is_a?(String) ? {:name => c} : c }.map do |cart|
+              cart[:links] ||= mock_response_links(mock_cart_links(domain_name,app_name, cart[:name]))
+              cart
+            end
+          }.to_json,
+          :status => status
+        })
+    end
+
     def stub_simple_carts
       stub_api_request(:get, 'broker/rest/cartridges', mock_user_auth).to_return(simple_carts)
     end
@@ -324,7 +339,7 @@ module RHC::Rest::Mock
 
     def mock_app_links(domain_id='test_domain',app_id='test_app')
       [['ADD_CARTRIDGE',   "domains/#{domain_id}/apps/#{app_id}/carts/add", 'post'],
-       ['LIST_CARTRIDGES', "domains/#{domain_id}/apps/#{app_id}/carts/",    'get' ],
+       ['LIST_CARTRIDGES', "broker/rest/domains/#{domain_id}/applications/#{app_id}/cartridges",'get' ],
        ['GET_GEAR_GROUPS', "domains/#{domain_id}/apps/#{app_id}/gear_groups", 'get' ],
        ['START',           "domains/#{domain_id}/apps/#{app_id}/start",     'post'],
        ['STOP',            "domains/#{domain_id}/apps/#{app_id}/stop",      'post'],
@@ -333,14 +348,14 @@ module RHC::Rest::Mock
        ['ADD_ALIAS',       "domains/#{domain_id}/apps/#{app_id}/event",     'post'],
        ['REMOVE_ALIAS',    "domains/#{domain_id}/apps/#{app_id}/event",     'post'],
        ['LIST_ALIASES',    "domains/#{domain_id}/apps/#{app_id}/aliases",   'get'],
-       ['DELETE',          "domains/#{domain_id}/apps/#{app_id}/delete",    'post']]
+       ['DELETE',          "broker/rest/domains/#{domain_id}/applications/#{app_id}", 'DELETE']]
     end
 
     def mock_cart_links(domain_id='test_domain',app_id='test_app',cart_id='test_cart')
       [['START',   "domains/#{domain_id}/apps/#{app_id}/carts/#{cart_id}/start",   'post'],
        ['STOP',    "domains/#{domain_id}/apps/#{app_id}/carts/#{cart_id}/stop",    'post'],
        ['RESTART', "domains/#{domain_id}/apps/#{app_id}/carts/#{cart_id}/restart", 'post'],
-       ['DELETE',  "domains/#{domain_id}/apps/#{app_id}/carts/#{cart_id}/delete",  'post']]
+       ['DELETE',  "broker/rest/domains/#{domain_id}/applications/#{app_id}/cartridges/#{cart_id}",  'DELETE']]
     end
 
     def mock_client_links
@@ -487,6 +502,8 @@ module RHC::Rest::Mock
        MockRestCartridge.new(self, "mock_cart-2", "embedded"),
        MockRestCartridge.new(self, "unique_mock_cart-1", "embedded"),
        MockRestCartridge.new(self, "jenkins-client-1.4", "embedded"),
+       MockRestCartridge.new(self, "embcart-1", "embedded"),
+       MockRestCartridge.new(self, "embcart-2", "embedded"),
        premium_embedded
       ]
     end
@@ -601,11 +618,14 @@ module RHC::Rest::Mock
 
   class MockRestGearGroup < RHC::Rest::GearGroup
     include Helpers
-    def initialize(client=nil)
+    def initialize(client=nil, carts=['name' => 'fake_geargroup_cart-0.1'], count=1)
       super({}, client)
-      @cartridges = [{'name' => 'fake_geargroup_cart-0.1'}]
-      @gears = [{'state' => 'started', 'id' => 'fakegearid', 'ssh_url' => 'ssh://fakegearid@fakesshurl.com'}]
+      @cartridges = carts
+      @gears = count.times.map do |i| 
+        {'state' => 'started', 'id' => "fakegearid#{i}", 'ssh_url' => "ssh://fakegearid#{i}@fakesshurl.com"}
+      end
       @gear_profile = 'small'
+      @base_gear_storage = 1
     end
   end
 
@@ -710,7 +730,13 @@ module RHC::Rest::Mock
 
     def gear_groups
       # we don't have heavy interaction with gear groups yet so keep this simple
-      @gear_groups ||= [MockRestGearGroup.new(client)]
+      @gear_groups ||= begin
+        if @scalable
+          cartridges.map{ |c| MockRestGearGroup.new(client, [c.name], c.current_scale) if c.name != 'haproxy-1.4' }.compact
+        else
+          [MockRestGearGroup.new(client, cartridges.map{ |c| {'name' => c.name} }, 1)]
+        end
+      end
     end
 
     def cartridges

data/lib/rhc/ssh_helpers.rb

@@ -20,6 +20,134 @@ require 'rhc/vendor/sshkey'
 
 module RHC
   module SSHHelpers
+
+    class MultipleGearTask
+      def initialize(command, over, opts={})
+        requires_ssh_multi!
+
+        @command = command
+        @over = over
+        @opts = opts
+      end
+
+      def run(&block)
+        out = nil
+
+        Net::SSH::Multi.start(
+          :concurrent_connections => @opts[:limit], 
+          :on_error => lambda{ |server| $stderr.puts "Unable to connect to gear #{server}" }
+        ) do |session|
+          
+          @over.each do |item| 
+            case item
+            when RHC::Rest::GearGroup
+              item.gears.each do |gear|
+                session.use ssh_host_for(gear), :properties => {:gear => gear, :group => item}
+              end
+            #when RHC::Rest::Gear
+            #  session.use ssh_host_for(item), :properties => {:gear => item}
+            #end
+            else 
+              raise "Cannot establish an SSH session to this type"
+            end
+          end
+          session.exec @command, &(
+            case
+            when @opts[:raw]
+              lambda { |ch, dest, data|
+                (dest == :stdout ? $stdout : $stderr).puts data
+              }
+            when @opts[:as] == :table
+              out = []
+              lambda { |ch, dest, data| 
+                label = label_for(ch)
+                data.chomp.each_line do |line|
+                  row = out.find{ |row| row[0] == label } || (out << [label, []])[-1]
+                  row[1] << line
+                end
+              }
+            when @opts[:as] == :gear
+              lambda { |ch, dest, data| (ch.connection.properties[:gear]['data'] ||= "") << data }              
+            else
+              width = 0
+              lambda { |ch, dest, data|
+                label = label_for(ch)
+                io = dest == :stdout ? $stdout : $stderr
+                data.chomp!
+
+                if data.each_line.to_a.count < 2
+                  io.puts "[#{label}] #{data}"
+                elsif @opts[:always_prefix]
+                  data.each_line do |line|
+                    io.puts "[#{label}] #{line}"
+                  end
+                else
+                  io.puts "=== #{label}"
+                  io.puts data
+                end
+              }
+            end)
+          session.loop
+        end
+
+        if block_given? && !@opts[:raw]
+          case
+          when @opts[:as] == :gear
+            out = []
+            @over.each do |item|
+              case item
+              when RHC::Rest::GearGroup then item.gears.each{ |gear| out << yield(gear, gear['data'], item) }
+              #when RHC::Rest::Gear      then out << yield(gear, gear['data'], nil)
+              end
+            end
+          end
+        end
+
+        out
+      end
+      protected
+        def ssh_host_for(gear)
+          RHC::Helpers.ssh_string(gear['ssh_url']) or raise NoPerGearOperations
+        end
+
+        def label_for(channel)
+          channel.properties[:label] ||= 
+            begin
+              group = channel.connection.properties[:group]
+              "#{key_for(channel)} #{group.cartridges.map{ |c| c['name'] }.join('+')}"
+            end
+        end
+
+        def key_for(channel)
+          channel.connection.properties[:gear]['id']
+        end
+
+        def requires_ssh_multi!
+          begin 
+            require 'net/ssh/multi' 
+          rescue LoadError
+            raise RHC::OperationNotSupportedException, "You must install Net::SSH::Multi to use the --gears option.  Most systems: 'gem install net-ssh-multi'"
+          end
+        end          
+    end
+
+    def run_on_gears(command, gears, opts={}, &block)
+      debug "Executing #{command} on each of #{gears.inspect}"
+      MultipleGearTask.new(command, gears, {:limit => options.limit, :always_prefix => options.always_prefix, :raw => options.raw}.merge(opts)).run(&block)
+    end
+
+    def table_from_gears(command, groups, opts={}, &block)
+      cells = run_on_gears(command, groups, {:as => :table}.merge(opts), &block)
+      cells.each{ |r| r.concat(r.pop.first.split(opts[:split_cells_on])) } if !block_given? && opts[:split_cells_on]
+      say table cells, opts unless options.raw
+    end
+
+    def ssh_command_for_op(operation)
+      #case operation
+      raise RHC::OperationNotSupportedException, "The operation #{operation} is not supported."
+      #end
+    end
+
     # Public: Run ssh command on remote host
     #
     # host - The String of the remote hostname to ssh to.
@@ -100,7 +228,6 @@ module RHC
       end
     end
 
-
     # For Net::SSH versions (< 2.0.11) that does not have
     # Net::SSH::KeyFactory.load_public_key, we drop to shell to get
     # the key's fingerprint
@@ -147,6 +274,22 @@ module RHC
       ssh_key_triple_for(RHC::Config.ssh_pub_key_file_path)
     end
 
+    # check the version of SSH that is installed
+    def ssh_version
+      @ssh_version ||= `ssh -V 2>&1`.strip
+    end
+
+    # return whether or not SSH is installed
+    def has_ssh?
+      @has_ssh ||= begin
+        @ssh_version = nil
+        ssh_version
+        $?.success?
+      rescue
+        false
+      end
+    end
+
     private
 
     def ssh_add

data/lib/rhc/usage_templates/command_help.erb

@@ -1,7 +1,20 @@
 Usage: <%= Array(program :name).first %> <%= @command.name %> <%= @command.syntax %>
 
 <%= @command.description || @command.summary %>
-<% if @actions.blank? -%>
+<% if @actions.blank? or @command.root? and @command.info[:method].present? -%>
+
+<% unless @command.info[:args].blank? or @command.options.all?{ |o| o[:hide] or o[:switches].present? } -%>
+
+Arguments
+<%= table(
+	  @command.info[:args].select do |opt| 
+	  	not opt[:hide] and not opt[:switches].present?
+	  end.map do |opt| 
+	  	[opt[:name], opt[:description]] 
+	  end, 
+	  table_args('  ', 25)
+	).join("\n") %>
+<% end -%>
 <% unless @command.options.blank? or @command.options.all?{ |o| o[:hide] } -%>
 
 Options
@@ -26,7 +39,8 @@ Global Options
 	).join("\n") %>
 
   See 'rhc help options' for a full list of global options.
-<% else -%>
+<% end -%>
+<% if @actions.present? -%>
 
 List of Actions
 <%= table(@actions.map{ |a| [a[:name], a[:summary]] }, table_args('  ', 13)).join("\n") %>

data/spec/coverage_helper.rb

@@ -16,19 +16,22 @@ unless RUBY_VERSION < '1.9'
     def print_missed_lines
       @files.each do |file|
         file.missed_lines.each do |line|
-          puts "MISSED #{file.filename}:#{line.number}"
+          STDERR.puts "MISSED #{file.filename}:#{line.number}"
         end
       end
     end
   end
 
-  original_stderr = $stderr # in case helpers don't properly cleanup
   SimpleCov.at_exit do
-    SimpleCov.result.format!
-    if SimpleCov.result.covered_percent < 100.0
-      SimpleCov.result.print_missed_lines if SimpleCov.result.covered_percent > 98.0
-      original_stderr.puts "Coverage not 100%, build failed."
-      exit 1
+    begin
+      SimpleCov.result.format!
+      if SimpleCov.result.covered_percent < 100.0
+        SimpleCov.result.print_missed_lines if SimpleCov.result.covered_percent > 98.0
+        STDERR.puts "Coverage not 100%, build failed."
+        exit 1
+      end
+    rescue Exception => e
+      STDERR.puts "Exception at exit, #{e.message}"
     end
   end