rhc 1.12.4 → 1.13.6

data/spec/rhc/commands/env_spec.rb

@@ -0,0 +1,493 @@
+require 'spec_helper'
+require 'rest_spec_helper'
+require 'rhc/commands/env'
+require 'rhc/config'
+
+describe RHC::Commands::Env do
+
+  def exit_with_code_and_message(code, message=nil)
+    expect{ run }.to exit_with_code(code)
+    run_output.should match(message) if message
+  end
+
+  def exit_with_code_and_without_message(code, message=nil)
+    expect{ run }.to exit_with_code(code)
+    run_output.should_not match(message) if message
+  end
+
+  def succeed_with_message(message="done")
+    exit_with_code_and_message(0, message)
+  end
+
+  def succeed_without_message(message="done")
+    exit_with_code_and_without_message(0, message)
+  end
+
+  let!(:rest_client) { MockRestClient.new }
+
+  before(:each) do
+    user_config
+    @rest_domain = rest_client.add_domain("mock_domain_0")
+    @rest_app = @rest_domain.add_application("mock_app_0", "ruby-1.8.7")
+  end
+
+  describe 'env help' do
+    let(:arguments) { ['env', '--help'] }
+    context 'help is run' do
+      it "should display help" do
+        expect { run }.to exit_with_code(0)
+      end
+      it('should output usage') { run_output.should match("Usage: rhc env <action>$") }
+    end
+  end
+
+  describe 'env set --help' do
+    [['env', 'set', '--help'],
+     ['env', 'add', '--help'],
+     ['set-env', '--help'],
+     ['env-set', '--help']
+    ].each_with_index do |args, i|
+      context "help is run run with arguments #{i}" do
+        let(:arguments) { args }
+        it "should display help" do
+          expect { run }.to exit_with_code(0)
+        end
+        it('should output usage') { run_output.should match("Usage: rhc env-set <VARIABLE=VALUE>") }
+      end
+    end
+  end
+
+  describe 'env unset --help' do
+    [['env', 'unset', '--help'],
+     ['env', 'remove', '--help'],
+     ['unset-env', '--help'],
+     ['env-unset', '--help']
+    ].each_with_index do |args, i|
+      context "help is run run with arguments #{i}" do
+        let(:arguments) { args }
+        it "should display help" do
+          expect { run }.to exit_with_code(0)
+        end
+        it('should output usage') { run_output.should match("Usage: rhc env-unset <VARIABLE>") }
+      end
+    end
+  end
+
+  describe 'env list --help' do
+    [['env', 'list', '--help'],
+     ['list-env', '--help'],
+     ['env-list', '--help']
+    ].each_with_index do |args, i|
+      context "help is run run with arguments #{i}" do
+        let(:arguments) { args }
+        it "should display help" do
+          expect { run }.to exit_with_code(0)
+        end
+        it('should output usage') { run_output.should match("Usage: rhc env-list <app> [--namespace NAME]") }
+      end
+    end
+  end
+
+  describe 'env show --help' do
+    [['env', 'show', '--help'],
+     ['show-env', '--help'],
+     ['env-show', '--help']
+    ].each_with_index do |args, i|
+      context "help is run run with arguments #{i}" do
+        let(:arguments) { args }
+        it "should display help" do
+          expect { run }.to exit_with_code(0)
+        end
+        it('should output usage') { run_output.should match("Usage: rhc env-show <VARIABLE>") }
+      end
+    end
+  end
+
+  describe 'set env' do
+
+    [['env', 'set', 'TEST_ENV_VAR=1', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['set-env', 'TEST_ENV_VAR=1', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', '-e', 'TEST_ENV_VAR=1', '--app', 'mock_app_0', '--noprompt', '--confirm' ],
+     ['env', 'set', '--env', 'TEST_ENV_VAR=1', '--app', 'mock_app_0', '--noprompt', '--confirm' ],
+     ['env', 'set', 'FOO_BAR=1', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', 'F1=1', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', 'F_=1', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', '_FOO=1', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', 'FOO=BAR=BAZ', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', 'FOO==', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', 'FOO=Test 1 2 3', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+    ].each_with_index do |args, i|
+      context "when run with single env var #{i}" do
+        let(:arguments) { args }
+        it { succeed_with_message /Setting environment variable\(s\) \.\.\./ }
+        it { succeed_with_message /done/ }
+        it { succeed_without_message /TEST_ENV_VAR=1/ }
+      end
+    end
+
+
+    [['env', 'set', 'TEST_ENV_VAR1=1', 'TEST_ENV_VAR2=2', 'TEST_ENV_VAR3=3', '--app', 'mock_app_0', '--noprompt', '--confirm' ],
+     ['set-env', 'TEST_ENV_VAR1=1', 'TEST_ENV_VAR2=2', 'TEST_ENV_VAR3=3', '--app', 'mock_app_0', '--noprompt', '--confirm' ],
+     ['set-env', '-e', 'TEST_ENV_VAR1=1', '-e', 'TEST_ENV_VAR2=2', '-e', 'TEST_ENV_VAR3=3', '--app', 'mock_app_0', '--noprompt', '--confirm' ],
+     ['set-env', '--env', 'TEST_ENV_VAR1=1', '--env', 'TEST_ENV_VAR2=2', '--env', 'TEST_ENV_VAR3=3', '--app', 'mock_app_0', '--noprompt', '--confirm' ]
+    ].each_with_index do |args, i|
+      context "when run with multiple env vars #{i}" do
+        let(:arguments) { args }
+        it { succeed_with_message /Setting environment variable\(s\) \.\.\./ }
+        it { succeed_with_message /done/ }
+        it { succeed_without_message /TEST_ENV_VAR1=1/ }
+        it { succeed_without_message /TEST_ENV_VAR2=2/ }
+        it { succeed_without_message /TEST_ENV_VAR3=3/ }
+      end
+    end
+
+    [['env', 'set', 'TEST_ENV_VAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['set-env', 'TEST_ENV_VAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', '-e', 'TEST_ENV_VAR', '--app', 'mock_app_0', '--noprompt', '--confirm' ],
+     ['env', 'set', '--env', 'TEST_ENV_VAR', '--app', 'mock_app_0', '--noprompt', '--confirm' ],
+    ].each_with_index do |args, i|
+      context "when run with no env var provided #{i}" do
+        let(:arguments) { args }
+        it "should raise env var not provided exception" do
+          expect{ run }.to exit_with_code(159)
+          run_output.should match(/Environment variable\(s\) not provided\./)
+          run_output.should match(/Please provide at least one environment variable using the syntax VARIABLE=VALUE\./)
+        end
+      end
+    end
+
+    context 'when run with multiple env vars from file' do
+      let(:arguments) {['env', 'set', File.expand_path('../../assets/env_vars.txt', __FILE__), '--app', 'mock_app_0', '--noprompt', '--confirm' ]}
+        it { succeed_with_message /FOO=123/ }
+        it { succeed_with_message /BAR=456/ }
+        it { succeed_with_message /MY_OPENSHIFT_ENV_VAR/ }
+        it { succeed_with_message /MY_EMPTY_ENV_VAR/ }
+        it { succeed_without_message /ZEE/ }
+        it { succeed_without_message /LOL/ }
+        it { succeed_without_message /MUST NOT BE INCLUDED/ }
+    end
+
+    context 'when run with multiple env vars from multiple files' do
+      let(:arguments) {['env', 'set', '-e', File.expand_path('../../assets/env_vars.txt', __FILE__), '-e', File.expand_path('../../assets/env_vars_2.txt', __FILE__), '--app', 'mock_app_0', '--noprompt', '--confirm' ]}
+        it { succeed_with_message /FOO=123/ }
+        it { succeed_with_message /BAR=456/ }
+        it { succeed_with_message /MY_OPENSHIFT_ENV_VAR/ }
+        it { succeed_with_message /MY_EMPTY_ENV_VAR/ }
+        it { succeed_with_message /AND=123/ }
+        it { succeed_without_message /ZEE/ }
+        it { succeed_without_message /LOL/ }
+        it { succeed_without_message /MUST NOT BE INCLUDED/ }
+    end
+
+    context 'when run with empty file' do
+      let(:arguments) {['env', 'set', File.expand_path('../../assets/empty.txt', __FILE__), '--app', 'mock_app_0', '--noprompt', '--confirm' ]}
+        it "should raise env var not provided exception" do
+          expect{ run }.to exit_with_code(159)
+          run_output.should match(/Environment variable\(s\) not found in the provided file\(s\)\./)
+          run_output.should match(/Please provide at least one environment variable using the syntax VARIABLE=VALUE\./)
+        end
+    end
+
+    context 'when run with --noprompt and without --confirm' do
+      let(:arguments) { ['env', 'set', 'TEST_ENV_VAR=1', '--app', 'mock_app_0', '--noprompt' ] }
+      it("should not ask for confirmation") { expect{ run }.to exit_with_code(0) }
+      it("should output confirmation") { run_output.should_not match("This action requires the --confirm option") }
+    end
+
+    context 'when run with --noprompt and without --confirm from file' do
+      let(:arguments) { ['env', 'set', File.expand_path('../../assets/env_vars.txt', __FILE__), '--app', 'mock_app_0', '--noprompt' ] }
+      it "should ask for confirmation" do
+        expect{ run }.to exit_with_code(1)
+      end
+      it("should output confirmation") { run_output.should match("This action requires the --confirm option") }
+    end
+
+    context 'when run against an unsupported server' do
+      before {
+        @rest_app.links.delete 'SET_UNSET_ENVIRONMENT_VARIABLES'
+        @rest_app.links.delete 'LIST_ENVIRONMENT_VARIABLES'
+      }
+      let(:arguments) { ['env', 'set', 'TEST_ENV_VAR=1', '--app', 'mock_app_0', '--noprompt', '--confirm' ] }
+      it "should raise env var not found exception" do
+        expect{ run }.to exit_with_code(158)
+        run_output.should match(/Server does not support environment variables/)
+      end
+    end
+
+    [['env', 'set', 'FOO.Z=BAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', '2FOO=BAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', 'FO$O=BAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', 'FO%O=BAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', 'FO*O=BAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', 'FOO.=BAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', '=BAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'set', '==', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+    ].each_with_index do |args, i|
+      context "when run with invalid env var names #{i}" do
+        let(:arguments) { args }
+        it "should raise env var not provided exception" do
+          expect{ run }.to exit_with_code(159)
+          run_output.should match(/Environment variable\(s\) not provided\./)
+          run_output.should match(/Please provide at least one environment variable using the syntax VARIABLE=VALUE\./)
+        end
+      end
+    end
+
+  end
+
+  describe 'unset env' do
+
+    [['env', 'unset', 'TEST_ENV_VAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['unset-env', 'TEST_ENV_VAR', '--app', 'mock_app_0', '--noprompt', '--confirm'],
+     ['env', 'unset', '-e', 'TEST_ENV_VAR', '--app', 'mock_app_0', '--noprompt', '--confirm' ],
+     ['env', 'unset', '--env', 'TEST_ENV_VAR', '--app', 'mock_app_0', '--noprompt', '--confirm' ]
+    ].each_with_index do |args, i|
+      context "when run with single env var #{i}" do
+        let(:arguments) { args }
+        it { succeed_with_message /TEST_ENV_VAR/ }
+        it { succeed_with_message /Removing environment variable\(s\) \.\.\./ }
+        it { succeed_with_message /removed/ }
+      end
+    end
+
+    [['env', 'unset', 'TEST_ENV_VAR1', 'TEST_ENV_VAR2', 'TEST_ENV_VAR3', '--app', 'mock_app_0', '--noprompt', '--confirm' ],
+     ['unset-env', 'TEST_ENV_VAR1', 'TEST_ENV_VAR2', 'TEST_ENV_VAR3', '--app', 'mock_app_0', '--noprompt', '--confirm' ]
+    ].each_with_index do |args, i|
+      context "when run with multiple env vars #{i}" do
+        let(:arguments) { args }
+        it { succeed_with_message /TEST_ENV_VAR1/ }
+        it { succeed_with_message /TEST_ENV_VAR2/ }
+        it { succeed_with_message /TEST_ENV_VAR3/ }
+        it { succeed_with_message /Removing environment variable\(s\) \.\.\./ }
+        it { succeed_with_message /removed/ }
+      end
+    end
+
+    context 'when run with --noprompt and without --confirm' do
+      let(:arguments) { ['env', 'unset', 'TEST_ENV_VAR', '--app', 'mock_app_0', '--noprompt' ] }
+      it "should ask for confirmation" do
+        expect{ run }.to exit_with_code(1)
+      end
+      it("should output confirmation") { run_output.should match("This action requires the --confirm option") }
+    end
+  end
+
+  describe 'list env' do
+    context 'when list with default format' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'list', '--app', 'mock_app_0'] }
+      it { succeed_with_message /FOO=123/ }
+      it { succeed_with_message /BAR=456/ }
+      it "should contain the environment variables" do
+        @rest_app.environment_variables.length.should == 2
+      end
+    end
+
+    context 'when list with default format and empty env vars' do
+      let(:arguments) { ['env', 'list', '--app', 'mock_app_0'] }
+      it "should exit with no message" do
+        expect{ run }.to exit_with_code(0)
+      end
+    end
+
+    context 'when list with quotes format' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'list', '--app', 'mock_app_0', '--quotes'] }
+      it { succeed_with_message /FOO="123"/ }
+      it { succeed_with_message /BAR="456"/ }
+      it "should contain the environment variables" do
+        @rest_app.environment_variables.length.should == 2
+      end
+    end
+
+    context 'when list with quotes format and empty env vars' do
+      let(:arguments) { ['env', 'list', '--app', 'mock_app_0', '--quotes'] }
+      it "should exit with no message" do
+        expect{ run }.to exit_with_code(0)
+      end
+    end
+
+    context 'when list with table format' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'list', '--app', 'mock_app_0', '--table'] }
+      it { succeed_with_message /Name\s+Value/ }
+      it { succeed_with_message /FOO\s+123/ }
+      it { succeed_with_message /BAR\s+456/ }
+      it "should contain the right number of env vars" do
+        @rest_app.environment_variables.length.should == 2
+      end
+    end
+
+    context 'when list with table and quotes format' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'list', '--app', 'mock_app_0', '--table', '--quotes'] }
+      it { succeed_with_message /Name\s+Value/ }
+      it { succeed_with_message /FOO\s+"123"/ }
+      it { succeed_with_message /BAR\s+"456"/ }
+      it "should contain the right number of env vars" do
+        @rest_app.environment_variables.length.should == 2
+      end
+    end
+
+    context 'when list with table format and empty env vars' do
+      let(:arguments) { ['env', 'list', '--app', 'mock_app_0', '--table'] }
+      it "should exit with no message" do
+        expect{ run }.to exit_with_code(0)
+      end
+    end
+  end
+
+  describe 'show env' do
+    context 'when show with default format' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'show', 'FOO', '--app', 'mock_app_0'] }
+      it { succeed_with_message /FOO=123/ }
+      it "should not contain env vars not specified to show" do
+        run_output.should_not match(/BAR=456/)
+      end
+      it "should contain the right number of env vars" do
+        @rest_app.environment_variables.length.should == 2
+      end
+    end
+
+    context 'when show with default format and not found env var' do
+      let(:arguments) { ['env', 'show', 'FOO', '--app', 'mock_app_0'] }
+      it "should raise env var not found exception" do
+        expect{ run }.to exit_with_code(157)
+        run_output.should match(/Environment variable\(s\) FOO can't be found in application mock_app_0/)
+      end
+    end
+
+    context 'when show with default format and not found env var' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'show', 'ZEE', '--app', 'mock_app_0'] }
+      it "should contain the right number of env vars" do
+        @rest_app.environment_variables.length.should == 2
+      end
+      it "should not contain env vars not specified to show" do
+        run_output.should_not match(/FOO=123/)
+        run_output.should_not match(/BAR=456/)
+      end
+      it "should raise env var not found exception" do
+        expect{ run }.to exit_with_code(157)
+        run_output.should match(/Environment variable\(s\) ZEE can't be found in application mock_app_0/)
+      end
+    end
+
+    context 'when show with quotes format' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'show', 'FOO', '--app', 'mock_app_0', '--quotes'] }
+      it { succeed_with_message /FOO="123"/ }
+      it "should not contain env vars not specified to show" do
+        run_output.should_not match(/BAR="456"/)
+      end
+      it "should contain the right number of env vars" do
+        @rest_app.environment_variables.length.should == 2
+      end
+    end
+
+    context 'when show with quotes format and not found env var' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'show', 'ZEE', '--app', 'mock_app_0', '--quotes'] }
+      it "should contain the right number of env vars" do
+        @rest_app.environment_variables.length.should == 2
+      end
+      it "should not contain env vars not specified to show" do
+        run_output.should_not match(/FOO=123/)
+        run_output.should_not match(/BAR=456/)
+      end
+      it "should raise env var not found exception" do
+        expect{ run }.to exit_with_code(157)
+        run_output.should match(/Environment variable\(s\) ZEE can't be found in application mock_app_0/)
+      end
+    end
+
+    context 'when show with table format' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'show', 'FOO', '--app', 'mock_app_0', '--table'] }
+      it { succeed_with_message /Name\s+Value/ }
+      it { succeed_with_message /FOO\s+123/ }
+      it "should not contain env vars not specified to show" do
+        run_output.should_not match(/BAR/)
+      end
+      it "should contain the right number of env vars" do
+        @rest_app.environment_variables.length.should == 2
+      end
+    end
+
+    context 'when show with table and quotes format' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'show', 'FOO', '--app', 'mock_app_0', '--table', '--quotes'] }
+      it { succeed_with_message /Name\s+Value/ }
+      it { succeed_with_message /FOO\s+"123"/ }
+      it "should not contain env vars not specified to show" do
+        run_output.should_not match(/BAR/)
+      end
+      it "should contain the right number of env vars" do
+        @rest_app.environment_variables.length.should == 2
+      end
+    end
+
+    context 'when show with table format and not found env var' do
+      before(:each) do
+        @rest_app.set_environment_variables(
+          [RHC::Rest::EnvironmentVariable.new({:name => 'FOO', :value => '123'}),
+           RHC::Rest::EnvironmentVariable.new({:name => 'BAR', :value => '456'})])
+      end
+      let(:arguments) { ['env', 'show', 'ZEE', '--app', 'mock_app_0', '--table'] }
+      it "should contain the right number of env vars" do
+        @rest_app.environment_variables.length.should == 2
+      end
+      it "should not contain env vars not specified to show" do
+        run_output.should_not match(/FOO/)
+        run_output.should_not match(/BAR/)
+      end
+      it "should raise env var not found exception" do
+        expect{ run }.to exit_with_code(157)
+        run_output.should match(/Environment variable\(s\) ZEE can't be found in application mock_app_0/)
+      end
+    end
+
+  end
+
+end

data/spec/rhc/helpers_spec.rb

@@ -329,7 +329,7 @@ describe AllRhcHelpers do
     it "should handle a block in multi_ssh calls" do
       expect_multi_ssh('foo', 'fakegearid0@fakesshurl.com' => 'bar')
       capture{ subject.table_from_gears('foo', [RHC::Rest::Mock::MockRestGearGroup.new], :header => ['cart','col']) }.should match /cart.*col\n-+.*fakegearid0.*bar/m
-    end    
+    end
 
     it "should handle a run_on_gears error for unrecognized type" do
       expect_multi_ssh('foo', {})
@@ -385,21 +385,21 @@ describe AllRhcHelpers do
 
   describe "#strip_ansi" do
     it{ "\e[1m \e[1m".strip_ansi.should == " " }
-    it{ "\eiei0".strip_ansi.should == "\eiei0" } 
-    it{ "\e[iei0]".strip_ansi.should == "\e[iei0]" } 
+    it{ "\eiei0".strip_ansi.should == "\eiei0" }
+    it{ "\e[iei0]".strip_ansi.should == "\e[iei0]" }
   end
 
   context "Resolv helper" do
     let(:resolver) { Object.new }
     let(:existent_host) { 'real_host' }
     let(:nonexistent_host) { 'fake_host' }
-    
+
     before do
       Resolv::Hosts.stub(:new) { resolver }
       resolver.stub(:getaddress).with(existent_host)   { existent_host }
       resolver.stub(:getaddress).with(nonexistent_host){ Resolv::ResolvError }
     end
-    
+
     context "when hosts file has the desired host" do
       it "does not raise error" do
         expect {
@@ -446,6 +446,26 @@ describe AllRhcHelpers do
       end
     end
   end
+
+  describe "#collect_env_vars" do
+    it { subject.collect_env_vars('FOO=BAR').first.to_hash.should == { :name => 'FOO', :value => 'BAR' } }
+    it { subject.collect_env_vars('FOO2=BAR2').first.to_hash.should == { :name => 'FOO2', :value => 'BAR2' } }
+    it { subject.collect_env_vars('FOO_BAR=ZEE').first.to_hash.should == { :name => 'FOO_BAR', :value => 'ZEE' } }
+    it { subject.collect_env_vars('_FOO=BAR').first.to_hash.should == { :name => '_FOO', :value => 'BAR' } }
+    it { subject.collect_env_vars('FOO=').first.to_hash.should == { :name => 'FOO', :value => '' } }
+    it { subject.collect_env_vars('FOO==').first.to_hash.should == { :name => 'FOO', :value => '=' } }
+    it { subject.collect_env_vars('FOO=BAR=ZEE').first.to_hash.should == { :name => 'FOO', :value => 'BAR=ZEE' } }
+    it { subject.collect_env_vars('foo25_=BAR=\][#%*').first.to_hash.should == { :name => 'foo25_', :value => 'BAR=\][#%*' } }
+    it { subject.collect_env_vars('FOO=Test 1 2 3').first.to_hash.should == { :name => 'FOO', :value => 'Test 1 2 3' } }
+    it { subject.collect_env_vars('2FOO=BAR').empty?.should be_true }
+    it { subject.collect_env_vars('FOO.2=BAR').empty?.should be_true }
+    it { subject.collect_env_vars('FOO BAR=ZEE').empty?.should be_true }
+    it { subject.collect_env_vars('FOO*BAR=ZEE').empty?.should be_true }
+    it { subject.collect_env_vars('FOO&BAR=ZEE').empty?.should be_true }
+    it { subject.collect_env_vars('FOO:BAR=ZEE').empty?.should be_true }
+    it { subject.collect_env_vars('FOO@BAR=ZEE').empty?.should be_true }
+    it { subject.collect_env_vars('FOO!BAR=ZEE').empty?.should be_true }
+  end
 end
 
 describe RHC::Helpers::StringTee do

data/spec/rhc/rest_spec.rb

@@ -293,19 +293,20 @@ module RHC
             {:field => 'base',   :severity => 'result', :text => 'Result severity'}, # >= 1.5 API
             {:field => 'base',   :severity => 'info',   :text => 'Non-result message' },
             {:field => 'result', :severity => 'debug',  :text => 'Debug message' },
+            {:field => 'base', :severity => 'warning',  :text => 'Warning message' },
           ]
         end
         let(:response) do
           { :type => 'user', :data => object, :messages => messages }.to_json
         end
 
-        it "copies result messages to the object" do
+        it "copies all non-warning and non-info messages to the object" do
           subject.send(:parse_response, response).messages.should == ['Result field', 'Result severity']
         end
 
-        it "includes debug info when debug true" do
+        it "includes debug and info when debug true" do
           subject.stub(:debug?).and_return(true)
-          subject.send(:parse_response, response).messages.should == ['Result field', 'Result severity', 'Debug message']
+          subject.send(:parse_response, response).messages.should == ['Nil field', 'Result field', 'Result severity', 'Non-result message', 'Debug message']
         end
       end
     end