From ffcb9ad688ef8f7b19d87363cee58e4b8892e591 Mon Sep 17 00:00:00 2001
From: Hayato ITO <haya10.ito@gmail.com>
Date: Fri, 5 Jul 2013 08:21:12 +0900
Subject: [PATCH 1/2] support be_installed.by('rpm') on RHEL

---
 lib/serverspec/commands/redhat.rb | 6 +++++-
 spec/redhat/package_spec.rb       | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/serverspec/commands/redhat.rb b/lib/serverspec/commands/redhat.rb
index 49a5a038..80798e68 100644
--- a/lib/serverspec/commands/redhat.rb
+++ b/lib/serverspec/commands/redhat.rb
@@ -19,7 +19,11 @@ def check_yumrepo_enabled(repository)
       end
 
       def check_installed(package,version=nil)
-        cmd = "rpm -q #{escape(package)}"
+        check_installed_by_rpm(package,version)
+      end
+
+      def check_installed_by_rpm name, version=nil
+        cmd = "rpm -q #{name}"
         if ! version.nil?
           cmd = "#{cmd} | grep -w -- #{escape(version)}"
         end
diff --git a/spec/redhat/package_spec.rb b/spec/redhat/package_spec.rb
index 81add1ed..e595e1c6 100644
--- a/spec/redhat/package_spec.rb
+++ b/spec/redhat/package_spec.rb
@@ -11,11 +11,20 @@
   it { should_not be_installed }
 end
 
+package('invalid-package') do
+  it { should_not be_installed.by('rpm') }
+end
+
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
   its(:command) { should eq "rpm -q httpd | grep -w -- 2.2.15-28.el6" }
 end
 
+describe package('httpd') do
+  it { should be_installed.by('rpm').with_version('2.2.15-28.el6') }
+  its(:command) { should eq "rpm -q httpd | grep -w -- 2.2.15-28.el6" }
+end
+
 describe package('httpd') do
   it { should_not be_installed.with_version('invalid-version') }
 end

From 50d669c04eb1bf5d0e95f6a10d5c9847d4750ea9 Mon Sep 17 00:00:00 2001
From: Hayato ITO <haya10.ito@gmail.com>
Date: Fri, 5 Jul 2013 21:21:25 +0900
Subject: [PATCH 2/2] use method alias for be_installed_by.('rpm')

---
 lib/serverspec/commands/redhat.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/serverspec/commands/redhat.rb b/lib/serverspec/commands/redhat.rb
index 80798e68..f8f0e3fd 100644
--- a/lib/serverspec/commands/redhat.rb
+++ b/lib/serverspec/commands/redhat.rb
@@ -19,16 +19,14 @@ def check_yumrepo_enabled(repository)
       end
 
       def check_installed(package,version=nil)
-        check_installed_by_rpm(package,version)
-      end
-
-      def check_installed_by_rpm name, version=nil
-        cmd = "rpm -q #{name}"
+        cmd = "rpm -q #{escape(package)}"
         if ! version.nil?
           cmd = "#{cmd} | grep -w -- #{escape(version)}"
         end
         cmd
       end
+
+      alias :check_installed_by_rpm :check_installed
     end
   end
 end