rhc 1.16.9 → 1.17.6

data/features/core_feature.rb

@@ -45,7 +45,7 @@ describe "rhc core scenarios" do
 
   context "when creating an app" do
     when_running 'create-app', 'test1', a_web_cartridge
-    before{ no_applications(/^test1/) }
+    before{ no_applications }
     it "returns the proper info and is in the rest api" do
       status.should == 0
       output.should match "Your application 'test1' is now available"
@@ -146,4 +146,36 @@ describe "rhc core scenarios" do
       end
     end
   end
+
+  context "when adding a cartridge" do
+    context "with a scalable app" do
+      before(:all) do
+        standard_config
+        @app = has_a_scalable_application
+      end
+
+      after(:all) do
+        debug.puts "cleaning up scalable app" if debug?
+        @app.destroy
+      end
+
+      let(:app){ @app }
+
+      it "should add a cartridge with small gear size" do
+        cartridge = a_random_cartridge(['embedded', 'service', 'database'])
+        r = rhc 'add-cartridge', cartridge, '-a', app.name, '--gear-size', 'small'
+        r.stdout.should match /#{cartridge}/
+        r.stdout.should match /Gears:\s+1 small/
+        r.status.should == 0
+      end
+
+      it "should fail for a cartridge with not allowed gear size" do
+        cartridge = a_random_cartridge(['embedded', 'service', 'database'])
+        r = rhc 'add-cartridge', cartridge, '-a', app.name, '--gear-size', 'medium'
+        r.stdout.should match "The gear size 'medium' is not valid for this domain. Allowed sizes: small."
+        r.status.should_not == 0
+      end
+    end
+
+  end
 end

data/features/domains_feature.rb

@@ -34,12 +34,21 @@ describe "rhc domain scenarios" do
 
     it "should reject invalid gear size configuration changes" do
       all_sizes = client.user.capabilities.gear_sizes
+      valid_sizes = client.api.links['ADD_DOMAIN']['optional_params'].inject([]) {|sizes, p| sizes += p['valid_options'] if p['name'] == 'allowed_gear_sizes' } rescue []
+      disallowed_sizes = valid_sizes - all_sizes
 
       r = rhc 'configure-domain', domain.name, '--allowed-gear-sizes', '_not_a_size_'
       r.status.should_not == 1
       r.stdout.should match "Updating domain configuration.*The following gear sizes are invalid: _not_a_size_"
       client.reset.find_domain(domain.name).allowed_gear_sizes.should == all_sizes
 
+      if disallowed_sizes.first
+        r = rhc 'configure-domain', domain.name, '--allowed-gear-sizes', disallowed_sizes.first
+        r.status.should_not == 1
+        r.stdout.should match "Updating domain configuration.*The following gear sizes are not available.*: #{disallowed_sizes.first}"
+        client.reset.find_domain(domain.name).allowed_gear_sizes.should == all_sizes
+      end
+
       r = rhc 'configure-domain', domain.name, '--allowed-gear-sizes'
       r.status.should_not == 1
       r.stdout.should match "invalid option: Provide a comma delimited .* --allowed-gear-sizes"

data/lib/rhc/cartridge_helpers.rb

@@ -51,7 +51,7 @@ module RHC
         ].compact.any?{ |s| s.present? && s.downcase.gsub(/[_\-\s]/,' ').include?(search) } || 
         search.length > 2 && [
           cart.description
-        ].compact.any?{ |s| s.present? && !s.downcase.match(/\b#{search}\b/).nil? }
+        ].compact.any?{ |s| s.present? && !s.downcase.match(/\b#{Regexp.escape(search)}\b/).nil? }
       end
 
       def web_carts_only

data/lib/rhc/commands/cartridge.rb

@@ -72,6 +72,7 @@ module RHC::Commands
     syntax "<cartridge_type> [--namespace NAME] [--app NAME]"
     takes_application
     option ["-e", "--env VARIABLE=VALUE"], "Environment variable(s) to be set on this cartridge, or path to a file containing environment variables", :type => :list
+    option ["-g", "--gear-size SIZE"], "Gear size controls how much memory and CPU your cartridge can use"
     argument :cart_type, "The type of the cartridge you are adding (run 'rhc cartridge list' to obtain a list of available cartridges)", ["-c", "--cartridge cart_type"]
     alias_action :"app cartridge add", :root_command => true, :deprecated => true
     def add(cart_type)
@@ -84,7 +85,10 @@ module RHC::Commands
       rest_app = find_app(:include => :cartridges)
 
       supports_env_vars = rest_app.supports_add_cartridge_with_env_vars?
+      supports_gear_size = rest_app.supports_add_cartridge_with_gear_size?
+
       cart.environment_variables = collect_env_vars(options.env).map { |item| item.to_hash } if options.env && supports_env_vars
+      cart.gear_size = options.gear_size if options.gear_size && supports_gear_size
 
       rest_cartridge = rest_app.add_cartridge(cart)
 
@@ -95,6 +99,7 @@ module RHC::Commands
       paragraph{ display_cart(rest_cartridge) }
       paragraph{ say "Use 'rhc env --help' to manage environment variable(s) on this cartridge and application." } if cart.environment_variables.present?
       paragraph{ warn "Server does not support environment variables." if options.env && !supports_env_vars  }
+      paragraph{ warn "Server does not support gear sizes for cartridges." if options.gear_size && !supports_gear_size  }
       paragraph{ rest_cartridge.messages.each { |msg| success msg } }
 
       0
@@ -194,7 +199,7 @@ module RHC::Commands
       cartridges such as databases may require specific increments of scaling (1, 3, 5) in order to
       properly function.  Please consult the cartridge documentation for more on specifics of scaling.
 
-      Set both values the same to guarantee a scale value.  You may pecify both values with the argument
+      Set both values the same to guarantee a scale value.  You may specify both values with the argument
       'multiplier' or use '--min' and '--max' independently.
 
       Scaling may take several minutes or more if the server must provision multiple gears. Your operation

data/lib/rhc/commands/domain.rb

@@ -37,7 +37,8 @@ module RHC::Commands
       '--allowed-gear-sizes' option.  If '--no-allowed-gear-sizes' is set, no applications
       can be created in the domain.  Older servers may not support this option.
       DESC
-    option ['--[no-]allowed-gear-sizes [SIZES]'], 'A comma-delimited list of the gear sizes that will be allowed in this domain.', :optional => true
+    option ['--no-allowed-gear-sizes'], 'Do not allow any gear sizes in this domain.', :optional => true
+    option ['--allowed-gear-sizes [SIZES]'], 'A comma-delimited list of the gear sizes that will be allowed in this domain.', :optional => true
     argument :namespace, "New domain name (letters and numbers, max 16 chars)", ["-n", "--namespace NAME"]
     def create(namespace)
       say "Creating domain '#{namespace}' ... "
@@ -68,12 +69,13 @@ module RHC::Commands
 
     summary "Change one or more configuration settings on the domain"
     syntax "<namespace>"
-    option ['--[no-]allowed-gear-sizes [SIZES]'], 'A comma-delimited list of the gear sizes that will be allowed in this domain.', :optional => true
+    option ['--no-allowed-gear-sizes'], 'Do not allow any gear sizes in this domain.', :optional => true
+    option ['--allowed-gear-sizes [SIZES]'], "A comma-delimited list of gear sizes allowed in this domain. To see available sizes, run 'rhc account'.", :optional => true
     takes_domain :argument => true
     def configure(_)
       domain = find_domain
       payload = {}
-      payload[:allowed_gear_sizes] = check_allowed_gear_sizes unless options.allowed_gear_sizes.nil?
+      payload[:allowed_gear_sizes] = check_allowed_gear_sizes unless options.allowed_gear_sizes.nil? and options.no_allowed_gear_sizes.nil?
 
       if payload.present?
         say "Updating domain configuration ... "
@@ -128,11 +130,12 @@ module RHC::Commands
     summary "Delete a domain"
     syntax "<namespace>"
     takes_domain :argument => true
+    option ["-f", "--force"], "Force the action"
     def delete(_)
       domain = find_domain
 
       say "Deleting domain '#{domain.name}' ... "
-      domain.destroy
+      domain.destroy(options.force.present?)
       success "deleted"
 
       0
@@ -153,7 +156,8 @@ module RHC::Commands
 
     protected
       def check_allowed_gear_sizes
-        sizes = options.allowed_gear_sizes
+        raise OptionParser::InvalidOption, "--allowed-gear-sizes and --no-allowed-gear-sizes cannot both be specified" unless options.allowed_gear_sizes.nil? or options.no_allowed_gear_sizes.nil?
+        sizes = options.no_allowed_gear_sizes.nil? ? options.allowed_gear_sizes : false
         raise OptionParser::InvalidOption, "The server does not support --allowed-gear-sizes" unless sizes.nil? || rest_client.api.has_param?(:add_domain, 'allowed_gear_sizes')
         if sizes.is_a? String
           sizes.split(',').map(&:strip).map(&:presence)

data/lib/rhc/commands/server.rb

@@ -2,7 +2,7 @@ module RHC::Commands
   class Server < Base
     suppress_wizard
 
-    summary "Display information about the status of the OpenShift service."
+    summary "Display information about the status of the OpenShift service"
     description <<-DESC
       Retrieves any open issues or notices about the operation of the
       OpenShift service and displays them in the order they were opened.

data/lib/rhc/deployment_helpers.rb

@@ -10,11 +10,34 @@ module RHC
     protected
 
       def deploy_artifact(rest_app, artifact, hot_deploy, force_clean_build)
-        File.file?(artifact) ?
-          deploy_local_file(rest_app, artifact, hot_deploy, force_clean_build) :
-        artifact =~ /^#{URI::regexp}$/ ?
-          deploy_file_from_url(rest_app, artifact, hot_deploy, force_clean_build) :
-        deploy_git_ref(rest_app, artifact, hot_deploy, force_clean_build)
+        is_file = File.file?(artifact)
+        is_url = URI::ABS_URI.match(artifact).present?
+
+        if rest_app.deployment_type == 'binary'
+          if is_file
+            deploy_local_file(rest_app, artifact, hot_deploy, force_clean_build)
+          elsif is_url
+            deploy_file_from_url(rest_app, artifact, hot_deploy, force_clean_build)
+          else
+            paragraph do
+              warn "The application '#{rest_app.name}' is configured for binary deployments but the artifact "\
+                "provided ('#{artifact}') is not a binary file. Please provide the path to a deployable file on "\
+                "your local filesystem or a url, or configure your app to deploy from a git reference with 'rhc "\
+                "configure-app #{rest_app.name} --deployment-type git'."
+            end
+            raise IncompatibleDeploymentTypeException
+          end
+        elsif is_file || is_url
+          paragraph do
+            warn "The application '#{rest_app.name}' is configured for git "\
+              "reference deployments but the artifact provided ('#{artifact}') is #{is_file ? 'a file' : 'a url'}. Please "\
+              "provide a git reference to deploy (branch, tag or commit SHA1) or configure your app to deploy from binaries "\
+              "with 'rhc configure-app #{rest_app.name} --deployment-type binary'."
+          end
+          raise IncompatibleDeploymentTypeException
+        else
+          deploy_git_ref(rest_app, artifact, hot_deploy, force_clean_build)
+        end
       end
 
       def deploy_git_ref(rest_app, ref, hot_deploy, force_clean_build)

data/lib/rhc/exceptions.rb

@@ -132,6 +132,12 @@ module RHC
     end
   end
 
+  class IncompatibleDeploymentTypeException < Exception
+    def initialize(message="The artifact provided is not compatible with the app deployment type.")
+      super message, 133
+    end
+  end
+
   class MissingScalingValueException < Exception
     def initialize(message="Must provide either a min or max value for scaling")
       super message

data/lib/rhc/rest/application.rb

@@ -45,6 +45,9 @@ module RHC
             if cart.respond_to?(:environment_variables) && cart.environment_variables.present?
               c[:environment_variables] = cart.environment_variables
             end
+            if cart.respond_to?(:gear_size) && cart.gear_size.present?
+              c[:gear_size] = cart.gear_size
+            end
             cart = c
           end
 
@@ -178,6 +181,10 @@ module RHC
         has_param?('ADD_CARTRIDGE', 'environment_variables')
       end
 
+      def supports_add_cartridge_with_gear_size?
+        has_param?('ADD_CARTRIDGE', 'gear_size')
+      end
+
       def deployments
         debug "Listing deployments for application #{name}"
         raise RHC::DeploymentsNotSupportedException if !supports? "LIST_DEPLOYMENTS"

data/lib/rhc/rest/cartridge.rb

@@ -5,7 +5,7 @@ module RHC
 
       define_attr :type, :name, :display_name, :properties, :gear_profile, :status_messages, :scales_to, :scales_from, :scales_with,
                   :current_scale, :supported_scales_to, :supported_scales_from, :tags, :description, :collocated_with, :base_gear_storage,
-                  :additional_gear_storage, :url, :environment_variables
+                  :additional_gear_storage, :url, :environment_variables, :gear_size
 
       def scalable?
         supported_scales_to != supported_scales_from

data/lib/rhc/rest/mock.rb

@@ -667,8 +667,8 @@ module RHC::Rest::Mock
       self
     end
 
-    def destroy
-      raise RHC::Rest::ClientErrorException.new("Applications must be empty.") unless @applications.empty?
+    def destroy(force=false)
+      raise RHC::Rest::ClientErrorException.new("Applications must be empty.") unless @applications.empty? or force.present?
       client.domains.delete_if { |d| d.name == @name }
 
       @applications = nil
@@ -929,9 +929,10 @@ module RHC::Rest::Mock
 
     attr_accessor :usage_rate
 
-    def initialize(client, name, type, app=nil, tags=[], properties=[{'type' => 'cart_data', 'name' => 'connection_url', 'value' => "http://fake.url" }])
+    def initialize(client, name, type, app=nil, tags=[], properties=[{'type' => 'cart_data', 'name' => 'connection_url', 'value' => "http://fake.url" }], description=nil)
       super({}, client)
       @name = name
+      @description = description || "Description of #{name}"
       @type = type
       @app = app
       @tags = tags

data/spec/direct_execution_helper.rb

@@ -36,6 +36,11 @@ module RhcExecutionHelper
     end
   end
 
+  def a_random_cartridge(with_tags=nil, for_user=nil)
+    c = for_user ? for_user.client : client
+    c.cartridges.select{|cartridge| with_tags.nil? || (with_tags - cartridge.tags).empty?}.shuffle.first.name
+  end
+
   def rhc(*args)
     opts = args.pop if args.last.is_a? Hash
     opts ||= {}
@@ -139,13 +144,24 @@ module RhcExecutionHelper
     c = for_user ? for_user.client : client
     debug.puts "Creating or reusing an app" if debug?
     apps = c.applications
-    apps.first or begin
+    apps.find{|app| !app.scalable?} or begin
       domain = has_a_domain(for_user)
       debug.puts "  creating a new application" if debug?
       c.domains.first.add_application("test#{random}", :cartridges => [a_web_cartridge])
     end
   end
 
+  def has_a_scalable_application(for_user=nil)
+    c = for_user ? for_user.client : client
+    debug.puts "Creating or reusing a scalable app" if debug?
+    apps = c.applications
+    apps.find(&:scalable?) or begin
+      domain = has_a_domain(for_user)
+      debug.puts "  creating a new scalable application" if debug?
+      c.domains.first.add_application("scalable#{random}", :cartridges => [a_web_cartridge], :scale => true)
+    end
+  end
+
   def has_a_domain(for_user=nil)
     c = for_user ? for_user.client : client
     debug.puts "Creating or reusing a domain" if debug?

data/spec/rhc/commands/cartridge_spec.rb

@@ -92,6 +92,38 @@ describe RHC::Commands::Cartridge do
     end
   end
 
+  describe 'cartridge add' do
+    let!(:rest_client){ MockRestClient.new }
+    let(:arguments) { ['cartridge', 'add', 'mock_cart-1', '--app', 'app1', '--gear-size', 'small'] }
+
+    context 'with gear size' do
+      before do
+        domain = rest_client.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type", true)
+      end
+      it { succeed_with_message /Adding mock_cart-1 to application 'app1' \.\.\. / }
+      it { succeed_with_message /Connection URL:\s+http\:\/\/fake\.url/ }
+      it { succeed_with_message /Prop1:\s+value1/ }
+      it { succeed_with_message /Cartridge added with properties/ }
+      it "should not contain env var info" do
+        run_output.should_not match(/Environment Variables/)
+      end
+      it { succeed_with_message /Gears:\s+1 small/ }
+    end
+
+    context 'with gear size on unsupported server' do
+      let(:arguments) { ['cartridge', 'add', 'mock_cart-1', '--app', 'app1', '--gear-size', 'small']  }
+      before do
+        domain = rest_client.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type", true)
+        @app.stub(:has_param?).with('ADD_CARTRIDGE','environment_variables').and_return(true)
+        @app.stub(:has_param?).with('ADD_CARTRIDGE','gear_size').and_return(false)
+      end
+      it { expect { run }.to exit_with_code(0) }
+      it { run_output.should match(/Server does not support gear sizes for cartridges/) }
+    end
+  end
+
   describe 'cartridge add' do
     let!(:rest_client){ MockRestClient.new }
     let(:instance) do
@@ -152,6 +184,15 @@ describe RHC::Commands::Cartridge do
       }
     end
 
+    context 'when cartridge with regex breaking name does not exist' do
+      let(:arguments) { ['cartridge', 'add', '*##', '--app', 'app1'] }
+      before do
+        domain = rest_client.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+      end
+      it{ fail_with_code 154 }
+    end
+
     context 'when cartridge does not exist' do
       let(:arguments) { ['cartridge', 'add', 'nomatch_cart', '--app', 'app1'] }
       before do
@@ -595,7 +636,10 @@ describe RHC::Commands::Cartridge do
     ].each_with_index do |args, i|
       context "when run against a server without env vars support #{i}" do
         let(:arguments) { args }
-        before{ @app.should_receive(:has_param?).with('ADD_CARTRIDGE','environment_variables').and_return(false) }
+        before do
+          @app.stub(:has_param?).with('ADD_CARTRIDGE','environment_variables').and_return(false)
+          @app.stub(:has_param?).with('ADD_CARTRIDGE','gear_size').and_return(true)
+        end
         it { expect { run }.to exit_with_code(0) }
         it { run_output.should match(/Server does not support environment variables/) }
         it { run_output.should_not match(/Environment Variables:\s+FOO=BAR/) }

data/spec/rhc/commands/deployment_spec.rb

@@ -58,6 +58,7 @@ describe RHC::Commands::Deployment do
 
     context "binary file successfully" do
       before do
+        @rest_app.stub(:deployment_type).and_return('binary')
         ssh = double(Net::SSH)
         session = double(Net::SSH::Connection::Session)
         channel = double(Net::SSH::Connection::Channel)
@@ -92,6 +93,7 @@ describe RHC::Commands::Deployment do
      URI('https://foo.com/path/to/file/' + DEPLOYMENT_APP_NAME + '.tar.gz')].each do |uri|
       context "url file successfully" do
         before do
+        @rest_app.stub(:deployment_type).and_return('binary')
           ssh = double(Net::SSH)
           session = double(Net::SSH::Connection::Session)
           channel = double(Net::SSH::Connection::Channel)
@@ -126,6 +128,7 @@ describe RHC::Commands::Deployment do
 
     context "binary file with corrupted file" do
       before do
+        @rest_app.stub(:deployment_type).and_return('binary')
         ssh = double(Net::SSH)
         session = double(Net::SSH::Connection::Session)
         channel = double(Net::SSH::Connection::Channel)
@@ -165,7 +168,10 @@ describe RHC::Commands::Deployment do
     end
 
     context "fails when deploying binary file" do
-      before (:each) { Net::SSH.should_receive(:start).and_raise(Errno::ECONNREFUSED) }
+      before (:each) do
+        @rest_app.stub(:deployment_type).and_return('binary')
+        Net::SSH.should_receive(:start).and_raise(Errno::ECONNREFUSED)
+      end
       let(:arguments) {['app', 'deploy', @targz_filename, '--app', DEPLOYMENT_APP_NAME]}
       it "should exit with error" do
         expect{ run }.to exit_with_code(1)
@@ -173,7 +179,10 @@ describe RHC::Commands::Deployment do
     end
 
     context "fails when deploying binary file" do
-      before (:each) { Net::SSH.should_receive(:start).and_raise(SocketError) }
+      before (:each) do
+        @rest_app.stub(:deployment_type).and_return('binary')
+        Net::SSH.should_receive(:start).and_raise(SocketError)
+      end
       let(:arguments) {['app', 'deploy', @targz_filename, '--app', DEPLOYMENT_APP_NAME]}
       it "should exit with error" do
         expect{ run }.to exit_with_code(1)
@@ -181,7 +190,10 @@ describe RHC::Commands::Deployment do
     end
 
     context "fails when deploying url file" do
-      before (:each) { Net::SSH.should_receive(:start).and_raise(Errno::ECONNREFUSED) }
+      before (:each) do
+        @rest_app.stub(:deployment_type).and_return('binary')
+        Net::SSH.should_receive(:start).and_raise(Errno::ECONNREFUSED)
+      end
       let(:arguments) {['app', 'deploy', 'http://foo.com/deploy.tar.gz', '--app', DEPLOYMENT_APP_NAME]}
       it "should exit with error" do
         expect{ run }.to exit_with_code(1)
@@ -189,7 +201,10 @@ describe RHC::Commands::Deployment do
     end
 
     context "fails when deploying url file" do
-      before (:each) { Net::SSH.should_receive(:start).and_raise(SocketError) }
+      before (:each) do
+        @rest_app.stub(:deployment_type).and_return('binary')
+        Net::SSH.should_receive(:start).and_raise(SocketError)
+      end
       let(:arguments) {['app', 'deploy', 'http://foo.com/deploy.tar.gz', '--app', DEPLOYMENT_APP_NAME]}
       it "should exit with error" do
         expect{ run }.to exit_with_code(1)
