rhc 1.25.3 → 1.26.9

data/autocomplete/rhc_bash

@@ -10,9 +10,9 @@ _rhc()
     if [[ "$cur" == -* ]]; then
       opts="--always-prefix --clean --config --debug --insecure --limit --mock --noprompt --password --raw --rhlogin --server --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --token"
     elif [ -z $cur ]; then
-      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone logout member member-add member-list member-remove member-update port-forward scp server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail team team-create team-delete team-leave team-list team-show threaddump"
+      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone logout member member-add member-list member-remove member-update port-forward scp server server-add server-configure server-list server-remove server-show server-status server-use setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail team team-create team-delete team-leave team-list team-show threaddump"
     else
-      opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain create-app create-domain create-team delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain delete-team deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset force-stop-app git-clone leave-domain leave-team list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-sshkey list-team logout member member-add member-list member-remove member-update members port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server set-env setup show-app show-cartridge show-deployment show-domain show-env show-sshkey show-team snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail team team-create team-delete team-leave team-list team-show teams threaddump tidy-app unset-env update-cert-alias update-member"
+      opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-server add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain configure-server create-app create-domain create-team delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain delete-team deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset force-stop-app git-clone leave-domain leave-team list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-server list-sshkey list-team logout member member-add member-list member-remove member-update members port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-server remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server server-add server-configure server-list server-remove server-show server-status server-use servers set-env setup show-app show-cartridge show-deployment show-domain show-env show-server show-sshkey show-team snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge status-server stop-app stop-cartridge storage-cartridge tail team team-create team-delete team-leave team-list team-show teams threaddump tidy-app unset-env update-cert-alias update-member use-server"
     fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
@@ -84,6 +84,14 @@ _rhc()
         fi
         ;;
 
+      "rhc add-server")
+        if [[ "$cur" == -* ]]; then
+          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc add-sshkey")
         if [[ "$cur" == -* ]]; then
           opts="--confirm --content --type"
@@ -192,7 +200,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="env snapshot create delete start stop scale-up scale-down force-stop restart reload tidy show deploy configure"
+          opts="create delete start stop scale-up scale-down force-stop restart reload tidy show deploy configure env snapshot"
         fi
         ;;
 
@@ -764,6 +772,14 @@ _rhc()
         fi
         ;;
 
+      "rhc configure-server")
+        if [[ "$cur" == -* ]]; then
+          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc create-app")
         if [[ "$cur" == -* ]]; then
           opts="--app --dns --enable-jenkins --env --from-app --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --no-scaling --repo --scaling --type"
@@ -1236,6 +1252,14 @@ _rhc()
         fi
         ;;
 
+      "rhc list-server")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc list-sshkey")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -1388,6 +1412,14 @@ _rhc()
         fi
         ;;
 
+      "rhc remove-server")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc remove-sshkey")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -1469,6 +1501,126 @@ _rhc()
         ;;
 
       "rhc server")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts="status add list use remove configure show"
+        fi
+        ;;
+
+      "rhc server add")
+        if [[ "$cur" == -* ]]; then
+          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server configure")
+        if [[ "$cur" == -* ]]; then
+          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server list")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server remove")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server show")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server status")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server use")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server-add")
+        if [[ "$cur" == -* ]]; then
+          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server-configure")
+        if [[ "$cur" == -* ]]; then
+          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server-list")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server-remove")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server-show")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server-status")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc server-use")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc servers")
         if [[ "$cur" == -* ]]; then
           opts=""
         else
@@ -1532,6 +1684,14 @@ _rhc()
         fi
         ;;
 
+      "rhc show-server")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc show-sshkey")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -1692,6 +1852,14 @@ _rhc()
         fi
         ;;
 
+      "rhc status-server")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc stop-app")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --namespace"
@@ -1860,6 +2028,14 @@ _rhc()
         fi
         ;;
 
+      "rhc use-server")
+        if [[ "$cur" == -* ]]; then
+          opts="--server"
+        else
+          opts=""
+        fi
+        ;;
+
     esac
     IFS=$SAVE_IFS
   fi

data/features/core_feature.rb

@@ -163,7 +163,7 @@ describe "rhc core scenarios" do
     context "with a scalable app" do
       before(:each) do
         standard_config
-        has_gears_available(1)
+        has_gears_available(2) # 1 for the app create, 1 for the scale
         @app = has_a_scalable_application
       end
 

data/features/members_feature.rb

@@ -17,7 +17,7 @@ describe "rhc member scenarios" do
         r = rhc 'show-domain', domain.name
         r.status.should == 0
         r.stdout.should_not match "Members:"
-        r.stdout.should match "owned by #{domain.owner}"
+        r.stdout.should match "owned by #{domain.owner.name}"
       end
 
       it "should prevent leaving the domain for the owner" do

