rhc 1.1.11 → 1.2.7

data/lib/rhc/exceptions.rb

@@ -46,13 +46,13 @@ module RHC
   end
 
   class DeprecatedError < RuntimeError; end
-  
+
   class KeyFileNotExistentException < Exception
     def initialize(message="SSH Key file not found")
       super message, 128
     end
   end
-  
+
   class KeyFileAccessDeniedException < Exception
     def initialize(message = "Insufficient acces to SSH Key file")
       super message, 128
@@ -65,12 +65,6 @@ module RHC
     end
   end
 
-  class ScaledApplicationsNotSupportedException < Exception
-    def initialize(message="Scaled applications not supported")
-      super message, 128
-    end
-  end
-
   class PermissionDeniedException < Exception
     def initialize(message="Permission denied")
       super message, 129
@@ -112,4 +106,25 @@ module RHC
       super message, 1
     end
   end
+
+=begin
+#  Commenting this out for US2438
+  class AdditionalStorageArgumentsException < Exception
+    def initialize(message="Only one storage action can be performed at a time.")
+      super message, 1
+    end
+  end
+
+  class AdditionalStorageValueException < Exception
+    def initialize(message="The amount format must be a number, optionally followed by 'GB' (ex.: 5GB)")
+      super message, 1
+    end
+  end
+
+  class AdditionalStorageRemoveException < Exception
+    def initialize(message="The amount of additional storage to be removed exceeds the total amount in use. Add the -f flag to override.")
+      super message, 1
+    end
+  end
+=end
 end

data/lib/rhc/helpers.rb

@@ -3,6 +3,7 @@ require 'rhc/version'
 require 'rhc/config'
 require 'rhc/commands'
 require 'rhc/output_helpers'
+require 'rbconfig'
 
 require 'resolv'
 
@@ -83,6 +84,7 @@ module RHC
     global_option '-d', '--debug', "Turn on debugging"
 
     global_option('--timeout seconds', Integer, 'Set the timeout in seconds for network commands') do |value|
+      abort(color("Timeout must be a positive integer",:red)) unless value > 0
       # FIXME: Refactor so we don't have to use a global var here
       $rest_timeout = value
     end
@@ -164,19 +166,27 @@ module RHC
       count == 1 ? "#{count} #{s}" : "#{count} #{s}s"
     end
 
+    # given an array of arrays "items", construct an array of strings that can
+    # be used to print in tabular form.
     def table(items, opts={}, &block)
       items = items.map &block if block_given?
-      columns = []
-      max = items.each do |item|
+      widths = []
+      items.each do |item|
         item.each_with_index do |s, i|
           item[i] = s.to_s
-          columns[i] = [columns[i] || 0, s.length].max if s.respond_to?(:length)
+          widths[i] = [widths[i] || 0, s.length].max if s.respond_to?(:length)
         end
       end
       align = opts[:align] || []
       join = opts[:join] || ' '
+      if opts[:header]
+        sep = opts[:separator] || "="
+        ary = Array.new(opts[:header].length)
+        items.unshift ary.each_with_index {|obj, idx| ary[idx] = sep.to_s * (widths[idx] || 1)}
+        items.unshift(opts[:header])
+      end
       items.map do |item|
-        item.each_with_index.map{ |s,i| s.send((align[i] == :right ? :rjust : :ljust), columns[i], ' ') }.join(join).strip
+        item.each_with_index.map{ |s,i| s.send((align[i] == :right ? :rjust : :ljust), widths[i], ' ') }.join(join).strip
       end
     end
 
@@ -314,6 +324,7 @@ module RHC
     def jruby? ; RUBY_PLATFORM =~ /java/i end
     def windows? ; RUBY_PLATFORM =~ /win(32|dows|ce)|djgpp|(ms|cyg|bcc)win|mingw32/i end
     def unix? ; !jruby? && !windows? end
+    def mac? ; RbConfig::CONFIG['host_os'] =~ /^darwin/ end
 
     # common SSH key display format in ERB
     def ssh_key_display_format
@@ -335,5 +346,15 @@ Fingerprint: <%= key.fingerprint %>
       dns.getresources(host, Resolv::DNS::Resource::IN::A).any?
       # :nocov:
     end
+    
+    def hosts_file_contains?(host)
+      # :nocov:
+      resolver = Resolv::Hosts.new
+      begin
+        resolver.getaddress host
+      rescue Resolv::ResolvError
+      end
+      # :nocov:
+    end
   end
 end

data/lib/rhc/output_helpers.rb

@@ -101,6 +101,8 @@ module RHC
       header cart.name do
         display_cart_properties(cart,properties) if properties
         display_cart_scaling_info(cart) if cart.scalable?
+        #  Commenting this out for US2438
+        # display_cart_storage_info(cart) if cart.additional_gear_storage > 0
         display_no_info("cartridge") unless @table_displayed
       end
     end
@@ -122,6 +124,22 @@ module RHC
         get_properties(cart,:current_scale,:scales_from,:scales_to)
     end
 
+=begin
+#  Commenting this out for US2438
+    def display_cart_storage_info(cart, title="Storage Info")
+      say_table \
+        title,
+        get_properties(cart,:base_gear_storage,:additional_gear_storage)
+    end
+
+    def display_cart_storage_list(carts)
+      carts.each do |cart|
+        puts
+        display_cart_storage_info(cart, cart.display_name)
+      end
+    end
+=end
+
     #---------------------------
     # Misc information
     #---------------------------
@@ -174,6 +192,11 @@ module RHC
           date(value)
         when :scales_from,:scales_to
           (value == -1 ? "available gears" : value)
+=begin
+#  Commenting this out for US2438
+        when :base_gear_storage,:additional_gear_storage
+          ((value.nil? or value == 0) ? "None" : "#{value}GB")
+=end
         when :aliases
           value.join ' '
         else

data/lib/rhc/rest.rb

@@ -101,19 +101,19 @@ module RHC
       when 'domains'
         domains = Array.new
         data.each do |domain_json|
-          domains.push(Domain.new(domain_json, @debug))
+          domains.push(Domain.new(domain_json, debug?))
         end
         return domains
       when 'domain'
-        return Domain.new(data, @debug)
+        return Domain.new(data, debug?)
       when 'applications'
         apps = Array.new
         data.each do |app_json|
-          apps.push(Application.new(app_json, @debug))
+          apps.push(Application.new(app_json, debug?))
         end
         return apps
       when 'application'
-        app = Application.new(data, @debug)
+        app = Application.new(data, debug?)
         result['messages'].each do |message|
           app.add_message(message['text']) if message['field'].nil? or message['field'] == 'result'
         end
@@ -121,25 +121,25 @@ module RHC
       when 'cartridges'
         carts = Array.new
         data.each do |cart_json|
-          carts.push(Cartridge.new(cart_json, @debug))
+          carts.push(Cartridge.new(cart_json, debug?))
         end
         return carts
       when 'cartridge'
-        return Cartridge.new(data, @debug)
+        return Cartridge.new(data, debug?)
       when 'user'
-        return User.new(data, @debug)
+        return User.new(data, debug?)
       when 'keys'
         keys = Array.new
         data.each do |key_json|
-          keys.push(Key.new(key_json, @debug))
+          keys.push(Key.new(key_json, debug?))
         end
         return keys
       when 'key'
-        return Key.new(data, @debug)
+        return Key.new(data, debug?)
       when 'gear_groups'
         gears = Array.new
         data.each do |gear_json|
-          gears.push(GearGroup.new(gear_json, @debug))
+          gears.push(GearGroup.new(gear_json, debug?))
         end
         return gears
       else
@@ -150,14 +150,20 @@ module RHC
     def new_request(options)
       # user specified timeout takes presidence
       options[:timeout] = $rest_timeout || options[:timeout]
-      options[:open_timeout] ||= 4
+      options[:open_timeout] ||= (options[:timeout] || 4)
 
       RestClient::Request.new options
     end
 
     def request(request, &block)
+      tried = 0
       begin
-        response = request.execute
+        debug "Request: #{request.inspect}" if debug?
+        begin
+          response = request.execute
+        ensure
+          debug "Response: #{response.inspect}" rescue nil if debug?
+        end
         #set cookie
         rh_sso = response.cookies['rh_sso']
         if not rh_sso.nil?
