oyencov 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3e5ee7aa1684c38b97b8e6ee22616c2aed628ac615c5957cb90a210c3ff6aee
-  data.tar.gz: 9b3f27e56cc9ba41de77a4ff60363d03a30130e5dc3fe9d6071e12f46b39b14a
+  metadata.gz: 284aeba7dff7bdcad7911b65bf24a3cf2126730ab050e1468e35d68c42241e01
+  data.tar.gz: e88b831a197f736e59f6912d9083d6885b5adb811d80a092bd143f36dcee92f8
 SHA512:
-  metadata.gz: e716dfd3bdcf079207bd5d35788ead90636cabe1adb787e512fc6e773746aa1dd90588e669f9b3385d8c5998fa938ea253cccfbcd72cbbdad061673432e3aebf
-  data.tar.gz: 7d5ae1f08f69014ab759b1bf4b8a59f517efd8bd44d9f9e6ac25f1fd0024e767e744eabc3e58eec2f948136be9eecaed136a21dd85ab34a287a78e2c28c74c93
+  metadata.gz: fc0857d3ba42f0fcbb5dcc1806ed19e19577cbafef96f814baaed18e4a8da4fcce0b9d2a75a1408410407e0e55534140b3ed1aeac7ed0fc574b8cfb397daaabd
+  data.tar.gz: d4e63b3c9f0837996ef371509b8935e1ed20b72fd7d7bffd2892e1e276f19241af18763985db8186a8ddbcdec9697e9eee63e1d0449df31af4118570c567d144

data/lib/oyencov/api_connection.rb

@@ -28,9 +28,9 @@ module OyenCov
         response = get("/v1/data_submission_clearance")
 
         if Hash === response.body && response.body["status"] == "ok"
-          return response.body
+          response.body
         else
-          return false
+          false
         end
       rescue Faraday::Error => e
         OyenCov::Logger.log(e, 2)

data/lib/oyencov/background.rb

@@ -1,6 +1,7 @@
 require "securerandom"
 require "singleton"
 require_relative "api_connection"
+require_relative "controller_tracking"
 require_relative "coverage_peek_delta"
 require_relative "logger"
 
@@ -26,8 +27,9 @@ module OyenCov
     def self.start
       OyenCov::Logger.log(<<~TXT)
         Env: #{@config.mode}
-        $PROGRAM_NAME: #{$PROGRAM_NAME || "nil"}
-        @process_type: #{@config.process_type}
+        program_name: #{$PROGRAM_NAME || "nil"}
+        process_type: #{@config.process_type}
+        release/git_commit_sha: #{@config.release}
         Env vars set: #{ENV.keys.grep(/^OYENCOV_/)}
       TXT
 

data/lib/oyencov/configuration.rb

@@ -46,13 +46,27 @@ module OyenCov
 
       if release == "" || release.nil?
         [".source_version", "REVISION"].each do |version_clue|
-          if File.exist?(Rails.root.join(version_clue))
-            release = File.read(Rails.root.join(version_clue)).strip
-            return release
+          version_clue_path = if defined?(Rails.root) && Rails.root
+            Rails.root.join(version_clue)
+          elsif defined?(Bundler.root) && Bundler.root
+            Bundler.root.join(version_clue)
+          elsif defined?(Pathname.pwd) && Pathname.pwd
+            Pathname.pwd.join(version_clue)
+          else
+            next
+          end
+
+          if File.exist?(version_clue_path)
+            return File.read(version_clue_path).strip
           end
         end
       end
 
+      # Last resort, prevent null value.
+      if release == "" || release.nil?
+        release = "-"
+      end
+
       release
     end
 
@@ -72,10 +86,13 @@ module OyenCov
         end
       end
 
-      if /^puma/.match?($PROGRAM_NAME)
-        if defined?(Rails)
-          return "rails-server"
-        end
+      # If its cluster mode & we are in worker process, puma is at the beginning.
+      # If it's `bundle exec puma` then it comes in the end
+      #
+      # If it's booted up by puma not rails server, `Rails` module wont be defined.
+      # We will just assume puma = rails-server
+      if /^puma/.match?($0) || sliced_program_name == "puma"
+        return "rails-server"
       end
 
       # Rails can be server or rake task

data/lib/oyencov/puma/plugin/oyencov.rb

@@ -2,15 +2,30 @@ require "puma/plugin"
 require_relative "../../background"
 require_relative "../../logger"
 
-Puma::Plugin.create do
+defined?(Puma::Plugin.create) && Puma::Plugin.create do
   OyenCov::Logger.log("Puma::Plugin.create running...")
 
   def config(c)
     OyenCov::Logger.log("Puma::Plugin.create config(c) running...")
 
+    c.on_booted do
+      OyenCov::Logger.log("Puma::Plugin.create config on_booted called")
+      OyenCov::Background.start
+      if defined?(Rails::Railtie)
+        load(File.expand_path("../../railtie.rb", File.dirname(__FILE__)))
+      else
+        OyenCov::Logger.log("on_booted: Railtie undefined 😭")
+      end
+    end
+
     c.on_worker_boot do
       OyenCov::Logger.log("Puma::Plugin.create config on_worker_boot called")
       OyenCov::Background.start
+      if defined?(Rails::Railtie)
+        load(File.expand_path("../../railtie.rb", File.dirname(__FILE__)))
+      else
+        OyenCov::Logger.log("on_worker_boot: Railtie undefined 😭")
+      end
     end
   end
 end

data/lib/oyencov/railtie.rb

@@ -5,6 +5,7 @@ require_relative "logger"
 
 module OyenCov
   class Railtie < Rails::Railtie
+    # This is only useful when `rails s` is run in lieu of webserver command first.
     def install_puma_hooks
       return unless defined?(Puma)
       OyenCov::Logger.log("Puma defined, installing puma hooks")
@@ -15,7 +16,7 @@ module OyenCov
         OyenCov::Logger.log("Load errors: #{e}")
       end
 
-      # # Cluster mode
+      # Cluster mode
       if defined?(Puma::Plugin)
         OyenCov::Logger.log("Puma::Plugin defined, installing hooks for CLUSTER MODE")
         require_relative "puma/plugin/oyencov"

data/lib/oyencov/version.rb

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

data/lib/oyencov.rb

@@ -3,15 +3,27 @@ require_relative "oyencov/simplecov_resultset_translator"
 require_relative "oyencov/version"
 require_relative "oyencov/logger"
 
-# For now, support only Rails. We bootstrap from Railtie.
+# For now, support only Rails. We bootstrap background thread and controller tracking from Railtie.
 module OyenCov
   def self.config
     @config ||= OyenCov::Configuration.new
   end
 
+  # 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")
+
   if defined?(Rails::Railtie) # && ENV["OYENCOV_API_KEY"]
-    OyenCov::Logger.log("Starting Railtie")
+    OyenCov::Logger.log("Rails::Railtie already present, starting oyencov/railtie")
     require_relative "oyencov/railtie"
+  else
+    OyenCov::Logger.log("Rails::Railtie absent, cannot start tracking & reporting yet.")
   end
 end

metadata

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