rhc 1.7.8 → 1.8.9

data/autocomplete/rhc_bash

@@ -174,7 +174,7 @@ _rhc()
 
       "rhc app create")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --from-code --gear-size --git --namespace --no-dns --no-git --nogit --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --nogit --repo --scaling --type"
         else
           opts=""
         fi
@@ -262,7 +262,7 @@ _rhc()
 
       "rhc app-create")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --from-code --gear-size --git --namespace --no-dns --no-git --nogit --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --nogit --repo --scaling --type"
         else
           opts=""
         fi
@@ -614,7 +614,7 @@ _rhc()
 
       "rhc create-app")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --from-code --gear-size --git --namespace --no-dns --no-git --nogit --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --nogit --repo --scaling --type"
         else
           opts=""
         fi

data/features/lib/rhc_helper/commandify.rb

@@ -93,7 +93,7 @@ module RHCHelper
           args << arg0.first if arg0.first
       end
 
-      args.rstrip
+      args.rstrip.gsub(/([\\\$])/, "\\\\\\1")
     end
 
     # This looks for a callback method that is defined for the command.

data/features/lib/rhc_helper/loggable.rb

@@ -19,10 +19,10 @@ module RHCHelper
       original_formatter = Logger::Formatter.new
       @logger.formatter = proc { |severity, datetime, progname, msg|
         # Filter out any passwords
-        filter_msg = msg.gsub(PASSWORD_REGEX, " -p ***** ") 
+        #filter_msg = msg.gsub(PASSWORD_REGEX, " -p ***** ") 
 
         # Format with the original formatter
-        original_formatter.call(severity, datetime, progname, filter_msg)
+        original_formatter.call(severity, datetime, progname, msg)
       }
     end
 

data/features/support/before_hooks.rb

@@ -1,7 +1,3 @@
-Before('@clean') do
-  clean_applications(true)
-end
-
 Before('@sshkey') do
   Sshkey.remove "key1"
   Sshkey.remove "key2"
@@ -16,12 +12,22 @@ Before('@geared_user_required') do
   $old_username = $username
   $username = "user_with_multiple_gear_sizes@test.com"
   $namespace = nil
+
+  if !$cleaned_gears
+    clean_applications($username)
+    $cleaned_gears = true
+  end
 end
 
 Before('@certificates_capable_user_required') do
   $old_username = $username
   $username = "user_with_certificate_capabilities@test.com"
   $namespace = nil
+
+  if !$cleaned_certificates
+    clean_applications($username)
+    $cleaned_certificates = true
+  end
 end
 
 After do
@@ -37,6 +43,15 @@ Before('@cartridge_storage_user_required') do
   $old_username = $username
   $username = "user_with_extra_storage@test.com"
   $namespace = nil
+
+  if !$cleaned_storage
+    clean_applications($username)
+    $cleaned_storage = true
+  end
+end
+
+Before('@clean') do
+  clean_applications($username, true)
 end
 
 Before('@domain_required') do

data/features/support/env.rb

@@ -105,9 +105,9 @@ _log "  Creating New Namespace: #{$namespace.nil?}"
 _log "--------------------------------------------------------------------------------------------------"
 _log "\n\n"
 
-def clean_applications(leave_domain = false)
+def clean_applications(user=$username,leave_domain=false)
   return if ENV['NO_CLEAN']
-  users = [$username,'user_with_multiple_gear_sizes@test.com','user_with_extra_storage@test.com']
+  users = Array(user)
 
   _log "  Cleaning up test applications..."
 
@@ -128,8 +128,8 @@ def clean_applications(leave_domain = false)
           app.delete
         end
       end
-      domain.delete unless leave_domain
     end
+    client.domains.each{ |domain| domain.delete } unless leave_domain
     client.sshkeys.each do |key|
       _log "\t\tKey: #{key.name}"
       key.delete

data/lib/rhc/cartridge_helpers.rb

@@ -7,6 +7,8 @@ module RHC
         from = opts[:from] || all_cartridges
 
         cartridge_names.map do |name|
+          next use_cart(RHC::Rest::Cartridge.for_url(name), name) if name =~ %r(\Ahttps?://)i
+
           name = name.downcase
           from.find{ |c| c.name.downcase == name } ||
           begin
@@ -33,7 +35,11 @@ module RHC
       end
 
       def use_cart(cart, for_cartridge_name)
-        info "Using #{cart.name}#{cart.display_name ? " (#{cart.display_name})" : ''} for '#{for_cartridge_name}'"
+        if 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
         cart
       end
 
@@ -50,7 +56,7 @@ module RHC
         lambda{ |cart|
           next cart unless cart.is_a? Array
           name = cart.instance_variable_get(:@for)
-          matching = cart.select(&:only_in_new?)
+          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
@@ -93,6 +99,6 @@ module RHC
         carts.unshift ['==========', '=========']
         carts.unshift ['Short Name', 'Full name']
         say table(carts)
-      end
+      end    
   end
 end

data/lib/rhc/commands.rb

@@ -299,6 +299,7 @@ module RHC
             raise ArgumentError, "Missing required argument '#{arg[:name]}'." unless arg[:optional]
             break if available.empty?
           else
+            value = Array(value) if arg[:arg_type] == :list
             slots[i] = value
             options.__hash__[option] = value if option
           end

data/lib/rhc/commands/app.rb

@@ -6,7 +6,12 @@ require 'rhc/cartridge_helpers'
 module RHC::Commands
   class App < Base
     summary "Commands for creating and managing applications"
-    description "Creates and controls an OpenShift application.  To see the list of all applications use the rhc domain show command.  Note that delete is not reversible and will stop your application and then remove the application and repo from the remote server. No local changes are made."
+    description <<-DESC
+      Creates and controls an OpenShift application.  To see the list of all 
+      applications use the rhc domain show command.  Note that delete is not 
+      reversible and will stop your application and then remove the application 
+      and repo from the remote server. No local changes are made.
+      DESC
     syntax "<action>"
     default_action :help
     suppress_wizard
@@ -19,7 +24,11 @@ module RHC::Commands
       scheduled jobs, or continuous integration.
 
       You can see a list of all valid cartridge types by running
-      'rhc cartridge list'.
+      'rhc cartridge list'. OpenShift also supports downloading cartridges -
+      pass a URL in place of the cartridge name and we'll download 
+      and install that cartridge into your app.  Keep in mind that
+      these cartridges receive no security updates.  Note that not
+      all OpenShift servers allow downloaded cartridges.
 
       When your application is created, a domain name that is a combination
       of the name of your app and the namespace of your domain will be
@@ -38,7 +47,7 @@ module RHC::Commands
       may be specified to change the gears used.
 
       DESC
-    syntax "<name> <cartridge> [-n namespace]"
+    syntax "<name> <cartridge> [... <cartridge>] [-n namespace]"
     option ["-n", "--namespace NAME"], "Namespace for the application"
     option ["-g", "--gear-size SIZE"], "Gear size controls how much memory and CPU your cartridges can use."
     option ["-s", "--scaling"], "Enable scaling for the web cartridge."
@@ -51,7 +60,6 @@ module RHC::Commands
     option ["--enable-jenkins [NAME]"], "Enable Jenkins builds for this application (will create a Jenkins application if not already available). The default name will be 'jenkins' if not specified."
     argument :name, "Name for your application", ["-a", "--app NAME"], :optional => true
     argument :cartridges, "The web framework this application should use", ["-t", "--type CARTRIDGE"], :optional => true, :arg_type => :list
-    #argument :additional_cartridges, "A list of other cartridges such as databases you wish to add. Cartridges can also be added later using 'rhc cartridge add'", [], :arg_type => :list
     def create(name, cartridges)
       check_config!
 
@@ -69,7 +77,7 @@ module RHC::Commands
       rest_app = nil
 
       cart_names = cartridges.collect do |c|
-        c.usage_rate? ? "#{c.name} (addtl. costs may apply)" : c.name
+        c.usage_rate? ? "#{c.short_name} (addtl. costs may apply)" : c.short_name
       end.join(', ')
 
       paragraph do
@@ -88,13 +96,9 @@ module RHC::Commands
       paragraph do
         say "Creating application '#{name}' ... "
 
-
         # create the main app
-        rest_app = create_app(name, cartridges.map(&:name), rest_domain,
-                              options.gear_size, options.scaling, options.from_code)
-
+        rest_app = create_app(name, cartridges, rest_domain, options.gear_size, options.scaling, options.from_code)
         messages.concat(rest_app.messages)
-
         success "done"
       end
 
@@ -115,8 +119,8 @@ module RHC::Commands
               warn "not complete"
               add_issue("Jenkins failed to install - #{e}",
                         "Installing jenkins and jenkins-client",
-                        "rhc app create jenkins",
-                        "rhc cartridge add jenkins-client -a #{rest_app.name}")
+                        "rhc create-app jenkins",
+                        "rhc add-cartridge jenkins-client -a #{rest_app.name}")
             end
           end
         end
@@ -276,7 +280,19 @@ module RHC::Commands
           say "Cartridge #{gg.cartridges.collect { |c| c['name'] }.join(', ')} is #{gear_group_state(gg.gears.map{ |g| g['state'] })}"
         end
       elsif options.gears
-        say table(gear_groups_for_app(app_name).map{ |gg| gg.gears.map{ |g| [g['id'], g['state'], gg.cartridges.map{ |c| c['name'] }.join(", ")] } }.flatten(1))
+        gear_info = gear_groups_for_app(app_name).map do |group|
+          group.gears.map do |gear|
+            [
+              gear['id'],
+              gear['state'] == 'started' ? gear['state'] : color(gear['state'], :yellow),
+              group.cartridges.collect{ |c| c['name'] }.join(' '),
+              group.gear_profile,
+              ssh_string(gear['ssh_url'])
+            ]
+          end
+        end.flatten(1)
+
+        say table(gear_info, :header => ['ID', 'State', 'Cartridges', 'Size', 'SSH URL'])
       else
         app = rest_client.find_application(options.namespace, app_name, :include => :cartridges)
         display_app(app, app.cartridges)
@@ -325,8 +341,8 @@ module RHC::Commands
       def require_one_web_cart
         lambda{ |carts|
           match, ambiguous = carts.partition{ |c| not c.is_a?(Array) }
-          selected_web = match.any?(&:only_in_new?)
-          possible_web = ambiguous.flatten.any?(&:only_in_new?)
+          selected_web = match.any?{ |c| not c.only_in_existing? }
+          possible_web = ambiguous.flatten.any?{ |c| not c.only_in_existing? }
           if not (selected_web or possible_web)
             section(:bottom => 1){ list_cartridges(standalone_cartridges) }
             raise RHC::CartridgeNotFoundException, "Every application needs a web cartridge to handle incoming web requests. Please provide the short name of one of the carts listed above."
@@ -363,11 +379,11 @@ module RHC::Commands
           rest_client.find_domain(options.namespace)
         else
           if rest_client.domains.empty?
-            raise RHC::Rest::DomainNotFoundException, "No domains found. Please create a domain with 'rhc domain create <namespace>' before creating applications." unless interactive?
+            raise RHC::Rest::DomainNotFoundException, "No domains found. Please create a domain with 'rhc create-domain <namespace>' before creating applications." unless interactive?
             RHC::DomainWizard.new(config, options, rest_client).run
           end
           domain = rest_client.domains.first
-          raise RHC::Rest::DomainNotFoundException, "No domains found. Please create a domain with 'rhc domain create <namespace>' before creating applications." unless domain
+          raise RHC::Rest::DomainNotFoundException, "No domains found. Please create a domain with 'rhc create-domain <namespace>' before creating applications." unless domain
           options.namespace = domain.id
           domain
         end
@@ -446,7 +462,7 @@ module RHC::Commands
           warn "not complete"
           add_issue("Jenkins client failed to install - #{exit_message}",
                     "Install the jenkins client",
-                    "rhc cartridge add jenkins-client -a #{rest_app.name}")
+                    "rhc add-cartridge jenkins-client -a #{rest_app.name}")
         end
       end
 
@@ -565,7 +581,7 @@ WARNING:  Your application was created successfully but had problems during
   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.
 
-    Forums - https://openshift.redhat.com/community/forums/openshift
+    Forums - https://www.openshift.com/forums/openshift
     IRC - #openshift (on Freenode)
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

data/lib/rhc/commands/apps.rb

@@ -7,12 +7,12 @@ module RHC::Commands
     def run
       domains = rest_client.domains
 
-      info "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc domain create'." and return 1 if domains.empty?
+      info "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc create-domain'." and return 1 if domains.empty?
 
       applications = domains.map{ |d| d.applications(:include => :cartridges) }.flatten.sort
 
       applications.each{ |a| display_app(a, a.cartridges) }.blank? and
-        info "No applications. Use 'rhc app create'." and
+        info "No applications. Use 'rhc create-app'." and
         return 1
 
       success "You have #{applications.length} applications"

data/lib/rhc/commands/authorization.rb

@@ -7,7 +7,7 @@ module RHC::Commands
       can add, edit, or delete authorizations with subcommands.
 
       An authorization token grants access to the OpenShift REST API with
-      a set of privleges called 'scopes' for a limited time.  You can
+      a set of privileges called 'scopes' for a limited time.  You can
       add an optional note to each authorization token to assist you in
       remembering what is available.
       DESC
@@ -25,7 +25,7 @@ module RHC::Commands
     syntax "--scopes SCOPES [--note NOTE] [--expires-in SECONDS]"
     description <<-DESC
       Add an authorization to your account. An authorization token grants
-      access to the OpenShift REST API with a set of privleges called 'scopes'
+      access to the OpenShift REST API with a set of privileges called 'scopes'
       for a limited time.  You can add an optional note to each authorization
       token to assist you in remembering what is available.
 

data/lib/rhc/commands/cartridge.rb

@@ -17,7 +17,11 @@ module RHC::Commands
       (like Jenkins) or provide environment variables.
 
       Use the 'cartridges' command to see a list of all available cartridges.
-      Add a new cartridge to your application with 'add-cartridge'.
+      Add a new cartridge to your application with 'add-cartridge'. OpenShift 
+      also supports downloading cartridges - pass a URL in place of the cartridge 
+      name and we'll download and install that cartridge into your app.  Keep 
+      in mind that these cartridges receive no security updates.  Note that 
+      not all OpenShift servers allow downloaded cartridges.
 
       For scalable applications, use the 'cartridge-scale' command on the web
       cartridge to set the minimum and maximum scale.
@@ -42,7 +46,7 @@ module RHC::Commands
           paragraph do
             name = c.display_name != c.name && "#{color(c.display_name, :cyan)} [#{c.name}]" || c.name
             tags = c.tags - RHC::Rest::Cartridge::HIDDEN_TAGS
-            say header([name, "(#{c.only_in_new? ? 'web' : 'addon'})"])
+            say header([name, "(#{c.only_in_existing? ? 'addon' : 'web'})"])
             say c.description
             paragraph{ say "Tagged with: #{tags.sort.join(', ')}" } if tags.present?
             paragraph{ say format_usage_message(c) } if c.usage_rate?
@@ -52,7 +56,7 @@ module RHC::Commands
         say table(carts.collect do |c|
           [c.usage_rate? ? "#{c.name} (*)" : c.name,
            c.display_name,
-           c.only_in_new? ? 'web' : 'addon']
+           c.only_in_existing? ? 'addon' : 'web']
         end)
       end
 
@@ -71,12 +75,12 @@ module RHC::Commands
     def add(cart_type)
       cart = check_cartridges(cart_type, :from => not_standalone_cartridges).first
 
-      say "Adding #{cart.name} to application '#{options.app}' ... "
+      say "Adding #{cart.short_name} to application '#{options.app}' ... "
 
       say format_usage_message(cart) if cart.usage_rate?
 
       rest_app = rest_client.find_application(options.namespace, options.app, :include => :cartridges)
-      rest_cartridge = rest_app.add_cartridge(cart.name)
+      rest_cartridge = rest_app.add_cartridge(cart)
 
       success "Success"
 

data/lib/rhc/commands/domain.rb

@@ -26,7 +26,7 @@ module RHC::Commands
 
       results do
         say "Success!"
-        say "You may now create an application using the 'rhc app create' command"
+        say "You may now create an application using the 'rhc create-app' command"
       end
 
       0
@@ -40,14 +40,12 @@ module RHC::Commands
     def update(old_namespace, new_namespace)
       domain = rest_client.find_domain(old_namespace)
 
-      say "Changing namespace '#{domain.id}' to '#{new_namespace}'..."
+      say "Changing namespace '#{domain.id}' to '#{new_namespace}' ... "
 
       domain.update(new_namespace)
 
-      results do
-        say "Success!"
-        say "You can use 'rhc domain show' to view any url changes.  Be sure to update any links including the url in your local git config: <local_git_repo>/.git/config"
-      end
+      success "success"
+      info "Applications in this domain will use the new namespace in their URL."
 
       0
     end
@@ -56,7 +54,7 @@ module RHC::Commands
     def show
       domain = rest_client.domains.first
 
-      warn "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc domain create'." and return 1 unless domain
+      warn "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc create-domain'." and return 1 unless domain
 
       applications = domain.applications(:include => :cartridges)
 
@@ -68,7 +66,7 @@ module RHC::Commands
         end
         success "You have #{applications.length} applications in your domain."
       else
-        success "The domain #{domain.id} exists but has no applications. You can use 'rhc app create' to create a new application."
+        success "The domain #{domain.id} exists but has no applications. You can use 'rhc create-app' to create a new application."
       end
 
       0
@@ -94,7 +92,7 @@ module RHC::Commands
       begin
         domain.destroy
       rescue RHC::Rest::ClientErrorException #FIXME: I am insufficiently specific
-        raise RHC::Exception.new("Domain contains applications. Delete applications first.", 128)
+        raise RHC::Exception.new("Your domain contains applications. Delete applications first.", 128)
       end
 
       success "deleted"

data/lib/rhc/commands/port_forward.rb

@@ -72,11 +72,12 @@ module RHC::Commands
     syntax "<application>"
     option ["-n", "--namespace NAME"], "Namespace of the application you are port forwarding to", :context => :namespace_context, :required => true
     argument :app, "Application you are port forwarding to (required)", ["-a", "--app NAME"]
+    option ["-g", "--gear ID"], "Gear ID you are port forwarding to (optional)"
     def run(app)
       rest_app = rest_client.find_application(options.namespace, app)
+      ssh_uri = URI.parse(options.gear ? rest_app.gear_ssh_url(options.gear) : rest_app.ssh_url)
 
-      ssh_uri = URI.parse(rest_app.ssh_url)
-      say "Using #{rest_app.ssh_url}..." if options.debug
+      say "Using #{ssh_uri}..." if options.debug
 
       forwarding_specs = []
 
@@ -104,7 +105,7 @@ module RHC::Commands
               end
             end
           end
-          
+
           if forwarding_specs.length == 0
             # check if the gears have been stopped
             ggs = rest_app.gear_groups
@@ -115,7 +116,7 @@ module RHC::Commands
               warn "Application #{rest_app.name} is stopped. Please restart the application and try again."
               return 1
             else
-              raise RHC::NoPortsToForwardException.new "There are no available ports to forward for this application. Your application may be stopped." 
+              raise RHC::NoPortsToForwardException.new "There are no available ports to forward for this application. Your application may be stopped or idled."
             end
           end
 
@@ -148,7 +149,7 @@ module RHC::Commands
                   say table(
                         bound_ports.map do |fs|
                           [fs.service, "#{fs.host_from}:#{fs.port_from}", " => ", "#{fs.remote_host}:#{fs.port_to.to_s}"]
-                        end, 
+                        end,
                         :header => ["Service", "Local", "    ", "OpenShift"]
                       )
                 end