rhc 1.9.6 → 1.10.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7c23c41b519b26aa7aee54c9e93e0d47e8c54a51
+  data.tar.gz: 1859032019fb864654b41f9270bd42bcda16e6a8
+SHA512:
+  metadata.gz: f21f8a5e3a943ffd84ace86a9a47c0ffa5c3327d93953bf14901c5ab6f9329d7d03f83220a59252d655f7c8c2aaab5b1097016215cb1ca4b35c5de972eb1a570
+  data.tar.gz: b0bb0eaba39778c409bbe84aa035b45b1c61867dfa2221b2cd61b6629da2476d56e38eed49d3cc0634acc544b094671b15d3913f37c70fb79a4fe80306c03736

data/features/lib/rhc_helper.rb

@@ -5,10 +5,6 @@ require 'tmpdir'
 ### Some shared constant declarations
 module RHCHelper
   TEMP_DIR = File.join(Dir.tmpdir, "rhc") unless const_defined?(:TEMP_DIR)
-  # The regex to parse the UUID output from the create app results
-  UUID_OUTPUT_PATTERN = /UUID\s*(?:\:|=)\s*(.+)/i unless const_defined?(:UUID_OUTPUT_PATTERN)
-  # The regex to parse the Gear Profile output from the create app results
-  GEAR_PROFILE_OUTPUT_PATTERN = /Gear Size\s*(?:\:|=)\s*(\w+)/m unless const_defined?(:GEAR_PROFILE_OUTPUT_PATTERN)
   # Regex to parse passwords out of logging messages
   PASSWORD_REGEX = / -p [^\s]* / unless const_defined?(:PASSWORD_REGEX)
 end

data/features/lib/rhc_helper/app.rb

@@ -117,20 +117,20 @@ module RHCHelper
     end
 
     def get_index_file
-      case @type
-        when "php-5.3","php-5.4" then "php/index.php"
-        when "ruby-1.8" then "config.ru"
-        when "python-2.6" then "wsgi/application"
-        when "perl-5.10" then "perl/index.pl"
-        when "jbossas-7" then "src/main/webapp/index.html"
-        when "jbosseap-6.0" then "src/main/webapp/index.html"
-        when "nodejs-0.6" then "index.html"
+      case @type.split("-").first
+        when "php" then "php/index.php"
+        when "ruby" then "config.ru"
+        when "python" then "wsgi/application"
+        when "perl" then "perl/index.pl"
+        when "jbossas" then "src/main/webapp/index.html"
+        when "jbosseap" then "src/main/webapp/index.html"
+        when "nodejs" then "index.html"
       end
     end
 
     def get_mysql_file
-      case @type
-        when "php-5.3","php-5.4" then File.expand_path("../misc/php/db_test.php", File.expand_path(File.dirname(__FILE__)))
+      case @type.split("-").first
+        when "php" then File.expand_path("../misc/php/db_test.php", File.expand_path(File.dirname(__FILE__)))
       end
     end
   end

data/features/lib/rhc_helper/commandify.rb

@@ -124,34 +124,16 @@ module RHCHelper
     end
   end
 
+  # The regex to parse the UUID output from the create app results
+  UUID_OUTPUT_PATTERN = /UUID\s*(?:\:|=)\s*(.+)/i unless const_defined?(:UUID_OUTPUT_PATTERN)
+  # The regex to parse the Gear Profile output from the create app results
+  GEAR_PROFILE_OUTPUT_PATTERN = /Gear Size\s*(?:\:|=)\s*(\w+)/m unless const_defined?(:GEAR_PROFILE_OUTPUT_PATTERN)
+
   #
   # Begin Post Processing Callbacks
   #
   def app_create_callback(exitcode, stdout, stderr, arg)
-    match = stdout.match(UUID_OUTPUT_PATTERN)
-    @uid = match[1] if match
-    match = stdout.match(GEAR_PROFILE_OUTPUT_PATTERN)
-    @gear_profile = nil
-    @gear_profile = match[1] if match
-
-    def no_match(msg,expected,actual)
-      [ msg,
-        "-"*20,
-        ("Expected: %s" % expected),
-        ("Actual:\n%s" % actual),
-        "-"*20,
-      ].join("\n")
-    end
-
-    raise no_match(
-      "UID not parsed from app create output",
-      UUID_OUTPUT_PATTERN, stdout
-    ) unless @uid
-
-    raise no_match(
-      "Gear Profile not parsed from app create output",
-      GEAR_PROFILE_OUTPUT_PATTERN, stdout
-    ) unless @gear_profile
+    stdout.should =~ /Your application '([^']+)' is now available./
 
     persist
   end

data/features/support/before_hooks.rb

@@ -45,7 +45,7 @@ Before('@cartridge_storage_user_required') do
   $namespace = nil
 
   if !$cleaned_storage
-    clean_applications($username)
+    clean_applications($username, true)
     $cleaned_storage = true
   end
 end

data/features/support/env.rb

@@ -8,7 +8,15 @@ rescue
   exit 1
 end
 
-$target_os = ENV['RHC_TARGET'] || (File.exist?("/etc/fedora-release") ? "Fedora" : "RHEL")
+$target_os = ENV['RHC_TARGET']
+if $target_os.nil?
+  if File.exist?("/etc/fedora-release")
+    version = File.open("/etc/fedora-release").read.match(/[\w ]*release ([\d]+) [.]*/)[1]
+    $target_os = "fedora-#{version}"
+  else
+    $target_os = "rhel"
+  end
+end
 
 require 'rhc/coverage_helper'
 SimpleCov.at_exit{ SimpleCov.result.format! } if defined? SimpleCov
@@ -82,7 +90,6 @@ if ENV['REGISTER_USER']
   command = $user_register_script_format % [$username,$password]
   if Object.const_defined?('Bundler')
     Bundler::with_clean_env do
-      system "gem install activeresource bundler parseconfig --no-ri --no-rdoc"
       system command
     end
   else

data/features/support/platform_support.rb

@@ -1,4 +1,4 @@
-if $target_os == 'Fedora'
+if $target_os == 'fedora-18'
   CARTRIDGE_MAP = {
     "php"         => { type: "php-5.4", name: "PHP 5.4" },
     "mysql"       => { type: "mysql-5.1", name: "MySQL Database 5.1" },
@@ -8,6 +8,16 @@ if $target_os == 'Fedora'
     "cron"        => { type: "cron-1.4", name: "Cron 1.4" },
     "haproxy"     => { type: "haproxy-1.4", name: "" }
   }
+elsif $target_os == 'fedora-19'
+  CARTRIDGE_MAP = {
+      "php"         => { type: "php-5.5", name: "PHP 5.5" },
+      "mysql"       => { type: "mariadb-5.5", name: "MariaDB 5.5" },
+      "phpmyadmin"  => { type: "phpmyadmin-3.5", name: "phpMyAdmin 3.5" },
+      "mongodb"     => { type: "mongodb-2.2", name: "MongoDB NoSQL Database 2.2" },
+      "postgresql"  => { type: "postgresql-9.2", name: "PostgreSQL Database 9.2" },
+      "cron"        => { type: "cron-1.4", name: "Cron 1.4" },
+      "haproxy"     => { type: "haproxy-1.4", name: "" }
+  }
 else
   CARTRIDGE_MAP = {
     "php"         => { type: "php-5.3", name: "PHP 5.3" },

data/lib/rhc/auth/basic.rb

@@ -49,7 +49,10 @@ module RHC::Auth
         @username = ask("Login to #{openshift_server}: ") unless @no_interactive
       end
       def ask_password
-        @password = ask("Password: ") { |q| q.echo = '*' } unless @no_interactive
+        @password = ask("Password: ") { |q|
+          q.echo = '*'
+          q.whitespace = :chomp
+        } unless @no_interactive
       end
 
       def username?

data/lib/rhc/cartridge_helpers.rb

@@ -35,8 +35,8 @@ module RHC
       end
 
       def use_cart(cart, for_cartridge_name)
-        if cart.custom?
-        info "The cartridge '#{cart.url}' will be downloaded and installed"
+        if cart.name.blank? and cart.custom?
+          info "The cartridge '#{cart.url}' will be downloaded and installed"
         else
           info "Using #{cart.name}#{cart.display_name ? " (#{cart.display_name})" : ''} for '#{for_cartridge_name}'"
         end
@@ -57,9 +57,7 @@ module RHC
           next cart unless cart.is_a? Array
           name = cart.instance_variable_get(:@for)
           matching = cart.select{ |c| not c.only_in_existing? }
-          if matching.empty?
-            raise RHC::MultipleCartridgesException, "You must select only a single web cartridge. '#{name}' matches web cartridges."
-          elsif matching.size == 1
+          if matching.size == 1
             use_cart(matching.first, name)
           else
             matching.instance_variable_set(:@for, name)
@@ -73,9 +71,7 @@ module RHC
           next cart unless cart.is_a? Array
           name = cart.instance_variable_get(:@for)
           matching = cart.select{ |c| not c.only_in_new? }
-          if matching.empty?
-            raise RHC::MultipleCartridgesException, "You must select only a single web cartridge. '#{name}' matches web cartridges."
-          elsif matching.size == 1
+          if matching.size == 1
             use_cart(matching.first, name)
           else
             matching.instance_variable_set(:@for, name)

data/lib/rhc/commands.rb

@@ -16,6 +16,7 @@ module Commander
     def deprecated(as_alias=nil)
       return false unless info
       return info[:deprecated] if info[:deprecated]
+      return false unless info[:aliases]
       info[:aliases].select{ |a| ['-',' '].map{ |s| Array(a[:action]).join(s) }.include?(as_alias) }.map{ |a| a[:deprecated] }.first if as_alias
     end
 
@@ -220,15 +221,17 @@ module RHC
 
           c.when_called do |args, options|
             deprecated!
-
+            
             config = c.instance_variable_get(:@config)
-
+            
             cmd = opts[:class].new
             cmd.options = options
             cmd.config = config
-
+            
             args = fill_arguments(cmd, options, args_metadata, options_metadata, args)
             needs_configuration!(cmd, options, config)
+            
+            return execute(cmd, :help, args) unless opts[:method]
             execute(cmd, opts[:method], args)
           end
         end

data/lib/rhc/commands/alias.rb

@@ -109,6 +109,7 @@ module RHC::Commands
     syntax "<application>"
     argument :app, "Application name (required)", ["-a", "--app name"], :context => :app_context, :required => true
     option ["-n", "--namespace NAME"], "Namespace of your application", :context => :namespace_context, :required => true
+    alias_action "aliases", :root_command => true
     def list(app)
       rest_app = rest_client.find_application(options.namespace, app)
       items = rest_app.aliases.map do |a|

data/lib/rhc/commands/app.rb

@@ -75,6 +75,7 @@ module RHC::Commands
 
       rest_domain = check_domain!
       rest_app = nil
+      repo_dir = nil
 
       cart_names = cartridges.collect do |c|
         c.usage_rate? ? "#{c.short_name} (addtl. costs may apply)" : c.short_name
@@ -91,15 +92,14 @@ module RHC::Commands
              ).each { |s| say "  #{s}" }
       end
 
-      messages = []
-
       paragraph do
         say "Creating application '#{name}' ... "
 
         # create the main app
         rest_app = create_app(name, cartridges, rest_domain, options.gear_size, options.scaling, options.from_code)
-        messages.concat(rest_app.messages)
         success "done"
+
+        paragraph{ indent{ success rest_app.messages.map(&:strip) } }
       end
 
       build_app_exists = rest_app.building_app
@@ -113,7 +113,7 @@ module RHC::Commands
               build_app_exists = add_jenkins_app(rest_domain)
 
               success "done"
-              messages.concat(build_app_exists.messages)
+              paragraph{ indent{ success build_app_exists.messages.map(&:strip) } }
 
             rescue Exception => e
               warn "not complete"
@@ -126,7 +126,9 @@ module RHC::Commands
         end
 
         paragraph do
+          messages = []
           add_jenkins_client_to(rest_app, messages)
+          paragraph{ indent{ success messages.map(&:strip) } }
         end if build_app_exists
       end
 
@@ -150,31 +152,37 @@ module RHC::Commands
         end
 
         if options.git
-          paragraph do
-            say "Downloading the application Git repository ..."
-            paragraph do
-              begin
-                git_clone_application(rest_app)
-              rescue RHC::GitException => e
-                warn "#{e}"
-                unless RHC::Helpers.windows? and windows_nslookup_bug?(rest_app)
-                  add_issue("We were unable to clone your application's git repo - #{e}",
-                            "Clone your git repo",
-                            "rhc git-clone #{rest_app.name}")
-                end
+          section(:now => true, :top => 1, :bottom => 1) do
+            begin
+              repo_dir = git_clone_application(rest_app)
+            rescue RHC::GitException => e
+              warn "#{e}"
+              unless RHC::Helpers.windows? and windows_nslookup_bug?(rest_app)
+                add_issue("We were unable to clone your application's git repo - #{e}",
+                          "Clone your git repo",
+                          "rhc git-clone #{rest_app.name}")
               end
             end
           end
         end
       end
 
-      display_app(rest_app, rest_app.cartridges)
-
-      if issues?
-        output_issues(rest_app)
-      else
-        results{ messages.each { |msg| success msg } }.blank? and "Application created"
+      output_issues(rest_app) if issues?
+            
+      paragraph do
+        say "Your application '#{rest_app.name}' is now available."
+        paragraph do
+          indent do
+            say table [
+                ['URL:', rest_app.app_url],
+                ['SSH to:', rest_app.ssh_string],
+                ['Git remote:', rest_app.git_url],
+                (['Cloned to:', repo_dir] if repo_dir)
+              ].compact
+          end
+        end
       end
+      paragraph{ say "Run 'rhc show-app #{name}' for more details about your app." }
 
       0
     end
@@ -198,6 +206,8 @@ module RHC::Commands
       rest_app.destroy
       success "deleted"
 
+      paragraph{ rest_app.messages.each{ |s| success s } }
+
       0
     end
 
@@ -268,17 +278,52 @@ module RHC::Commands
     end
 
     summary "Show information about an application"
+    description <<-DESC
+      Display the properties of an application, including its URL, the SSH
+      connection string, and the Git remote URL.  Will also display any 
+      cartridges, their scale, and any values they expose.
+
+      The '--state' option will retrieve information from each cartridge in 
+      the application, which may include cartridge specific text.
+
+      To see information about the individual gears within an application,
+      use '--gears', including whether they are started or stopped and their
+      SSH host strings.  Passing '--gears quota' will show the free and maximum
+      storage on each gear.
+
+      If you want to run commands against individual gears, use:
+       
+        rhc ssh <app> --gears '<command>'
+
+      to run and display the output from each gear.
+      DESC
     syntax "<app> [--namespace NAME]"
     argument :app, "The name of the application you are getting information on", ["-a", "--app NAME"], :context => :app_context
     option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
     option ["--state"], "Get the current state of the cartridges in this application"
-    option ["--gears"], "Show the ID, state, and cartridges on each gear in this application"
+    option ["--gears [quota|ssh]"], "Show information about the cartridges on each gear in this application. Pass 'quota' to see per gear disk usage and limits. Pass 'ssh' to print only the SSH connection strings of each gear."
     def show(app_name)
 
       if options.state
         gear_groups_for_app(app_name).each do |gg|
           say "Cartridge #{gg.cartridges.collect { |c| c['name'] }.join(', ')} is #{gear_group_state(gg.gears.map{ |g| g['state'] })}"
         end
+
+      elsif options.gears && options.gears != true
+        groups = rest_client.find_application_gear_groups(options.namespace, app_name)
+
+        case options.gears
+        when 'quota'
+          opts = {:as => :gear, :split_cells_on => /\s*\t/, :header => ['Gear', 'Cartridges', 'Used', 'Limit'], :align => [nil, nil, :right, :right]}
+          table_from_gears('echo "$(du -s 2>/dev/null | cut -f 1)"', groups, opts) do |gear, data, group|
+            [gear['id'], group.cartridges.collect{ |c| c['name'] }.join(' '), (human_size(data.chomp) rescue 'error'), human_size(group.quota)]
+          end
+        when 'ssh'
+          groups.each{ |group| group.gears.each{ |g| say (ssh_string(g['ssh_url']) or raise NoPerGearOperations) } }
+        else 
+          run_on_gears(ssh_command_for_op(options.gears), groups)
+        end
+
       elsif options.gears
         gear_info = gear_groups_for_app(app_name).map do |group|
           group.gears.map do |gear|
@@ -301,28 +346,6 @@ module RHC::Commands
       0
     end
 
-    summary "SSH into the specified application"
-    syntax "<app> [--ssh path_to_ssh_executable]"
-    argument :app, "The name of the application you want to SSH into", ["-a", "--app NAME"], :context => :app_context
-    option ["--ssh PATH"], "Path to your SSH executable"
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
-    alias_action 'ssh', :root_command => true
-    def ssh(app_name)
-      raise ArgumentError, "No application specified" unless app_name.present?
-      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?
-
-      rest_app = rest_client.find_application(options.namespace, app_name)
-
-      say "Connecting to #{rest_app.ssh_string.to_s} ..."
-      if options.ssh
-        debug "Using user specified SSH: #{options.ssh}"
-        Kernel.send(:system, "#{options.ssh} #{rest_app.ssh_string.to_s}")
-      else
-        debug "Using system ssh"
-        Kernel.send(:system, "ssh #{rest_app.ssh_string.to_s}")
-      end
-    end
-
     summary "DEPRECATED use 'show <app> --state' instead"
     syntax "<app> [--namespace NAME] [--app NAME]"
     argument :app, "The name of the application you are getting information on", ["-a", "--app NAME"], :context => :app_context
@@ -337,6 +360,7 @@ module RHC::Commands
     private
       include RHC::GitHelpers
       include RHC::CartridgeHelpers
+      include RHC::SSHHelpers
 
       def require_one_web_cart
         lambda{ |carts|
@@ -349,7 +373,7 @@ module RHC::Commands
           end
           if selected_web
             carts.map! &other_carts_only
-          elsif possible_web
+          elsif possible_web && ambiguous.length == 1
             carts.map! &web_carts_only
           end
         }
@@ -518,22 +542,6 @@ module RHC::Commands
         # :nocov:
       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
-
       def windows_nslookup_bug?(rest_app)
         windows_nslookup = run_nslookup(rest_app.host)
         windows_ping = run_ping(rest_app.host)
@@ -573,20 +581,49 @@ WARNING:  Your application was created successfully but had problems during
 #{reasons}
   Steps to complete your configuration:
 #{steps}
-  If you can't get your application '#{rest_app.name}' running in the browser,
+  If you continue to experience problems after completing these steps,
   you can try destroying and recreating the application:
 
     $ rhc app delete #{rest_app.name} --confirm
 
-  If this doesn't work for you, let us know in the forums or in IRC and we'll
-  make sure to get you up and running.
+  Please contact us if you are unable to successfully create your 
+  application:
 
-    Forums - https://www.openshift.com/forums/openshift
-    IRC - #openshift (on Freenode)
+    Support - https://www.openshift.com/support
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 WARNING_OUTPUT
       end
+
+    # Issues collector collects a set of recoverable issues and steps to fix them
+    # for output at the end of a complex command
+    def add_issue(reason, commands_header, *commands)
+      @issues ||= []
+      issue = {:reason => reason,
+               :commands_header => commands_header,
+               :commands => commands}
+      @issues << issue
+    end
+
+    def format_issues(indent)
+      return nil unless issues?
+
+      indentation = " " * indent
+      reasons = ""
+      steps = ""
+
+      @issues.each_with_index do |issue, i|
+        reasons << "#{indentation}#{i+1}. #{issue[:reason].strip}\n"
+        steps << "#{indentation}#{i+1}. #{issue[:commands_header].strip}\n"
+        issue[:commands].each { |cmd| steps << "#{indentation}  $ #{cmd}\n" }
+      end
+
+      [reasons, steps]
+    end
+
+    def issues?
+      not @issues.nil?
+    end      
   end
 end