rhc 1.6.8 → 1.7.8

data/features/README.md

@@ -179,7 +179,7 @@ doesn't exist.
 Given "a demo directory exists or is created" do
   begin
     Given "the demo directory exists"
-  rescue Spec::Expectations::ExpectationNotMetError
+  rescue RSpec::Expectations::ExpectationNotMetError
     Then "create the demo directory"
   end
 end

data/features/domain.feature

@@ -17,7 +17,7 @@ Feature: Existing Domain Operations
 
   Scenario: Domain Create Fails
     When rhc domain create is called
-    Then the domain command should fail with an exitcode of 128
+    Then the domain command should fail with an exitcode of 1
 
   Scenario: Domain Delete
     When domain is deleted

data/features/lib/rhc_helper/persistable.rb

@@ -31,7 +31,10 @@ module RHCHelper
       app.mysql_password = json['mysql_password']
       app.mysql_hostname = json['mysql_hostname']
       app.uid = json['uid']
-      return app
+      # Strip off any version info for the type
+      app.type = app.type.split('-').first
+
+      app
     end
   end
 

data/features/multiple_cartridge.feature

@@ -8,11 +8,12 @@ Feature: Multiple Cartridge Tests
     Then the phpmyadmin cartridge should be running
 
   @not-origin
-  Scenario: Conflicting Cartridge Fails
-    Then adding the postgresql cartridge should fail
+  Scenario: Multiple DBs Allowed
+    When the postgresql cartridge is added
+    Then the postgresql cartridge should be running
 
   Scenario: Cartridge 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
+    Then the mysql cartridge should be removed

data/features/sshkey.feature

@@ -28,7 +28,7 @@ As an OpenShift user, I want to manage SSH keys with 'rhc sshkey' commands.
   @sshkey_add
   Scenario: invalid key name is given
     When a new SSH key "key1.pub" is added as "blah\\ss"
-    Then the command exits with status code 128
+    Then the command exits with status code 1
 
   @sshkey_add
   Scenario: invalid SSH key is added
@@ -43,13 +43,13 @@ As an OpenShift user, I want to manage SSH keys with 'rhc sshkey' commands.
   @sshkey_add @key1
   Scenario: SSH key with the same name already exists
     When a new SSH key "key2.pub" is added as "key1"
-    Then the command exits with status code 128
+    Then the command exits with status code 1
 
   @sshkey_add
   Scenario: SSH key with the identical content already exists
     Given a new SSH key "key1.pub" is added as "key1"
     And a new SSH key "key1.pub" is added as "key2"
-    Then the command exits with status code 128
+    Then the command exits with status code 1
 
   @sshkey_remove @key1
   Scenario: SSH key is deleted successfully

data/features/support/assumptions.rb

@@ -9,7 +9,7 @@ Given 'we have an existing domain' do
   begin
     step 'the key "key1" is shown'
     step 'the output includes the key information for "key1"'
-  rescue Spec::Expectations::ExpectationNotMetError
+  rescue RSpec::Expectations::ExpectationNotMetError
     step 'a new SSH key "key1.pub" is added as "key1"'
   end
 end
@@ -27,7 +27,7 @@ Given /^we have a (.*) (.*) cartridge$/ do |status,type|
   retried = false
   begin
     step "the #{type} cartridge should be #{status}"
-  rescue Spec::Expectations::ExpectationNotMetError
+  rescue RSpec::Expectations::ExpectationNotMetError
     step "the #{type} cartridge is #{cmd}"
     (retried = true && retry) unless retried
   end
@@ -43,7 +43,7 @@ Given /^we have a (stopped|running) application$/ do |state|
 
   begin
     step "the application should #{before}"
-  rescue Spec::Expectations::ExpectationNotMetError
+  rescue RSpec::Expectations::ExpectationNotMetError
     step "the application is #{after}"
   end
 end

data/features/support/env.rb

@@ -1,5 +1,15 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
+begin
+  require 'rspec/expectations'
+  World(RSpec::Matchers)
+rescue
+  puts "Require RSpec >= 2"
+  exit 1
+end
+
+$target_os = ENV['RHC_TARGET'] || (File.exist?("/etc/fedora-release") ? "Fedora" : "RHEL")
+
 require 'rhc/coverage_helper'
 SimpleCov.at_exit{ SimpleCov.result.format! } if defined? SimpleCov
 

data/features/support/platform_support.rb

@@ -1,4 +1,4 @@
-if File.exist?("/etc/fedora-release")
+if $target_os == 'Fedora'
   CARTRIDGE_MAP = {
     "php"         => { type: "php-5.4", name: "PHP 5.4" },
     "mysql"       => { type: "mysql-5.1", name: "MySQL Database 5.1" },
@@ -26,4 +26,4 @@ end
 
 def map_cartridge_name(type)
   CARTRIDGE_MAP[type][:name]
-end
+end

data/lib/rhc.rb

@@ -11,6 +11,7 @@ require 'pry' if ENV['PRY']
 require 'rhc/core_ext'
 
 module RHC
+  autoload :AutoComplete,   'rhc/autocomplete'
   autoload :Auth,           'rhc/auth'
   autoload :CartridgeHelpers, 'rhc/cartridge_helpers'
   autoload :CommandRunner,  'rhc/command_runner'
@@ -27,3 +28,8 @@ end
 
 require 'rhc/exceptions'
 
+require 'commander'
+require 'commander/delegates'
+require 'highline/system_extensions'
+
+require 'rhc/highline_extensions'

data/lib/rhc/auth/token.rb

@@ -16,8 +16,10 @@ module RHC::Auth
 
     def to_request(request)
       if token
+        debug "Using token authentication"
         (request[:headers] ||= {})['authorization'] = "Bearer #{token}"
       elsif auth and (!@allows_tokens or @can_get_token == false)
+        debug "Bypassing token auth"
         auth.to_request(request)
       end
       request
@@ -56,6 +58,7 @@ module RHC::Auth
           if has_token
             raise RHC::Rest::TokenExpiredOrInvalid, "Your authorization token is expired or invalid."
           end
+          debug "Cannot authenticate via token or password, exiting"
           return false
         end
 
@@ -78,6 +81,7 @@ module RHC::Auth
 
         return auth.retry_auth?(response, client) unless @can_get_token
 
+        debug "Creating a new authorization token"
         if auth_token = client.new_session(:auth => auth)
           @fetch_once = true
           save(auth_token.token)

data/lib/rhc/autocomplete.rb

@@ -1,68 +1,66 @@
-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] }
+    attr_reader :runner
+
+    def initialize(runner=::Commander::Runner.instance, shell='bash')
+      @runner, @shell = runner, shell
     end
 
-    def gen()
-      process_data
-      gen_script
+    def to_s
+      @s ||= template.result AutoCompleteBindings.new(self).get_binding
     end
 
     private
-      def cli_init
-        runner = RHC::CommandRunner.new([])
-        Commander::Runner.instance_variable_set :@singleton, runner
-        RHC::Commands.load.to_commander
+
+      def template
+        @template ||= ERB.new(File.read(File.join(File.dirname(__FILE__), 'autocomplete_templates', "#{@shell}.erb")), nil, '-')
       end
+  end
+
+  class AutoCompleteBindings
+    attr_reader :commands, :top_level_commands, :global_options
+
+    def initialize(data)
+      @commands = {}
+      @top_level_commands = []
 
-      def process_data
-        Commander::Runner.instance.commands.each_pair do |name, cmd|
-          next if cmd.summary.nil?
+      data.runner.commands.each_pair do |name, cmd|
+        next if cmd.summary.nil?
+        next if cmd.deprecated(name)
 
-          if name.rindex(' ').nil?
+        if cmd.root?
+          if cmd.name == name
             @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
+        else
+          @top_level_commands << name if name == cmd.name
+          commands = name.split ' '
+          action = commands.pop
+          id = commands.join(' ')
+          v = @commands[id] || {:actions => [], :switches => []}
+          v[:actions] << action unless id == '' && name != cmd.name
+          @commands[id] = v
         end
-      end
 
-      def gen_script
-        @script_erb.result AutoCompleteBindings.new(@top_level_commands.join(' '), @command_data).get_binding
+        v = @commands[name.to_s] || {:actions => [], :switches => []}
+        v[:switches].concat(cmd.options.map do |o| 
+          if o[:switches] 
+            s = o[:switches][-1].split(' ')[0]
+            if m = /--\[no-\](.+)/.match(s)
+              s = ["--#{m[1]}", "--no-#{m[1]}"]
+            else
+              s
+            end
+          end
+        end.flatten.compact.sort)
+        @commands[name.to_s] = v
       end
-  end
+      @commands.delete('')
+      @commands = @commands.to_a.sort{ |a,b| a[0] <=> b[0] }
+
+      @top_level_commands.sort!
+
+      @global_options = data.runner.options.map{ |o| o[:switches][-1].split(' ')[0] }.sort
+    end
+  end  
 end

data/lib/rhc/autocomplete_templates/{rhc.erb → bash.erb}

@@ -7,13 +7,19 @@ _rhc()
   COMPREPLY=()
   cur="${COMP_WORDS[COMP_CWORD]}"
   if [ $COMP_CWORD -eq 1 ]; then
-    opts=<%= "\"%s\"" % @top_level_opts %>
+    if [[ "$cur" == -* ]]; then
+      opts=<%= "\"%s\"" % global_options.join(' ') %>
+    elif [ -z $cur ]; then
+      opts=<%= "\"%s\"" % top_level_commands.join(' ') %>
+    else
+      opts=<%= "\"%s\"" % commands.map{ |c| c.first }.delete_if{ |s| s.include? ' ' }.sort.join(' ') %>
+    fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
     SAVE_IFS=$IFS
     IFS=" "
     case "${prev[*]}" in
-      <%- for name, data in @commands %>
+      <%- for name, data in commands %>
       <%= "\"rhc %s\")" % name %>
         if [[ "$cur" == -* ]]; then
           opts=<%= "\"%s\"" % data[:switches].join(" ") %>

data/lib/rhc/cartridge_helpers.rb

@@ -92,7 +92,7 @@ module RHC
         carts = cartridges.map{ |c| [c.name, c.display_name || ''] }.sort{ |a,b| a[1].downcase <=> b[1].downcase }
         carts.unshift ['==========', '=========']
         carts.unshift ['Short Name', 'Full name']
-        say table(carts).join("\n")
+        say table(carts)
       end
   end
 end

data/lib/rhc/cli.rb

@@ -1,12 +1,6 @@
 require 'rhc'
-require 'commander'
-require 'commander/runner'
-require 'commander/delegates'
 require 'rhc/commands'
 
-include Commander::UI
-include Commander::UI::AskForClass
-
 module RHC
   #
   # Run and execute a command line session with the RHC tools.
@@ -21,7 +15,7 @@ module RHC
 
     def self.set_terminal
       $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first rescue 80 if $stdin.tty?
-      $terminal.page_at = :auto if $stdin.tty? and $stdout.tty?
+      #$terminal.page_at = :auto if $stdin.tty? and $stdout.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.

data/lib/rhc/command_runner.rb

@@ -35,7 +35,7 @@ module RHC
       if (@args & HELP_OPTIONS).present?
         args = (@args -= HELP_OPTIONS)
         args.shift if args.first == 'help' && !command_exists?(args.join(' '))
-        exit run_help(args, nil)
+        exit run_help(args)
       end
     end
 
@@ -69,14 +69,8 @@ module RHC
         begin
           run_active_command
         rescue InvalidCommandError => e
-          if provided_arguments.empty?
-            return RHC::Wizard.new.run unless RHC::Wizard.has_configuration?
-            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
+          return RHC::Wizard.new.run unless RHC::Wizard.has_configuration? || provided_arguments.present?
+          run_help(provided_arguments)
         rescue \
           OptionParser::InvalidOption => e
           RHC::Helpers.error e.message
@@ -107,7 +101,7 @@ module RHC
     end
 
     def provided_arguments
-      @args[0, @args.find_index { |arg| arg.start_with?('-') } || @args.length]
+      @args[0, @args.find_index { |arg| arg != '--' and arg.start_with?('-') } || @args.length]
     end
 
     def global_option(*args, &block)
@@ -122,6 +116,7 @@ module RHC
         c.description = "Display all global options and information about configuration"
         c.when_called do |args, options|
           say help_formatter.render_options self
+          0
         end
       end
       command :help do |c|
@@ -131,17 +126,51 @@ module RHC
       end
     end
 
-    def run_help(args, options)
-      cmd = (1..args.length).reverse_each.map{ |n| args[0,n].join(' ') }.find{ |cmd| command_exists?(cmd) }
+    def run_help(args=[], options=nil)
+      args.delete_if{ |a| a.start_with? '-' }
+      unless args[0] == 'commands'
+        variations = (1..args.length).reverse_each.map{ |n| args[0,n].join('-') }
+        cmd = variations.first(1).find{ |cmd| command_exists?(cmd) }
+      end
 
       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
