rhc 1.18.2 → 1.19.5

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-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-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 port-forward server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail 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 port-forward server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail 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-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 delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain 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 list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-sshkey logout member member-add member-list member-remove 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 server set-env setup show-app show-cartridge show-deployment show-domain show-env show-sshkey 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 threaddump tidy-app unset-env update-cert-alias"
+      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-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 delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain 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 list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-sshkey logout member member-add member-list member-remove 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 server set-env setup show-app show-cartridge show-deployment show-domain show-env show-sshkey 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 threaddump tidy-app unset-env update-cert-alias"
     fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
@@ -70,7 +70,7 @@ _rhc()
 
       "rhc add-cartridge")
         if [[ "$cur" == -* ]]; then
-          opts="--app --application-id --cartridge --env --namespace"
+          opts="--app --application-id --cartridge --env --gear-size --namespace"
         else
           opts=""
         fi
@@ -86,7 +86,7 @@ _rhc()
 
       "rhc add-sshkey")
         if [[ "$cur" == -* ]]; then
-          opts="--confirm"
+          opts="--confirm --content --type"
         else
           opts=""
         fi
@@ -192,7 +192,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="create delete start stop force-stop restart reload tidy show deploy configure env snapshot"
+          opts="env snapshot create delete start stop scale-up scale-down force-stop restart reload tidy show deploy configure"
         fi
         ;;
 
@@ -206,7 +206,7 @@ _rhc()
 
       "rhc app create")
         if [[ "$cur" == -* ]]; then
-          opts="--app --auto-deploy --deployment-branch --dns --enable-jenkins --env --from-code --gear-size --git --keep-deployments --namespace --no-auto-deploy --no-dns --no-git --no-keys --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --repo --scaling --type"
         else
           opts=""
         fi
@@ -260,6 +260,22 @@ _rhc()
         fi
         ;;
 
+      "rhc app scale-down")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc app scale-up")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc app show")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --configuration --gears --namespace --state"
@@ -318,7 +334,7 @@ _rhc()
 
       "rhc app-create")
         if [[ "$cur" == -* ]]; then
-          opts="--app --auto-deploy --deployment-branch --dns --enable-jenkins --env --from-code --gear-size --git --keep-deployments --namespace --no-auto-deploy --no-dns --no-git --no-keys --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --repo --scaling --type"
         else
           opts=""
         fi
@@ -372,6 +388,22 @@ _rhc()
         fi
         ;;
 
+      "rhc app-scale-down")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc app-scale-up")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc app-show")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --configuration --gears --namespace --state"
@@ -518,7 +550,7 @@ _rhc()
 
       "rhc cartridge add")
         if [[ "$cur" == -* ]]; then
-          opts="--app --application-id --cartridge --env --namespace"
+          opts="--app --application-id --cartridge --env --gear-size --namespace"
         else
           opts=""
         fi
@@ -606,7 +638,7 @@ _rhc()
 
       "rhc cartridge-add")
         if [[ "$cur" == -* ]]; then
-          opts="--app --application-id --cartridge --env --namespace"
+          opts="--app --application-id --cartridge --env --gear-size --namespace"
         else
           opts=""
         fi
@@ -718,7 +750,7 @@ _rhc()
 
       "rhc create-app")
         if [[ "$cur" == -* ]]; then
-          opts="--app --auto-deploy --deployment-branch --dns --enable-jenkins --env --from-code --gear-size --git --keep-deployments --namespace --no-auto-deploy --no-dns --no-git --no-keys --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --repo --scaling --type"
         else
           opts=""
         fi
@@ -766,7 +798,7 @@ _rhc()
 
       "rhc delete-domain")
         if [[ "$cur" == -* ]]; then
-          opts="--namespace"
+          opts="--force --namespace"
         else
           opts=""
         fi
@@ -878,7 +910,7 @@ _rhc()
 
       "rhc domain delete")
         if [[ "$cur" == -* ]]; then
-          opts="--namespace"
+          opts="--force --namespace"
         else
           opts=""
         fi
@@ -934,7 +966,7 @@ _rhc()
 
       "rhc domain-delete")
         if [[ "$cur" == -* ]]; then
-          opts="--namespace"
+          opts="--force --namespace"
         else
           opts=""
         fi
@@ -1348,6 +1380,22 @@ _rhc()
         fi
         ;;
 
+      "rhc scale-down-app")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc scale-up-app")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc server")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -1478,7 +1526,7 @@ _rhc()
 
       "rhc sshkey add")
         if [[ "$cur" == -* ]]; then
