rhc 0.96.9 → 0.97.17

data/README.md

@@ -80,6 +80,7 @@ first).  See [README.md](https://github.com/openshift/rhc/blob/master/features/R
 have full line coverage.  Some old code is currently excluded until it
 can be refactored.  Run <code>bundle exec rake spec</code> on Ruby 1.9+
 to see your code coverage level.
+4. When writting a new Command please follow [ADDING_COMMANDS.md](https://github.com/openshift/rhc/blob/master/lib/rhc/commands/ADDING_COMMANDS.md)
 
 Once you've made your changes:
 

data/bin/rhc

@@ -44,10 +44,6 @@ end
 
 begin
   case ARGV[0]
-  when "domain"
-    run_setup_wizard_if_needed
-    system("rhc-domain #{get_args} 2>&1")
-    retcode = $?.exitstatus
   when "app"
     run_setup_wizard_if_needed
     system("rhc-app #{get_args} 2>&1")
@@ -60,21 +56,13 @@ begin
     run_setup_wizard_if_needed
     system("rhc-port-forward #{get_args} 2>&1")
     retcode = $?.exitstatus
-  when "-h", "--help", "help", nil
-    p_usage 0
   else
-    if ["server", "setup"].include?(ARGV[0])
-      run_setup_wizard_if_needed if ARGV[0] != "setup"
-      begin
-        require 'rhc/cli'
-        RHC::CLI.start(ARGV)
-        retcode = 0
-      rescue SystemExit => e
-        retcode = e.status
-      end
-    else
-      puts "Invalid rhc command: #{ARGV[0]}"
-      p_usage
+    begin
+      require 'rhc/cli'
+      RHC::CLI.start(ARGV)
+      retcode = 0
+    rescue SystemExit => e
+      retcode = e.status
     end
   end
 

data/bin/rhc-app

@@ -35,7 +35,7 @@ List of commands
   threaddump                     Trigger a thread dump for jbossas, jbosseap, and ruby applications
   tail                           Tail the logs of an application
   snapshot       [save|restore]  Saves/Restores an application snapshot to/from a tarball at the location specified using --filepath (default: ./$APPNAME.tar.gz)
-  cartridge      <action>        Manage a cartridge runningin this application
+  cartridge      <action>        Manage a cartridge running in this application
 
 List of cartridge actions
   list                           List of supported embedded cartridges
@@ -48,8 +48,8 @@ List of cartridge actions
   reload                         Reloads cartridge configuration
 
 List of arguments
-  -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
-  -p|--password     password     RHLogin password (optional, will prompt)
+  -l|--rhlogin      rhlogin      OpenShift login (#{rhlogin})
+  -p|--password     password     Password (optional, will prompt)
   -a|--app          application  Application name  (alphanumeric - max #{RHC::APP_NAME_MAX_LENGTH} chars) (required)
   -t|--type         type         Type of app to create (#{type_keys}) (required for creating an application)
   -c|--cartridge    cartridge    The embedded cartrige to manage (required for the cartridge command)

data/bin/rhc-chk

@@ -29,8 +29,8 @@ Usage: rhc domain status
 Run a simple check on local configs and credentials to confirm tools are
 properly setup.  Often run to troubleshoot connection issues.
 
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login) (#{rhlogin})
-  -p|--password  password   Red Hat password (for RHN or OpenShift)
+  -l|--rhlogin   rhlogin    OpenShift login (#{rhlogin})
+  -p|--password  password   Password (optional, will prompt)
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
   --config  path            Path of alternate config file

data/bin/rhc-create-app

@@ -17,8 +17,8 @@ Create an OpenShift app.
   -t|--type  type            Type of app to create (#{type_keys}) (required)
   -g|--gear-size size        The size of the gear for this app ([small|medium], defaults to small)
   -s|--scaling               Enable scaling for this app
-  -l|--rhlogin  rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
-  -p|--password  password    RHLogin password  (optional, will prompt)
+  -l|--rhlogin  rhlogin      OpenShift login (#{rhlogin})
+  -p|--password  password    Password (optional, will prompt)
   -r|--repo  path            Git Repo path (defaults to ./$app_name)
   -n|--nogit                 Only create remote space, don't pull it locally
   -d|--debug                 Print Debug info

data/bin/rhc-create-domain

@@ -4,6 +4,9 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
+puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc domain (create|update)' instead."
+puts""
+
 #
 # print help
 #
@@ -18,8 +21,8 @@ Bind a registered rhcloud user to a domain in rhcloud.
         <id_rsa>.pub keys, then re-run with --alter
 
   -n|--namespace   namespace   Namespace for your application(s) (alphanumeric - max #{RHC::DEFAULT_MAX_LENGTH} chars) (required)
-  -l|--rhlogin     rhlogin     Red Hat login (RHN or OpenShift login) (#{rhlogin})
-  -p|--password    password    RHLogin password (optional, will prompt)
+  -l|--rhlogin     rhlogin     OpenShift login (#{rhlogin})
+  -p|--password    password    Password (optional, will prompt)
   -a|--alter                   Alter namespace (will change urls) and/or ssh key
   -d|--debug                   Print Debug info
   -h|--help                    Show Usage info

data/bin/rhc-ctl-app

@@ -14,8 +14,8 @@ Usage: #{$0}
 Control an OpenShift express app
 
   -a|--app   application   Application name  (alphanumeric) (required)
-  -l|--rhlogin rhlogin     Red Hat login (RHN or OpenShift login) (#{rhlogin})
-  -p|--password password   RHLogin password  (optional, will prompt)
+  -l|--rhlogin rhlogin     OpenShift login (#{rhlogin})
+  -p|--password password   Password (optional, will prompt)
   -c|--command command     (start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|threaddump)
   -L|--embedded-list       List supported embedded cartridges
   -e|--embed               (add|remove|stop|start|restart|status|reload)-$cartridge eg: add-mysql-5.1

data/bin/rhc-ctl-domain

@@ -4,6 +4,9 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
+puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc sshkey' instead."
+puts""
+
 #
 # print help
 #
@@ -16,8 +19,8 @@ Manage multiple keys for the registered rhcloud user.
 
   rhc-ctl-domain [-l rhlogin] [-p password] [-d] [-h] [-n namespace] (-a key-name [-k ssh-pubkey] | -u key-name [-k ssh-pubkey] | -r key-name | --destroy)
 
-  -l|--rhlogin         rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
-  -p|--password        password     RHLogin password (optional, will prompt)
+  -l|--rhlogin         rhlogin      OpenShift login (#{rhlogin})
+  -p|--password        password     Password (optional, will prompt)
   -n|--namespace       namespace    Namespace for your application(s) (alphanumeric - max #{RHC::DEFAULT_MAX_LENGTH} chars) (required for destroying domain)
   -a|--add-ssh-key     key-name     Add SSH key to the user account (key-name is the user-specified identifier for the key)
   -r|--remove-ssh-key  key-name     Remove SSH key from the user account

data/bin/rhc-domain

@@ -4,6 +4,9 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
+puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc domain' instead."
+puts""
+
 #
 # print help
 #
@@ -22,8 +25,8 @@ List of commands
   destroy           Destroys the domain and any added ssh keys
 
 List of arguments
-  -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
-  -p|--password     password     RHLogin password (optional, will prompt)
+  -l|--rhlogin      rhlogin      OpenShift login (#{rhlogin})
+  -p|--password     password     Password (optional, will prompt)
   -n|--namespace    namespace    Namespace for your application(s) (alphanumeric - max #{RHC::DEFAULT_MAX_LENGTH} chars) (required for creating or destroying domain)
   -d|--debug                     Print Debug info
   -h|--help                      Show Usage info
@@ -225,7 +228,7 @@ def show_domain_info()
   end
 
   #puts "    UUID: #{user_info['user_info']['uuid']}"
-  puts "  RHLogin: #{user_info['user_info']['rhlogin']}"
+  puts "  OpenShift login: #{user_info['user_info']['rhlogin']}"
 
   puts "\n\n" 
 

data/bin/rhc-domain-info

@@ -4,6 +4,9 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
+puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc domain show' instead."
+puts""
+
 #
 # print help
 #
@@ -14,8 +17,8 @@ def p_usage(error_code = 255)
 Usage: #{$0}
 Display information about a user
 
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login) (#{rhlogin})
-  -p|--password  password   RHLogin password (optional, will prompt)
+  -l|--rhlogin   rhlogin    OpenShift login (#{rhlogin})
+  -p|--password  password   Password (optional, will prompt)
   -a|--apps                 List applications for rhlogin
   -i|--info                 Show user info
   -d|--debug                Print Debug info
@@ -95,7 +98,7 @@ if opt['info']
       domains.each_index { |i| puts "Namespace(#{i}): #{domains[i]['namespace']}" }
     end
     #puts "    UUID: #{user_info['user_info']['uuid']}"
-    puts "  RHLogin: #{user_info['user_info']['rhlogin']}"
+    puts "  OpenShift login: #{user_info['user_info']['rhlogin']}"
     puts "Primary SSH key: #{user_info['user_info']['ssh_key']}"
     puts "Primary SSH key type: #{user_info['user_info']['ssh_type']}"  unless user_info['user_info']['ssh_type'].to_s.strip.length == 0
 

data/bin/rhc-port-forward

@@ -14,9 +14,9 @@ def p_usage(exit_code = 255)
 Usage: rhc port-forward
 Forward remote ports to the workstation
 
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login) (#{rhlogin})
+  -l|--rhlogin   rhlogin    OpenShift login (#{rhlogin})
   -a|--app                  Target application (required)
-  -p|--password  password   RHLogin password (optional, will prompt)
+  -p|--password  password   Password (optional, will prompt)
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
   --config  path            Path of alternate config file
@@ -86,6 +86,13 @@ unless user_info['app_info'][app_name]
     exit 101
 end
 
+if (user_info['app_info'][app_name].has_key?('embedded') && user_info['app_info'][app_name]['embedded'].keys.any?{ |k| k =~ /\Ahaproxy/ })
+  puts
+  puts "This utility does not currently support scaled applications.\n"
+  puts "You will need to set up port forwarding manually.\n"
+  puts
+  exit 101
+end
 
 # mock for windows
 if defined?(UNIXServer) != 'constant' or UNIXServer.class != Class

data/bin/rhc-snapshot

@@ -14,11 +14,11 @@ def p_usage(exit_code = 255)
 Usage: #{$0}
 Pull down application snapshot for a user
 
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login) (#{rhlogin})
+  -l|--rhlogin   rhlogin    OpenShift login (#{rhlogin})
   -a|--app                  Target application to snapshot (required)
   -r|--restore              Local path of the tarball to restore (restores git and application data folders found in archive)
   -s|--save                 Local path to save tarball (default: ./$APPNAME.tar.gz)
-  -p|--password  password   RHLogin password (optional, will prompt)
+  -p|--password  password   Password (optional, will prompt)
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
   --config  path            Path of alternate config file

data/bin/rhc-sshkey

@@ -21,8 +21,8 @@ List of commands
   remove                         Remove SSH key from the user account
 
 List of arguments
-  -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
-  -p|--password     password     RHLogin password (optional, will prompt)
+  -l|--rhlogin      rhlogin      OpenShift login (#{rhlogin})
+  -p|--password     password     Password (optional, will prompt)
   -i|--identifier   key-name     User-specified identifier for the key
   -k|--ssh          key-filepath SSH public key filepath 
   -d|--debug                     Print Debug info

data/bin/rhc-tail-files

@@ -15,11 +15,11 @@ def p_usage(exit_code = 255)
 Usage: #{$0}
 Tail the logs of an application
 
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login) (#{rhlogin})
+  -l|--rhlogin   rhlogin    OpenShift login (#{rhlogin})
   -a|--app                  Target application (required)
   -f|--files                File glob relative to app (default <application_name>/logs/*) (optional)
   -o|--opts                 Options to pass to the server-side (linux based) tail command (-f is implicit.  See the linux tail man page full list of options.) (Ex: --opts '-n 100')
-  -p|--password  password   RHLogin password (optional, will prompt)
+  -p|--password  password   Password (optional, will prompt)
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
   --config  path            Path of alternate config file

data/features/lib/rhc_helper/app.rb

@@ -82,7 +82,7 @@ module RHCHelper
 
     def add_cartridge(name)
       exitcode = 0
-      cartridge(name).add do |ec|
+      cartridge(name).add do |ec, stdout, stderr, arg|
         exitcode = ec
         embed << name unless embed.include?(name) or ec != 0
       end

data/features/lib/rhc_helper/commandify.rb

@@ -16,11 +16,15 @@ module RHCHelper
         # Add arguments to the command
         cmd << get_args(cmd, args[0])
 
+        exitcode = nil
         # Run the command, timing it
         time = Benchmark.realtime do
-          run(cmd, args[0], &cmd_callback).should == 0
+          exitcode = run(cmd, args[0], &cmd_callback)
         end
 
+        # if there is a callback let it take care of validating the results
+        exitcode.should == 0 unless cmd_callback
+
         # Log the benchmarking info
         perf_logger.info "#{time} #{sym.to_s.upcase} #{$namespace} #{$login}"
       else
@@ -58,8 +62,12 @@ module RHCHelper
 
       # Command specific arguments
       case cmd
-        when /domain/
+        when /domain show/
+          # domain show doesn't take arguments
+        when /domain /
           raise "No namespace set" unless $namespace
+          # use legacy switch for specifying namespace to verify older interface
+          # should switch to using argument once all commands are moved over
           args << "-n #{$namespace} "
         when /destroy/
           args << "-b "
@@ -87,7 +95,7 @@ module RHCHelper
     def get_cmd_callback(cmd, cartridge=nil)
       # Break the command up on spaces
       cmd_parts = cmd.split
-      
+
       # Drop the 'rhc' portion from the array
       cmd_parts.shift
 
@@ -151,4 +159,25 @@ module RHCHelper
     @embed.delete(cartridge)
     persist
   end
+
+  def domain_callback(exitcode, stdout, stderr, arg)
+    @domain_output = stdout
+  end
+
+  def domain_show_callback(exitcode, stdout, stderr, arg)
+    @domain_show_output = stdout
+  end
+
+  def domain_create_callback(exitcode, stdout, stderr, arg)
+    @exitcode = exitcode
+  end
+  
+  def domain_update_callback(exitcode, stdout, stderr, arg)
+    @exitcode = exitcode
+  end
+
+  def domain_delete_callback(exitcode, stdout, stderr, arg)
+    @exitcode = exitcode
+  end
+
 end

data/features/lib/rhc_helper/domain.rb

@@ -10,29 +10,55 @@ module RHCHelper
     extend Commandify
     include Dnsruby
 
+    class << self
+      attr_reader :domain_output, :domain_show_output, :exitcode
+    end
+
+    def self.unique_namespace(prefix)
+      namepace = nil
+      begin
+        # Loop until we find a unique namespace
+        chars = ("1".."9").to_a
+        namespace = prefix + Array.new(8, '').collect{chars[rand(chars.size)]}.join
+
+       end while reserved?(namespace)
+       namespace
+    end
+
     def self.create_if_needed(prefix="test")
       unless $namespace
-        loop do
-          # Loop until we find a unique namespace
-          chars = ("1".."9").to_a
-          namespace = prefix + Array.new(8, '').collect{chars[rand(chars.size)]}.join
-
-          # No retries on reservation check
-          unless reserved?(namespace)
-            # Set the global namespace
-            $namespace = namespace
-
-            # Create the domain
-            rhc_domain_create
-
-            # Write the new domain to a file in the temp directory
-            File.open(File.join(RHCHelper::TEMP_DIR, 'namespace'), 'w') do |f| 
-              f.write(namespace)
-            end
-
-            break
-          end
+        $namespace = unique_namespace(prefix)
+        # Create the domain
+        rhc_domain_create
+
+        # Write the new domain to a file in the temp directory
+        File.open(File.join(RHCHelper::TEMP_DIR, 'namespace'), 'w') do |f|
+          f.write($namespace)
+        end
+      end
+    end
+
+    def self.delete
+      rhc_domain_delete
+      $namespace = nil
+      # Write the new domain to a file in the temp directory
+      namespace_file = File.join(RHCHelper::TEMP_DIR, 'namespace')
+      File.delete(namespace_file) if File.exists?(namespace_file)
+    end
+
+    def self.update(prefix="update")
+      old_namespace = $namespace
+      $namespace = unique_namespace(prefix)
+      rhc_domain_update
+
+      namespace_file = File.join(RHCHelper::TEMP_DIR, 'namespace')
+      if @exitcode == 0
+        # Write the new domain to a file in the temp directory
+        File.open(namespace_file, 'w') do |f|
+          f.write($namespace)
         end
+      else
+        $namespace = old_namespace
       end
     end
 

data/features/step_definitions/cartridge_steps.rb

@@ -32,11 +32,11 @@ Then /^the (.+) cartridge should be stopped$/ do |name|
 end
 
 Then /^the (.+) cartridge should be removed$/ do |name|
-  # for some reason the server returns Success when cart does not exist
-  @app.cartridge(name).status.should match("RESULT:\n(.*)Success")
+  # look for response code 400
+  @app.cartridge(name).status.should match("Response code was 400")
 end
 
 
 Then /^adding the (.+) cartridge should fail$/ do |name|
-  @app.add_cartridge(name).should == 1
+  @app.add_cartridge(name).should == 154
 end

data/features/step_definitions/client_steps.rb

@@ -1,3 +1,5 @@
+require 'rhc/wizard'
+
 # Cross-platform way of finding an executable in the $PATH.
 #
 #   which('ruby') #=> /usr/bin/ruby
@@ -27,6 +29,6 @@ When /^the setup wizard is run$/ do
 end
 
 Then /^the client tools should be setup$/ do
-  RHC::Config.should_run_wizard?.should be_false, "Wizard still thinks it needs to be run"
+  RHC::Wizard.new(RHC::Config).needs_configuration?.should be_false, "Wizard still thinks it needs to be run"
 end