rhc 1.12.4 → 1.13.6

data/lib/rhc/rest/mock.rb

@@ -64,7 +64,7 @@ module RHC::Rest::Mock
         to_return({
           :body => {
             :data => mock_response_links(authorizations ? mock_api_with_authorizations : mock_real_client_links),
-            :supported_api_versions => [1.0, 1.1, 1.2, 1.3, 1.4, 1.5],
+            :supported_api_versions => [1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6],
           }.to_json
         })
     end
@@ -357,17 +357,19 @@ 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'],
-       ['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'],
-       ['STOP',            "domains/#{domain_id}/apps/#{app_id}/stop",      'post'],
-       ['RESTART',         "domains/#{domain_id}/apps/#{app_id}/restart",   'post'],
-       ['THREAD_DUMP',     "domains/#{domain_id}/apps/#{app_id}/event",     'post'],
-       ['ADD_ALIAS',       "domains/#{domain_id}/apps/#{app_id}/event",     'post'],
-       ['REMOVE_ALIAS',    "domains/#{domain_id}/apps/#{app_id}/event",     'post'],
-       ['LIST_ALIASES',    "domains/#{domain_id}/apps/#{app_id}/aliases",   'get'],
-       ['DELETE',          "broker/rest/domains/#{domain_id}/applications/#{app_id}", 'DELETE']]
+      [['ADD_CARTRIDGE',                   "domains/#{domain_id}/apps/#{app_id}/carts/add",                      'post'],
+       ['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'],
+       ['STOP',                            "domains/#{domain_id}/apps/#{app_id}/stop",                           'post'],
+       ['RESTART',                         "domains/#{domain_id}/apps/#{app_id}/restart",                        'post'],
+       ['THREAD_DUMP',                     "domains/#{domain_id}/apps/#{app_id}/event",                          'post'],
+       ['ADD_ALIAS',                       "domains/#{domain_id}/apps/#{app_id}/event",                          'post'],
+       ['REMOVE_ALIAS',                    "domains/#{domain_id}/apps/#{app_id}/event",                          'post'],
+       ['LIST_ALIASES',                    "domains/#{domain_id}/apps/#{app_id}/aliases",                        'get'],
+       ['LIST_ENVIRONMENT_VARIABLES',      "domains/#{domain_id}/apps/#{app_id}/event",                          'post'],
+       ['SET_UNSET_ENVIRONMENT_VARIABLES', "domains/#{domain_id}/apps/#{app_id}/event",                          'post'],
+       ['DELETE',                          "broker/rest/domains/#{domain_id}/applications/#{app_id}",            'DELETE']]
     end
 
     def mock_cart_links(domain_id='test_domain',app_id='test_app',cart_id='test_cart')
@@ -383,6 +385,7 @@ module RHC::Rest::Mock
        ['LIST_DOMAINS',    'domains/',    'get' ],
        ['LIST_CARTRIDGES', 'cartridges/', 'get' ]]
     end
+
     def mock_real_client_links
       [['GET_USER',        "broker/rest/user",       'GET'],
        ['LIST_DOMAINS',    "broker/rest/domains",    'GET'],
@@ -390,6 +393,7 @@ module RHC::Rest::Mock
        ['LIST_CARTRIDGES', "broker/rest/cartridges", 'GET'],
       ]
     end
