rhc 1.13.6 → 1.14.7

data/lib/rhc/commands/domain.rb

@@ -5,10 +5,10 @@ module RHC::Commands
     summary "Add or rename the container for your apps"
     syntax "<action>"
     description <<-DESC
-      OpenShift groups applications within a domain.  Each domain has a namespace value
-      that will be used as part of the public URL for an application.
+      OpenShift groups applications within a domain.  The name of the domain
+      will be used as part of the public URL for an application. 
 
-      For example, when creating a domain with the namespace "test", any applications 
+      For example, when creating a domain with the name "test", any applications 
       created in that domain will have the public URL:
 
         http://<appname>-test.rhcloud.com
@@ -17,11 +17,11 @@ module RHC::Commands
       DESC
     default_action :list
 
-    summary "Define a namespace for your applications to share."
+    summary "Create a new application grouping."
     syntax "<namespace>"
-    argument :namespace, "Namespace for your application(s) (alphanumeric)", ["-n", "--namespace NAME"]
+    argument :namespace, "Name for your application(s) (alphanumeric)", ["-n", "--namespace NAME"]
     def create(namespace)
-      paragraph { say "Creating domain with namespace '#{namespace}'" }
+      paragraph { say "Creating domain '#{namespace}'" }
       rest_client.add_domain(namespace)
 
       results do
@@ -32,26 +32,26 @@ module RHC::Commands
       0
     end
 
-    summary "Change current namespace (will change application urls)"
-    syntax "<old namespace> <new namespace>"
-    argument :old_namespace, "Old namespace to change", []
-    argument :new_namespace, "New namespace to change", ["-n", "--namespace NAME"]
+    summary "Rename a domain (will change application urls)"
+    syntax "<old name> <new name>"
+    argument :old_namespace, "Existing domain name", []
+    argument :new_namespace, "New domain name", ["-n", "--namespace NAME"]
     alias_action :alter, :deprecated => true
     def update(old_namespace, new_namespace)
       domain = rest_client.find_domain(old_namespace)
 
-      say "Changing namespace '#{domain.id}' to '#{new_namespace}' ... "
+      say "Renaming domain '#{domain.id}' to '#{new_namespace}' ... "
 
       domain.update(new_namespace)
 
-      success "success"
-      info "Applications in this domain will use the new namespace in their URL."
+      success "done"
+      info "Applications in this domain will use the new name in their URL."
 
       0
     end
 
     summary "Display a domain and its applications"
-    argument :namespace, "Namespace of the domain", ["-n", "--namespace NAME"], :optional => true
+    argument :namespace, "Name of the domain", ["-n", "--namespace NAME"], :optional => true
     def show(namespace)
       domain = (rest_client.find_domain(namespace) if namespace) || rest_client.domains.first
 

data/lib/rhc/commands/snapshot.rb

@@ -78,7 +78,7 @@ module RHC::Commands
         rest_app = rest_client.find_application(options.namespace, app)
         ssh_uri = URI.parse(rest_app.ssh_url)
 
-        ssh_cmd = "cat #{filename} | ssh #{ssh_uri.user}@#{ssh_uri.host} 'restore#{include_git ? ' INCLUDE_GIT' : ''}'"
+        ssh_cmd = "cat '#{filename}' | ssh #{ssh_uri.user}@#{ssh_uri.host} 'restore#{include_git ? ' INCLUDE_GIT' : ''}'"
 
         say "Restoring from snapshot #{filename}..."
         debug ssh_cmd

data/lib/rhc/helpers.rb

@@ -26,9 +26,6 @@ module RHC
 
     extend self
 
-    MAX_RETRIES = 7
-    DEFAULT_DELAY_THROTTLE = 2.0
-
     def decode_json(s)
       RHC::Vendor::OkJson.decode(s)
     end
@@ -174,6 +171,11 @@ module RHC
       ssh_url
     end
 
