copy_tuner_client 0.13.6 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18a9b47fc9ce6eb6887518560e3f70b45068b49a3f96a69ddba25a0881a5f0eb
-  data.tar.gz: bab8e9d03f8a9234c08ccb2a14f2110c1bf82b57054aec363fb9d5cb60497bd1
+  metadata.gz: b43b5c8067dd3666dccb82ed7a98df2ba4bc062c3f12d540fecfe74ac7988b72
+  data.tar.gz: 49d07a02e6f7db85afc39cf7bde5453231fe2ba112e29a7ed10581a4890d39dc
 SHA512:
-  metadata.gz: 736eccf7b435cdd6a800adea2a8a9134efcda643dd470648b2e6f391685eb09fb80a81fc5dba261140af4a2ebbabe384b51d553ff09f663b40986f702f9f6e56
-  data.tar.gz: 82a552afe1876391d165600f02336e544d5ba78dc8b596a015917bd04f116dd785daf87ba58f3e31b117ad76b735dab4f8a594de5c1055118a8e5a0a192f2c11
+  metadata.gz: 4342ff5bea8a937980ab0e0656ae273d533803a07167c383761456addb425cadbe9712cfc0327474f8e4d35d04523bf5839c5dcb347a818aca4fdca33c36e9be
+  data.tar.gz: 0a8553e3ca6cf15b6a41c4ab4bc9e6b8c0150e8025c379d2fab9aa46618a6c960799fa8efada1b00a32ee2864a44c043c1282e7deace4019489aa0a1f62d1380

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.14.1
+
+- Fix super call in define_method
+
+## 0.14.0
+
+- Add Support for good_job
+- Drop Support for Resque
+
 ## 0.13.5
 
 - Rename assets

data/lib/copy_tuner_client/process_guard.rb

@@ -18,7 +18,6 @@ module CopyTunerClient
         register_spawn_hooks
       else
         register_exit_hooks
-        register_job_hooks
         start_polling
       end
     end
@@ -30,7 +29,7 @@ module CopyTunerClient
     end
 
     def spawner?
-      passenger_spawner? || unicorn_spawner? || delayed_job_spawner? || puma_spawner?
+      passenger_spawner? || unicorn_spawner? || delayed_job_spawner? || puma_spawner? || good_job_spawner?
     end
 
     def passenger_spawner?
@@ -53,6 +52,10 @@ module CopyTunerClient
       defined?(Delayed::Worker) && $0.include?('delayed_job')
     end
 
+    def good_job_spawner?
+      $0.include?('good_job') && defined?(GoodJob) && ARGV.include?('--daemonize')
+    end
+
     def register_spawn_hooks
       if passenger_spawner?
         register_passenger_hook
@@ -62,6 +65,8 @@ module CopyTunerClient
         register_puma_hook
       elsif delayed_job_spawner?
         register_delayed_hook
+      elsif good_job_spawner?
+        register_good_job_hook
       end
     end
 
@@ -96,6 +101,18 @@ module CopyTunerClient
       end
     end
 
+    def register_good_job_hook
+      @logger.info("Registered good_job start hook")
+      poller = @poller
+      hook_module = Module.new do
+        define_method :daemon do
+          super() # NOTE: define_method 内で super を呼ぶ場合は引数を明示的に指定する必要があるので注意
+          poller.start
+        end
+      end
+      ::Process.singleton_class.prepend hook_module
+    end
+
     def register_puma_hook
       # If Puma is clustered mode without preload_app, this method is called on worker process.
       # Just start poller and return.
@@ -112,7 +129,7 @@ module CopyTunerClient
       hook_module = Module.new do
         define_method :start_server do
           poller.start
-          super()
+          super() # NOTE: define_method 内で super を呼ぶ場合は引数を明示的に指定する必要があるので注意
         end
       end
       Puma::Runner.prepend hook_module
@@ -123,20 +140,5 @@ module CopyTunerClient
         @cache.flush
       end
     end
-
-    def register_job_hooks
-      if defined?(Resque::Job)
-        @logger.info("Registered Resque after_perform hook")
-        cache = @cache
-        Resque::Job.class_eval do
-          alias_method :perform_without_copy_tuner, :perform
-          define_method :perform do
-            job_was_performed = perform_without_copy_tuner
-            cache.flush
-            job_was_performed
-          end
-        end
-      end
-    end
   end
 end

data/lib/copy_tuner_client/version.rb

@@ -1,6 +1,6 @@
 module CopyTunerClient
   # Client version
-  VERSION = '0.13.6'.freeze
+  VERSION = '0.14.1'.freeze
 
   # API version being used to communicate with the server
   API_VERSION = '2.0'.freeze

data/spec/copy_tuner_client/process_guard_spec.rb

@@ -91,28 +91,4 @@ describe CopyTunerClient::ProcessGuard do
 
     expect(cache).to be_written
   end
-
-  it "flushes after running a resque job" do
-    logger = FakeLogger.new
-    cache = WritingCache.new
-    define_constant('Resque', Module.new)
-    job_class = define_constant('Resque::Job', FakeResqueJob)
-    job = job_class.new
-    process_guard = build_process_guard(:cache => cache, :logger => logger)
-
-    process_guard.start
-    job.fork_and_perform
-
-    expect(cache).to be_written
-    expect(logger).to have_entry(:info, "Registered Resque after_perform hook")
-  end
-
-  it "doesn't fail if only Resque is defined and not Resque::Job" do
-    logger = FakeLogger.new
-    cache = WritingCache.new
-    define_constant('Resque', Module.new)
-    process_guard = build_process_guard(:cache => cache, :logger => logger)
-
-    process_guard.start
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.13.6
+  version: 0.14.1
 platform: ruby
 authors:
 - SonicGarden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -248,7 +248,6 @@ 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
 - spec/support/middleware_stack.rb
 - spec/support/writing_cache.rb
@@ -307,7 +306,6 @@ test_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
 - spec/support/middleware_stack.rb
 - spec/support/writing_cache.rb

data/spec/support/fake_resque_job.rb

@@ -1,18 +0,0 @@
-class FakeResqueJob
-  def initialize(&action)
-    @action = action || lambda {}
-  end
-
-  def fork_and_perform
-    fork do
-      perform
-      exit!
-    end
-    Process.wait
-  end
-
-  def perform
-    @action.call
-    true
-  end
-end