copy_tuner_client 0.13.5 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28ccf5e2ed38298ddcd90d04ec2a6180fa6ebb09410923b0dbb5d2f64d90e05e
-  data.tar.gz: 4fd8162f350c4fc57725a10e44016f10f7048393e88656fe94b75689c5b9d2c1
+  metadata.gz: 0c3aa96213cfb378917e854a87a2d123811e5b680ac1d0cad51d0a7c5cd63ac0
+  data.tar.gz: 690b11ad48005c79a59c50132b0f3f603160353cd45a29dc72f63f02f480ee08
 SHA512:
-  metadata.gz: c627bcbaf93424c9cac41132bd05bfa3c26b887d66e4ebcf2438a18bf5d05f4f6e38c1a6030d63b3ad981f20a6fd40256383564fa3d67b4ebf19446bef609c1b
-  data.tar.gz: '08adeeff5aaaafdcf872382448ebc4bb76c230d6bfda1460b460a7ec3fb7006cb08372c9e0535db406089e7cd2a18b134ea526727d48dc8b015ff23634d06654'
+  metadata.gz: ba67841e0fe4bd9472bb6ff773cd1c91b3a50dbe899d6bd44f1aebba03601dbc42be664dcbb08de920c11a9c6b33acedbf00e342f0db22e3c3894fad0270d066
+  data.tar.gz: a6f481140fcce7273249f76b00a28a5e935419c965bf5efa57f100de13d4b9de11ac0310c706e65557763cb3372dbb951d040c23f5acc2ffb5026f1aa77be105

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.14.0
+
+- Add Support for good_job
+- Drop Support for Resque
+
 ## 0.13.5
 
 - Rename assets

data/app/assets/javascripts/copytuner.js

@@ -373,7 +373,7 @@ const start = () => {
       copyray2.hide();
       return;
     }
-    if ((isMac && event.metaKey || !isMac && event.ctrlKey) && event.shiftKey && event.key === "k") {
+    if ((isMac && event.metaKey || !isMac && event.ctrlKey) && event.shiftKey && event.key.toLowerCase() === "k") {
       copyray2.toggle();
     }
   });

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
+          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
         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.5'.freeze
+  VERSION = '0.14.0'.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

data/src/main.ts

@@ -41,7 +41,7 @@ const start = () => {
       return
     }
 
-    if (((isMac && event.metaKey) || (!isMac && event.ctrlKey)) && event.shiftKey && event.key === 'k') {
+    if (((isMac && event.metaKey) || (!isMac && event.ctrlKey)) && event.shiftKey && event.key.toLowerCase() === 'k') {
       copyray.toggle()
     }
   })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.14.0
 platform: ruby
 authors:
 - SonicGarden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-12-03 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