Merge pull request julienXX#189 from iRath96/patch-1

Fix arguments starting with "-" being unrecognized

Ruby/lib/terminal-notifier.rb

@@ -16,7 +16,7 @@ def self.version
 
   def self.execute(verbose, options)
     if available?
-      command = [BIN_PATH, *options.map { |k,v| v = v.to_s; ["-#{k}", "#{Shellwords.escape(v[0,1])}#{v[1..-1]}"] }.flatten]
+      command = [BIN_PATH, *options.map { |k,v| v = v.to_s; ["-#{k}", "#{v[0] == "-" ? " " : ""}#{Shellwords.escape(v[0,1])}#{v[1..-1]}"] }.flatten]
       command = Shellwords.join(command) if RUBY_VERSION < '1.9'
       result = ''
       IO.popen(command) do |stdout|

Ruby/spec/terminal-notifier_spec.rb

@@ -15,6 +15,13 @@
     IO.expects(:popen).with(command).yields(StringIO.new('output'))
     TerminalNotifier.execute(false, :message => '[ZOMG] "OH YEAH"')
   end
+
+  it "correctly escapes arguments that start with a dash" do
+    command = [TerminalNotifier::BIN_PATH, '-message', ' -kittens', '-title', ' -rule']
+    command = Shellwords.join(command) if RUBY_VERSION < '1.9'
+    IO.expects(:popen).with(command).yields(StringIO.new('output'))
+    TerminalNotifier.execute(false, :message => '-kittens', :title => '-rule')
+  end
 
   it "returns the result output of the command" do
     TerminalNotifier.execute(false, 'help' => '').should == `'#{TerminalNotifier::BIN_PATH}' -help`