+        if cmd.nil?
+          matches = (variations || ['']).inject(nil) do |candidates, term|
+            prefix = commands.keys.select{ |n| n.downcase.start_with? term.downcase }
+            inline = commands.keys.select{ |n| n.downcase.include? term.downcase }
+            break [term, prefix, inline - prefix] unless prefix.empty? && inline.empty?
+          end
+
+          unless matches
+            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." 
+            return 1
+          end
+
+          candidates = (matches[1] + matches[2]).map{ |n| commands[n] }.uniq.sort_by{ |c| c.name }.reverse
+          if candidates.length == 1
+            cmd = candidates.first.name
+          else
+            RHC::Helpers.pager
+            RHC::Helpers.say matches[0] != '' ? "Showing commands matching '#{matches[0]}'" : "Showing all commands"
+            candidates.reverse.each do |command|
+              RHC::Helpers.paragraph do
+                aliases = (commands.map{ |(k,v)| k if command == v }.compact - [command.name]).map{ |s| "'#{s}'"}
+                aliases[0] = "(also #{aliases[0]}" if aliases[0]
+                aliases[-1] << ')' if aliases[0]
+
+                RHC::Helpers.header [RHC::Helpers.color(command.name, :cyan), *aliases.join(', ')]
+                say command.description || command.summary
+              end
+            end
+            return 1
+          end
+        end
+
+        RHC::Helpers.pager
         command = command(cmd)
         help_bindings = CommandHelpBindings.new command, commands, self
         say help_formatter.render_command help_bindings

data/lib/rhc/commands.rb

@@ -5,10 +5,19 @@ require 'commander/command'
 #  to avoid conflicts and side effects of similar short switches
 module Commander
   class Command
-    attr_accessor :default_action
+    attr_accessor :default_action, :root, :info
     def default_action?
       default_action.present?
     end
+    def root?
+      root.present?
+    end
+
+    def deprecated(as_alias=nil)
+      return false unless info
+      return info[:deprecated] if info[:deprecated]
+      info[:aliases].select{ |a| ['-',' '].map{ |s| Array(a[:action]).join(s) }.include?(as_alias) }.map{ |a| a[:deprecated] }.first if as_alias
+    end
 
     def parse_options_and_call_procs *args
       runner = Commander::Runner.instance
@@ -25,7 +34,11 @@ module Commander
         opts
       end
 
-      remaining = opts.parse! args
+      # Separate option lists with '--'
+      remaining = args.split('--').map{ |a| opts.parse!(a) }.inject([]) do |arr, sub|
+        arr << '--' unless arr.empty?
+        arr.concat(sub)
+      end
 
       _, config_path = proxy_options.find{ |arg| arg[0] == :config }
       clean, _ = proxy_options.find{ |arg| arg[0] == :clean }
@@ -134,12 +147,12 @@ module RHC
       global_options << [args.freeze, block]
     end
 
-    def self.deprecated?
-      command_name = Commander::Runner.instance.command_name_from_args
-      command = Commander::Runner.instance.active_command
+    def self.deprecated!
+      instance = Commander::Runner.instance
+      command_name = instance.command_name_from_args
+      command = instance.active_command
 
-      new_cmd = deprecated[command_name.to_sym]
-      if new_cmd
+      if new_cmd = command.deprecated(command_name)
         new_cmd = "rhc #{command.name}" if new_cmd == true
         RHC::Helpers.deprecated_command new_cmd
       end
@@ -152,9 +165,7 @@ module RHC
               config.has_local_config? or
               config.has_opts_config?)
 
-        RHC::Helpers.warn(
-          "You have not yet configured the OpenShift client tools. Please run 'rhc setup'.",
-            :stderr => true)
+        $stderr.puts RHC::Helpers.color("You have not yet configured the OpenShift client tools. Please run 'rhc setup'.", :yellow)
       end
     end
 
@@ -166,47 +177,48 @@ module RHC
         option.merge!(opts)
       end
       commands.each_pair do |name, opts|
+        name = Array(name)
+        names = [name.reverse.join('-'), name.join(' ')] if name.length > 1
+        name = name.join('-')
+
         instance.command name do |c|
           c.description = opts[:description]
           c.summary = opts[:summary]
           c.syntax = opts[:syntax]
           c.default_action = opts[:default]
 