-          opts="--confirm"
+          opts="--confirm --content --type"
         else
           opts=""
         fi
@@ -1510,7 +1558,7 @@ _rhc()
 
       "rhc sshkey-add")
         if [[ "$cur" == -* ]]; then
-          opts="--confirm"
+          opts="--confirm --content --type"
         else
           opts=""
         fi

data/conf/express.conf

@@ -5,4 +5,4 @@ libra_server = 'openshift.redhat.com'
 debug = 'false'
 
 # Timeout
-#timeout = '10'
+#timeout = '10'

data/features/core_feature.rb

@@ -37,9 +37,13 @@ describe "rhc core scenarios" do
       r.stdout.should match 'SSL Certificates'
     end
 
-    it "starts the wizard on default invocation" do
+    it "displays help on default invocation" do
       r = rhc
-      r.stdout.should match "OpenShift Client Tools"
+      r.status.should == 0
+      r.stdout.should match "Command line interface for OpenShift"
+      r.stdout.should match "Usage: rhc"
+      r.stdout.should match "Getting started"
+      r.stdout.should match "See 'rhc help options' for a list"
     end
   end
 
@@ -114,6 +118,7 @@ describe "rhc core scenarios" do
         Dir.chdir @app.name
       end
       let(:git_config){ `git config --list` }
+      let(:git_remotes){ `git remote -v` }
 
       it "will set Git config values" do
         git_config.should match "rhc.app-id=#{app.id}"
@@ -121,6 +126,11 @@ describe "rhc core scenarios" do
         git_config.should match "rhc.domain-name=#{app.domain_name}"
       end
 
+      it "will set remote branches correctly" do
+        git_remotes.should match "origin"
+        git_remotes.should_not match "upstream"
+      end
+
       it "will infer the current app from the git repository" do
         r = rhc 'show-app'
         r.stdout.should match app.name

data/features/deployments_feature.rb

@@ -98,6 +98,8 @@ describe "rhc deployment scenarios" do
         FileUtils.rm_rf git_directory
         git_clone
         Dir.chdir git_directory
+        `git config user.email "you@example.com"`
+        `git config user.name "Your Name"`
         `sed -i "s/Welcome to OpenShift/#{content}/" php/index.php`
         `git commit -a -m "Commit from Feature Tests"`
         `git push origin master`

data/lib/rhc/cartridge_helpers.rb

@@ -7,7 +7,7 @@ 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
+          next from.find{ |c| c.url.present? && c.url.downcase == name} || use_cart(RHC::Rest::Cartridge.for_url(name), name) if name =~ %r(\Ahttps?://)i
 
           name = name.downcase
           from.find{ |c| c.name.downcase == name } ||

data/lib/rhc/cli.rb

@@ -14,7 +14,7 @@ module RHC
     extend Commander::Delegates
 
     def self.set_terminal
-      $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first rescue 80 if $stdin.tty?
+      $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first rescue 80 if $stdout.tty?
       $terminal.wrap_at = nil if $terminal.wrap_at == 0
       #$terminal.page_at = :auto if $stdin.tty? and $stdout.tty?
       # FIXME: ANSI terminals are not default on windows but we may just be

data/lib/rhc/command_runner.rb

@@ -72,7 +72,6 @@ module RHC
         begin
           run_active_command
         rescue InvalidCommandError => e
-          return RHC::Wizard.new.run unless RHC::Wizard.has_configuration? || provided_arguments.present?
           run_help(provided_arguments)
         rescue \
           OptionParser::InvalidOption => e

data/lib/rhc/commands/app.rb

@@ -244,6 +244,26 @@ module RHC::Commands
       0
     end
 
+    summary "Scale up the application's web cartridge"
+    syntax "<app> [--namespace NAME]"
+    takes_application :argument => true
+    def scale_up(app)
+      app_action :scale_up
+
+      results { say "#{app} scaled up" }
+      0
+    end
+
+    summary "Scale down the application's web cartridge"
+    syntax "<app> [--namespace NAME]"
+    takes_application :argument => true
+    def scale_down(app)
+      app_action :scale_down
+
+      results { say "#{app} scaled down" }
+      0
+    end
+
     summary "Stops all application processes"
     syntax "<app> [--namespace NAME]"
     takes_application :argument => true

data/lib/rhc/commands/authorization.rb

@@ -1,9 +1,28 @@
 module RHC::Commands
   class Authorization < Base
 
+    summary "Manage your authorization tokens"
+    syntax "<action>"
+    description <<-DESC
+      An authorization token grants 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
+      why it was created.
+
+      To see all your authorizations, run 'rhc authorizations'.
+
+      To view the list of scopes supported by this server, run the
+      'rhc add-authorization' command with no arguments.
+
+      These commands manage your authorization tokens on the server - if you
+      want to clear your authorization tokens from the current machine use
+      'rhc logout'
+      DESC
+    default_action :help
+
     summary "Show the authorization tokens for your account"
     description <<-DESC
-      Shows the full list of authorization tokens on your account. You 
+      Shows the full list of authorization tokens on your account. You
       can add, edit, or delete authorizations with subcommands.
 
       An authorization token grants access to the OpenShift REST API with
@@ -12,7 +31,6 @@ module RHC::Commands
       remembering what is available.
       DESC
     alias_action 'authorizations', :root_command => true
-    default_action :list
     def list
       rest_client.authorizations.each{ |auth| paragraph{ display_authorization(auth, token_for_user) } } or info "No authorizations"
 

data/lib/rhc/commands/domain.rb

@@ -98,7 +98,7 @@ module RHC::Commands
       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)
