copycopter_client 1.0.0.beta1 → 1.0.0.beta2

data/lib/copycopter_client/sync.rb

@@ -35,10 +35,13 @@ module CopycopterClient
       if spawner?
         register_spawn_hooks
       else
+        register_job_hooks
         logger.info("Starting poller")
         @pending = true
         at_exit { sync }
-        Thread.new { poll }
+        unless Thread.new { poll }
+          logger.error("Couldn't start poller thread")
+        end
       end
     end
 
@@ -78,6 +81,12 @@ module CopycopterClient
       end
     end
 
+    def flush
+      with_queued_changes do |queued|
+        client.upload(queued)
+      end
+    end
+
     private
 
     attr_reader :client, :polling_delay, :logger
@@ -95,9 +104,7 @@ module CopycopterClient
       begin
         downloaded_blurbs = client.download
         lock { @blurbs = downloaded_blurbs }
-        with_queued_changes do |queued|
-          client.upload(queued)
-        end
+        flush
       rescue ConnectionError => error
         logger.error(error.message)
       end
@@ -124,6 +131,20 @@ module CopycopterClient
       $0.include?("ApplicationSpawner") || $0 =~ /unicorn.*master/
     end
 
+    def register_job_hooks
+      if defined?(Resque)
+        logger.info("Registered Resque after_perform hook")
+        Resque::Job.class_eval do
+          alias_method :perform_without_copycopter, :perform
+          def perform
+            job_was_performed = perform_without_copycopter
+            CopycopterClient.flush
+            job_was_performed
+          end
+        end
+      end
+    end
+
     def register_spawn_hooks
       if defined?(PhusionPassenger)
         logger.info("Registered Phusion Passenger fork hook")

data/lib/copycopter_client/version.rb

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

data/lib/copycopter_client.rb

@@ -34,6 +34,12 @@ module CopycopterClient
     sync.start
   end
 
+  # Flush queued changed synchronously
+  # This is called from the Resque after perform "hook"
+  def self.flush
+    sync.flush
+  end
+
   # Call this method to modify defaults in your initializers.
   #
   # @example

data/spec/copycopter_client/sync_spec.rb

@@ -95,6 +95,17 @@ describe CopycopterClient::Sync do
     client.uploaded.should == { 'test.key' => 'test value' }
   end
 
+  it "uploads changes when flushed" do
+    sync = build_sync(:polling_delay => 86400)
+    sync.start
+    sleep 2
+    sync['test.key'] = 'test value'
+    sync.flush
+    sleep(2)
+
+    client.uploaded.should == { 'test.key' => 'test value' }
+  end
+
   it "handles connection errors when polling" do
     failure = "server is napping"
     logger = FakeLogger.new
@@ -153,6 +164,39 @@ describe CopycopterClient::Sync do
                   "Got entries: #{logger.entries.inspect}"
   end
 
+  it "flushes after running a resque job" do
+    define_constant('Resque', Module.new)
+    job = define_constant('Resque::Job', FakeResqueJob).new(:key => 'test.key', :value => 'all your base')
+
+    api_key = "12345"
+    FakeCopycopterApp.add_project api_key
+    logger = FakeLogger.new
+
+    config = { :logger => logger, :polling_delay => 86400, :api_key => api_key }
+    default_config = CopycopterClient::Configuration.new.to_hash.update(config)
+    real_client = CopycopterClient::Client.new(default_config)
+    sync = CopycopterClient::Sync.new(real_client, default_config)
+    CopycopterClient.sync = sync
+    job.sync = sync
+
+    sync.start
+    sleep(2)
+
+    logger.should have_entry(:info, "Registered Resque after_perform hook")
+
+    if fork
+      Process.wait
+    else
+      job.perform
+      exit!
+    end
+    sleep(2)
+
+    project = FakeCopycopterApp.project(api_key)
+    project.draft['test.key'].should == 'all your base'
+
+  end
+
   it "starts after spawning when using unicorn" do
     logger = FakeLogger.new
     define_constant('Unicorn', Module.new)
@@ -232,6 +276,15 @@ describe CopycopterClient::Sync do
     logger.should_not have_entry(:info, "Waiting for first sync")
   end
 
+  it "logs an error if the background thread can't start" do
+    Thread.stubs(:new => nil)
+    logger = FakeLogger.new
+
+    build_sync(:logger => logger).start
+
+    logger.should have_entry(:error, "Couldn't start poller thread")
+  end
+
   describe "given locked mutex" do
     Spec::Matchers.define :finish_after_unlocking do |mutex|
       match do |thread|
@@ -291,5 +344,15 @@ describe CopycopterClient::Sync do
 
     sync.should have_received(:start)
   end
+
+  it "flushes from the top level" do
+    sync = build_sync
+    CopycopterClient.sync = sync
+    sync.stubs(:flush)
+
+    CopycopterClient.flush
+
+    sync.should have_received(:flush)
+  end
 end
 

data/spec/support/fake_resque_job.rb

@@ -0,0 +1,11 @@
+class FakeResqueJob
+  attr_accessor :sync
+  def initialize(hash)
+    @key = hash[:key]
+    @value = hash[:value]
+  end
+  def perform
+    sync[@key] = @value
+    true
+  end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: copycopter_client
 version: !ruby/object:Gem::Version 
-  hash: 62196353
-  prerelease: 6
+  hash: 299253594
+  prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta
-  - 1
-  version: 1.0.0.beta1
+  - beta2
+  version: 1.0.0.beta2
 platform: ruby
 authors: 
 - thoughtbot
@@ -21,9 +20,10 @@ date: 2010-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: i18n
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,8 +32,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 description: 
 email: support@thoughtbot.com
 executables: []
@@ -73,6 +72,7 @@ files:
 - spec/support/fake_html_safe_string.rb
 - spec/support/fake_logger.rb
 - spec/support/fake_passenger.rb
+- spec/support/fake_resque_job.rb
 - spec/support/fake_unicorn.rb
 - features/rails.feature
 - features/step_definitions/copycopter_server_steps.rb
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: copycopter_client
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Client for the Copycopter content management service