@@ -217,6 +232,32 @@ describe RHC::Commands::Deployment do
       end
     end
 
+    context "fails when deploying git reference on an app configured to deployment_type = binary" do
+      before { @rest_app.stub(:deployment_type).and_return('binary') }
+      let(:arguments) {['app', 'deploy', 'master', '--app', DEPLOYMENT_APP_NAME]}
+      it "should exit with error" do
+        expect{ run }.to exit_with_code(133)
+      end
+    end
+
+    context "fails when deploying file on an app configured to deployment_type = git" do
+      before { @rest_app.stub(:deployment_type).and_return('git') }
+      let(:arguments) {['app', 'deploy', @targz_filename, '--app', DEPLOYMENT_APP_NAME]}
+      it "should exit with error" do
+        expect{ run }.to exit_with_code(133)
+      end
+    end
+
+    [URI('http://foo.com/path/to/file/' + DEPLOYMENT_APP_NAME + '.tar.gz'),
+     URI('https://foo.com/path/to/file/' + DEPLOYMENT_APP_NAME + '.tar.gz')].each do |uri|
+      context "fails when deploying url on an app configured to deployment_type = git" do
+        before { @rest_app.stub(:deployment_type).and_return('git') }
+        let(:arguments) {['app', 'deploy', uri.to_s, '--app', DEPLOYMENT_APP_NAME]}
+        it "should exit with error" do
+          expect{ run }.to exit_with_code(133)
+        end
+      end
+    end
   end
 
   describe "activate deployment" do

data/spec/rhc/commands/domain_spec.rb

@@ -321,6 +321,11 @@ describe RHC::Commands::Domain do
         it("should succeed"){ expect { run }.to exit_with_code(0) }
         it("should display the domain config"){ run_output.should match(/Domain domain1 configuration.*Allowed Gear Sizes:\s+<none>/m) }
       end
+
+      context "with --allowed-gear-sizes and --no-allowed-gear-sizes" do
+        let(:arguments) { ['domain', 'configure', 'domain1', '--trace', '--no-allowed-gear-sizes', '--allowed-gear-sizes', 'small'] }
+        it("raise an invalid option"){ expect{ run }.to raise_error(OptionParser::InvalidOption, /--allowed-gear-sizes.*--no-allowed-gear-sizes/) }
+      end
     end
   end
 
@@ -368,6 +373,19 @@ describe RHC::Commands::Domain do
       end
       it { run_output.should match("Applications must be empty") }
     end
+
+    context 'when delete is forced' do
+      let(:arguments) { ['domain', 'delete', 'deleteme', '--force'] }
+      before do
+        domain = rest_client.add_domain("deleteme")
+        domain.add_application 'testapp1', 'mock-1.0'
+      end
+      it "should delete successfully" do
+        expect { run }.to exit_with_code(0)
+        rest_client.domains.empty?.should be_true
+      end
+    end
+    
   end
 
   describe 'help' do

metadata

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