@@ -169,17 +175,30 @@ module RHC
           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.") 
+        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 show' "\
+          "to see the status of your applications.")
       rescue RestClient::ServerBrokeConnection => e
-        raise ConnectionException.new("Connection to server got interrupted: #{e.message}")
+        raise ConnectionException.new(
+          "Connection to server got interrupted: #{e.message}")
+      rescue RestClient::BadGateway => e
+        debug "ERROR: Received bad gateway from server, will retry once if this is a GET" if debug?
+        retry if (tried += 1) < 2 && request.method.to_s.upcase == "GET"
+        raise ConnectionException.new(
+          "An error occurred while communicating with the server (#{e.message}). This problem may only be temporary."\
+          "#{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 RestClient::ExceptionWithResponse => e
         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}'."}")
+        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}")
+        logger.debug e.backtrace.join("\n  ") if debug?
+        raise ResourceAccessException.new(
+          "Failed to access resource: #{e.message}")
       end
     end
 
@@ -199,7 +218,7 @@ module RHC
         result = RHC::Json.decode(response)
         messages = Array(result['messages'])
       rescue => e
-        logger.debug "Response did not include a message from server: #{e.message}" if @debug
+        logger.debug "Response did not include a message from server: #{e.message}" if debug?
         parse_error = generic_error(url)
       end
       case response.code

data/lib/rhc/rest/base.rb

@@ -18,9 +18,14 @@ module RHC
         @messages << msg
       end
 
+      protected
+        def debug?
+          @debug
+        end
+
       private
-        def debug(msg)
-          logger.debug(msg) if @debug
+        def debug(msg, obj=nil)
+          logger.debug("#{msg}#{obj ? " #{obj}" : ''}") if debug?
         end
 
         def rest_method(link_name, payload={}, timeout=nil)
@@ -28,7 +33,6 @@ module RHC
           method =  links[link_name]['method']
 
           request = new_request(:url => url, :method => method, :headers => @@headers, :payload => payload, :timeout => timeout)
-          debug "Request: #{request.inspect}"
           request(request)
         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, :display_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, :base_gear_storage, :additional_gear_storage
       def initialize(args, use_debug=false)
         @properties = {}
         props = args[:properties] || args["properties"] || []
@@ -13,6 +13,10 @@ module RHC
           @properties[:"#{p['type']}"] = category
         end
 
+        # Make sure that additional gear storage is an integer
+        # TODO:  This should probably be fixed in the broker
+        args['additional_gear_storage'] = args['additional_gear_storage'].to_i rescue 0
+
         super
       end
 
@@ -63,6 +67,11 @@ module RHC
         rest_method "UPDATE", values
       end
 
+      def set_storage(values)
+        debug "Setting additional storage: #{values[:additional_gear_storage]}GB"
+        rest_method "UPDATE", values
+      end
+
       def connection_info
         info = property(:cart_data, :connection_url) || property(:cart_data, :job_url) || property(:cart_data, :monitoring_url)
         info ? (info["value"] || '').rstrip : nil

data/lib/rhc/usage_templates/command_help.erb

@@ -1,13 +1,7 @@
-Usage: rhc <%= @command.name %> <%= @command.syntax %>
+Usage: <%= Array(program :name).first %> <%= @command.name %> <%= @command.syntax %>
 
 <%= @command.description || @command.summary %>
-<% unless @actions.nil? or @actions.empty? -%>
-
-List of Actions
-<% for action in @actions -%>
-  <%= "%-18s %s\n" % [action[:name], action[:summary]] -%>
-<% end -%>
-<% end -%>
+<% if @actions.blank? -%>
 <% unless @command.options.blank? or @command.options.all?{ |o| o[:hide] } -%>
 
 Options for <%= @command.name %>
@@ -20,8 +14,14 @@ Global Options
 <% for option in @global_options -%><% next if option[:hide] -%>
   <%= "%-25s %s\n" % [option[:switches].join(', '), option[:description]] -%>
 <% end -%>
-<%#-
-  Other Attrs we may wish to use:
+<% else -%>
 
-   * @examples - for description, command in @examples
--%>
+List of Actions
+<% for action in @actions -%>
+  <%= "%-18s %s\n" % [action[:name], action[:summary]] -%>
+<% end -%>
+<% if @command.default_action? -%>
+
+The default action for this resource is '<%= @command.default_action %>'
+<% end -%>
+<% end -%>

data/lib/rhc/usage_templates/command_syntax_help.erb

@@ -1,4 +1,4 @@
-Usage: rhc <%= @command.name %> <%= @command.syntax %>
+Usage: <%= Array(program :name).first %> <%= @command.name %><%= " #{@command.syntax}" if @command.syntax %>
 <% unless @command.options.blank? or @command.options.all?{ |o| o[:hide] } -%>
 Pass '--help' to see the full list of options
 <% end -%>

data/lib/rhc/usage_templates/help.erb

@@ -1,5 +1,5 @@
-Usage: <%= program :name %> (<resource> | --help) [<action>] [<args>]
-<%= program :description %>
+Usage: <%= Array(program :name).first %> <resource> [<action>] [--help] [<args>]
+<%= Array(program :description).first %>
 
 List of Commands and Resources
 <% for name, command in @commands.sort -%>
@@ -13,7 +13,7 @@ Global Options
 <% end -%>
 <%- end -%>
 
-See '<%= program :name %> help <resource>' for more specifics on each resource or command.
+See '<%= Array(program :name).first %> help <resource>' for more specifics on each resource or command.
 <% if program :help -%>
   <% for title, body in program(:help) %>
   <%= $terminal.color title.to_s.upcase, :bold %>:

data/lib/rhc/usage_templates/missing_help.erb

@@ -1 +1 @@
-See '<%= program :name %> help' for a list of available commands.
+See '<%= Array(program :name).first %> help' for a list of available commands.

data/lib/rhc/version.rb

@@ -1,9 +1,5 @@
 module RHC
   module VERSION #:nocov:
-    MAJOR = 1
-    MINOR = 1
-    MICRO = 11
-    #PRE  = ''
-    STRING = [MAJOR,MINOR,MICRO].compact.join('.')
+    STRING = Gem.loaded_specs['rhc'].version.to_s rescue '0.0.0'
   end
 end

data/lib/rhc/wizard.rb

@@ -59,20 +59,10 @@ module RHC
     private
 
     def greeting_stage
-      paragraph do
-        say "Starting Interactive Setup for OpenShift's command line interface"
-      end
-
-      paragraph do
-        say "It looks like you have not configured or used OpenShift " \
-            "client tools on this computer. " \
-            "We'll help you configure the client tools with a few quick questions. " \
-            "You can skip this in the future by copying your configuration files to other machines you use to manage your OpenShift account:"
-      end
+      info "OpenShift Client Tools (RHC) Setup Wizard"
 
       paragraph do
-        say "#{@config_path}"
-        say "#{RHC::Config.home_dir}/.ssh/"
+        say "This wizard will help you upload your SSH keys, set your application namespace, and check that other programs like Git are properly installed."
       end
 
       true
@@ -83,9 +73,9 @@ module RHC
       section(:top => 1, :bottom => -1) do
         if @config.has_opts? && @config.opts_login
           @username = @config.opts_login
-          say "Using #{@username}, which was given on the command line"
+          say "Using #{@username}"
         else
-          @username = ask("To connect to #{@libra_server} enter your OpenShift login (email or Red Hat login id): ") do |q|
+          @username = ask("Login to #{@libra_server}: ") do |q|
             q.default = RHC::Config.default_rhlogin
           end
         end
@@ -443,24 +433,6 @@ EOF
       super(config, login)
     end
 
-    def greeting_stage
-      paragraph do
-        say "Starting Interactive Setup for OpenShift's command line interface"
-      end
-
-      paragraph do
-        say "We'll help get you setup with just a couple of questions. " \
-            "You can skip this in the future by copying your config's around:"
-      end
-
-      paragraph do
-        say "    #{@config_path}"
-        say "    #{RHC::Config.home_dir}/.ssh/"
-      end
-
-      true
-    end
-
     def create_config_stage
       if File.exists? @config_path
         backup = "#{@config_path}.bak"