-      display_domain(domain, applications)
+      display_domain(domain, applications, true)
 
       if applications.present?
         success "You have #{pluralize(applications.length, 'application')} in your domain."
@@ -111,15 +111,16 @@ module RHC::Commands
 
     summary "Display all domains you have access to"
     option ['--mine'], "Display only domains you own"
-    option ['--ids'], "Display the unique id of the domain (not supported by all servers)"
+    option ['--ids'], "Display the unique id of the domain (deprecated, domain IDs are now displayed by default)"
     alias_action :domains, :root_command => true
     def list
       domains = rest_client.send(options.mine ? :owned_domains : :domains)
 
       warn "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc create-domain'." and return 1 unless domains.present?
+      warn "The --ids option is deprecated. Domain IDs are displayed by default." if options.ids
 
       domains.each do |d|
-        display_domain(d, nil, options.ids)
+        display_domain(d, nil, true)
       end
 
       success "You have access to #{pluralize(domains.length, 'domain')}."

data/lib/rhc/deployment_helpers.rb

@@ -95,7 +95,7 @@ module RHC
         say "Activating deployment '#{deployment_id}' on application #{rest_app.name} ..."
 
         ssh_url = URI(rest_app.ssh_url)
-        remote_cmd = "gear activate #{deployment_id}"
+        remote_cmd = "gear activate --all #{deployment_id}"
 
         begin
           ssh_ruby(ssh_url.host, ssh_url.user, remote_cmd)

data/lib/rhc/git_helpers.rb

@@ -41,6 +41,8 @@ module RHC
         git_config_set "rhc.app-id", app.id
         git_config_set "rhc.app-name", app.name
         git_config_set "rhc.domain-name", app.domain_id
+
+        git_remote_add("upstream", app.initial_git_url) if app.initial_git_url.present?
       end
 
       git_clone_deploy_hooks(repo_dir)
@@ -48,6 +50,13 @@ module RHC
       dir
     end
 
+    def git_remote_add(remote_name, remote_url)
+      cmd = "#{git_cmd} remote add upstream \"#{remote_url}\""
+      debug "Running #{cmd} 2>&1"
+      output = %x[#{cmd} 2>&1]
+      raise RHC::GitException, "Error while adding upstream remote - #{output}" unless output.empty?
+    end
+
     # :nocov: These all call external binaries so test them in cucumber
     def git_config_get(key)
       return nil unless has_git?

data/lib/rhc/helpers.rb

@@ -95,7 +95,7 @@ module RHC
     #
 
     def user_agent
-      "rhc/#{RHC::VERSION::STRING} (ruby #{RUBY_VERSION}; #{RUBY_PLATFORM})#{" (API #{RHC::Rest::API_VERSION})" rescue ''}"
+      "rhc/#{RHC::VERSION::STRING} (ruby #{RUBY_VERSION}; #{RUBY_PLATFORM})#{" (API #{RHC::Rest::Client::CLIENT_API_VERSIONS})"}"
     end
 
     #

data/lib/rhc/rest/application.rb

@@ -21,6 +21,14 @@ module RHC
         attributes['id'] || uuid
       end
 
+      def uuid
+        if (client.api_version_negotiated >= 1.6)
+          attributes['id']
+        else
+          attributes['uuid']
+        end
+      end
+
       def domain
         domain_id
       end
@@ -97,6 +105,14 @@ module RHC
         rest_method 'TIDY', :event => "tidy"
       end
 
+      def scale_up
+        rest_method 'SCALE_UP', :event => "scale-up"
+      end
+
+      def scale_down
+        rest_method 'SCALE_DOWN', :event => "scale-down"
+      end
+
       def start
         debug "Starting application #{name}"
         rest_method 'START', :event => "start"

data/lib/rhc/rest/client.rb

@@ -214,7 +214,7 @@ module RHC
       # The list may not necessarily be sorted; we will select the last
       # matching one supported by the server.
       # See #api_version_negotiated
-      CLIENT_API_VERSIONS = [1.1, 1.2, 1.3, 1.4, 1.5]
+      CLIENT_API_VERSIONS = [1.1, 1.2, 1.3, 1.4, 1.5, 1.6]
       MAX_RETRIES = 5
 
       def initialize(*args)

data/lib/rhc/rest/mock.rb

@@ -395,6 +395,8 @@ module RHC::Rest::Mock
        ['START',                           "domains/#{domain_id}/apps/#{app_id}/start",                          'post'],
        ['STOP',                            "domains/#{domain_id}/apps/#{app_id}/stop",                           'post'],
        ['RESTART',                         "domains/#{domain_id}/apps/#{app_id}/restart",                        'post'],
+       ['SCALE_UP',                        "broker/rest/application/#{app_id}/events",                           'scale-up'],
+       ['SCALE_DOWN',                      "broker/rest/application/#{app_id}/events",                           'scale-down'],
        ['THREAD_DUMP',                     "domains/#{domain_id}/apps/#{app_id}/event",                          'post'],
        ['ADD_ALIAS',                       "domains/#{domain_id}/apps/#{app_id}/event",                          'post'],
        ['REMOVE_ALIAS',                    "domains/#{domain_id}/apps/#{app_id}/event",                          'post'],
@@ -854,6 +856,14 @@ module RHC::Rest::Mock
       @app
     end
 
+    def scale_up
+      @app
+    end
+
+    def scale_down
+      @app
+    end
+
     def add_alias(app_alias)
       @aliases << MockRestAlias.new(@client, app_alias)
     end

data/lib/rhc/ssh_helpers.rb

@@ -370,7 +370,7 @@ module RHC
     def ssh_add
       if exe?('ssh-add')
         #:nocov:
-        `ssh-add 2&>1`
+        `ssh-add 2>&1`
         #:nocov:
       end
     end

data/lib/rhc/tar_gz.rb

@@ -13,7 +13,7 @@ module RHC
       return false if ! (File.file? filename and File.basename(filename).downcase =~ /.\.t(ar\.)?gz$/i)
 
       regex = Regexp.new search
-      if RHC::Helpers.windows? or force_ruby
+      if RHC::Helpers.windows? or RHC::Helpers.mac? or force_ruby
         begin
           zlib::GzipReader.open(filename) do |gz|
             Minitar::Reader.open gz do |tar|

data/spec/rhc/cli_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rest_spec_helper'
 require 'rhc/wizard'
 
 describe RHC::CLI do
@@ -81,8 +82,7 @@ describe RHC::CLI do
       it_should_behave_like 'a global help page'
 
       context "without a config file" do
-        before{ RHC::Wizard.stub(:has_configuration?).and_return(false) }
-        it_should_behave_like 'a first run wizard'
+        it_should_behave_like 'a global help page'
       end
     end
 
@@ -174,13 +174,12 @@ describe RHC::CLI do
   describe '#set_terminal' do
     before(:each) { mock_terminal }
     it('should update $terminal.wrap_at') do
-      $stdin.should_receive(:tty?).once.and_return(true)
+      $stdout.should_receive(:tty?).twice.and_return(true)
       HighLine::SystemExtensions.should_receive(:terminal_size).and_return([5])
       expect { RHC::CLI.set_terminal }.to change($terminal, :wrap_at)
     end
     it('should not update $terminal.page_at') do
-      $stdin.should_receive(:tty?).once.and_return(true)
-      $stdout.should_receive(:tty?).once.and_return(true)
+      $stdout.should_receive(:tty?).twice.and_return(true)
       expect { RHC::CLI.set_terminal }.to_not change($terminal, :page_at)
     end
   end

data/spec/rhc/commands/app_spec.rb

@@ -669,6 +669,18 @@ describe RHC::Commands::App do
       it { expect{ run }.to exit_with_code(0) }
     end
 
+    context 'app scale-up' do
+      let(:arguments) { ['app', 'scale-up', '-a', 'app1'] }
+      it { run_output.should match('scaled up') }
+      it { expect{ run }.to exit_with_code(0) }
+    end
+
+    context 'app scale-down' do
+      let(:arguments) { ['app', 'scale-down', '-a', 'app1'] }
+      it { run_output.should match('scaled down') }
+      it { expect{ run }.to exit_with_code(0) }
+    end
+
     context 'app stop' do
       let(:arguments) { ['app', 'stop', 'app1'] }
 

data/spec/rhc/commands/authorization_spec.rb

@@ -28,7 +28,7 @@ describe RHC::Commands::Authorization do
   end
 
   describe '#run' do
-    let(:arguments) { ['authorization'] }
+    let(:arguments) { ['authorizations'] }
     context "with authorizations" do
       with_authorization
       before{ challenge{ stub_authorizations } }
@@ -42,12 +42,13 @@ describe RHC::Commands::Authorization do
 
     expect_an_unsupported_message
   end
-  
+
   describe '#run' do
-    let(:arguments) { ['authorization', '--h']}
-    context 'given --h' do
-      it 'should not raise' do
-        expect{ run }.to_not raise_error
+    let(:arguments) { ['authorization']}
+    context 'given no arguments' do
+      it('should display help'){ run_output.should =~ /An authorization token grants access to the OpenShift REST API.*To see all your authorizations/m }
+      it 'should ask for an argument' do
+        expect{ run }.to exit_with_code(1)
       end
     end
   end

data/spec/rhc/commands/cartridge_spec.rb

@@ -256,6 +256,21 @@ describe RHC::Commands::Cartridge do
       end
     end
 
+    context 'when run with custom cart url' do
+      let(:arguments) { ['cartridge', 'remove', 'https://foo.bar.com', '--confirm', '-a', 'app1'] }
+      before do
+        @domain = rest_client.add_domain("mockdomain")
+        @app = @domain.add_application("app1", "mock_type")
+        cart1 = @app.add_cartridge('mock_cart-1')
+        cart1.url = 'https://foo.bar.com'
+      end
+      it "should remove cartridge" do
+        expect { run }.to exit_with_code(0)
+        # framework cart should be the only one listed
+        @app.cartridges.length.should == 1
+      end
+    end
+
     context "against a 1.5 server" do
       let!(:rest_client){ nil }
       let(:username){ mock_user }

data/spec/rhc/commands/git_clone_spec.rb

@@ -53,6 +53,19 @@ describe RHC::Commands::GitClone do
 
         it { expect { run }.to exit_with_code(0) }
         it { run_output.should match("Cloned") }
+
+        context 'when app has an initial git url' do
+          before do
+            @app2 = @domain.add_application("app2", "mock_unique_standalone_cart", nil, "default", "git://test")
+            @instance.stub(:git_remote_add) do |remote_name, remote_url|
+              say "Added remote #{remote_name} pointing to #{remote_url}"
+              true
+            end
+          end
+          let(:arguments) { ['git-clone', 'app2'] }
+          it { run_output.should match("Added remote upstream pointing to git://test") }
+        end
+
       end
 
       context "testing git_clone_deploy_hooks" do

data/spec/rhc/rest_application_spec.rb

@@ -242,6 +242,16 @@ module RHC
         let(:control_data) { { :method => :destroy, :event => 'delete', :link => 'delete', :payload => false } }
         it_should_behave_like "a control method"
       end
+
+      context "#scale_up" do
+        let(:control_data) { { :method => :scale_up, :event => 'scale-up', :link => 'scale_up', :payload => false } }
+        it_should_behave_like "a control method"
+      end
+
+      context "#scale_down" do
+        let(:control_data) { { :method => :scale_down, :event => 'scale-down', :link => 'scale_down', :payload => false } }
+        it_should_behave_like "a control method"
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 81
   prerelease: 
   segments: 
   - 1
-  - 18
-  - 2
-  version: 1.18.2
+  - 19
+  - 5
+  version: 1.19.5
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-11 00:00:00 Z
+date: 2014-01-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -237,82 +237,82 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/rhc/command_runner.rb
+- lib/rhc.rb
+- lib/rhc/auth.rb
 - lib/rhc/version.rb
-- lib/rhc/cartridge_helpers.rb
-- lib/rhc/auth/basic.rb
-- lib/rhc/auth/token_store.rb
-- lib/rhc/auth/token.rb
-- lib/rhc/output_helpers.rb
+- lib/rhc/core_ext.rb
+- lib/rhc/json.rb
 - lib/rhc/wizard.rb
-- lib/rhc/help_formatter.rb
-- lib/rhc/commands.rb
-- lib/rhc/context_helper.rb
 - lib/rhc/rest.rb
-- lib/rhc/ssh_helpers.rb
-- lib/rhc/helpers.rb
-- lib/rhc/coverage_helper.rb
-- lib/rhc/json.rb
-- lib/rhc/deployment_helpers.rb
-- lib/rhc/git_helpers.rb
-- lib/rhc/auth.rb
-- lib/rhc/exceptions.rb
 - lib/rhc/autocomplete.rb
+- lib/rhc/git_helpers.rb
+- lib/rhc/command_runner.rb
+- lib/rhc/context_helper.rb
 - lib/rhc/config.rb
-- lib/rhc/commands/setup.rb
-- lib/rhc/commands/account.rb
+- lib/rhc/exceptions.rb
+- lib/rhc/commands/threaddump.rb
+- lib/rhc/commands/cartridge.rb
+- lib/rhc/commands/base.rb
 - lib/rhc/commands/port_forward.rb
+- lib/rhc/commands/logout.rb
+- lib/rhc/commands/setup.rb
+- lib/rhc/commands/deployment.rb
 - lib/rhc/commands/tail.rb
-- lib/rhc/commands/alias.rb
-- lib/rhc/commands/git_clone.rb
+- lib/rhc/commands/server.rb
 - lib/rhc/commands/ssh.rb
-- lib/rhc/commands/domain.rb
-- lib/rhc/commands/cartridge.rb
+- lib/rhc/commands/apps.rb
+- lib/rhc/commands/alias.rb
 - lib/rhc/commands/authorization.rb
-- lib/rhc/commands/member.rb
 - lib/rhc/commands/sshkey.rb
-- lib/rhc/commands/deployment.rb
-- lib/rhc/commands/snapshot.rb
-- lib/rhc/commands/server.rb
 - lib/rhc/commands/app.rb
-- lib/rhc/commands/logout.rb
+- lib/rhc/commands/member.rb
+- lib/rhc/commands/domain.rb
 - lib/rhc/commands/env.rb
-- lib/rhc/commands/apps.rb
-- lib/rhc/commands/threaddump.rb
-- lib/rhc/commands/base.rb
-- lib/rhc/tar_gz.rb
+- lib/rhc/commands/account.rb
+- lib/rhc/commands/git_clone.rb
+- lib/rhc/commands/snapshot.rb
 - lib/rhc/highline_extensions.rb
-- lib/rhc/cli.rb
-- lib/rhc/core_ext.rb
-- lib/rhc/vendor/parseconfig.rb
-- lib/rhc/vendor/zliby.rb
-- lib/rhc/vendor/okjson.rb
-- lib/rhc/vendor/sshkey.rb
-- lib/rhc/rest/user.rb
-- lib/rhc/rest/attributes.rb
-- lib/rhc/rest/environment_variable.rb
-- lib/rhc/rest/activation.rb
-- lib/rhc/rest/api.rb
-- lib/rhc/rest/alias.rb
-- lib/rhc/rest/domain.rb
+- lib/rhc/tar_gz.rb
+- lib/rhc/commands.rb
+- lib/rhc/ssh_helpers.rb
+- lib/rhc/output_helpers.rb
+- lib/rhc/coverage_helper.rb
+- lib/rhc/help_formatter.rb
 - lib/rhc/rest/key.rb
 - lib/rhc/rest/cartridge.rb
-- lib/rhc/rest/membership.rb
-- lib/rhc/rest/authorization.rb
+- lib/rhc/rest/base.rb
+- lib/rhc/rest/activation.rb
 - lib/rhc/rest/deployment.rb
 - lib/rhc/rest/gear_group.rb
-- lib/rhc/rest/mock.rb
-- lib/rhc/rest/client.rb
+- lib/rhc/rest/environment_variable.rb
+- lib/rhc/rest/membership.rb
+- lib/rhc/rest/user.rb
 - lib/rhc/rest/application.rb
-- lib/rhc/rest/base.rb
+- lib/rhc/rest/api.rb
+- lib/rhc/rest/client.rb
+- lib/rhc/rest/alias.rb
+- lib/rhc/rest/authorization.rb
+- lib/rhc/rest/mock.rb
 - lib/rhc/rest/httpclient.rb
-- lib/rhc.rb
+- lib/rhc/rest/attributes.rb
+- lib/rhc/rest/domain.rb
+- lib/rhc/vendor/okjson.rb
+- lib/rhc/vendor/parseconfig.rb
+- lib/rhc/vendor/zliby.rb
+- lib/rhc/vendor/sshkey.rb
+- lib/rhc/auth/token.rb
+- lib/rhc/auth/basic.rb
+- lib/rhc/auth/token_store.rb
+- lib/rhc/helpers.rb
+- lib/rhc/cli.rb
+- lib/rhc/deployment_helpers.rb
+- lib/rhc/cartridge_helpers.rb
 - lib/rhc/autocomplete_templates/bash.erb
+- lib/rhc/usage_templates/help.erb
 - lib/rhc/usage_templates/command_syntax_help.erb
+- lib/rhc/usage_templates/options_help.erb
 - lib/rhc/usage_templates/missing_help.erb
 - lib/rhc/usage_templates/command_help.erb
-- lib/rhc/usage_templates/options_help.erb
-- lib/rhc/usage_templates/help.erb
 - conf/express.conf
 - autocomplete/rhc_bash
 - LICENSE
@@ -320,59 +320,59 @@ files:
 - README.md
 - Rakefile
 - spec/rest_spec_helper.rb
+- spec/keys/server.pem
+- spec/keys/example_private.pem
+- spec/keys/example.pem
+- spec/spec_helper.rb
+- spec/direct_execution_helper.rb
+- spec/coverage_helper.rb
 - spec/wizard_spec_helper.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/auth_spec.rb
-- spec/rhc/rest_client_spec.rb
-- spec/rhc/assets/empty.txt
-- spec/rhc/assets/env_vars_2.txt
-- spec/rhc/assets/cert_key_rsa
-- spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/assets/env_vars.txt
-- spec/rhc/assets/targz_corrupted.tar.gz
-- spec/rhc/assets/cert.crt
-- spec/rhc/assets/foo.txt
 - spec/rhc/highline_extensions_spec.rb
-- spec/rhc/command_spec.rb
 - spec/rhc/cli_spec.rb
-- spec/rhc/commands/setup_spec.rb
-- spec/rhc/commands/tail_spec.rb
-- spec/rhc/commands/port_forward_spec.rb
-- spec/rhc/commands/app_spec.rb
-- spec/rhc/commands/deployment_spec.rb
-- spec/rhc/commands/domain_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/wizard_spec.rb
+- spec/rhc/rest_client_spec.rb
 - spec/rhc/commands/sshkey_spec.rb
-- spec/rhc/commands/threaddump_spec.rb
-- spec/rhc/commands/server_spec.rb
-- spec/rhc/commands/ssh_spec.rb
-- spec/rhc/commands/logout_spec.rb
-- spec/rhc/commands/member_spec.rb
-- spec/rhc/commands/alias_spec.rb
-- spec/rhc/commands/authorization_spec.rb
+- spec/rhc/commands/apps_spec.rb
 - spec/rhc/commands/account_spec.rb
+- spec/rhc/commands/domain_spec.rb
 - spec/rhc/commands/cartridge_spec.rb
-- spec/rhc/commands/env_spec.rb
+- spec/rhc/commands/app_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
+- spec/rhc/commands/ssh_spec.rb
+- spec/rhc/commands/tail_spec.rb
+- spec/rhc/commands/setup_spec.rb
+- spec/rhc/commands/alias_spec.rb
+- spec/rhc/commands/env_spec.rb
+- spec/rhc/commands/port_forward_spec.rb
 - spec/rhc/commands/git_clone_spec.rb
-- spec/rhc/commands/apps_spec.rb
+- spec/rhc/commands/authorization_spec.rb
+- spec/rhc/commands/member_spec.rb
+- spec/rhc/commands/threaddump_spec.rb
+- spec/rhc/commands/server_spec.rb
+- spec/rhc/commands/deployment_spec.rb
+- spec/rhc/commands/logout_spec.rb
+- spec/rhc/assets/targz_sample.tar.gz
+- spec/rhc/assets/env_vars_2.txt
+- spec/rhc/assets/cert_key_rsa
+- spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/assets/cert.crt
+- spec/rhc/assets/env_vars.txt
+- spec/rhc/assets/empty.txt
+- spec/rhc/assets/foo.txt
 - spec/rhc/json_spec.rb
-- spec/rhc/wizard_spec.rb
+- spec/rhc/auth_spec.rb
+- spec/rhc/config_spec.rb
+- spec/rhc/helpers_spec.rb
 - spec/rhc/rest_application_spec.rb
-- spec/spec_helper.rb
-- spec/coverage_helper.rb
-- spec/direct_execution_helper.rb
-- spec/keys/server.pem
-- spec/keys/example.pem
-- spec/keys/example_private.pem
-- features/core_feature.rb
+- spec/rhc/command_spec.rb
+- features/members_feature.rb
 - features/assets/deploy.tar.gz
+- features/deployments_feature.rb
+- features/core_feature.rb
 - features/keys_feature.rb
 - features/domains_feature.rb
-- features/members_feature.rb
-- features/deployments_feature.rb
 - bin/rhc
 homepage: https://github.com/openshift/rhc
 licenses: []
@@ -414,56 +414,56 @@ specification_version: 3
 summary: OpenShift Client Tools
 test_files: 
 - spec/rest_spec_helper.rb
+- spec/keys/server.pem
+- spec/keys/example_private.pem
+- spec/keys/example.pem
+- spec/spec_helper.rb
+- spec/direct_execution_helper.rb
+- spec/coverage_helper.rb
 - spec/wizard_spec_helper.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/auth_spec.rb
-- spec/rhc/rest_client_spec.rb
-- spec/rhc/assets/empty.txt
-- spec/rhc/assets/env_vars_2.txt
-- spec/rhc/assets/cert_key_rsa
-- spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/assets/env_vars.txt
-- spec/rhc/assets/targz_corrupted.tar.gz
-- spec/rhc/assets/cert.crt
-- spec/rhc/assets/foo.txt
 - spec/rhc/highline_extensions_spec.rb
-- spec/rhc/command_spec.rb
 - spec/rhc/cli_spec.rb
-- spec/rhc/commands/setup_spec.rb
-- spec/rhc/commands/tail_spec.rb
-- spec/rhc/commands/port_forward_spec.rb
-- spec/rhc/commands/app_spec.rb
-- spec/rhc/commands/deployment_spec.rb
-- spec/rhc/commands/domain_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/wizard_spec.rb
+- spec/rhc/rest_client_spec.rb
 - spec/rhc/commands/sshkey_spec.rb
-- spec/rhc/commands/threaddump_spec.rb
-- spec/rhc/commands/server_spec.rb
-- spec/rhc/commands/ssh_spec.rb
-- spec/rhc/commands/logout_spec.rb
-- spec/rhc/commands/member_spec.rb
-- spec/rhc/commands/alias_spec.rb
-- spec/rhc/commands/authorization_spec.rb
+- spec/rhc/commands/apps_spec.rb
 - spec/rhc/commands/account_spec.rb
+- spec/rhc/commands/domain_spec.rb
 - spec/rhc/commands/cartridge_spec.rb
-- spec/rhc/commands/env_spec.rb
+- spec/rhc/commands/app_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
+- spec/rhc/commands/ssh_spec.rb
+- spec/rhc/commands/tail_spec.rb
+- spec/rhc/commands/setup_spec.rb
+- spec/rhc/commands/alias_spec.rb
+- spec/rhc/commands/env_spec.rb
+- spec/rhc/commands/port_forward_spec.rb
 - spec/rhc/commands/git_clone_spec.rb
-- spec/rhc/commands/apps_spec.rb
+- spec/rhc/commands/authorization_spec.rb
+- spec/rhc/commands/member_spec.rb
+- spec/rhc/commands/threaddump_spec.rb
+- spec/rhc/commands/server_spec.rb
+- spec/rhc/commands/deployment_spec.rb
+- spec/rhc/commands/logout_spec.rb
+- spec/rhc/assets/targz_sample.tar.gz
+- spec/rhc/assets/env_vars_2.txt
+- spec/rhc/assets/cert_key_rsa
+- spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/assets/cert.crt
+- spec/rhc/assets/env_vars.txt
+- spec/rhc/assets/empty.txt
+- spec/rhc/assets/foo.txt
 - spec/rhc/json_spec.rb
-- spec/rhc/wizard_spec.rb
+- spec/rhc/auth_spec.rb
+- spec/rhc/config_spec.rb
+- spec/rhc/helpers_spec.rb
 - spec/rhc/rest_application_spec.rb
-- spec/spec_helper.rb
-- spec/coverage_helper.rb
-- spec/direct_execution_helper.rb
-- spec/keys/server.pem
-- spec/keys/example.pem
-- spec/keys/example_private.pem
-- features/core_feature.rb
+- spec/rhc/command_spec.rb
+- features/members_feature.rb
 - features/assets/deploy.tar.gz
+- features/deployments_feature.rb
+- features/core_feature.rb
 - features/keys_feature.rb
 - features/domains_feature.rb
-- features/members_feature.rb
-- features/deployments_feature.rb