rhc 1.17.6 → 1.18.2

data/lib/rhc/auth/token.rb

@@ -74,7 +74,7 @@ module RHC::Auth
         @can_get_token = client.supports_sessions? && @allows_tokens
 
         if has_token
-          warn "Your authorization token has expired. Please sign in now to continue."
+          warn "Your authorization token has expired. Please sign in now to continue on #{openshift_server}."
         elsif @can_get_token
           info "Please sign in to start a new session to #{openshift_server}."
         end

data/lib/rhc/commands/app.rb

@@ -92,14 +92,14 @@ module RHC::Commands
 
       paragraph do
         header "Application Options"
-        table([["Domain:", options.namespace],
+        say table([["Domain:", options.namespace],
                ["Cartridges:", cart_names],
               (["Source Code:", options.from_code] if options.from_code),
                ["Gear Size:", options.gear_size || "default"],
                ["Scaling:", options.scaling ? "yes" : "no"],
               (["Environment Variables:", env.map{|item| "#{item.name}=#{item.value}"}.join(', ')] if env.present?),
               ].compact
-             ).each { |s| say "  #{s}" }
+             )
       end
 
       paragraph do
@@ -165,7 +165,11 @@ module RHC::Commands
         if options.git
           section(:now => true, :top => 1, :bottom => 1) do
             begin
-              repo_dir = git_clone_application(rest_app)
+              if has_git?
+                repo_dir = git_clone_application(rest_app)
+              else
+                warn "You do not have git installed, so your application's git repo will not be cloned"
+              end
             rescue RHC::GitException => e
               warn "#{e}"
               unless RHC::Helpers.windows? and windows_nslookup_bug?(rest_app)

data/lib/rhc/commands/authorization.rb

@@ -42,7 +42,7 @@ module RHC::Commands
       server maximum, you will be given the default value.
       DESC
     def add
-      unless options.scopes
+      unless options.scopes.to_s.strip.present?
         say "When adding an authorization, you must specify which permissions clients will have."
         scope_help
         say "Run 'rhc authorization add --help' to see more options"

data/lib/rhc/commands/git_clone.rb

@@ -16,11 +16,16 @@ module RHC::Commands
     # TODO: Implement default values for arguments once ffranz has added context arguments
     # argument :directory, "The name of a new directory to clone into", [], :default => nil
     def run(app_name)
-      rest_app = find_app
-      dir = git_clone_application(rest_app)
-      success "Your application Git repository has been cloned to '#{system_path(dir)}'"
+      if has_git?
+        rest_app = find_app
+        dir = git_clone_application(rest_app)
+        success "Your application Git repository has been cloned to '#{system_path(dir)}'"
 
-      0
+        0
+      else
+        error "You do not have git installed. In order to fully interact with OpenShift you will need to install and configure a git client."
+        2
+      end
     end
 
     private

data/lib/rhc/git_helpers.rb

@@ -3,8 +3,12 @@ require 'fileutils'
 
 module RHC
   module GitHelpers
+    def git_cmd
+      "git"
+    end
+
     def git_version
-      @git_version ||= `git --version 2>&1`.strip #:nocov:
+      @git_version ||= `#{git_cmd} --version 2>&1`.strip #:nocov:
     end
 
     def has_git?
@@ -46,7 +50,9 @@ module RHC
 
     # :nocov: These all call external binaries so test them in cucumber
     def git_config_get(key)
-      config_get_cmd = "git config --get #{key}"
+      return nil unless has_git?
+      
+      config_get_cmd = "#{git_cmd} config --get #{key}"
       value = %x[#{config_get_cmd}].strip
       debug "Git config '#{config_get_cmd}' returned '#{value}'"
       value = nil if $?.exitstatus != 0 or value.empty?
@@ -55,8 +61,8 @@ module RHC
     end
 
     def git_config_set(key, value)
-      unset_cmd = "git config --unset-all #{key}"
-      config_cmd = "git config --add #{key} #{value}"
+      unset_cmd = "#{git_cmd} config --unset-all #{key}"
+      config_cmd = "#{git_cmd} config --add #{key} #{value}"
       debug "Adding #{key} = #{value} to git config"
       commands = [unset_cmd, config_cmd]
       commands.each do |cmd|
@@ -70,7 +76,7 @@ module RHC
     def git_clone_repo(git_url, repo_dir)
       # quote the repo to avoid input injection risk
       destination = (repo_dir ? " \"#{repo_dir}\"" : "")
-      cmd = "git clone #{git_url}#{destination}"
+      cmd = "#{git_cmd} clone #{git_url}#{destination}"
       debug "Running #{cmd}"
 
       status, stdout, stderr = run_with_tee(cmd)

data/spec/rhc/auth_spec.rb

@@ -391,7 +391,7 @@ describe RHC::Auth::Token do
             context "with a token" do
               let(:default_options){ {:use_authorization_tokens => true, :token => 'foo'} }
               it("should invoke raise an error on retry because sessions are not supported") do
-                subject.should_receive(:warn).with("Your authorization token has expired. Please sign in now to continue.")
+                subject.should_receive(:warn).with("Your authorization token has expired. Please sign in now to continue on #{subject.openshift_server}.")
                 auth.should_receive(:retry_auth?).with(response, client).and_return true
                 subject.retry_auth?(response, client).should be_true
                 #expect{ subject.retry_auth?(response, client) }.to raise_error RHC::Rest::AuthorizationsNotSupported

data/spec/rhc/commands/app_spec.rb

@@ -411,6 +411,15 @@ describe RHC::Commands::App do
       end
     end
 
+    context 'when run without git installed' do
+      before do
+        @instance.stub(:has_git?) { false }
+      end
+      it "should print out git warning" do
+        run_output.should match("You do not have git installed")
+      end
+    end
+
     context 'when run with windows and no nslookup bug' do
       before do
         RHC::Helpers.stub(:windows?) { true }

data/spec/rhc/commands/authorization_spec.rb

@@ -126,6 +126,16 @@ describe RHC::Commands::Authorization do
 
     expect_an_unsupported_message
 
+    context "with empty scope options" do
+      let(:arguments) { ['authorization', 'add', '--scopes', ' ', '--note', 'a_note', '--expires-in', '300'] }
+      using_command_instance
+      with_authorization
+      before{ instance.should_receive(:scope_help) }
+
+      it('should display the scope help') { command_output.should =~ /When adding an authorization.*to see more options/m }
+      it{ expect{ run_command }.to exit_with_code(0) }
+    end
+
     context "with options" do
       let(:arguments) { ['authorization', 'add', '--scope', 'foo,bar', '--note', 'a_note', '--expires-in', '300'] }
       with_authorization

data/spec/rhc/commands/git_clone_spec.rb

@@ -32,6 +32,15 @@ describe RHC::Commands::GitClone do
   describe 'git-clone' do
     let(:arguments) { ['app', 'git-clone', 'app1'] }
 
+    context 'when run without git installed' do
+      before do
+        @instance.stub(:has_git?) { false }
+      end
+      it "should print out git warning" do
+        run_output.should match("You do not have git installed")
+      end
+    end
+
     context "stubbing git_clone_repo" do
       context "reports success successfully" do
         before do

data/spec/rhc/helpers_spec.rb

@@ -269,6 +269,12 @@ describe AllRhcHelpers do
     before{ subject.stub(:git_version){ raise "Fake Exception" } }
     its(:has_git?) { should be_false }
 
+    context "without git" do
+      before{ subject.stub(:git_cmd){ "nonexistent_git" } }
+      its(:has_git?) { should be_false }
+      it { subject.git_config_get('key').should == nil }
+    end
+
     context "git clone repo" do
       let(:stdout){ 'fake git clone' }
       let(:exit_status){ 0 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 91
   prerelease: 
   segments: 
   - 1
-  - 17
-  - 6
-  version: 1.17.6
+  - 18
+  - 2
+  version: 1.18.2
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-02 00:00:00 Z
+date: 2013-12-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh