rhc 1.38.4 → 1.38.7

data/README.md

@@ -10,6 +10,10 @@ comments.  For more information about OpenShift, visit https://openshift.redhat.
 or the OpenShift support page
 https://openshift.redhat.com/support.
 
+RHC from rubygems.org is built on Ruby 1.8.7.  RHC does have conditional 
+dependencies during build time, so it can be built on multiple versions of Ruby.  
+If you are running into any dependency issues when using RHC, please try to 
+build RHC locally using `gem build rhc.gemspec` to use the correct dependencies.
 
 ## Using RHC to create an application
 

data/lib/rhc/helpers.rb

@@ -329,7 +329,7 @@ module RHC
         else
           $terminal.color(item, *args)
         end
-      else 
+      else
         item
       end
     end
@@ -522,7 +522,15 @@ module RHC
 
     # split spaces but preserve sentences between quotes
     def split_path(s, keep_quotes=false)
-      keep_quotes ? s.split(/\s(?=(?:[^"]|"[^"]*")*$)/) : CSV::parse_line(s, :col_sep => ' ')
+      #:nocov:
+      if keep_quotes
+        s.split(/\s(?=(?:[^"]|"[^"]*")*$)/)
+      elsif RUBY_VERSION.to_f < 1.9
+        CSV::parse_line(s, fs = ' ')
+      else #ruby 1.9 or newer
+        CSV::parse_line(s, :col_sep => ' ')
+      end
+      #:nocov:
     end
 
     def discover_windows_executables(&block)

data/spec/rhc/commands/ssh_spec.rb

@@ -28,7 +28,7 @@ describe RHC::Commands::Ssh do
       it { expect{ run }.to exit_with_code(0) }
     end
   end
-  
+
   describe 'ssh without command including debugging' do
     let(:arguments) { ['app', 'ssh', 'app1', '--debug'] }
 
@@ -173,18 +173,17 @@ describe RHC::Commands::Ssh do
 
   describe 'app ssh custom ssh with spaces and arguments' do
     let(:arguments) { ['app', 'ssh', 'app1', '--ssh', '"/path/to /ssh" --with_custom_flag'] }
-    context 'when custom ssh does not exist as a path' do
-      before(:each) do
-        @domain = rest_client.add_domain("mockdomain")
-        @domain.add_application("app1", "mock_type")
-        RHC::Commands::Ssh.any_instance.should_not_receive(:has_ssh?)
-        File.should_receive(:exist?).at_least(1).and_return(true)
-        File.should_receive(:executable?).at_least(1).and_return(true)
-        subject.class.any_instance.stub(:discover_git_executable).and_return('git')
-        Kernel.should_receive(:exec).with("/path/to /ssh", '--with_custom_flag', "fakeuuidfortestsapp1@127.0.0.1").once.times.and_return(0)
-      end
-      it { expect { run }.to exit_with_code(0) }
+
+    before(:each) do
+      @domain = rest_client.add_domain("mockdomain")
+      @domain.add_application("app1", "mock_type")
+      RHC::Commands::Ssh.any_instance.should_not_receive(:has_ssh?)
+      File.should_receive(:exist?).at_least(1).and_return(true)
+      File.should_receive(:executable?).at_least(1).and_return(true)
+      subject.class.any_instance.stub(:discover_git_executable).and_return('git')
+      Kernel.should_receive(:exec).with("/path/to /ssh", "--with_custom_flag", "fakeuuidfortestsapp1@127.0.0.1").once.times.and_return(0)
     end
+    it { expect { run }.to exit_with_code(0) }
   end
 
   describe 'ssh tests' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 135
+  hash: 129
   prerelease: 
   segments: 
   - 1
   - 38
-  - 4
-  version: 1.38.4
+  - 7
+  version: 1.38.7
 platform: ruby
 authors: 
 - Red Hat
@@ -15,28 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-10-23 00:00:00 Z
+date: 2016-08-01 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - <=
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 9
-        - 2
-        version: 2.9.2
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-scp
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,11 +32,11 @@ dependencies:
         - 2
         version: 1.1.2
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh-multi
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,11 +48,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,11 +62,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: commander
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,11 +85,11 @@ dependencies:
         - 0
         version: 4.3.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -117,11 +101,11 @@ dependencies:
         - 11
         version: 1.6.11
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: httpclient
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -132,12 +116,20 @@ dependencies:
         - 4
         - 0
         version: 2.4.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
+        version: 2.7.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -147,11 +139,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,11 +155,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -178,11 +170,11 @@ dependencies:
         - 12
         version: "1.12"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -201,11 +193,11 @@ dependencies:
         - 99
         version: "2.99"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: fakefs
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -224,11 +216,11 @@ dependencies:
         - 0
         version: 0.6.0
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -238,25 +230,27 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id013
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 51
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 3
+        - 20
+        version: 1.3.20
   type: :development
-  version_requirements: *id014
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -267,7 +261,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id015
+  version_requirements: *id014
 description: The client tools for the OpenShift platform that allow for application management.
 email: dev@lists.openshift.redhat.com
 executables: