oyencov 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284aeba7dff7bdcad7911b65bf24a3cf2126730ab050e1468e35d68c42241e01
-  data.tar.gz: e88b831a197f736e59f6912d9083d6885b5adb811d80a092bd143f36dcee92f8
+  metadata.gz: 6002d91269a3df5ab927906b23aa43d19491319ea03946ac3e4fe17b71580b1f
+  data.tar.gz: 146126aecfb5d2e642d598a1552e7a1964bf025d284218ced8492542ed1b164a
 SHA512:
-  metadata.gz: fc0857d3ba42f0fcbb5dcc1806ed19e19577cbafef96f814baaed18e4a8da4fcce0b9d2a75a1408410407e0e55534140b3ed1aeac7ed0fc574b8cfb397daaabd
-  data.tar.gz: d4e63b3c9f0837996ef371509b8935e1ed20b72fd7d7bffd2892e1e276f19241af18763985db8186a8ddbcdec9697e9eee63e1d0449df31af4118570c567d144
+  metadata.gz: c4f91c7983f7291de4d6666cd8ac821960f6511eb75097620528678ef8a285676a0124f95e6b82c5105157ce2173faf733864be16ed061998a8236fb4e26fbcd
+  data.tar.gz: 14deea365dc87c6dbba325ae707c0100bec1f0df7e7b937088e20a6483fb5980c9433b03d613a70129202ef484baf1758279f23ebc5811e870d53a3ae216bce5

data/lib/oyencov/api_connection.rb

@@ -27,7 +27,7 @@ module OyenCov
       begin
         response = get("/v1/data_submission_clearance")
 
-        if Hash === response.body && response.body["status"] == "ok"
+        if Hash === response.body # && response.body["status"] == "ok"
           response.body
         else
           false

data/lib/oyencov/background.rb

@@ -17,14 +17,24 @@ require_relative "logger"
 #
 module OyenCov
   class Background
+    # Added to be more fork-aware. Ruby/Puma can fork a process copy-on-write, 
+    #   but it won't start the threads that are running in the parent process.
+    # 
+    # If the PID > 0 but also not the current process_id, make the thread run.
+    @@running_pid = 0
+
     @loop_interval = 60 # seconds, can be set from server
-    @semaphore = Mutex.new
     @thread = nil
     @reporter = nil
     @api_conn = OyenCov::APIConnection.instance
     @config = OyenCov.config
 
     def self.start
+      if @@running_pid == $$
+        OyenCov::Logger.log("OyenCov Background thread is already running.")
+        return false
+      end
+
       OyenCov::Logger.log(<<~TXT)
         Env: #{@config.mode}
         program_name: #{$PROGRAM_NAME || "nil"}
@@ -45,7 +55,7 @@ module OyenCov
           clearance = @api_conn.get_data_submission_clearance
 
           unless clearance && clearance["status"] == "ok"
-            OyenCov::Logger.log "Unable to obtain oyencov submission clearance. Stopping OyenCov background thread."
+            OyenCov::Logger.log "Unable to obtain oyencov submission clearance. Stopping OyenCov background thread. #{clearance.inspect}"
             Thread.stop
           end
 
@@ -79,6 +89,7 @@ module OyenCov
             OyenCov::Logger.log "POST runtime_report ok."
           else
             OyenCov::Logger.log "POST runtime_report failed. Stopping background thread."
+            @@running_pid = 0
             Thread.stop
           end
 
@@ -87,6 +98,8 @@ module OyenCov
       }
 
       @thread.run
+      OyenCov::Logger.log("OyenCov Background thread starts.")
+      @@running_pid = $$
 
       nil
     end
@@ -95,6 +108,7 @@ module OyenCov
     # For `test`, persist controller report.
     def self.stop
       @thread.stop
+      @@running_pid = 0
     end
 
     private_class_method

data/lib/oyencov/cli.rb

@@ -82,11 +82,9 @@ module OyenCov
           "git_commit_sha" => options[:git_commit_sha]
         })
 
-      # puts JSON.pretty_generate(collated_report)
-
-      # Add metadaata
-
-      ENV["OYENCOV_API_KEY"] ||= options[:token]
+      if options[:token]
+        ENV["OYENCOV_API_KEY"] = options[:token]
+      end
       unless ENV["OYENCOV_API_KEY"]
         warn "API token not set. Unable to submit."
         exit(1)

data/lib/oyencov/configuration.rb

@@ -42,7 +42,7 @@ module OyenCov
 
     # Lots of ideas came from sentry-ruby, thanks to nate berkopec.
     def suggest_release
-      release = `git rev-parse HEAD ||:`.strip
+      release = `git rev-parse HEAD 2>/dev/null || true`.strip
 
       if release == "" || release.nil?
         [".source_version", "REVISION"].each do |version_clue|

data/lib/oyencov/coverage_peek_delta.rb

@@ -52,8 +52,8 @@ module OyenCov
       filtered.each_pair do |fpath, line_hits|
         MethodRangeParser[fpath]&.each_pair do |method_name, line_num|
           # puts [method_name, line_num, line_hits[line_num]]
-          next if line_num.nil? || line_hits[line_num].nil?
-          current_method_hits[method_name] = line_hits[line_num]
+          next if line_num.nil? || line_hits[line_num - 1].nil?
+          current_method_hits[method_name] = line_hits[line_num - 1]
         end
       end
 

data/lib/oyencov/logger.rb

@@ -12,7 +12,7 @@ module OyenCov
       if Exception === msg
         msg = msg.inspect
       end
-      formatted_msg = msg.split("\n").map { |m| "#{ORANGE_TEXT}[OyenCov] #{m}#{RESET_COLOR}" }.join("\n")
+      formatted_msg = msg.split("\n").map { |m| "#{ORANGE_TEXT}[OyenCov] PID##{$$} #{m}#{RESET_COLOR}" }.join("\n")
 
       if level == 2
         warn formatted_msg

data/lib/oyencov/railtie.rb

@@ -5,6 +5,8 @@ require_relative "logger"
 
 module OyenCov
   class Railtie < Rails::Railtie
+    @@controller_tracker_notification = nil
+
     # This is only useful when `rails s` is run in lieu of webserver command first.
     def install_puma_hooks
       return unless defined?(Puma)
@@ -26,12 +28,14 @@ module OyenCov
     initializer "oyencov.configure" do
       OyenCov::Background.start
       install_puma_hooks
-    end
 
-    config.after_initialize do
-      OyenCov::Logger.log("lib/oyencov/railtie.rb config.after_initialize")
+      if @@controller_tracker_notification.nil?
+        OyenCov::Logger.log "@@controller_tracker_notification is nil"
+      else
+        OyenCov::Logger.log "@@controller_tracker_notification is already set, Railtie init rerun."
+      end
 
-      ActiveSupport::Notifications.subscribe("start_processing.action_controller") do |name, start, finish, id, payload|
+      @@controller_tracker_notification ||= ActiveSupport::Notifications.subscribe("start_processing.action_controller") do |name, start, finish, id, payload|
         ControllerTracking.bump("#{payload[:controller]}##{payload[:action]}")
         OyenCov::Logger.log "ControllerTracking.bump(#{payload[:controller]}##{payload[:action]})"
       end

data/lib/oyencov/version.rb

@@ -1,3 +1,3 @@
 module OyenCov
-  VERSION = "0.0.9".freeze
+  VERSION = "0.0.11".freeze
 end

data/lib/oyencov.rb

@@ -11,14 +11,20 @@ module OyenCov
 
   # Sometimes oyencov cant start on their own, maybe when oyencov is loaded
   #   before Rails did.
-  # 
+  #
   # For Rails, put `OyenCov.start!` in `config/initializers/oyencov.rb`.
   def self.start!
     require_relative "oyencov/railtie"
   end
 
   OyenCov::Logger.log("Hello! Booting from #{__FILE__}")
-  OyenCov::Logger.log("Checking Rails existence")
+  OyenCov::Logger.log("Checking/Forcing Rails existence")
+
+  begin
+    require "rails"
+  rescue LoadError
+    # do nothing
+  end
 
   if defined?(Rails::Railtie) # && ENV["OYENCOV_API_KEY"]
     OyenCov::Logger.log("Rails::Railtie already present, starting oyencov/railtie")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oyencov
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Anonoz Chong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday