rhc 1.35.4 → 1.36.4

data/lib/rhc/commands/app.rb

@@ -101,6 +101,12 @@ module RHC::Commands
       end.join(', ')
 
       env = collect_env_vars(arg_envs.concat(Array(options.env)))
+      if options.env && env.empty?
+        raise RHC::EnvironmentVariableNotProvidedException.new(
+        "Environment variable(s) not provided.\n" +
+        "Please provide at least one environment variable using the syntax VARIABLE=VALUE. VARIABLE can only contain letters, digits and underscore ('_') and can't begin with a digit.")
+      end
+
       if env.present? && !rest_domain.supports_add_application_with_env_vars?
         env = []
         warn "Server does not support environment variables."
@@ -179,7 +185,7 @@ module RHC::Commands
               warn "not complete"
               add_issue("Jenkins failed to install - #{e}",
                         "Installing jenkins and jenkins-client",
-                        "rhc create-app jenkins",
+                        "rhc create-app jenkins jenkins-1",
                         "rhc add-cartridge jenkins-client -a #{rest_app.name}")
             end
           end
@@ -432,10 +438,16 @@ module RHC::Commands
         domain, app = discover_domain_and_app
         gear_info = rest_client.find_application_gear_groups_endpoints(domain, app).map do |group|
           group.gears.map do |gear|
+            color_cart = if gear['endpoints'].present?
+              e = gear['endpoints'].collect{ |c| c['cartridge_name'] }.uniq
+              lambda { |c| e.include?(c) ? color(c, :green) : c }
+            else
+              lambda { |c| c }
+            end
             [
               gear['id'],
               gear['state'] == 'started' ? color(gear['state'], :green) : color(gear['state'], :yellow),
-              (gear['endpoints'].blank? ? group.cartridges : gear['endpoints']).collect{ |c| c['cartridge_name'] || c['name'] }.join(' '),
+              group.cartridges.collect{ |c| color_cart.call(c['name']) }.join(' '),
               group.gear_profile,              
               gear['region'],
               gear['zone'],

data/lib/rhc/commands/port_forward.rb

@@ -71,6 +71,7 @@ module RHC::Commands
     syntax "<application>"
     takes_application :argument => true
     option ["-g", "--gear ID"], "Gear ID you are port forwarding to (optional)"
+    option ["-s", "--service [SERVICE,]"], "A CSV list of services to port forward (optional)"
     def run(app)
       rest_app = find_app
       ssh_uri = URI.parse(options.gear ? rest_app.gear_ssh_url(options.gear) : rest_app.ssh_url)
@@ -95,7 +96,7 @@ module RHC::Commands
                 raise RHC::PermissionDeniedException.new "Permission denied." if line =~ /permission denied/i
                 # ...and also which services are available for the application
                 # for us to forward ports for.
-                if line =~ /\A\s*(\S+) -> #{HOST_AND_PORT}\z/
+                if line =~ /\A\s*(\S+) -> #{HOST_AND_PORT}\z/ and (options.service.nil? or options.service.empty? or options.service.split(',').include? $1)
                   debug fs = ForwardingSpec.new($1, $2, $3.to_i)
                   forwarding_specs << fs
                 else

data/lib/rhc/rest/client.rb

@@ -436,7 +436,7 @@ module RHC
               handle_error!(e.res, args[1], client)
             end
             raise ConnectionException.new(
-              "An unexpected error occured when connecting to the server: #{e.message}")
+              "An unexpected error occurred when connecting to the server: #{e.message}")
           rescue HTTPClient::TimeoutError => e
             raise TimeoutException.new(
               "Connection to server timed out. "\
@@ -493,7 +493,7 @@ module RHC
             raise
           rescue => e
             debug_error(e)
-            raise ConnectionException, "An unexpected error occured: #{e.message}", e.backtrace
+            raise ConnectionException, "An unexpected error occurred: #{e.message}", e.backtrace
           end
         end
       end

data/spec/rhc/commands/app_spec.rb

@@ -775,27 +775,43 @@ describe RHC::Commands::App do
   end
 
   describe 'app show --gears' do
-    let(:arguments) { ['app', 'show', 'app1', '--gears', '--raw'] }
+    context do
+      let(:arguments) { ['app', 'show', 'app1', '--gears', '--raw'] }
 
-    context 'when run' do
-      before do
-        @domain = rest_client.add_domain("mockdomain")
-        @domain.add_application("app1", "mock_type")
+      context 'when run' do
+        before do
+          @domain = rest_client.add_domain("mockdomain")
+          @domain.add_application("app1", "mock_type")
+        end
+        it { run_output.should match(/ID\s+State\s+Cartridges\s+Size\s+SSH URL/) }
+        it { run_output.should match("fakegearid0 started mock_type  small fakegearid0@fakesshurl.com") }
+        it { expect{ run }.to exit_with_code(0) }
+      end
+
+      context 'with regions and zones' do
+        before do
+          @domain = rest_client.add_domain("mockdomain")
+          @app = @domain.add_application("app1", "mock_type")
+          @app.gears.each{|g| g['region'] = 'south'; g['zone'] = 'west'}
+        end
+        it { run_output.should match(/ID\s+State\s+Cartridges\s+Size\s+Region\s+Zone\s+SSH URL/) }
+        it { run_output.should match(/fakegearid0\s+started\s+mock_type\s+small\s+south\s+west\s+fakegearid0@fakesshurl.com/) }
+        it { expect{ run }.to exit_with_code(0) }
       end
-      it { run_output.should match(/ID\s+State\s+Cartridges\s+Size\s+SSH URL/) }
-      it { run_output.should match("fakegearid0 started mock_type  small fakegearid0@fakesshurl.com") }
-      it { expect{ run }.to exit_with_code(0) }
     end
 
-    context 'with regions and zones' do
-      before do
-        @domain = rest_client.add_domain("mockdomain")
-        @app = @domain.add_application("app1", "mock_type")
-        @app.gears.each{|g| g['region'] = 'south'; g['zone'] = 'west'}
+    context do
+      let(:arguments) { ['app', 'show', 'app1', '--gears'] }
+
+      context 'with cartridge that exposes an endpoint' do
+        before do
+          @domain = rest_client.add_domain("mockdomain")
+          # An application has to be scalable to expose an endpoint.
+          @app = @domain.add_application("app1", "mock_type", true)
+          @app.gears.first['endpoints'] = [{ 'cartridge_name' => 'mock_cart-1' }]
+        end
+        it { (run_output.match(/fakegearid0\s+([^\s]+)\s+small\s+fakegearid0@fakesshurl\.com/)[1]).should be_colorized("started", :green) }
       end
-      it { run_output.should match(/ID\s+State\s+Cartridges\s+Size\s+Region\s+Zone\s+SSH URL/) }
-      it { run_output.should match(/fakegearid0\s+started\s+mock_type\s+small\s+south\s+west\s+fakegearid0@fakesshurl.com/) }
-      it { expect{ run }.to exit_with_code(0) }
     end
   end
 
@@ -974,5 +990,16 @@ describe RHC::Commands::App do
       end
     end
 
+    [['app', 'create', 'app1', 'mock_standalone_cart-1', '-e', 'FOOBAR'],
+     ['app', 'create', 'app1', 'mock_standalone_cart-1', '--env', 'FOOBAR'],
+     ['app', 'create', 'app1', 'mock_standalone_cart-1', '-eFOOBAR']
+    ].each_with_index do |args, i|
+      context "when run with syntactically incorrect env vars #{i}" do
+        let(:arguments) { args }
+        it { expect { run }.to exit_with_code(159) }
+        it { run_output.should match(/Environment variable\(s\) not provided.\nPlease provide at least one environment variable using the syntax VARIABLE=VALUE\. VARIABLE can only contain letters, digits and underscore \('_'\) and can't begin with a digit\./) }
+      end
+    end
+
   end
 end

data/spec/rhc/helpers_spec.rb

@@ -60,7 +60,7 @@ describe AllRhcHelpers do
     it("should be colorized") do
       message = "this is #{_color} -"
       output = capture{ subject.send(method,message) }
-      output.should be_colorized(message,_color)
+      output.chomp.should be_colorized(message,_color)
     end
     it("should return true"){ subject.send(method,'anything').should be_true }
   end

data/spec/rhc/rest_client_spec.rb

@@ -71,7 +71,7 @@ module RHC
         context "against an endpoint that has a generic error" do
           let(:endpoint){ mock_href('other_error') }
           it "raises a generic error for any other error condition" do
-            expect{ client.api }.to raise_error(RHC::Rest::ConnectionException, "An unexpected error occured: Other Error")
+            expect{ client.api }.to raise_error(RHC::Rest::ConnectionException, "An unexpected error occurred: Other Error")
           end
         end
       end

data/spec/rhc/rest_spec.rb

@@ -368,7 +368,7 @@ module RHC
           stub_request(:get, mock_href).to_return(return_data)
         end
         it "throws an error" do
-          response.should raise_error(RHC::Rest::ConnectionException, 'An unexpected error occured: unexpected nil')
+          response.should raise_error(RHC::Rest::ConnectionException, 'An unexpected error occurred: unexpected nil')
         end
       end
 
@@ -496,7 +496,7 @@ module RHC
 
       context "with a generic exception error" do
         before{ stub_request(:get, mock_href).to_raise(Exception.new('Generic Error')) }
-        it{ response.should raise_error(RHC::Rest::ConnectionException, "An unexpected error occured: Generic Error") }
+        it{ response.should raise_error(RHC::Rest::ConnectionException, "An unexpected error occurred: Generic Error") }
       end
 
       context "with an unauthorized request" do

data/spec/spec_helper.rb

@@ -567,8 +567,7 @@ module ColorMatchers
       [
         ansi_code(color),
         msg,
-        ansi_code(:clear),
-        "\n"
+        ansi_code(:clear)
       ].join('')
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 147
+  hash: 143
   prerelease: 
   segments: 
   - 1
-  - 35
+  - 36
   - 4
-  version: 1.35.4
+  version: 1.36.4
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-06-10 00:00:00 Z
+date: 2015-07-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh