From 3d4747a3a6529cd15c990f24b71ddcff60f33926 Mon Sep 17 00:00:00 2001 From: August Jaenicke Date: Wed, 18 Apr 2012 15:24:38 -0700 Subject: [PATCH 1/2] Changed require_path from 'lib' to '.' --- groem.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groem.gemspec b/groem.gemspec index 19a8fd4..956c97f 100644 --- a/groem.gemspec +++ b/groem.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |s| s.files = `git ls-files -c`.split("\n") s.platform = Gem::Platform::RUBY - s.require_path = 'lib' + s.require_path = '.' s.rubyforge_project = '' s.required_rubygems_version = '>= 1.3.6' From 63e5511685057191e469ef5e6164ac6e82df7365 Mon Sep 17 00:00:00 2001 From: August Jaenicke Date: Wed, 2 May 2012 15:30:32 -0700 Subject: [PATCH 2/2] Tests run under Ruby 1.9.2. Call growlify_action on callback_result in Response.initialize to deal wit Growl on OSX --- lib/groem/response.rb | 4 +++- spec/shared/dummy_server_helper.rb | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/groem/response.rb b/lib/groem/response.rb index 38cd924..5c23083 100755 --- a/lib/groem/response.rb +++ b/lib/groem/response.rb @@ -22,7 +22,9 @@ def initialize(resp) self.notification_id = resp[1][GNTP_NOTIFICATION_ID_KEY] self.context = resp[2][GNTP_NOTIFICATION_CALLBACK_CONTEXT_KEY] self.context_type = resp[2][GNTP_NOTIFICATION_CALLBACK_CONTEXT_TYPE_KEY] - self.callback_result = resp[2][GNTP_NOTIFICATION_CALLBACK_RESULT_KEY] + # On Growl OSX, we get CLOSED/CLICKED instead of CLOSE/CLICK + callback_result_key = resp[2][GNTP_NOTIFICATION_CALLBACK_RESULT_KEY] + self.callback_result = growlify_action(callback_result_key) self.method = if self.status.to_i == 0 if self.callback_result GNTP_CALLBACK_RESPONSE diff --git a/spec/shared/dummy_server_helper.rb b/spec/shared/dummy_server_helper.rb index 088564f..17c02e7 100755 --- a/spec/shared/dummy_server_helper.rb +++ b/spec/shared/dummy_server_helper.rb @@ -4,7 +4,9 @@ module DummyServerHelper DEFAULT_PORT = Groem::Dummy::Server::DEFAULT_PORT def self.fork_server(opts = {}) - fork { + sleep(1) + + pid = fork { puts '-------------- server process fork ------------------' Groem::Dummy::Server.reset_canned_responses if opts[:register] @@ -21,11 +23,14 @@ def self.fork_server(opts = {}) Groem::Dummy::Server.listen } puts '-------------- server process exiting -----------' - } + } + sleep(1) + pid end def self.kill_server(pid) Process.kill("INT", pid) + #sleep(1) end end