+
     def mock_api_with_authorizations
       mock_real_client_links.concat([
         ['LIST_AUTHORIZATIONS', "broker/rest/user/authorizations", 'GET'],
@@ -517,10 +521,10 @@ module RHC::Rest::Mock
        MockRestCartridge.new(self, "mock_standalone_cart-1", "standalone"),
        MockRestCartridge.new(self, "mock_standalone_cart-2", "standalone"),
        MockRestCartridge.new(self, "mock_unique_standalone_cart-1", "standalone"),
-       MockRestCartridge.new(self, "jenkins-1.4", "standalone"),
+       MockRestCartridge.new(self, "jenkins-1", "standalone", nil, ['ci']),
        MockRestCartridge.new(self, "mock_cart-2", "embedded"),
        MockRestCartridge.new(self, "unique_mock_cart-1", "embedded"),
-       MockRestCartridge.new(self, "jenkins-client-1.4", "embedded"),
+       MockRestCartridge.new(self, "jenkins-client-1", "embedded", nil, ['ci_builder']),
        MockRestCartridge.new(self, "embcart-1", "embedded"),
        MockRestCartridge.new(self, "embcart-2", "embedded"),
        premium_embedded
@@ -645,7 +649,7 @@ module RHC::Rest::Mock
     def initialize(client=nil, carts=['name' => 'fake_geargroup_cart-0.1'], count=1)
       super({}, client)
       @cartridges = carts
-      @gears = count.times.map do |i| 
+      @gears = count.times.map do |i|
         {'state' => 'started', 'id' => "fakegearid#{i}", 'ssh_url' => "ssh://fakegearid#{i}@fakesshurl.com"}
       end
       @gear_profile = 'small'
@@ -694,7 +698,7 @@ module RHC::Rest::Mock
       "fakeuuidfortests#{@name}"
     end
 
-    def initialize(client, name, type, domain, scale=nil, gear_profile='default', initial_git_url=nil)
+    def initialize(client, name, type, domain, scale=nil, gear_profile='default', initial_git_url=nil, environment_variables=nil)
       super({}, client)
       @name = name
       @domain = domain
@@ -706,6 +710,7 @@ module RHC::Rest::Mock
       @app_url = "https://#{@name}-#{@domain.id}.fake.foo/"
       @ssh_url = "ssh://#{@uuid}@127.0.0.1"
       @aliases = []
+      @environment_variables = environment_variables || []
       @gear_profile = gear_profile
       if scale
         @scalable = true
@@ -730,8 +735,8 @@ module RHC::Rest::Mock
       @domain.applications.delete self
     end
 
-    def add_cartridge(cart, embedded=true)
-      name, url = 
+    def add_cartridge(cart, embedded=true, environment_variables=nil)
+      name, url =
         if cart.is_a? String
           [cart, nil]
         elsif cart.respond_to? :[]
@@ -742,10 +747,11 @@ module RHC::Rest::Mock
 
       type = embedded ? "embedded" : "standalone"
       c = MockRestCartridge.new(client, name, type, self)
-      if url 
+      if url
         c.url = url
         c.name = c.url_basename
       end
+      #set_environment_variables(environment_variables)
       c.properties << {'name' => 'prop1', 'value' => 'value1', 'description' => 'description1' }
       @cartridges << c
       c.messages << "Cartridge added with properties"
@@ -798,6 +804,31 @@ module RHC::Rest::Mock
     def aliases
       @aliases
     end
+
+    def environment_variables
+      if supports? "LIST_ENVIRONMENT_VARIABLES"
+        @environment_variables || []
+      else
+        raise RHC::EnvironmentVariablesNotSupportedException.new
+      end
+    end
+
+    def set_environment_variables(env_vars=[])
+      if supports? "SET_UNSET_ENVIRONMENT_VARIABLES"
+        environment_variables.concat env_vars
+      else
+        raise RHC::EnvironmentVariablesNotSupportedException.new
+      end
+    end
+
+    def unset_environment_variables(env_vars=[])
+      if supports? "SET_UNSET_ENVIRONMENT_VARIABLES"
+        env_vars.each { |item| environment_variables.delete_if { |env_var| env_var.name == item } }
+      else
+        raise RHC::EnvironmentVariablesNotSupportedException.new
+      end
+    end
+
   end
 
   class MockRestCartridge < RHC::Rest::Cartridge
@@ -805,11 +836,12 @@ module RHC::Rest::Mock
 
     attr_accessor :usage_rate
 
-    def initialize(client, name, type, app=nil, 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" }])
       super({}, client)
       @name = name
       @type = type
       @app = app
+      @tags = tags
       @properties = properties.each(&:stringify_keys!)
       @status_messages = [{"message" => "started", "gear_id" => "123"}]
       @scales_from = 1

data/lib/rhc/rest.rb

@@ -1,21 +1,22 @@
 module RHC
   module Rest
 
-    autoload :Base,          'rhc/rest/base'
-    autoload :Attributes,    'rhc/rest/attributes'
-
-    autoload :HTTPClient,    'rhc/rest/httpclient'
-
-    autoload :Api,           'rhc/rest/api'
-    autoload :Application,   'rhc/rest/application'
-    autoload :Authorization, 'rhc/rest/authorization'
-    autoload :Cartridge,     'rhc/rest/cartridge'
-    autoload :Client,        'rhc/rest/client'
-    autoload :Domain,        'rhc/rest/domain'
-    autoload :Key,           'rhc/rest/key'
-    autoload :User,          'rhc/rest/user'
-    autoload :GearGroup,     'rhc/rest/gear_group'
-    autoload :Alias,         'rhc/rest/alias'
+    autoload :Base,                 'rhc/rest/base'
+    autoload :Attributes,           'rhc/rest/attributes'
+
+    autoload :HTTPClient,           'rhc/rest/httpclient'
+
+    autoload :Alias,                'rhc/rest/alias'
+    autoload :Api,                  'rhc/rest/api'
+    autoload :Application,          'rhc/rest/application'
+    autoload :Authorization,        'rhc/rest/authorization'
+    autoload :Cartridge,            'rhc/rest/cartridge'
+    autoload :Client,               'rhc/rest/client'
+    autoload :Domain,               'rhc/rest/domain'
+    autoload :EnvironmentVariable,  'rhc/rest/environment_variable'
+    autoload :GearGroup,            'rhc/rest/gear_group'
+    autoload :Key,                  'rhc/rest/key'
+    autoload :User,                 'rhc/rest/user'
 
     class Exception < RuntimeError
       attr_reader :code
@@ -32,17 +33,17 @@ module RHC
     #
     #503 Service Unavailable
     #
-    #The server is currently unable to handle the request due to a temporary 
-    #overloading or maintenance of the server. The implication is that this 
+    #The server is currently unable to handle the request due to a temporary
+    #overloading or maintenance of the server. The implication is that this
     #is a temporary condition which will be alleviated after some delay.
     class ServiceUnavailableException < ServerErrorException; end
 
-    #Exceptions thrown in case of an HTTP 4xx is received with the exception 
+    #Exceptions thrown in case of an HTTP 4xx is received with the exception
     #of 401, 403, 403 and 422 where a more sepcific exception is thrown
     #
     #HTTP Error Codes 4xx
     #
-    #The 4xx class of status code is intended for cases in which the client 
+    #The 4xx class of status code is intended for cases in which the client
     #seems to have errored.
     class ClientErrorException < Exception; end
 
@@ -81,16 +82,16 @@ module RHC
     #403 Forbidden
     #
     #The server understood the request, but is refusing to fulfill it.
-    #Authorization will not help and the request SHOULD NOT be repeated. 
+    #Authorization will not help and the request SHOULD NOT be repeated.
     class RequestDeniedException < ClientErrorException; end
 
     #Exceptions thrown in case of an HTTP 401 is received.
     #
     #401 Unauthorized
     #
-    #The request requires user authentication.  If the request already 
-    #included Authorization credentials, then the 401 response indicates 
-    #that authorization has been refused for those credentials. 
+    #The request requires user authentication.  If the request already
+    #included Authorization credentials, then the 401 response indicates
+    #that authorization has been refused for those credentials.
     class UnAuthorizedException < ClientErrorException; end
     class TokenExpiredOrInvalid < UnAuthorizedException; end
 

data/lib/rhc/usage_templates/help.erb

@@ -4,7 +4,7 @@ Usage: rhc [--help] [--version] [--debug] <command> [<args>]
 
 <%
 remaining = Hash[commands.dup.select{ |name, command| not command.summary.blank? }]
-basic = remaining.slice!('setup', 'create-app', 'apps', 'cartridges', 'add-cartridge', 'server', 'logout')
+basic = remaining.slice!('setup', 'create-app', 'apps', 'cartridges', 'add-cartridge', 'set-env', 'logout')
 remaining.delete_if{ |name, command| alias?(name) }
 begin -%>
 Getting started:
@@ -18,14 +18,14 @@ Working with apps:
 <%= table(debugging.map{ |arr| arr[1] = arr[1].summary || arr[1].description; arr }, table_args('  ', 18)).join("\n") %>
 <% end unless debugging.empty? %>
 Management commands:
-<%= table(remaining.sort.select{ |arr| arr[1].root? and arr[1].summary.present? }.map do |arr| 
+<%= table(remaining.sort.select{ |arr| arr[1].root? and arr[1].summary.present? }.map do |arr|
 		arr[1] = arr[1].summary || arr[1].description
-		arr 
+		arr
 	end, table_args('  ', 18)).join("\n") %>
 
   Some management commands have nested actions - run 'rhc help <command>' for more info.
 
-See '<%= Array(program :name).first %> help <command>' for more information on a specific command.  You can see a list of all commands with 'rhc help commands'. See 'rhc help options' for a list of global command-line options and information about the config file.  
+See '<%= Array(program :name).first %> help <command>' for more information on a specific command.  You can see a list of all commands with 'rhc help commands'. See 'rhc help options' for a list of global command-line options and information about the config file.
 <% if program :help -%>
   <% for title, body in program(:help) %>
   <%= $terminal.color title.to_s.upcase, :bold %>:

data/spec/rhc/assets/env_vars.txt

@@ -0,0 +1,7 @@
+FOO=123
+BAR=456
+MY_OPENSHIFT_ENV_VAR=mongodb://user:pass@host:port/
+MY_EMPTY_ENV_VAR=
+ZEE
+LOL
+MUST NOT BE INCLUDED

data/spec/rhc/assets/env_vars_2.txt

@@ -0,0 +1 @@
+AND=123

data/spec/rhc/commands/app_spec.rb

@@ -177,6 +177,7 @@ describe RHC::Commands::App do
       it { expect { run }.to exit_with_code(0) }
       it { run_output.should match("Success") }
       it { run_output.should match("Cartridges: mock_standalone_cart-1\n") }
+      it { run_output.should_not match(/Environment Variables:/) }
     end
 
     context 'when Hosts resolver raises an Exception' do
@@ -196,6 +197,7 @@ describe RHC::Commands::App do
       it { expect { run }.to exit_with_code(0) }
       it { run_output.should match("Success") }
       it { run_output.should match("Cartridges: mock_standalone_cart-1, mock_cart-1\n") }
+      it { run_output.should_not match(/Environment Variables:/) }
       after{ rest_client.domains.first.applications.first.cartridges.find{ |c| c.name == 'mock_cart-1' }.should be_true }
     end
 
@@ -204,6 +206,7 @@ describe RHC::Commands::App do
       it { expect { run }.to exit_with_code(0) }
       it { run_output.should match("Success") }
       it { run_output.should match("Cartridges: http://foo.com, mock_cart-1\n") }
+      it { run_output.should_not match(/Environment Variables:/) }
       after{ rest_client.domains.first.applications.first.cartridges.find{ |c| c.url == 'http://foo.com' }.should be_true }
     end
 
@@ -267,12 +270,12 @@ describe RHC::Commands::App do
       let(:arguments) { ['app', 'create', 'app1', 'http://foo.com', '--trace', '--noprompt'] }
       it('tells me about custom carts') { run_output.should match("The cartridge 'http://foo.com' will be downloaded") }
       it('lists the cart using the short_name') { run_output.should match(%r(Cartridges:\s+http://foo.com$)) }
-    end    
+    end
     context 'when I pick a custom URL cart and a web cart' do
       let(:arguments) { ['app', 'create', 'app1', 'http://foo.com', 'embcart-1', '--trace', '--noprompt'] }
       it('tells me about custom carts') { run_output.should match("The cartridge 'http://foo.com' will be downloaded") }
       it('lists the carts using the short_name') { run_output.should match(%r(Cartridges:\s+http://foo.com, embcart-1$)) }
-    end    
+    end
   end
 
   describe 'app create enable-jenkins' do
@@ -286,9 +289,9 @@ describe RHC::Commands::App do
         #puts run_output
         expect { run }.to exit_with_code(0)
         jenkins_app = rest_client.find_application(@domain.id,"jenkins")
-        jenkins_app.cartridges[0].name.should == "jenkins-1.4"
+        jenkins_app.cartridges[0].name.should == "jenkins-1"
         app = rest_client.find_application(@domain.id,"app1")
-        app.find_cartridge("jenkins-client-1.4")
+        app.find_cartridge("jenkins-client-1")
       end
     end
   end
@@ -321,7 +324,7 @@ describe RHC::Commands::App do
     context 'when run' do
       before(:each) do
         @domain = rest_client.add_domain("mockdomain")
-        @domain.add_application("jenkins", "jenkins-1.4")
+        @domain.add_application("jenkins", "jenkins-1")
       end
       it "should use existing jenkins" do
         expect { run }.to exit_with_code(0)
@@ -355,6 +358,15 @@ describe RHC::Commands::App do
         run_output.should match("Jenkins client failed to install")
       end
     end
+
+    context 'when run without jenkins cartridge available on server' do
+      before(:each) do
+        @instance.stub(:all_cartridges) { rest_client.cartridges.delete_if { |item| item.name =~ /\Ajenkins/i } }
+      end
+      it "should exit with jenkins error" do
+        run_output.should match("There is no installed cartridge that exposes Jenkins")
+      end
+    end
   end
 
   describe 'app create jenkins install with retries' do
@@ -503,12 +515,12 @@ describe RHC::Commands::App do
       let(:password){ 'password' }
       let(:server){ mock_uri }
       let(:arguments){ ['delete-app', 'foo', '--confirm', '--trace'] }
-      before do 
+      before do
         stub_api
         challenge{ stub_one_domain('test') }
         stub_one_application('test', 'foo')
       end
-      before do 
+      before do
         stub_api_request(:delete, "broker/rest/domains/test/applications/foo").
           to_return({
             :body   => {
@@ -568,7 +580,7 @@ describe RHC::Commands::App do
       it { run_output.should match(/Gears:\s+Located with mock_type/) }
       it { run_output.should match(/Gears:\s+1 small/) }
       it { run_output.should match(%r(From:\s+ https://foo.bar.com)) }
-    end    
+    end
   end
 
   describe 'app show' do
@@ -616,7 +628,7 @@ describe RHC::Commands::App do
       before do
         @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type", true)
-        expect_multi_ssh('echo "$(du -s 2>/dev/null | cut -f 1)"', 'fakegearid0@fakesshurl.com' => '1734934', 'fakegearid1@fakesshurl.com' => '1934234')
+        expect_multi_ssh('echo "$(du --block-size=1 -s 2>/dev/null | cut -f 1)"', 'fakegearid0@fakesshurl.com' => '1734334', 'fakegearid1@fakesshurl.com' => '1934348')
       end
       it { run_output.should match(/Gear.*Cartridges.*Used.*fakegearid0.*1\.7 MB.*1 GB.*fakegearid1.*1\.9 MB/m) }
       it { expect{ run }.to exit_with_code(0) }
@@ -705,7 +717,36 @@ describe RHC::Commands::App do
       subject.should_receive(:list_cartridges)
       domain = double
       domain.stub(:add_application).and_raise(RHC::Rest::ValidationException.new('Foo', :cartridges, 109))
-      expect{ subject.send(:create_app, 'name', 'jenkins-1.4', domain) }.to raise_error(RHC::Rest::ValidationException)
+      expect{ subject.send(:create_app, 'name', 'jenkins-1', domain) }.to raise_error(RHC::Rest::ValidationException)
     end
   end
+
+  describe 'create app with env vars' do
+    before{ 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']
+    ].each_with_index do |args, i|
+      context "when run with single env var #{i}" do
+        let(:arguments) { args }
+        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(/Environment Variables:\s+FOO=BAR\n/) }
+      end
+    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']
+    ].each_with_index do |args, i|
+      context "when run with multiple env vars #{i}" do
+        let(:arguments) { args }
+        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(/Environment Variables:\s+VAR1=VAL1, VAR2=VAL2, VAR3=VAL3\n/) }
+      end
+    end
+
+  end
 end

data/spec/rhc/commands/cartridge_spec.rb

@@ -27,11 +27,11 @@ describe RHC::Commands::Cartridge do
   describe 'run' do
     let!(:rest_client){ MockRestClient.new }
     context "with all arguments" do
-      let(:arguments) { ['cartridge', '--trace', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+      let(:arguments) { ['cartridges', '--trace', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
       it { succeed_with_message /mock_cart-1.*mock_cart-2.*unique_mock_cart-1/m }
     end
     context "without password" do
-      let(:arguments) { ['cartridge', '--trace', '--noprompt', '--config', 'test.conf'] }
+      let(:arguments) { ['cartridges', '--trace', '--noprompt', '--config', 'test.conf'] }
       it { succeed_with_message /mock_cart-1.*mock_cart-2.*unique_mock_cart-1/m }
     end
   end
@@ -66,7 +66,7 @@ describe RHC::Commands::Cartridge do
 
   describe 'alias app cartridge' do
     let!(:rest_client){ MockRestClient.new }
-    let(:arguments) { ['app', 'cartridge', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+    let(:arguments) { ['app', 'cartridge', 'list', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     context 'when run' do
       it { succeed_with_message /mock_cart-1.*mock_cart-2.*unique_mock_cart-1/m }
@@ -86,6 +86,9 @@ describe RHC::Commands::Cartridge do
       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
     end
   end
 
@@ -215,15 +218,15 @@ describe RHC::Commands::Cartridge do
       let(:username){ mock_user }
       let(:password){ 'password' }
       let(:server){ mock_uri }
-      let(:arguments){ ['remove-cartridge', 'jenkins-1.4', '-a', 'foo', '--confirm', '--trace'] }
-      before do 
+      let(:arguments){ ['remove-cartridge', 'jenkins-1', '-a', 'foo', '--confirm', '--trace'] }
+      before do
         stub_api(false)
         challenge{ stub_one_domain('test') }
         stub_one_application('test', 'foo').with(:query => {:include => 'cartridges'})
-        stub_application_cartridges('test', 'foo', [{:name => 'php-5.3'}, {:name => 'jenkins-1.4'}])
+        stub_application_cartridges('test', 'foo', [{:name => 'php-5.3'}, {:name => 'jenkins-1'}])
       end
-      before do 
-        stub_api_request(:delete, "broker/rest/domains/test/applications/foo/cartridges/jenkins-1.4").
+      before do
+        stub_api_request(:delete, "broker/rest/domains/test/applications/foo/cartridges/jenkins-1").
           to_return({
             :body   => {
               :type => nil,
@@ -238,7 +241,7 @@ describe RHC::Commands::Cartridge do
       end
 
       it("should not display info returned by the server"){ run_output.should_not match "Removed Jenkins" }
-      it("should display prefix returned by the server"){ run_output.should match "Removing jenkins-1.4" }
+      it("should display prefix returned by the server"){ run_output.should match "Removing jenkins-1" }
       it("should display results returned by the server"){ run_output.should match "Job URL changed" }
       it('should exit successfully'){ expect{ run }.to exit_with_code(0) }
     end
@@ -550,4 +553,53 @@ describe RHC::Commands::Cartridge do
 
     end
   end
+
+  describe 'cartridge add with env vars' do
+    let!(:rest_client){ MockRestClient.new }
+
+    [['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/)
+        }
+      end
+    end
+
+    [['app', 'cartridge', 'add', 'unique_mock_cart', '-e', 'FOO1=BAR1', '-e', 'FOO2=BAR2', '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
+     ['app', 'cartridge', 'add', 'unique_mock_cart', '--env', 'FOO1=BAR1', '--env', 'FOO2=BAR2', '--app', 'app1', '--noprompt', '--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 }
+        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/)
+        }
+      end
+    end
+
+    [['app', 'cartridge', 'add', 'unique_mock_cart', '-e', File.expand_path('../../assets/env_vars.txt', __FILE__), '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'],
+     ['app', 'cartridge', 'add', 'unique_mock_cart', '--env', File.expand_path('../../assets/env_vars.txt', __FILE__), '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password']
+    ].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/)
+        }
+      end
+    end
+  end
 end