Fix IO.popen call on Ruby 1.9.x. Fixes #15.

Codaisseur · Aug 10, 2012 · d348df5 · d348df5
1 parent c4a4d0a
commit d348df5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Ruby/Gemfile.lock b/Ruby/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    terminal-notifier (1.3.0)
+    terminal-notifier (1.4.1)
 
 GEM
   remote: http://rubygems.org/

diff --git a/Ruby/lib/terminal-notifier.rb b/Ruby/lib/terminal-notifier.rb
@@ -17,7 +17,7 @@ def self.execute(verbose, options)
         command = Shellwords.shelljoin(command)
       end
       result = ''
-      IO.popen(*command) do |stdout|
+      IO.popen(command) do |stdout|
         output = stdout.read
         STDOUT.print output if verbose
         result << output

diff --git a/Ruby/spec/terminal-notifier_spec.rb b/Ruby/spec/terminal-notifier_spec.rb
@@ -15,10 +15,14 @@
       require 'shellwords'
       command = Shellwords.shelljoin(command)
     end
-    IO.expects(:popen).with(*command).yields(StringIO.new('output'))
+    IO.expects(:popen).with(command).yields(StringIO.new('output'))
     TerminalNotifier.execute(false, :message => 'ZOMG')
   end
 
+  it "returns the result output of the command" do
+    TerminalNotifier.execute(false, 'help' => '').should == `'#{TerminalNotifier::BIN_PATH}' -help`
+  end
+
   it "sends a notification" do
     TerminalNotifier.expects(:execute).with(false, :message => 'ZOMG', :group => 'important stuff')
     TerminalNotifier.notify('ZOMG', :group => 'important stuff')