copycopter_client 1.0.0.beta5 → 1.0.0.beta6

data/lib/copycopter_client/sync.rb

@@ -135,7 +135,15 @@ module CopycopterClient
     end
 
     def spawner?
-      $0.include?("ApplicationSpawner") || $0 =~ /unicorn.*master/
+      passenger_spawner? || unicorn_spawner?
+    end
+
+    def passenger_spawner?
+      $0.include?("ApplicationSpawner")
+    end
+
+    def unicorn_spawner?
+      $0.include?("unicorn") && !caller.any? { |line| line.include?("worker_loop") }
     end
 
     def register_job_hooks

data/lib/copycopter_client/version.rb

@@ -1,6 +1,6 @@
 module CopycopterClient
   # Client version
-  VERSION = "1.0.0.beta5"
+  VERSION = "1.0.0.beta6"
 
   # API version being used to communicate with the server
   API_VERSION = "2.0"

data/spec/copycopter_client/sync_spec.rb

@@ -15,9 +15,13 @@ describe CopycopterClient::Sync do
 
   before do
     @syncs = []
+    @original_process_name = $0
   end
 
-  after { @syncs.each { |sync| sync.stop } }
+  after do
+    $0 = @original_process_name
+    @syncs.each { |sync| sync.stop }
+  end
 
   it "syncs when the process terminates" do
     api_key = "12345"

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ ShamRack.mount(FakeCopycopterApp.new, "copycopter.com")
 
 Spec::Runner.configure do |config|
   config.include ClientSpecHelpers
-  config.include WebMock
+  config.include WebMock::API
   config.mock_with :mocha
   config.before do
     FakeCopycopterApp.reset

data/spec/support/defines_constants.rb

@@ -1,4 +1,12 @@
-share_as :DefinesConstants do
+module DefinesConstants
+  def self.included(example_group)
+    super
+    example_group.class_eval do
+      before { @defined_constants = [] }
+      after { undefine_constants }
+    end
+  end
+
   def define_class(class_name, base = Object, &block)
     class_name = class_name.to_s.camelize
     klass = Class.new(base)
@@ -25,9 +33,7 @@ share_as :DefinesConstants do
     yield(parent, name)
   end
 
-  before { @defined_constants = [] }
-
-  after do
+  def undefine_constants
     @defined_constants.reverse.each do |path|
       parse_constant(path) do |parent, name|
         parent.send(:remove_const, name)

data/spec/support/fake_unicorn.rb

@@ -1,10 +1,9 @@
 class FakeUnicornServer
   def become_master
-    $0 = "unicorn master"
+    $0 = "unicorn"
   end
 
   def spawn
-    $0 = "PassengerFork"
     worker_loop(nil)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: copycopter_client
 version: !ruby/object:Gem::Version 
-  hash: 299253593
+  hash: 299253590
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta5
-  version: 1.0.0.beta5
+  - beta6
+  version: 1.0.0.beta6
 platform: ruby
 authors: 
 - thoughtbot