Merge pull request #238 from tmatilai/chef-version-check

Parse Chef version even if chef-solo command prints warnings
matschaffer · May 3, 2013 · e9572f2 · e9572f2
2 parents e92f970 + f09cbac
commit e9572f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/lib/chef/knife/solo_cook.rb b/lib/chef/knife/solo_cook.rb
@@ -294,8 +294,8 @@ def check_chef_version
 
       # Parses "Chef: x.y.z" from the chef-solo version output
       def chef_version
-        v = run_command('sudo chef-solo --version').stdout.split(':')
-        v[0].strip == 'Chef' ? v[1].strip : ''
+        cmd = %q{sudo chef-solo --version 2>/dev/null | awk '$1 == "Chef:" {print $2}'}
+        run_command(cmd).stdout.strip
       end
 
       def cook

diff --git a/test/solo_cook_test.rb b/test/solo_cook_test.rb
@@ -221,13 +221,6 @@ def test_barks_if_chef_not_found
     end
   end
 
-  def test_parses_chef_version_output
-    version_string = "\r\nChef: 11.2.0\r\n"
-    cmd = command("somehost")
-    cmd.stubs(:run_command).returns(OpenStruct.new(:stdout => version_string))
-    assert_equal '11.2.0', cmd.chef_version
-  end
-
   def test_barks_if_chef_too_old
     in_kitchen do
       cmd = command("somehost")