gorgon 0.4.2 → 0.4.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gorgon (0.4.1)
+    gorgon (0.4.3)
       amqp (~> 0.9.7)
       awesome_print
       bunny (~> 0.8.0)
@@ -14,12 +14,12 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    amq-client (0.9.5)
-      amq-protocol (>= 0.9.4)
+    amq-client (0.9.11)
+      amq-protocol (>= 1.0.1)
       eventmachine
-    amq-protocol (0.9.5)
-    amqp (0.9.7)
-      amq-client (~> 0.9.4)
+    amq-protocol (1.1.0)
+    amqp (0.9.8)
+      amq-client (~> 0.9.5)
       amq-protocol (>= 0.9.4)
       eventmachine
     awesome_print (1.1.0)
@@ -37,7 +37,7 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
-    ruby-progressbar (1.0.1)
+    ruby-progressbar (1.0.2)
     test-unit (2.5.2)
     uuidtools (2.1.3)
     yajl-ruby (1.1.0)

data/README.md

@@ -23,7 +23,7 @@ remote_test: &remote_test
   min_messages: warning
 ```
 
-Where `<<: *defaults` are the default values used in _database.yml_, like for example, adapter, username, password, and host. Replace <my-app> with a name to identify this application's dbs
+Where `<<: *defaults` are the default values used in _database.yml_, like for example, adapter, username, password, and host. Replace `<my-app>` with a name to identify this application's dbs
 
 Installing listener as a Daemon process (Ubuntu 9.10 or later)
 ----------------------------------------------------------------
@@ -40,6 +40,7 @@ Also note that these steps are **not** meant to work on every project, they will
 * gorgon.json
 * test/gorgon_callbacks/after\_sync.rb
 * test/gorgon_callbacks/before\_creating\_workers.rb
+* test/gorgon_callbacks/after\_creating\_workers.rb
 * test/gorgon_callbacks/before\_start.rb
 * test/gorgon_callbacks/after\_complete.rb
 * ~/.gorgon/gorgon_listener.json
@@ -94,4 +95,4 @@ Gorgon is maintained by:
 * Victor Savkin
 
 Gorgon is funded by [Nulogy Corp](http://www.nulogy.com/).
-Thank you to all the [contributors](/Fitzsimmons/Gorgon/graphs/contributors).
+Thank you to all the [contributors](/Fitzsimmons/Gorgon/graphs/contributors).

data/lib/gorgon/callback_handler.rb

@@ -18,4 +18,8 @@ class CallbackHandler
   def after_sync
     load(@config[:after_sync]) if @config[:after_sync]
   end
+
+  def after_creating_workers
+    load(@config[:after_creating_workers]) if @config[:after_creating_workers]
+  end
 end

data/lib/gorgon/settings/rails_project_files_content.rb

@@ -18,6 +18,8 @@ module Settings
                       content: after_sync_content},
                     {name: :before_creating_workers, file_name: "before_creating_workers.rb",
                       content: before_creating_workers_content},
+                    {name: :after_creating_workers, file_name: "after_creating_workers.rb",
+                      content: after_creating_workers_content},
                     {name: :before_start, file_name: "before_start.rb",
                       content: before_start_content},
                     {name: :after_complete, file_name: "after_complete.rb",
@@ -56,10 +58,23 @@ CONTENT
     end
 
     def before_creating_workers_content
-      content = ""
-      content << "require './test/test_helper'\n" if File.exist?("test/test_helper.rb")
-      content << "require './spec/spec_helper'\n" if File.exist?("spec/spec_helper.rb")
-      content
+      <<-CONTENT
+ENV["TEST_ENV_NUMBER"] = Process.pid.to_s
+ENV["RAILS_ENV"] = 'remote_test'
+
+pid, stdin, stdout, stderr = Open4::popen4 "TEST_ENV_NUMBER=#{Process.pid.to_s} RAILS_ENV='remote_test' bundle exec rake db:setup"
+ignore, status = Process.waitpid2 pid
+
+if status.exitstatus != 0
+  raise "ERROR: 'rake db:setup' failed.\n#{stderr.read}\n#{stdout.read}"
+end
+
+require File.expand_path('../../test_helper', __FILE__)
+CONTENT
+    end
+
+    def after_creating_workers_content
+      after_complete_content
     end
 
     def before_start_content

data/lib/gorgon/version.rb

@@ -1,3 +1,3 @@
 module Gorgon
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/gorgon/worker_manager.rb

@@ -77,6 +77,7 @@ class WorkerManager
 
       subscribe_to_originator_queue
     end
+    @callback_handler.after_creating_workers
   end
 
   def fork_a_worker

data/spec/callback_handler_spec.rb

@@ -7,7 +7,8 @@ describe CallbackHandler do
       :before_start => "some/file.rb",
       :after_complete => "some/other/file.rb",
       :before_creating_workers => "callbacks/before_creating_workers_file.rb",
-      :after_sync => "callbacks/after_sync_file.rb"
+      :after_sync => "callbacks/after_sync_file.rb",
+      :after_creating_workers => "callbacks/after_creating_workers.rb"
     }
   }
 
@@ -74,4 +75,20 @@ describe CallbackHandler do
 
     handler.after_sync
   end
+
+  it "calls the after creating workers hook" do
+    handler = CallbackHandler.new(config)
+
+    handler.should_receive(:load).with("callbacks/after_creating_workers.rb")
+
+    handler.after_creating_workers
+  end
+
+  it "does not attempt to load the after creating workers hook when after_creating_workers is not defined" do
+    handler = CallbackHandler.new({})
+
+    handler.should_not_receive(:load)
+
+    handler.after_creating_workers
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorgon
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -281,12 +281,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 266955656043169930
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 266955656043169930
 requirements: []
 rubyforge_project: gorgon
 rubygems_version: 1.8.24