data/features/server_feature.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+require 'direct_execution_helper'
+require 'rhc/helpers'
+
+describe "rhc server scenarios" do
+
+  context "with standard config" do
+    before(:all){ standard_config }
+
+    it "should list the default server" do
+      r = ensure_command 'servers'
+      r.stdout.should match /Server 'server1' \(in use\)/
+      r.stdout.should match /Hostname:\s+#{server}/
+      r.stdout.should match /Login:\s+#{rhlogin}/
+      r.stdout.should match /Use Auth Tokens:\s+true/
+      r.stdout.should match /Insecure:\s+true/
+      should_list_servers(1)
+    end    
+
+    it "should and and remove servers" do
+      should_add_mock_servers(2)
+      should_list_servers(3)
+      should_remove_server('mock1')
+      should_remove_server('mock2')
+      should_list_servers(1)
+    end
+  end
+
+  context "with a clean configuration" do
+    before(:all){ use_clean_config }
+
+    it "should add one working server" do
+      should_list_servers(0)
+      should_add_working_server
+      should_list_servers(1)
+    end
+  end
+
+  private
+    def ensure_command(*args)
+      r = rhc *args
+      r.status.should == 0
+      r
+    end
+
+    def should_list_servers(quantity)
+      r = ensure_command 'servers'
+      if quantity == 0
+        r.stdout.should match /You don't have any servers configured/
+      else
+        r.stdout.should match /You have #{RHC::Helpers.pluralize(quantity, 'server')} configured/
+      end
+      r
+    end
+
+    def should_add_mock_servers(quantity)
+      Array(1..quantity).each do |i|
+        new_server = "foo#{i}.openshift.com"
+        new_user = "user#{i}"
+        new_nickname = "mock#{i}"
+
+        r = ensure_command 'server', 'add', new_server, new_nickname, '-l', new_user, '--skip-wizard'
+        r.stdout.should match /Saving server configuration to .*servers\.yml .* done/
+
+        r = ensure_command 'servers'
+        r.stdout.should match /Server '#{new_nickname}'$/
+        r.stdout.should match /Hostname:\s+#{new_server}/
+        r.stdout.should match /Login:\s+#{new_user}/
+      end
+    end
+
+    def should_add_working_server
+      r = rhc 'server', 'add', server, '-l', rhlogin, '--insecure', '--use', :with => ['password', 'yes']
+      r.stdout.should match /Saving configuration to .*express\.conf .* done/
+      r.status.should == 0
+
+      r = ensure_command 'servers'
+      r.stdout.should match /Server 'server1' \(in use\)/
+      r.stdout.should match /Hostname:\s+#{server}/
+      r.stdout.should match /Login:\s+#{rhlogin}/
+      r.stdout.should match /Use Auth Tokens:\s+true/
+      r.stdout.should match /Insecure:\s+true/
+    end
+
+    def should_remove_server(server)
+      r = ensure_command 'server', 'remove', server
+      r.stdout.should match /Removing.*done/
+      r
+    end
+
+    def server
+      ENV['RHC_SERVER'] || 'localhost'
+    end
+
+    def rhlogin
+      ENV['TEST_USERNAME']
+    end
+  end

data/lib/rhc/command_runner.rb

@@ -14,21 +14,20 @@ module RHC
       #:nocov:
     end
 
-    def options_parse_trace
-      if @args.include?("--trace")
-        @args.delete "--trace"
+    def delete_args(*switches)
+      if @args.any?{|i| switches.include?(i)}
+        switches.each{|switch| @args.delete switch} 
         return true
       end
       false
     end
 
+    def options_parse_trace
+      delete_args("--trace")
+    end
+
     def options_parse_debug
-      if @args.include?("-d") or @args.include?("--debug")
-        @args.delete "-d"
-        @args.delete "--debug"
-        return true
-      end
-      false
+      delete_args("-d", "--debug")
     end
 
     def options_parse_version

data/lib/rhc/commands.rb

@@ -6,9 +6,11 @@ require 'commander/command'
 module Commander
   class Command
     attr_accessor :default_action, :root, :info
+    
     def default_action?
       default_action.present?
     end
+
     def root?
       root.present?
     end
@@ -81,11 +83,17 @@ module Commander
       begin
         @config = RHC::Config.new
         @config.use_config(config_path) if config_path
+        @config.sync_additional_config
+
         $terminal.debug("Using config file #{@config.config_path}")
 
         unless clean
-          @config.to_options.each_pair do |key, value|
+          local_command_options = (@options.collect{|o| Commander::Runner.switch_to_sym(o[:switches].last.split.first)} rescue [])
+
+          @config.to_options.each_pair do |key, value|  
+            next if local_command_options.include?(key)          
             next if proxy_options.detect{ |arr| arr[0] == key }
+
             if sw = opts.send(:search, :long, key.to_s.gsub(/_/, '-'))
               _, cb, val = sw.send(:conv_arg, nil, value) {|*exc| raise(*exc) }
               cb.call(val) if cb
@@ -94,6 +102,7 @@ module Commander
             end
           end
         end
+
       rescue ArgumentError => e
         n = OptionParser::InvalidOption.new(e.message)
         n.reason = "The configuration file #{@config.path} contains an invalid setting"
@@ -203,8 +212,7 @@ module RHC
       if not (cmd.class.suppress_wizard? or
               options.noprompt or
               options.help or
-              config.has_local_config? or
-              config.has_opts_config?)
+              config.has_configs_from_files?)
 
         $stderr.puts RHC::Helpers.color("You have not yet configured the OpenShift client tools. Please run 'rhc setup'.", :yellow)
       end
@@ -217,6 +225,7 @@ module RHC
         option = instance.global_option(*args, &block).last
         option.merge!(opts)
       end
+
       commands.each_pair do |name, opts|
         name = Array(name)
         names = [name.reverse.join('-'), name.join(' ')] if name.length > 1
@@ -289,6 +298,7 @@ module RHC
         # process defaults
         defaults = {}
         covers = {}
+
         (opts + args).each do |option_meta|
           arg = option_meta[:option_symbol] || option_meta[:name] || option_meta[:arg] or next
           if arg && option_meta[:type] != :list && options[arg].is_a?(Array)