+    def ssh_string_parts(ssh_url)
+      uri = URI.parse(ssh_url)
+      [uri.host, uri.user]
+    end
+
     def openshift_rest_endpoint
       uri = to_uri((options.server rescue nil) || ENV['LIBRA_SERVER'] || "openshift.redhat.com")
       uri.path = '/broker/rest/api' if uri.path.blank? || uri.path == '/'
@@ -426,12 +428,16 @@ module RHC
       [status, stdout, stderr]
     end
 
-    def collect_env_vars(item)
-      return nil if item.blank?
+    def env_var_regex_pattern
+      /^([a-zA-Z_][\w]*)=(.*)$/
+    end
+
+    def collect_env_vars(items)
+      return nil if items.blank?
 
       env_vars = []
 
-      [item].flatten.each do |item|
+      Array(items).each do |item|
         if match = item.match(env_var_regex_pattern)
           name, value = match.captures
           env_vars << RHC::Rest::EnvironmentVariable.new({ :name => name, :value => value })
@@ -447,9 +453,5 @@ module RHC
       env_vars
     end
 
-    def env_var_regex_pattern
-      /^([a-zA-Z_][\w]*)=(.*)$/
-    end
-
   end
 end

data/lib/rhc/rest/application.rb

@@ -167,6 +167,10 @@ module RHC
         end
       end
 
+      def supports_add_cartridge_with_env_vars?
+        has_param?('ADD_CARTRIDGE', 'environment_variables')
+      end
+
       def add_alias(app_alias)
         debug "Running add_alias for #{name}"
         rest_method "ADD_ALIAS", :event => "add-alias", :alias => app_alias

data/lib/rhc/rest/client.rb

@@ -9,8 +9,6 @@ require 'set'
 module RHC
   module Rest
 
-    MAX_RETRIES = 5
-
     #
     # These are methods that belong to the API object but are
     # callable from the client for convenience.
@@ -203,6 +201,7 @@ module RHC
       # matching one supported by the server.
       # See #api_version_negotiated
       CLIENT_API_VERSIONS = [1.1, 1.2, 1.3, 1.4, 1.5]
+      MAX_RETRIES = 5
 
       def initialize(*args)
         options = args[0].is_a?(Hash) && args[0] || {}
@@ -246,8 +245,15 @@ module RHC
         current_api_version
       end
 
+      def attempt(retries, &block)
+        (0..retries).each do |i|
+          yield i < (retries-1), i
+        end
+        raise "Too many retries, giving up."
+      end
+
       def request(options, &block)
-        (0..MAX_RETRIES).each do |i|
+        attempt(MAX_RETRIES) do |more, i|
           begin
             client, args = new_request(options.dup)
             auth = options[:auth] || self.auth
@@ -257,11 +263,11 @@ module RHC
             time = Benchmark.realtime{ response = client.request(*(args << true)) }
             debug "   code %s %4i ms" % [response.status, (time*1000).to_i] if response
 
-            next if retry_proxy(response, i, args, client)
-            auth.retry_auth?(response, self) and next if auth
+            next if more && retry_proxy(response, i, args, client)
+            auth.retry_auth?(response, self) and next if more && auth
             handle_error!(response, args[1], client) unless response.ok?
 
