rhc 1.10.7 → 1.11.4

data/autocomplete/rhc_bash

@@ -8,11 +8,11 @@ _rhc()
   cur="${COMP_WORDS[COMP_CWORD]}"
   if [ $COMP_CWORD -eq 1 ]; then
     if [[ "$cur" == -* ]]; then
-      opts="--clean --config --debug --insecure --mock --noprompt --password --rhlogin --server --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --token"
+      opts="--always-prefix --clean --config --debug --insecure --limit --mock --noprompt --password --raw --rhlogin --server --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --token"
     elif [ -z $cur ]; then
-      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-create app-delete app-force-stop app-reload app-restart app-show app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage domain domain-create domain-delete domain-show domain-update git-clone logout port-forward server setup snapshot snapshot-restore snapshot-save sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail threaddump"
+      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-create app-delete app-force-stop app-reload app-restart app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage domain domain-create domain-delete domain-show domain-update git-clone logout port-forward server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail threaddump"
     else
-      opts="account account-logout add-alias add-authorization add-cartridge add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-create app-delete app-force-stop app-reload app-restart app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges create-app create-domain delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain domain domain-create domain-delete domain-show domain-update force-stop-app git-clone list-alias list-cartridge list-sshkey logout port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-sshkey restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge server setup show-app show-cartridge show-domain show-sshkey snapshot snapshot-restore snapshot-save ssh ssh-app sshkey sshkey-add sshkey-delete sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail threaddump tidy-app update-cert-alias update-domain"
+      opts="account account-logout add-alias add-authorization add-cartridge add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-create app-delete app-force-stop app-reload app-restart app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges create-app create-domain delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain domain domain-create domain-delete domain-show domain-update force-stop-app git-clone list-alias list-authorization list-cartridge list-sshkey logout port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-sshkey restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge server setup show-app show-cartridge show-domain show-sshkey snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-delete sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail threaddump tidy-app update-cert-alias update-domain"
     fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
@@ -164,11 +164,19 @@ _rhc()
         fi
         ;;
 
+      "rhc aliases")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc app")
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="create delete start stop force-stop restart reload tidy show ssh"
+          opts="snapshot create delete start stop force-stop restart reload tidy show"
         fi
         ;;
 
@@ -222,7 +230,7 @@ _rhc()
 
       "rhc app snapshot")
         if [[ "$cur" == -* ]]; then
-          opts=""
+          opts="--app --filepath --namespace"
         else
           opts=""
         fi
@@ -230,7 +238,7 @@ _rhc()
 
       "rhc app ssh")
         if [[ "$cur" == -* ]]; then
-          opts="--app --namespace --ssh"
+          opts="--app --gears --limit --namespace --raw --ssh"
         else
           opts=""
         fi
@@ -310,7 +318,7 @@ _rhc()
 
       "rhc app-snapshot")
         if [[ "$cur" == -* ]]; then
-          opts=""
+          opts="--app --filepath --namespace"
         else
           opts=""
         fi
@@ -318,7 +326,7 @@ _rhc()
 
       "rhc app-ssh")
         if [[ "$cur" == -* ]]; then
-          opts="--app --namespace --ssh"
+          opts="--app --gears --limit --namespace --raw --ssh"
         else
           opts=""
         fi
@@ -360,7 +368,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="add delete delete-all"
+          opts="list add delete delete-all"
         fi
         ;;
 
@@ -388,6 +396,14 @@ _rhc()
         fi
         ;;
 
+      "rhc authorization list")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc authorization-add")
         if [[ "$cur" == -* ]]; then
           opts="--expires-in --note --scopes"
@@ -412,6 +428,14 @@ _rhc()
         fi
         ;;
 
+      "rhc authorization-list")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc authorizations")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -764,6 +788,14 @@ _rhc()
         fi
         ;;
 
+      "rhc list-authorization")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc list-cartridge")
         if [[ "$cur" == -* ]]; then
           opts="--verbose"
@@ -790,7 +822,7 @@ _rhc()
 
       "rhc port-forward")
         if [[ "$cur" == -* ]]; then
-          opts="--app --namespace"
+          opts="--app --gear --namespace"
         else
           opts=""
         fi
@@ -966,15 +998,7 @@ _rhc()
 
       "rhc ssh")
         if [[ "$cur" == -* ]]; then
-          opts="--app --namespace --ssh"
-        else
-          opts=""
-        fi
-        ;;
-
-      "rhc ssh-app")
-        if [[ "$cur" == -* ]]; then
-          opts="--app --namespace --ssh"
+          opts="--app --gears --limit --namespace --raw --ssh"
         else
           opts=""
         fi
@@ -1118,7 +1142,7 @@ _rhc()
 
       "rhc tail")
         if [[ "$cur" == -* ]]; then
-          opts="--app --files --namespace --opts"
+          opts="--app --files --gear --namespace --opts"
         else
           opts=""
         fi

data/lib/rhc/commands.rb

@@ -13,6 +13,19 @@ module Commander
       root.present?
     end
 
+    #
+    # Force proxy_option_struct to default to nil for values,
+    # backported for Commander 4.0.3 
+    #
+    def proxy_option_struct
+      proxy_options.inject Options.new do |options, (option, value)|
+        # options that are present will evaluate to true
+        value = true if value.nil?
+        options.__send__ :"#{option}=", value
+        options
+      end
+    end    
+
     def deprecated(as_alias=nil)
       return false unless info
       return info[:deprecated] if info[:deprecated]

data/lib/rhc/commands/cartridge.rb

@@ -84,7 +84,7 @@ module RHC::Commands
       rest_app = rest_client.find_application(options.namespace, options.app, :include => :cartridges)
       rest_cartridge = rest_app.add_cartridge(cart)
 
-      success "Success"
+      success "done"
 
       paragraph{ display_cart(rest_cartridge) }
       paragraph{ rest_cartridge.messages.each { |msg| success msg } }
@@ -131,11 +131,11 @@ module RHC::Commands
     summary "Start a cartridge"
     syntax "<cartridge> [--namespace NAME] [--app NAME]"
     argument :cart_type, "The name of the cartridge you are stopping", ["-c", "--cartridge cartridge"]
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartrdige belongs to", :context => :namespace_context, :required => true
+    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
     option ["-a", "--app NAME"], "Application the cartridge", :context => :app_context, :required => true
     alias_action :"app cartridge start", :root_command => true, :deprecated => true
     def start(cartridge)
-      cartridge_action(cartridge, :start){ |_, c| results{ say "#{c.name} started" } }
+      cartridge_action(cartridge, :start, 'Starting %s ... ')
       0
     end
 
@@ -143,10 +143,10 @@ module RHC::Commands
     syntax "<cartridge> [--namespace NAME] [--app NAME]"
     argument :cart_type, "The name of the cartridge you are stopping", ["-c", "--cartridge cartridge"]
     option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
-    option ["-a", "--app NAME"], "Application you the cartridge belongs to", :context => :app_context, :required => true
+    option ["-a", "--app NAME"], "Application the cartridge belongs to", :context => :app_context, :required => true
     alias_action :"app cartridge stop", :root_command => true, :deprecated => true
     def stop(cartridge)
-      cartridge_action(cartridge, :stop){ |_, c| results{ say "#{c.name} stopped" } }
+      cartridge_action(cartridge, :stop, 'Stopping %s ... ')
       0
     end
 
@@ -157,7 +157,7 @@ module RHC::Commands
     option ["-a", "--app NAME"], "Application the cartridge belongs to", :context => :app_context, :required => true
     alias_action :"app cartridge restart", :root_command => true, :deprecated => true
     def restart(cartridge)
-      cartridge_action(cartridge, :restart){ |_, c| results{ say "#{c.name} restarted" } }
+      cartridge_action(cartridge, :restart, 'Restarting %s ... ')
       0
     end
 
@@ -181,7 +181,7 @@ module RHC::Commands
     option ["-a", "--app NAME"], "Application the cartridge belongs to", :context => :app_context, :required => true
     alias_action :"app cartridge reload", :root_command => true, :deprecated => true
     def reload(cartridge)
-      cartridge_action(cartridge, :reload){ |_, c| results{ say "#{c.name} reloaded" } }
+      cartridge_action(cartridge, :reload, 'Reloading %s ... ')
       0
     end
 
@@ -305,12 +305,16 @@ module RHC::Commands
     private
       include RHC::CartridgeHelpers
 
-      def cartridge_action(cartridge, action, &block)
+      def cartridge_action(cartridge, action, message=nil)
         rest_app = rest_client.find_application(options.namespace, options.app, :include => :cartridges)
         rest_cartridge = check_cartridges(cartridge, :from => rest_app.cartridges).first
-        result = rest_cartridge.send action
+        say message % [rest_cartridge.name] if message
+        result = rest_cartridge.send(action)
         resp = [result, rest_cartridge, rest_app]
-        yield resp if block_given?
+        if message
+          success "done"
+          result.messages.each{ |s| paragraph{ say s } }
+        end
         resp
       end
   end

data/lib/rhc/commands/ssh.rb

@@ -30,6 +30,8 @@ module RHC::Commands
       raise ArgumentError, "--gears requires a command" if options.gears && command.blank?
       raise ArgumentError, "--limit must be an integer greater than zero" if options.limit && options.limit < 1
       raise OptionParser::InvalidOption, "No system SSH available. Please use the --ssh option to specify the path to your SSH executable, or install SSH." unless options.ssh or has_ssh?
+      raise OptionParser::InvalidOption, "SSH executable '#{options.ssh}' does not exist." if options.ssh and not File.exist?(options.ssh)
+      raise OptionParser::InvalidOption, "SSH executable '#{options.ssh}' is not executable." if options.ssh and not File.executable?(options.ssh)
 
       if options.gears
         groups = rest_client.find_application_gear_groups(options.namespace, app_name)

data/lib/rhc/helpers.rb

@@ -212,7 +212,7 @@ module RHC
     #
 
     def interactive?
-      $stdout.tty? and not options.noprompt
+      $stdin.tty? and $stdout.tty? and not options.noprompt
     end
 
     def debug(*args)
@@ -242,9 +242,20 @@ module RHC
       warn "Warning: #{msg}\n" % ['a warning','an error',1]
     end
 
+    #
+    # By default, agree should take a single character in interactive
+    #
+    def agree(*args, &block)
+      #args.push(interactive?.presence) if args.length == 1
+      block = lambda do |q| 
+        q.validate = /\A(?:y|yes|n|no)\Z/i
+      end unless block_given?
+      super *args, &block
+    end
+
     def confirm_action(question)
       return if options.confirm
-      return if !options.noprompt && paragraph{ agree("#{question} (yes|no): ") }
+      return if !options.noprompt && paragraph{ agree "#{question} (yes|no): " }
       raise RHC::ConfirmationError
     end
 

data/lib/rhc/highline_extensions.rb

@@ -15,6 +15,17 @@ class HighLineExtension < HighLine
     end
   end
 
+  if HighLine::CHARACTER_MODE == 'stty'
+    def raw_no_echo_mode
+      @state = `stty -g 2>/dev/null`
+      `stty raw -echo -icanon isig 2>&1`
+    end
+
+    def restore_mode
+      `stty #{@state} 2>&1`
+    end
+  end
+
   def debug(msg)
     $stderr.puts "DEBUG: #{msg}" if debug?
   end
@@ -37,7 +48,7 @@ class HighLineExtension < HighLine
       statement = template.result(binding)
 
       if @wrap_at
-        statement = statement.textwrap_ansi(@wrap_at, false)
+        statement = statement.chomp.textwrap_ansi(@wrap_at, false)
         if @last_line_open && statement.length > 1
           @last_line_open = false
           @output.puts
@@ -52,7 +63,8 @@ class HighLineExtension < HighLine
         if statement[-1, 1] == " " or statement[-1, 1] == "\t"
           @output.print(statement)
           @output.flush
-          statement.strip_ansi.length + (@last_line_open || 0)
+          #statement.strip_ansi.length + (@last_line_open || 0)
+          true
         else
           @output.puts(statement)
           false

data/lib/rhc/rest/application.rb

@@ -152,7 +152,7 @@ module RHC
           options = name
           name = options[:name]
         end
-        aliases.each { |a| return a if a.is_a?(String) || a.id == name }
+        aliases.each { |a| return a if a.is_a?(String) || a.id == name.downcase }
         raise RHC::AliasNotFoundException.new("Alias #{name} can't be found in application #{@name}.")
       end
 

data/lib/rhc/rest/client.rb

@@ -443,8 +443,8 @@ module RHC
 
           # Copy messages to each object
           messages = Array(result['messages']).map do |m|
-            m['text'] if m['field'].nil? or m['field'] == 'result' or m['severity'] == 'result'
-          end.compact
+            m['text'] if (m['field'] == 'result' || m['severity'] == 'result') && (m['severity'] != 'debug' || debug?)
+          end.compact.map!(&:chomp)
           data.each{ |d| d['messages'] = messages } if data.is_a?(Array)
           data['messages'] = messages if data.is_a?(Hash)
 

data/lib/rhc/rest/domain.rb

@@ -5,7 +5,7 @@ module RHC
 
       #Add Application to this domain
       # options
-      # cartrdige
+      # cartridge
       # template
       # scale
       # gear_profile

data/lib/rhc/wizard.rb

@@ -382,11 +382,11 @@ module RHC
           warn "none"
 
           paragraph do
-            say "Your namespace is unique to your account and is the suffix of the " \
-                "public URLs we assign to your applications. You may configure your " \
-                "namespace here or leave it blank and use 'rhc create-domain' to " \
-                "create a namespace later.  You will not be able to create " \
-                "applications without first creating a namespace."
+            say [
+              "Your namespace is unique to your account and is the suffix of the public URLs we assign to your applications.",
+              ("You may configure your namespace here or leave it blank and use 'rhc create-domain' to create a namespace later." if namespace_optional?),
+              "You will not be able to create applications without first creating a namespace.",
+            ].compact.join(' ')
           end
 
           ask_for_namespace
@@ -486,7 +486,11 @@ module RHC
       applications.take(1).each do |app|
         begin
           ssh = Net::SSH.start(app.host, app.uuid, :timeout => 60)
-        rescue => e
+        rescue Interrupt => e
+          debug_error(e)
+          raise "Connection attempt to #{app.host} was interrupted"
+        rescue ::Exception => e
+          debug_error(e)
           raise "An SSH connection could not be established to #{app.host}. Your SSH configuration may not be correct, or the application may not be responding. #{e.message} (#{e.class})"
         ensure
           ssh.close if ssh
@@ -592,6 +596,11 @@ EOF
     def finalize_stage
       true
     end
+    
+    protected
+      def namespace_optional?
+        false
+      end    
   end
 
   class DomainWizard < Wizard

data/spec/rhc/commands/app_spec.rb

@@ -163,7 +163,7 @@ describe RHC::Commands::App do
       before{ rest_client.domains.clear }
       let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1'] }
       # skips login stage and insecure check because of mock rest client, doesn't check keys
-      it { run_output(['mydomain', 'y', 'mykey']).should match(/This wizard.*Checking your namespace.*Your domain name 'mydomain' has been successfully created.*Creating application.*Your public SSH key.*Uploading key 'mykey'.*Your application 'app1' is now available.*Cloned to/m) }
+      it { run_output(['mydomain', 'y', 'mykey']).should match(/This wizard.*Checking your namespace.*assign to your applications\. You will not be able to create applications without first creating a namespace.*Your domain name 'mydomain' has been successfully created.*Creating application.*Your public SSH key.*Uploading key 'mykey'.*Your application 'app1' is now available.*Cloned to/m) }
     end
 
     context 'when run without a cart' do
@@ -523,7 +523,7 @@ describe RHC::Commands::App do
           })
       end
 
-      it("should display info returned by the server"){ run_output.should match "Removed foo" }
+      it("should display info returned by the server"){ run_output.should match "Deleting application 'foo'" }
       it("should display results returned by the server"){ run_output.should match "Job URL changed" }
       it('should exit successfully'){ expect{ run }.to exit_with_code(0) }
     end

data/spec/rhc/commands/cartridge_spec.rb

@@ -10,7 +10,7 @@ describe RHC::Commands::Cartridge do
     run_output.should match(message) if message
   end
 
-  def succeed_with_message(message = "Success")
+  def succeed_with_message(message = "done")
     exit_with_code_and_message(0,message)
   end
 
@@ -237,7 +237,8 @@ describe RHC::Commands::Cartridge do
           })
       end
 
-      it("should display info returned by the server"){ run_output.should match "Removed Jenkins" }
+      it("should not display info returned by the server"){ run_output.should_not match "Removed Jenkins" }
+      it("should display prefix returned by the server"){ run_output.should match "Removing jenkins-1.4" }
       it("should display results returned by the server"){ run_output.should match "Job URL changed" }
       it('should exit successfully'){ expect{ run }.to exit_with_code(0) }
     end
@@ -273,7 +274,7 @@ describe RHC::Commands::Cartridge do
         app = domain.add_application("app1", "mock_type")
         app.add_cartridge('mock_cart-1')
       end
-      it { run_output.should match('start') }
+      it { run_output.should match(/Starting mock_cart-1 .*done/) }
     end
   end
 
@@ -287,7 +288,7 @@ describe RHC::Commands::Cartridge do
         app = domain.add_application("app1", "mock_type")
         app.add_cartridge('mock_cart-1')
       end
-      it { run_output.should match('stop') }
+      it { run_output.should match(/Stopping mock_cart-1 .*done/) }
     end
   end
 
@@ -301,7 +302,7 @@ describe RHC::Commands::Cartridge do
         app = domain.add_application("app1", "mock_type")
         app.add_cartridge('mock_cart-1')
       end
-      it { run_output.should match('restart') }
+      it { run_output.should match(/Restarting mock_cart-1 .*done/) }
     end
   end
 
@@ -315,7 +316,7 @@ describe RHC::Commands::Cartridge do
         app = domain.add_application("app1", "mock_type")
         app.add_cartridge('mock_cart-1')
       end
-      it { run_output.should match('reload') }
+      it { run_output.should match(/Reloading mock_cart-1 .*done/) }
     end
   end