rhc 0.97.17 → 0.98.16

data/features/support/ssh.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+ssh -o StrictHostKeyChecking=no -- "$@"

data/features/verify.feature

@@ -1,159 +1,18 @@
-Feature: Client Integration Tests
-  @init
-  Scenario: Setup Wizard
-    Given the libra client tools
-    When the setup wizard is run
-    Then the client tools should be setup
-
-  @init
-  Scenario: Domain Creation
-    Given the libra client tools
-    When a new domain is needed and created
-    Then the domain should be reserved
-
-  Scenario: Domain Update
-    Given the libra client tools
-    And an existing domain
-    When domain is updated
-    Then the domain should be reserved
-
-  Scenario: Domain Show
-    Given the libra client tools
-    And an existing domain
-    When rhc domain is run
-    When rhc domain show is run
-    Then the default domain action output should equal the show action output
-
-  Scenario: Domain Create Fails
-    Given the libra client tools
-    And an existing domain
-    When rhc domain create is called
-    Then the domain command should fail with an exitcode of 128
-
-  Scenario: Domain Delete
-    Given the libra client tools
-    And an existing domain
-    When domain is deleted
-    Then domains should be empty
-
-  Scenario: Domain Update Fails
-    Given the libra client tools
-    And given domains is empty
-    When domain is updated
-    Then the domain command should fail with an exitcode of 127
-
-  @init
-  Scenario: Domain Creation for Apps
-    Given the libra client tools
-    When a new domain is needed and created
-    Then the domain should be reserved
-
-  Scenario: Application Creation
-    Given the libra client tools
-    When 1 php-5.3 applications are created
-    Then the applications should be accessible
-
-  Scenario: Application Stopping
-    Given the libra client tools
-    And an existing php-5.3 application
-    When the application is stopped
-    Then the application should not be accessible
-
-  Scenario: Application Starting
-    Given the libra client tools
-    And an existing php-5.3 application
-    When the application is started
-    Then the application should be accessible
-
-  Scenario: Application Restarting
-    Given the libra client tools
-    And an existing php-5.3 application
-    When the application is restarted
-    Then the application should be accessible
-
-  Scenario: Application Snapshot
-    Given the libra client tools
-    And an existing php-5.3 application
-    When the application is snapshot
-    Then the snapshot should be found
-
-  Scenario: Application Tidy
-    Given the libra client tools
-    And an existing php-5.3 application
-    When the application is tidied
-    Then it should succeed
-
-  Scenario: Application Show
-    Given the libra client tools
-    And an existing php-5.3 application
-    When the application is shown
-    Then it should succeed
-
-  Scenario: Cartridge Add
-    Given the libra client tools
-    And an existing php-5.3 application
-    When the mysql-5.1 cartridge is added
-    Then the mysql-5.1 cartridge should be running
-
-  Scenario: Cartridge Stop
-    Given the libra client tools
-    And an existing php-5.3 application with an embedded mysql-5.1 cartridge
-    When the mysql-5.1 cartridge is stopped
-    Then the mysql-5.1 cartridge should be stopped
-
-  Scenario: Cartridge Start
-    Given the libra client tools
-    And an existing php-5.3 application with an embedded mysql-5.1 cartridge
-    When the mysql-5.1 cartridge is started
-    Then the mysql-5.1 cartridge should be running
-
-  Scenario: Cartridge Restart
-    Given the libra client tools
-    And an existing php-5.3 application with an embedded mysql-5.1 cartridge
-    When the mysql-5.1 cartridge is restarted
-    Then the mysql-5.1 cartridge should be running
-
-  Scenario: Supporting Cartridge Added
-    Given the libra client tools
-    And an existing 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
-
-  Scenario: Conflicting Cartridge Fails
-    Given the libra client tools
-    And an existing php-5.3 application with embedded mysql-5.1 and phpmyadmin-3.4 cartridges
-    Then adding the postgresql-8.5 cartridge should fail
-
-  Scenario: Cartridge Removed
-    Given the libra client tools
-    And an existing php-5.3 application with embedded mysql-5.1 and phpmyadmin-3.4 cartridges
-    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
-
-  Scenario: Add Alias
-  Scenario: Remove Alias
-
-  Scenario: Application Destroy
-    Given the libra client tools
-    And an existing php-5.3 application
-    When the application is destroyed
-    Then the application should not be accessible
-
-  @init
-  Scenario: Template Creation
-  Scenario: Domain Changed
-  Scenario: Template Deleted
-  Scenario: Domain Changed Again
-  Scenario: Domain Deleted
-
-  @init
-  Scenario: Key Added
-  Scenario: Additional Key Added
-  Scenario: Default Key Deleted
-  Scenario: Key Overwritten
-  Scenario: Key Deleted
-
-  @init
-  Scenario: Get Server Status
+# these were defined before refactoring and have not been implemented yet
+#Feature: Client Integration Tests
+#  Scenario: Add Alias
+#  Scenario: Remove Alias
+#
+#  @init
+#  Scenario: Template Creation
+#  Scenario: Domain Changed
+#  Scenario: Template Deleted
+#  Scenario: Domain Changed Again
+#  Scenario: Domain Deleted
+#
+#  @init
+#  Scenario: Key Added
+#  Scenario: Additional Key Added
+#  Scenario: Default Key Deleted
+#  Scenario: Key Overwritten
+#  Scenario: Key Deleted

data/lib/rhc-common.rb

@@ -9,7 +9,7 @@ require 'resolv'
 require 'uri'
 require 'highline/import'
 require 'rhc'
-require 'rhc-rest'
+require 'rhc/rest'
 require 'rhc/helpers'
 require 'rhc/config'
 require 'rhc/wizard'
@@ -337,7 +337,7 @@ end
           tempfile = `mktemp /tmp/openshift.XXXXXXXX`
           `echo "#{type} #{key}" > #{tempfile}`
           ssh_keys['keys'][name]['fingerprint'] = `ssh-keygen -lf #{tempfile}`.split(' ')[1]
-        rescue NotImplementedError, Net::SSH::Exception
+        rescue NotImplementedError, Net::SSH::Exception, OpenSSL::PKey::PKeyError
           # Could be a new unsupported key type or invalid data on the server
           ssh_keys['keys'][name]['fingerprint'] = 'Key type is not recognized.  Please check this key is valid.'
         end
@@ -509,7 +509,7 @@ end
     #  API in order to access the rest of the logic in this function
     if scale
       end_point = "https://#{libra_server}/broker/rest/api"
-      client = Rhc::Rest::Client.new(end_point, rhlogin, password)
+      client = RHC::Rest::Client.new(end_point, rhlogin, password)
 
       domain = client.find_domain(user_info['user_info']['domains'][0]['namespace'])
 
@@ -526,12 +526,12 @@ end
         health_check_path = application.health_check_path
 
         puts "DEBUG: '#{app_name}' creation returned success." if @mydebug
-      rescue Rhc::Rest::ConnectionException, Rhc::Rest::ResourceAccessException => e
+      rescue RHC::Rest::ConnectionException, RHC::Rest::ResourceAccessException => e
         print_response_err(Struct::FakeResponse.new(e.message,e.code))
-      rescue Rhc::Rest::ValidationException => e
+      rescue RHC::Rest::ValidationException => e
         validation_error_code = (e.code.nil?) ? 406 : e.code
         print_response_err(Struct::FakeResponse.new(e.message, validation_error_code))
-      rescue Rhc::Rest::ServerErrorException => e
+      rescue RHC::Rest::ServerErrorException => e
         error_code = (e.code.nil?) ? 500 : e.code
         print_response_err(Struct::FakeResponse.new(e.message, error_code))
       end
@@ -642,9 +642,9 @@ WARNING
     unless no_git
         puts "Pulling new repo down" if @mydebug
     
-        puts "git clone --quiet #{git_url} #{repo_dir}" if @mydebug
         quiet = (@mydebug ? ' ' : '--quiet ')
-        git_clone = %x<git clone #{quiet} #{git_url} #{repo_dir}>
+        puts "git clone #{quiet}#{git_url} #{repo_dir}" if @mydebug
+        git_clone = %x[git clone #{quiet} #{git_url} #{repo_dir} 2>&1]
         if $?.exitstatus != 0
 
           if RHC::Helpers.windows? 
@@ -1221,16 +1221,3 @@ end
 def get_var(key)
   RHC::Config[key]
 end
-
-# Public: convinience function for running the wizard
-#
-# Returns: false if wizard did not need to run
-#          true if wizard ran successfuly
-#          nil of there was an error
-#
-def default_setup_wizard
-  w = RHC::Wizard.new(RHC::Config)
-  return w.run if w.needs_configuration?
-
-  false
-end

data/lib/rhc.rb

@@ -7,15 +7,19 @@ require 'logger'
 
 # Extend core methods
 require 'rhc/core_ext'
-require 'rhc/version'
 
 module RHC
-  module Commands; end
-
-  autoload :Helpers,  'rhc/helpers'
+  autoload :Helpers,        'rhc/helpers'
+  autoload :Rest,           'rhc/rest'
+  autoload :HelpFormatter,  'rhc/help_formatter'
+  autoload :CommandRunner,  'rhc/command_runner'
+  autoload :VERSION,        'rhc/version'
+  autoload :Commands,       'rhc/commands'
+  autoload :Config,         'rhc/config'
 end
 
+require 'rhc/exceptions'
+
 # Replace me with proper autoloads on the module RHC
 require 'rhc-common'
-require 'rhc-rest'
 

data/lib/rhc/autocomplete.rb

@@ -0,0 +1,68 @@
+require 'rhc'
+require 'commander'
+require 'commander/runner'
+require 'commander/delegates'
+require 'rhc/commands'
+
+module RHC
+  class AutoCompleteBindings
+    attr_reader :top_level_opts, :commands
+    def initialize(top_level_opts, commands)
+      @top_level_opts = top_level_opts
+      @commands = commands
+    end
+  end
+
+  class AutoComplete
+    def initialize(script="rhc")
+      @script_erb = ERB.new(File.read(File.join(File.dirname(__FILE__), 'autocomplete_templates', "#{script}.erb")), nil, '-')
+      cli_init
+      # :name => {:actions => [], :switches => []}
+      @command_data = {}
+      @top_level_commands = []
+      @global_switches = []
+      Commander::Runner.instance.options.each { |o| @global_switches << o[:switches][-1] }
+    end
+
+    def gen()
+      process_data
+      gen_script
+    end
+
+    private
+      def cli_init
+        runner = RHC::CommandRunner.new([])
+        Commander::Runner.instance_variable_set :@singleton, runner
+        RHC::Commands.load.to_commander
+      end
+
+      def process_data
+        Commander::Runner.instance.commands.each_pair do |name, cmd|
+          next if cmd.summary.nil?
+
+          if name.rindex(' ').nil?
+            @top_level_commands << name
+          else
+            commands = name.split ' '
+            action = commands.pop
+            id = commands.join(' ')
+            data = @command_data[:"#{id}"] || {:actions => [],
+                                               :switches => []}
+            data[:actions] << action
+            @command_data[:"#{id}"] = data
+          end
+
+          switches = []
+          cmd.options { |o| switches << o[:switches][-1] if o[:switches] }
+          data = @command_data[:"#{name}"] || {:actions => [],
+                                               :switches => []}
+          data[:switches] = switches.concat(@global_switches)
+          @command_data[:"#{name}"] = data
+        end
+      end
+
+      def gen_script
+        @script_erb.result AutoCompleteBindings.new(@top_level_commands.join(' '), @command_data).get_binding
+      end
+  end
+end

data/lib/rhc/autocomplete_templates/rhc.erb

@@ -0,0 +1,33 @@
+#
+# This is the bash auto completion script for the rhc command
+#
+_rhc()
+{
+  local cur opts prev
+  COMPREPLY=()
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  if [ $COMP_CWORD -eq 1 ]; then
+    opts=<%= "\"%s\"" % @top_level_opts %>
+  else
+    prev="${COMP_WORDS[@]:0:COMP_CWORD}"
+    SAVE_IFS=$IFS
+    IFS=" "
+    case "${prev[*]}" in
+      <%- for name, data in @commands %>
+      <%= "\"rhc %s\")" % name %>
+        if [[ "$cur" == -* ]]; then
+          opts=<%= "\"%s\"" % data[:switches].join(" ") %>
+        else
+          opts=<%= "\"%s\"" % data[:actions].join(" ") %>
+        fi
+        ;;
+      <%- end %>
+    esac
+    IFS=$SAVE_IFS
+  fi
+
+  COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+  return 0
+}
+
+complete -o default -F _rhc rhc

data/lib/rhc/cli.rb

@@ -3,7 +3,6 @@ require 'commander'
 require 'commander/runner'
 require 'commander/delegates'
 require 'rhc/commands'
-require 'rhc/help_formatter'
 
 include Commander::UI
 include Commander::UI::AskForClass
@@ -22,16 +21,20 @@ module RHC
 
     def self.set_terminal
       $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 5 rescue 80 if $stdin.tty?
+      # FIXME: ANSI terminals are not default on windows but we may just be
+      #        hitting a bug in highline if windows does support another method.
+      #        This is a safe fix for now but needs more research.
+      HighLine::use_color = false if RHC::Helpers.windows?
     end
 
     def self.start(args)
-      runner = RHC::Commands::Runner.new(args)
+      runner = RHC::CommandRunner.new(args)
       Commander::Runner.instance_variable_set :@singleton, runner
 
-      program :name,        'rhc'
-      program :version,     RHC::VERSION::STRING
-      program :description, 'Command line interface for OpenShift.'
-      program :help_formatter, RHC::UsageHelpFormatter
+      program :name,           'rhc'
+      program :description,    'Command line interface for OpenShift.'
+      program :version,        RHC::VERSION::STRING
+      program :help_formatter, RHC::HelpFormatter
 
       RHC::Commands.load.to_commander
       exit(run! || 0)

data/lib/rhc/command_runner.rb

@@ -0,0 +1,108 @@
+module RHC
+  class CommandRunner < Commander::Runner
+    # regex fix from git - match on word boundries
+    def valid_command_names_from *args
+      arg_string = args.delete_if { |value| value =~ /^-/ }.join ' '
+      commands.keys.find_all { |name| name if /^#{name}\b/.match arg_string }
+    end
+
+    # override so we can do our own error handling
+    def run!
+      trace = false
+      require_program :version, :description
+
+      trap('INT') { abort program(:int_message) } if program(:int_message)
+      trap('INT') { program(:int_block).call } if program(:int_block)
+
+      global_option('-h', '--help', 'Display help documentation') do
+        args = @args - %w[-h --help]
+        command(:help).run(*args)
+        return
+      end
+      global_option('-v', '--version', 'Display version information') { say version; return }
+      global_option('-t', '--trace', 'Display backtrace when an error occurs') { trace = true }
+
+      parse_global_options
+      remove_global_options options, @args
+
+      unless trace
+        begin
+          run_active_command
+        rescue InvalidCommandError => e
+          if provided_arguments.empty?
+            say RHC::HelpFormatter.new(self).render
+          else
+            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."
+          end
+          1
+        rescue \
+          ArgumentError,
+          OptionParser::InvalidOption,
+          OptionParser::InvalidArgument,
+          OptionParser::MissingArgument => e
+
+          help_bindings = CommandHelpBindings.new(active_command, commands, Commander::Runner.instance.options)
+          usage = RHC::HelpFormatter.new(self).render_command(help_bindings)
+          RHC::Helpers.error e.message
+          say "\n#{usage}"
+          1
+        rescue RHC::Exception, RHC::Rest::Exception => e
+          RHC::Helpers.error e.message
+          e.code.nil? ? 128 : e.code
+        end
+      else
+        run_active_command
+      end
+    end
+
+    def provided_arguments
+      @args[0, @args.find_index { |arg| arg.start_with?('-') } || @args.length]
+    end
+
+    def global_option(*args, &block)
+      opts = args.pop if Hash === args.last
+      super(*args, &block).tap do |options|
+        options.last.merge!(opts) if opts
+      end
+    end
+
+    def create_default_commands
+      command :help do |c|
+        c.syntax = 'rhc help <command>'
+        c.description = 'Display global or <command> help documentation.'
+        c.when_called do |args, options|
+          if args.empty?
+            say help_formatter.render
+          else
+            command = command args.join(' ')
+            begin
+              require_valid_command command
+            rescue InvalidCommandError => e
+              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
+            end
+
+            help_bindings = CommandHelpBindings.new command, commands, Commander::Runner.instance.options
+            say help_formatter.render_command help_bindings
+          end
+        end
+      end
+    end
+  end
+
+  class CommandHelpBindings
+    def initialize(command, instance_commands, global_options)
+      @command = command
+      @actions = instance_commands.collect do |command_name, command_class|
+        next if command_class.summary.nil?
+        m = /^#{command.name} ([^ ]+)/.match(command_name)
+        # if we have a match and it is not an alias then we can use it
+        m and command_name == command_class.name ? {:name => m[1], :summary => command_class.summary || ""} : nil
+      end
+      @actions.compact!
+      @global_options = global_options
+    end
+  end
+end