rhc 1.5.13 → 1.6.8

data/features/application.feature

@@ -3,7 +3,7 @@ Feature: Application Operations
 
   @init
   Scenario: Application Creation
-    When a php-5.3 application is created
+    When a php application is created
     Then the application should be accessible
 
   # The state in these examples should be able to be broken into before hooks when we update cucumber

data/features/cartridge.feature

@@ -10,12 +10,12 @@ Feature: Single Cartridge Tests
 
     Examples:
       | type            | command   | status  |
-      | mysql-5.1       | added     | running |
+      | mysql           | added     | running |
 
   Scenario Outline: Cartridge Commands
-    Given we have a <state> mysql-5.1 cartridge
-    When the mysql-5.1 cartridge is <command>
-    Then the mysql-5.1 cartridge should be <status>
+    Given we have a <state> mysql cartridge
+    When the mysql cartridge is <command>
+    Then the mysql cartridge should be <status>
 
     Examples:
       | state   | command   | status  |
@@ -25,13 +25,14 @@ Feature: Single Cartridge Tests
 
   Scenario Outline: Cartridge List
     When we list cartridges
-    Then the list should contain the cartridge <cart> with display name "<name>"
+    Then the list should contain the cartridge <cart> with display name
 
     Examples:
-      | cart        | name          |
-      | php-5.3     | PHP 5.3       |
-      | mongodb-2.2 | MongoDB NoSQL |
-      | cron-1.4    | Cron 1.4      |
+      | cart    |
+      | php     |
+      | mongodb |
+      | cron    |
+
 
 #  Commenting this out for US2438
 #  Scenario Outline: Cartridge Storage

data/features/geared_application.feature

@@ -1,11 +1,8 @@
 @geared_application @geared_user_required @domain_required
 Feature: Scaled Application Operations
 
-  @init
+  @init @not-origin
   Scenario: Geared Application Creation
-    When a php-5.3 application is created with a medium gear
+    When a php application is created with a medium gear
     Then the application should be accessible
-    Then the application should have a medium gear
-
-
-
+    Then the application should have a medium gear

data/features/lib/rhc_helper/app.rb

@@ -118,7 +118,7 @@ module RHCHelper
 
     def get_index_file
       case @type
-        when "php-5.3" then "php/index.php"
+        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"
@@ -130,7 +130,7 @@ module RHCHelper
 
     def get_mysql_file
       case @type
-        when "php-5.3" then File.expand_path("../misc/php/db_test.php", File.expand_path(File.dirname(__FILE__)))
+        when "php-5.3","php-5.4" then File.expand_path("../misc/php/db_test.php", File.expand_path(File.dirname(__FILE__)))
       end
     end
   end

data/features/multiple_cartridge.feature

@@ -3,15 +3,16 @@ Feature: Multiple Cartridge Tests
 
   @init
   Scenario: Supporting Cartridge Added
-    Given an existing or new php-5.3 application with an embedded mysql-5.1 cartridge
-    When the phpmyadmin-3.4 cartridge is added
-    Then the phpmyadmin-3.4 cartridge should be running
+    Given an existing or new php application with an embedded mysql cartridge
+    When the phpmyadmin cartridge is added
+    Then the phpmyadmin cartridge should be running
 
+  @not-origin
   Scenario: Conflicting Cartridge Fails
-    Then adding the postgresql-8.5 cartridge should fail
+    Then adding the postgresql cartridge should fail
 
   Scenario: Cartridge Removed
-    When the phpmyadmin-3.4 cartridge is removed
-    When the mysql-5.1 cartridge is removed
-    Then the phpmyadmin-3.4 cartridge should be removed
-    Then the mysql-5.1 cartridge should be removed
+    When the phpmyadmin cartridge is removed
+    When the mysql cartridge is removed
+    Then the phpmyadmin cartridge should be removed
+    Then the mysql cartridge should be removed

data/features/scaled_application.feature

@@ -3,7 +3,7 @@ Feature: Scaled Application Operations
 
   @init
   Scenario: Scaled Application Creation
-    When a scaled php-5.3 application is created
+    When a scaled php application is created
     Then the application should be accessible
     Then the application should be scalable
 
@@ -34,9 +34,9 @@ Feature: Scaled Application Operations
 
     Examples:
       | cart    | type  | value |
-      | php-5.3 | min   |   1   |
-      | php-5.3 | max   |   5   |
-      | php-5.3 | max   |   -1  |
+      | php     | min   |   1   |
+      | php     | max   |   5   |
+      | php     | max   |   -1  |
 
   Scenario Outline: Invalid Scaling Values
     When we are updating the <cart> cartridge
@@ -45,4 +45,4 @@ Feature: Scaled Application Operations
 
     Examples:
       | cart    | type  | value | code |
-      | php-5.3 | min   |   a   |  1   |
+      | php     | min   |   a   |  1   |

data/features/step_definitions/application_steps.rb

@@ -18,7 +18,7 @@ end
 # Use the transformed array so we can reuse this step for all combinations
 Given /^an existing (or new )?(scaled )?(.+) (application with.*)$/ do |create, scaled, type, embeds|
   options = { :type => type }
-  options[:embed] = embeds if embeds
+  options[:embed] = embeds.map{ |c| map_cartridge_type(c) } if embeds
   options[:scalable] = scaled if scaled
   @app = App.find_on_fs(options)
 
@@ -51,7 +51,8 @@ When /^(\d+) (.+) applications are created$/ do |app_count, type|
   @app = old_app
 end
 
-When /^a (scaled )?(.+) application is created(?: with a (.*) gear)?$/ do |scaled, type, gear_profile|
+When /^a (scaled )?(.+) application is created(?: with a (.*) gear)?$/ do |scaled, type, gear_profile|  
+  type = map_cartridge_type(type)
   @app = App.create_unique(type, scaled, gear_profile)
   @app.rhc_app_create
 end
@@ -111,7 +112,7 @@ Then /^it should succeed$/ do
 end
 
 Then /^the application should be scalable/ do
-  step "the haproxy-1.4 cartridge should be running"
+  step "the haproxy cartridge should be running"
 end
 
 Then /^the application should have a (.*) gear$/ do |gear_profile|

data/features/step_definitions/cartridge_steps.rb

@@ -4,14 +4,17 @@ require 'rhc/config'
 include RHCHelper
 
 When /^the (.+) cartridge is added$/ do |name|
+  name = map_cartridge_type(name)
   @app.add_cartridge name
 end
 
 When /^the (.+) cartridge is removed$/ do |name|
+  name = map_cartridge_type(name)
   @app.remove_cartridge name
 end
 
 When /^the (.+) cartridge is (stopped|(?:re)?started)$/ do |name,command|
+  name = map_cartridge_type(name)
   cmd = case command.to_sym
         when :stopped
           'stop'
@@ -26,6 +29,7 @@ When /^the (.+) cartridge is (stopped|(?:re)?started)$/ do |name,command|
 end
 
 Then /^the (.+) cartridge should be (.*)$/ do |name,status|
+  name = map_cartridge_type(name)
   expected = case status.to_sym
              when :running
                "(.+) is running|Uptime:"
@@ -40,10 +44,12 @@ Then /^the (.+) cartridge should be (.*)$/ do |name,status|
 end
 
 Then /^adding the (.+) cartridge should fail$/ do |name|
+  name = map_cartridge_type(name)
   @app.add_cartridge(name).should == 154
 end
 
 When /^we are updating the (.+) cartridge$/ do |cart|
+  cart = map_cartridge_type(cart)
   @cartridge_name = cart
 end
 
@@ -81,7 +87,8 @@ Then /^it should fail with code (\d+)$/ do |code|
   @exitcode.should == code.to_i
 end
 
-Then /^the list should contain the cartridge ([^\s]+) with display name "([^"]+)"$/ do |name, display_name|
+Then /^the list should contain the cartridge ([^\s]+) with display name$/ do |name|
+  display_name = map_cartridge_name(name)
   line = @cartridge_output.each_line.find{ |s| s.include?(name) }
   line.should_not be_nil
   line.should match(display_name)

data/features/support/before_hooks.rb

@@ -18,6 +18,12 @@ Before('@geared_user_required') do
   $namespace = nil
 end
 
+Before('@certificates_capable_user_required') do
+  $old_username = $username
+  $username = "user_with_certificate_capabilities@test.com"
+  $namespace = nil
+end
+
 After do
   if $old_username
     $username = $old_username
@@ -42,19 +48,19 @@ Before('@client_tools_required') do
 end
 
 Before('@single_cartridge','@init') do
-  step 'an existing or new php-5.3 application without an embedded cartridge'
+  step "an existing or new php application without an embedded cartridge"
 end
 
 # These assumptions help to ensure any steps that are run independently have the same state as after the @init step
 {
-  :application => 'an existing or new php-5.3 application without an embedded cartridge',
-  :scaled_application => 'an existing or new scaled php-5.3 application without an embedded cartridge',
+  :application => "an existing or new php application without an embedded cartridge",
+  :scaled_application => "an existing or new scaled php application without an embedded cartridge",
   :domain => 'we have an existing domain',
   :client => 'we have the client tools setup',
-  :single_cartridge => 'an existing or new php-5.3 application with an embedded mysql-5.1 cartridge',
-  :multiple_cartridge => 'an existing or new php-5.3 application with embedded mysql-5.1 and phpmyadmin-3.4 cartridges',
+  :single_cartridge => "an existing or new php application with an embedded mysql cartridge",
+  :multiple_cartridge => "an existing or new php application with embedded mysql and phpmyadmin cartridges",
 }.each do |tag,assumption|
     Before("@#{tag}",'~@init') do
       step assumption
     end
-  end
+  end

data/features/support/env.rb

@@ -70,7 +70,14 @@ raise "Password not found in environment (RHC_PASSWORD)" unless $password
 $user_register_script_format = "oo-register-user -l admin -p admin --username %s --userpass %s"
 if ENV['REGISTER_USER']
   command = $user_register_script_format % [$username,$password]
-  %x[#{command}]
+  if Object.const_defined?('Bundler')
+    Bundler::with_clean_env do
+      system "gem install activeresource bundler parseconfig --no-ri --no-rdoc"
+      system command
+    end
+  else
+    system command
+  end
 end
 
 def _log(msg)

data/features/support/platform_support.rb

@@ -0,0 +1,29 @@
+if File.exist?("/etc/fedora-release")
+  CARTRIDGE_MAP = {
+    "php"         => { type: "php-5.4", name: "PHP 5.4" },
+    "mysql"       => { type: "mysql-5.1", name: "MySQL Database 5.1" },
+    "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" },
+    "mysql"       => { type: "mysql-5.1", name: "MySQL Database 5.1" },
+    "phpmyadmin"  => { type: "phpmyadmin-3.4", name: "phpMyAdmin 3.4" },
+    "mongodb"     => { type: "mongodb-2.2", name: "MongoDB NoSQL Database 2.2" },
+    "postgresql"  => { type: "postgresql-8.4", name: "PostgreSQL Database 8.4" },    
+    "cron"        => { type: "cron-1.4", name: "Cron 1.4" },
+    "haproxy"     => { type: "haproxy-1.4", name: "" }    
+  }
+end
+
+def map_cartridge_type(type)
+  CARTRIDGE_MAP[type][:type]
+end
+
+def map_cartridge_name(type)
+  CARTRIDGE_MAP[type][:name]
+end

data/lib/rhc/command_runner.rb

@@ -29,6 +29,16 @@ module RHC
       end
     end
 
+    HELP_OPTIONS = ['--help', '-h']
+
+    def options_parse_help
+      if (@args & HELP_OPTIONS).present?
+        args = (@args -= HELP_OPTIONS)
+        args.shift if args.first == 'help' && !command_exists?(args.join(' '))
+        exit run_help(args, nil)
+      end
+    end
+
     # override so we can do our own error handling
     def run!
       trace = false
@@ -36,12 +46,8 @@ module RHC
       #trap('INT') { abort program(:int_message) } if program(:int_message)
       #trap('INT') { program(:int_block).call } if program(:int_block)
 
-      global_option('-h', '--help', 'Help on any command', :hide => true) do
-        args = @args - %w[-h --help]
-        command(:help).run(*args)
-        return
-      end
-      global_option('--version', 'Display version information', :hide => true) { say version; return }
+      global_option('-h', '--help', 'Help on any command', :hide => true)
+      global_option('--version', 'Display version information', :hide => true)
 
       # remove these because we monkey patch Commands to process all options
       # at once, avoiding conflicts between the global and command options
@@ -56,6 +62,9 @@ module RHC
       # special case --version so it is processed before an invalid command
       options_parse_version
 
+      # help is a special branch prior to command execution
+      options_parse_help
+
       unless trace
         begin
           run_active_command
@@ -110,7 +119,6 @@ module RHC
 
     def create_default_commands
       command 'help options' do |c|