-          (options_metadata = opts[:options] || []).each do |o|
+          c.info = opts
+
+          (options_metadata = Array(opts[:options])).each do |o|
             option_data = [o[:switches], o[:description]].flatten(1)
             c.option *option_data
             o[:arg] = Commander::Runner.switch_to_sym(Array(o[:switches]).last)
           end
 
-          deprecated[name.to_sym] = opts[:deprecated] unless opts[:deprecated].nil?
-
-          args_metadata = opts[:args] || []
-          args_metadata.each do |arg_meta|
-            arg_switches = arg_meta[:switches]
-            unless arg_switches.nil? or arg_switches.empty?
-              arg_switches << arg_meta[:description]
-              c.option *arg_switches
+          (args_metadata = Array(opts[:args])).each do |meta|
+            switches = meta[:switches]
+            unless switches.nil? or switches.empty?
+              switches << meta[:description]
+              c.option *switches
             end
           end
 
-          unless opts[:aliases].nil?
-            opts[:aliases].each do |a|
-              alias_cmd = a[:action]
-
-              unless a[:root_command]
-                # prepend the current resource
-                alias_components = name.split(" ")
-                alias_components[-1] = a[:action]
-                alias_cmd = alias_components.join(' ').to_sym
-              end
-
-              deprecated[alias_cmd] = true if a[:deprecated]
-              instance.alias_command "#{alias_cmd}", :"#{name}"
+          Array(opts[:aliases]).each do |a|
+            action = Array(a[:action])
+            [' ', '-'].each do |s|
+              cmd = action.join(s)
+              instance.alias_command cmd, name
             end
           end
 
+          if names
+            names.each{ |alt| instance.alias_command alt, name }
+          else
+            c.root = true
+          end
+
           c.when_called do |args, options|
-            deprecated?
+            deprecated!
 
             config = c.instance_variable_get(:@config)
 
@@ -232,7 +244,7 @@ module RHC
         Commander::Runner.instance.options.each do |opt|
           if opt[:context]
             arg = Commander::Runner.switch_to_sym(opt[:switches].last)
-            options[arg] ||= lambda{ cmd.send(opt[:context]) }
+            options.__hash__[arg] ||= lambda{ cmd.send(opt[:context]) }
           end
         end
 
@@ -258,32 +270,43 @@ module RHC
           end
           raise ArgumentError.new("Missing required option '#{arg}'.") if option_meta[:required] && options[arg].nil?
         end
-        # process args
-        arg_slots = [].fill(nil, 0, args_metadata.length)
-        fill_args = args.reverse
-        args_metadata.each_with_index do |arg_meta, i|
-          # check options
-          option = arg_meta[:option_symbol]
-          context_helper = arg_meta[:context_helper]
+
+        available = args.dup
+        slots = Array.new(args_metadata.length)
+        args_metadata.each_with_index do |arg, i|
+          option = arg[:option_symbol]
+          context_helper = arg[:context_helper]
 
           value = options.__hash__[option] if option
-          value = fill_args.pop if value.nil?
+
+          if value.nil?
+            value =
+              if arg[:arg_type] == :list
+                all = []
+                while available.first && available.first != '--'
+                  all << available.shift
+                end
+                available.shift if available.first == '--'
+                all
+              else
+                available.shift
+              end
+          end
+
           value = cmd.send(context_helper) if value.nil? and context_helper
 
-          if arg_meta[:arg_type] == :list
-            fill_args.push(value) unless value.nil?
-            value = fill_args.reverse
-            fill_args = []
-          elsif value.nil?
-            raise ArgumentError.new("Missing required argument '#{arg_meta[:name]}'.") if fill_args.empty?
+          if value.nil?
+            raise ArgumentError, "Missing required argument '#{arg[:name]}'." unless arg[:optional]
+            break if available.empty?
+          else
+            slots[i] = value
+            options.__hash__[option] = value if option
           end
-          arg_slots[i] = value
-          options.__hash__[option] = value if option
         end
 
-        raise ArgumentError.new("Too many arguments passed in: #{fill_args.reverse.join(" ")}") unless fill_args.empty?
+        raise ArgumentError, "Too many arguments passed in: #{available.reverse.join(" ")}" unless available.empty?
 
-        arg_slots
+        slots
       end
 
       def self.commands
@@ -292,8 +315,5 @@ module RHC
       def self.global_options
         @options ||= []
       end
-      def self.deprecated
-        @deprecated ||= {}
-      end
   end
 end