-            break (if block_given?
+            return (if block_given?
                 yield response
               else
                 parse_response(response.content) unless response.nil? or response.code == 204
@@ -270,8 +276,8 @@ module RHC
             if e.res
               debug "Response: #{e.res.status} #{e.res.headers.inspect}\n#{e.res.content}\n-------------" if debug?
 
-              next if retry_proxy(e.res, i, args, client)
-              auth.retry_auth?(e.res, self) and next if auth
+              next if more && retry_proxy(e.res, i, args, client)
+              auth.retry_auth?(e.res, self) and next if more && auth
               handle_error!(e.res, args[1], client)
             end
             raise ConnectionException.new(
@@ -504,7 +510,8 @@ module RHC
         def parse_messages(result, data)
           warnings, messages = Array(result['messages']).inject([[],[]]) do |a, m|
             severity, field, text = m.values_at('severity', 'field', 'text')
-            text = text.chomp
+            text.gsub!(/\A\n+/m, "")
+            text.rstrip!
             case severity
             when 'warning'
               a[0] << text

data/lib/rhc/rest/domain.rb

@@ -69,6 +69,10 @@ module RHC
         rest_method "DELETE", :force => force
       end
       alias :delete :destroy
+
+      def supports_add_application_with_env_vars?
+        has_param?('ADD_APPLICATION', 'environment_variables')
+      end
     end
   end
 end

data/lib/rhc/rest/httpclient.rb

@@ -1,3 +1,23 @@
+require 'httpclient'
+
+class HTTPClient
+  class SSPINegotiateAuth
+    def get_with_rescue(*args)
+      get_without_rescue(*args)
+    rescue
+      unless @warned
+        @warned = true
+        RHC::Helpers.warn "Could not enable Kerberos authentication"
+        RHC::Helpers.warn $!.message.sub('gss_init_sec_context did not return GSS_S_COMPLETE: Unspecified GSS failure.  Minor code may provide more information', '').strip rescue nil
+      end
+      nil
+    end
+
+    alias_method :get_without_rescue, :get if method_defined? :get
+    alias_method :get, :get_with_rescue
+  end
+end
+
 module RHC
   module Rest
     #

data/lib/rhc/rest/mock.rb

@@ -194,6 +194,7 @@ module RHC::Rest::Mock
               :domain_id => domain_name,
               :id => 1,
               :name => name,
+              :ssh_url => "ssh://12345@#{name}-#{domain_name}.rhcloud.com",
               :app_url => "http://#{name}-#{domain_name}.rhcloud.com",
               :links => mock_response_links([
               ]),
@@ -357,7 +358,7 @@ module RHC::Rest::Mock
     end
 
     def mock_app_links(domain_id='test_domain',app_id='test_app')
-      [['ADD_CARTRIDGE',                   "domains/#{domain_id}/apps/#{app_id}/carts/add",                      'post'],
+      [['ADD_CARTRIDGE',                   "domains/#{domain_id}/apps/#{app_id}/carts/add",                      'post', {'optional_params' => [{'name' => 'environment_variables'}]} ],
        ['LIST_CARTRIDGES',                 "broker/rest/domains/#{domain_id}/applications/#{app_id}/cartridges", 'get' ],
        ['GET_GEAR_GROUPS',                 "domains/#{domain_id}/apps/#{app_id}/gear_groups",                    'get' ],
        ['START',                           "domains/#{domain_id}/apps/#{app_id}/start",                          'post'],
@@ -403,7 +404,7 @@ module RHC::Rest::Mock
     end
 
     def mock_domain_links(domain_id='test_domain')
-      [['ADD_APPLICATION',   "domains/#{domain_id}/apps/add", 'post'],
+      [['ADD_APPLICATION',   "domains/#{domain_id}/apps/add", 'post', {'optional_params' => [{'name' => 'environment_variables'}]} ],
        ['LIST_APPLICATIONS', "domains/#{domain_id}/apps/",    'get' ],
        ['UPDATE',            "domains/#{domain_id}/update",   'post'],
        ['DELETE',            "domains/#{domain_id}/delete",   'post']]

data/lib/rhc/tar_gz.rb

@@ -30,7 +30,7 @@ module RHC
       else
         # combining STDOUT and STDERR (i.e., 2>&1) does not suppress output
         # when the specs run via 'bundle exec rake spec'
-        system "#{TAR_BIN} --wildcards -tf #{filename} #{regex.source} 2>/dev/null >/dev/null"
+        system "#{TAR_BIN} --wildcards -tf '#{filename}' '#{regex.source}' 2>/dev/null >/dev/null"
       end
     end
 

data/lib/rhc/wizard.rb

@@ -273,7 +273,7 @@ module RHC
           key_fingerprint = fingerprint_for_default_key
           unless key_fingerprint
             paragraph do
-              warn "Your ssh public key at #{system_path(RHC::Config.ssh_pub_key_file_path)} is invalid or unreadable. "\
+              warn "Your public SSH key at #{system_path(RHC::Config.ssh_pub_key_file_path)} is invalid or unreadable. "\
                   "Setup can not continue until you manually remove or fix your "\
                   "public and private keys id_rsa keys."
             end
@@ -288,7 +288,7 @@ module RHC
         end
       else
         paragraph do
-          info "You can upload your SSH key at a later time using the 'rhc sshkey' command"
+          info "You can upload your public SSH key at a later time using the 'rhc sshkey' command"
         end
       end
 
@@ -376,16 +376,16 @@ module RHC
 
     def config_namespace_stage
       paragraph do
-        say "Checking your namespace ... "
+        say "Checking for a domain ... "
         domains = rest_client.domains
         if domains.length == 0
           warn "none"
 
           paragraph do
             say [
-              "Your namespace is unique to your account and is the suffix of the public URLs we assign to your applications.",
-              ("You may configure your namespace here or leave it blank and use 'rhc create-domain' to create a namespace later." if namespace_optional?),
-              "You will not be able to create applications without first creating a namespace.",
+              "Applications are grouped into domains - each domain has a unique name (called a namespace) that becomes part of your public application URL.",
+              ("You may create your first domain here or leave it blank and use 'rhc create-domain' later." if namespace_optional?),
+              "You will not be able to create an application without completing this step.",
             ].compact.join(' ')
           end
 
@@ -485,7 +485,8 @@ module RHC
 
       applications.take(1).each do |app|
         begin
-          ssh = Net::SSH.start(app.host, app.uuid, :timeout => 60)
+          host, user = RHC::Helpers.ssh_string_parts(app.ssh_url)
+          ssh = Net::SSH.start(host, user, :timeout => 60)
         rescue Interrupt => e
           debug_error(e)
           raise "Connection attempt to #{app.host} was interrupted"
@@ -513,7 +514,7 @@ module RHC
     def config_namespace(namespace)
       # skip if string is empty
       if namespace_optional? and (namespace.nil? or namespace.chomp.blank?)
-        paragraph{ info "You may create a namespace later through 'rhc create-domain'" }
+        paragraph{ info "You may create a domain later through 'rhc create-domain'" }
         return true
       end
 
@@ -521,9 +522,9 @@ module RHC
         domain = rest_client.add_domain(namespace)
         options.namespace = namespace
 
-        success "Your domain name '#{domain.id}' has been successfully created"
+        success "Your domain '#{domain.id}' has been successfully created"
       rescue RHC::Rest::ValidationException => e
-        error e.message || "Unknown error during namespace creation."
+        error e.message || "Unknown error during domain creation."
         return false
       end
       true

data/spec/rhc/cli_spec.rb

@@ -149,14 +149,36 @@ describe RHC::CLI do
     end
   end
 
+  describe 'option provided twice' do
+    before{ user_config }
+    let!(:rest_client){ MockRestClient.new }
+    before(:each) do
+      domain = rest_client.add_domain("mock_domain")
+      @app = domain.add_application("app1", "mock_type")
+    end
+    context 'when run with -a provided twice, last being the valid one' do
+      let(:arguments) { ['cartridge', 'remove', 'mock_cart-1', '--confirm', '--trace','-a', 'app2', '-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+      it "should remove cartridge" do
+        @app.add_cartridge('mock_cart-1')
+        expect { run }.to exit_with_code(0)
+      end
+    end
+    context 'when run with -a provided twice, last not being the valid one' do
+      let(:arguments) { ['cartridge', 'remove', 'mock_cart-1', '--confirm', '--trace','-a', 'app1', '-a', 'app2', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+      it "should raise an application not found exception" do
+        expect{ run }.to raise_error(RHC::Rest::ApplicationNotFoundException)
+      end
+    end
+  end
+
   describe '#set_terminal' do
     before(:each) { mock_terminal }
-    it('should update $terminal.wrap_at') do 
+    it('should update $terminal.wrap_at') do
       $stdin.should_receive(:tty?).once.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 
+    it('should not update $terminal.page_at') do
       $stdin.should_receive(:tty?).once.and_return(true)
       $stdout.should_receive(:tty?).once.and_return(true)
       expect { RHC::CLI.set_terminal }.to_not change($terminal, :page_at)

data/spec/rhc/commands/app_spec.rb

@@ -163,7 +163,7 @@ describe RHC::Commands::App do
       before{ rest_client.domains.clear }
       let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1'] }
       # skips login stage and insecure check because of mock rest client, doesn't check keys
-      it { run_output(['mydomain', 'y', 'mykey']).should match(/This wizard.*Checking your namespace.*assign to your applications\. You will not be able to create applications without first creating a namespace.*Your domain name 'mydomain' has been successfully created.*Creating application.*Your public SSH key.*Uploading key 'mykey'.*Your application 'app1' is now available.*Cloned to/m) }
+      it { run_output(['mydomain', 'y', 'mykey']).should match(/This wizard.*Checking for a domain.*You will not be able to create an application without completing this step.*Your domain 'mydomain' has been successfully created.*Creating application.*Your public SSH key.*Uploading key 'mykey'.*Your application 'app1' is now available.*Cloned to/m) }
     end
 
     context 'when run without a cart' do
@@ -722,10 +722,11 @@ describe RHC::Commands::App do
   end
 
   describe 'create app with env vars' do
-    before{ rest_client.add_domain("mockdomain") }
+    before{ @domain = rest_client.add_domain("mockdomain") }
 
     [['app', 'create', 'app1', 'mock_standalone_cart-1', '-e', 'FOO=BAR', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
-     ['app', 'create', 'app1', 'mock_standalone_cart-1', '--env', 'FOO=BAR', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password']
+     ['app', 'create', 'app1', 'mock_standalone_cart-1', '--env', 'FOO=BAR', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
+     ['app', 'create', 'app1', 'mock_standalone_cart-1', 'FOO=BAR', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password']
     ].each_with_index do |args, i|
       context "when run with single env var #{i}" do
         let(:arguments) { args }
@@ -737,7 +738,10 @@ describe RHC::Commands::App do
     end
 
     [['app', 'create', 'app1', 'mock_standalone_cart-1', '-e', 'VAR1=VAL1', '-e', 'VAR2=VAL2', '-e', 'VAR3=VAL3', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
-     ['app', 'create', 'app1', 'mock_standalone_cart-1', '--env', 'VAR1=VAL1', '--env', 'VAR2=VAL2', '--env', 'VAR3=VAL3', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password']
+     ['app', 'create', 'app1', 'mock_standalone_cart-1', '--env', 'VAR1=VAL1', '--env', 'VAR2=VAL2', '--env', 'VAR3=VAL3', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
+     ['app', 'create', 'app1', 'mock_standalone_cart-1', 'VAR1=VAL1', 'VAR2=VAL2', 'VAR3=VAL3', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
+     ['app', 'create', 'app1', 'mock_standalone_cart-1', 'VAR1=VAL1', 'VAR2=VAL2', '-e', 'VAR3=VAL3', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
+     ['app', 'create', 'app1', 'mock_standalone_cart-1', 'VAR1=VAL1', '--env', 'VAR2=VAL2', '-e', 'VAR3=VAL3', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password']
     ].each_with_index do |args, i|
       context "when run with multiple env vars #{i}" do
         let(:arguments) { args }
@@ -748,5 +752,20 @@ describe RHC::Commands::App do
       end
     end
 
+    [['app', 'create', 'app1', 'mock_standalone_cart-1', '-e', 'FOO=BAR', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
+     ['app', 'create', 'app1', 'mock_standalone_cart-1', '--env', 'FOO=BAR', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
+     ['app', 'create', 'app1', 'mock_standalone_cart-1', 'FOO=BAR', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password']
+    ].each_with_index do |args, i|
+      context "when run against a server without env vars support #{i}" do
+        let(:arguments) { args }
+        before { @domain.should_receive(:has_param?).with('ADD_APPLICATION','environment_variables').and_return(false) }
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should match("Success") }
+        it { run_output.should match(/Cartridges:\s+mock_standalone_cart-1\n/) }
+        it { run_output.should match("Server does not support environment variables") }
+        it { run_output.should_not match(/Environment Variables:\s+FOO=BAR\n/) }
+      end
+    end
+
   end
 end

data/spec/rhc/commands/cartridge_spec.rb

@@ -556,19 +556,17 @@ describe RHC::Commands::Cartridge do
 
   describe 'cartridge add with env vars' do
     let!(:rest_client){ MockRestClient.new }
+    before do
+      domain = rest_client.add_domain("mock_domain")
+      @app = domain.add_application("app1", "mock_type")
+    end
 
     [['app', 'cartridge', 'add', 'unique_mock_cart', '-e', 'FOO=BAR', '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
      ['app', 'cartridge', 'add', 'unique_mock_cart', '--env', 'FOO=BAR', '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password']
     ].each_with_index do |args, i|
       context "when run with single env var #{i}" do
         let(:arguments) { args }
-        before(:each) do
-          domain = rest_client.add_domain("mock_domain")
-          app = domain.add_application("app1", "mock_type")
-        end
-        it {
-          succeed_with_message(/Environment Variables:\s+FOO=BAR/)
-        }
+        it { succeed_with_message(/Environment Variables:\s+FOO=BAR/) }
       end
     end
 
@@ -577,13 +575,7 @@ describe RHC::Commands::Cartridge do
     ].each_with_index do |args, i|
       context "when run with multiple env vars #{i}" do
         let(:arguments) { args }
-        before(:each) do
-          domain = rest_client.add_domain("mock_domain")
-          app = domain.add_application("app1", "mock_type")
-        end
-        it {
-          succeed_with_message(/Environment Variables:\s+FOO1=BAR1, FOO2=BAR2/)
-        }
+        it { succeed_with_message(/Environment Variables:\s+FOO1=BAR1, FOO2=BAR2/) }
       end
     end
 
@@ -592,14 +584,21 @@ describe RHC::Commands::Cartridge do
     ].each_with_index do |args, i|
       context "when run with env vars from files #{i}" do
         let(:arguments) { args }
-        before(:each) do
-          domain = rest_client.add_domain("mock_domain")
-          app = domain.add_application("app1", "mock_type")
-        end
-        it {
-          succeed_with_message(/Environment Variables:\s+BAR=456, FOO=123, MY_EMPTY_ENV_VAR=, MY_OPENSHIFT_ENV_VAR=mongodb:\/\/user:pass@host:port\/\n/)
-        }
+        it { succeed_with_message(/Environment Variables:\s+BAR=456, FOO=123, MY_EMPTY_ENV_VAR=, MY_OPENSHIFT_ENV_VAR=mongodb:\/\/user:pass@host:port\/\n/) }
       end
     end
+
+    [['app', 'cartridge', 'add', 'unique_mock_cart', '-e', 'FOO=BAR', '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
+     ['app', 'cartridge', 'add', 'unique_mock_cart', '--env', 'FOO=BAR', '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password']
+    ].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) }
+        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/) }
+      end
+    end
+
   end
 end