-#        c.syntax = ''
         c.description = "Display all global options and information about configuration"
         c.when_called do |args, options|
           say help_formatter.render_options self
@@ -119,21 +127,25 @@ module RHC
       command :help do |c|
         c.syntax = '<command>'
         c.description = 'Display global or <command> help documentation.'
-        c.when_called do |args, options|
-          cmd = (1..args.length).reverse_each.map{ |n| args[0,n].join(' ') }.find{ |cmd| command_exists?(cmd) }
+        c.when_called(&method(:run_help))
+      end
+    end
 
-          if args.empty?
-            say help_formatter.render
-          elsif cmd.nil?
-            RHC::Helpers.error "The command '#{program :name} #{provided_arguments.join(' ')}' is not recognized.\n"
-            say "See '#{program :name} help' for a list of valid commands."
-            next
-          else
-            command = command(cmd)
-            help_bindings = CommandHelpBindings.new command, commands, self
-            say help_formatter.render_command help_bindings
-          end
-        end
+    def run_help(args, options)
+      cmd = (1..args.length).reverse_each.map{ |n| args[0,n].join(' ') }.find{ |cmd| command_exists?(cmd) }
+
+      if args.empty?
+        say help_formatter.render
+        0
+      elsif cmd.nil?
+        RHC::Helpers.error "The command '#{program :name} #{provided_arguments.join(' ')}' is not recognized.\n"
+        say "See '#{program :name} help' for a list of valid commands."
+        1
+      else
+        command = command(cmd)
+        help_bindings = CommandHelpBindings.new command, commands, self
+        say help_formatter.render_command help_bindings
+        0
       end
     end
   end

data/lib/rhc/commands/account.rb

@@ -12,7 +12,7 @@ module RHC::Commands
     def run
       user = rest_client.user
 
-      say_table nil, get_properties(user, :login, :plan_id, :consumed_gears, :max_gears) + get_properties(user.capabilities, :gear_sizes).unshift(['Server', openshift_server]), :delete => true
+      say_table nil, get_properties(user, :login, :plan_id, :consumed_gears, :max_gears) + get_properties(user.capabilities, :gear_sizes).unshift(['Server:', openshift_server]) << ['SSL Certificates Supported:', user.capabilities.private_ssl_certificates ? 'yes' : 'no'], :delete => true
 
       if openshift_online_server?
       else

data/lib/rhc/commands/alias.rb

@@ -3,34 +3,117 @@ require 'rhc/config'
 
 module RHC::Commands
   class Alias < Base
-    summary "Add or remove a custom domain name for the application"
+    summary "Add or remove a custom domain name (alias) for the application"
     syntax "<command> <application> <alias> [--namespace namespace]"
     default_action :help
 
     summary "Add a custom domain name for the application"
     syntax "<application> <alias> [--namespace namespace]"
-    argument :app, "Application name (required)", []
+    argument :app, "Application name (required)", ["-a", "--app name"], :context => :app_context, :required => true
     argument :app_alias, "Custom domain name for the application", []
     option ["-n", "--namespace namespace"], "Namespace of your application", :context => :namespace_context, :required => true
     alias_action :"app add-alias", :root_command => true, :deprecated => true
     def add(app, app_alias)
       rest_app = rest_client.find_application(options.namespace, app)
-      response = rest_app.add_alias(app_alias)
-      results { say response.messages.first } if response.messages
+      rest_app.add_alias(app_alias)
+      results { say "Alias '#{app_alias}' has been added." } 
       0
     end
 
     summary "Remove a custom domain name for the application"
     syntax "<application> <alias> [--namespace namespace]"
-    argument :app, "Application name (required)", []
+    argument :app, "Application name (required)", ["-a", "--app name"], :context => :app_context, :required => true
     argument :app_alias, "Custom domain name for the application", []
     option ["-n", "--namespace namespace"], "Namespace of your application", :context => :namespace_context, :required => true
     alias_action :"app remove-alias", :root_command => true, :deprecated => true
     def remove(app, app_alias)
       rest_app = rest_client.find_application(options.namespace, app)
-      response = rest_app.remove_alias(app_alias)
-      results { say response.messages.first } if response.messages
+      rest_app.remove_alias(app_alias)
+      results { say "Alias '#{app_alias}' has been removed." } 
       0
     end
+
+    summary "Add or change the SSL certificate for an existing alias"
+    description <<-DESC 
+      Add or update the SSL certificate for your custom domain alias to 
+      allow secure HTTPS communication with your app.
+
+      Certificate files must be Base64 PEM-encoded and typically have a
+      .crt or .pem extension. You may combine multiple certificates and
+      certificate chains in a single file. The RSA or DSA private key 
+      must always be provided in a separate file.
+
+      Pass phrase for the certificate private key is required if the 
+      provided private key is encrypted.
+    DESC
+    syntax "<application> <alias> --certificate FILE --private-key FILE [--passphrase passphrase]"
+    argument :app, "Application name (required)", ["-a", "--app name"], :context => :app_context, :required => true
+    argument :app_alias, "Custom domain name for the application (required)", []
+    option ["--certificate FILE"], "SSL certificate filepath (file in .crt or .pem format)", :required => true
+    option ["--private-key FILE"], "Private key filepath for the given SSL certificate", :required => true
+    option ["--passphrase passphrase"], "Private key pass phrase, required if the private key is encripted", :required => false
+    option ["-n", "--namespace namespace"], "Namespace of your application", :context => :namespace_context, :required => true
+    def update_cert(app, app_alias)
+      certificate_file_path = options.certificate
+      raise ArgumentError, "Certificate file not found: #{certificate_file_path}" if !File.exist?(certificate_file_path) || !File.file?(certificate_file_path)
+
+      private_key_file_path = options.private_key
+      raise ArgumentError, "Private key file not found: #{private_key_file_path}" if !File.exist?(private_key_file_path) || !File.file?(private_key_file_path)
+
+      certificate_content = File.read(certificate_file_path)
+      raise ArgumentError, "Invalid certificate file: #{certificate_file_path} is empty" if certificate_content.to_s.strip.length == 0
+
+      private_key_content = File.read(private_key_file_path)
+      raise ArgumentError, "Invalid private key file: #{private_key_file_path} is empty" if private_key_content.to_s.strip.length == 0
+
+      rest_app = rest_client.find_application(options.namespace, app)
+      rest_alias = rest_app.find_alias(app_alias)
+      if rest_client.api_version_negotiated >= 1.4
+        rest_alias.add_certificate(certificate_content, private_key_content, options.passphrase)
+        results { say "SSL certificate successfully added." }
+        0
+      else
+        raise RHC::Rest::SslCertificatesNotSupported, "The server does not support SSL certificates for custom aliases."
+      end
+    end
+
+    summary "Delete the SSL certificate from an existing alias"
+    syntax "<application> <alias>"
+    argument :app, "Application name (required)", ["-a", "--app name"], :context => :app_context, :required => true
+    argument :app_alias, "Custom domain name for the application (required)", []
+    option ["--confirm"], "Pass to confirm deleting the application"
+    option ["-n", "--namespace namespace"], "Namespace of your application", :context => :namespace_context, :required => true
+    def delete_cert(app, app_alias)
+      rest_app = rest_client.find_application(options.namespace, app)
+      rest_alias = rest_app.find_alias(app_alias)
+      if rest_client.api_version_negotiated >= 1.4
+        confirm_action "#{color("This is a non-reversible action! Your SSL certificate will be permanently deleted from application '#{app}'.", :yellow)}\n\nAre you sure you want to delete the SSL certificate?"
+        rest_alias.delete_certificate
+        results { say "SSL certificate successfully deleted." }
+        0
+      else
+        raise RHC::Rest::SslCertificatesNotSupported, "The server does not support SSL certificates for custom aliases."
+      end
+    end
+
+    summary "List the aliases on an application"
+    syntax "<application>"
+    argument :app, "Application name (required)", ["-a", "--app name"], :context => :app_context, :required => true
+    option ["-n", "--namespace namespace"], "Namespace of your application", :context => :namespace_context, :required => true
+    def list(app)
+      rest_app = rest_client.find_application(options.namespace, app)
+      items = rest_app.aliases.map do |a|
+        a.is_a?(String) ?
+          [a, 'no', '-'] :
+          [a.id, a.has_private_ssl_certificate? ? 'yes' : 'no', a.has_private_ssl_certificate? ? Date.parse(a.certificate_added_at) : '-']
+      end
+      if items.empty?
+        results { say "No aliases associated with the application #{app}." }
+      else
+        table(items, :header => ["Alias", "Has Certificate?", "Certificate Added"]).each { |s| say s }
+      end
+      0
+    end
+
   end
 end