spoom 1.1.12 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed6d04e01efc1c6c8c00df77ad340f189a277aebf3afbd64edbd89f6145541f2
-  data.tar.gz: 1935557277bcfdb54b4ab0d389ab5a72fb5b2d00a6631f6c787dae9d83dac7c4
+  metadata.gz: 5cad6017cf76302bc359d170fce6c2e33c4ff5923a564b26e2f270b42c102e3d
+  data.tar.gz: 734654483394f8520346d0ddab7872e1c7f42de4eed7523e503264f8045bf2c9
 SHA512:
-  metadata.gz: 781d3bb6443c518fc1d4334e5c4ac17a09372ba9115f024bcdceb5cf15af4d4524d1e4cb465963ce5d23aaa07ebd5ab2114ebe81b4eea3fffe27942295e21b9f
-  data.tar.gz: 3427fdfe5cd483609fbbe6618de2f8a536f8bf0727a6865e44c2c4c9b74f9303c0fdcfdefd44bdd547d16e6766f0f09fa49c1e8cd991d0efcffaa37f3c9c7609
+  metadata.gz: a67da9fa2811e15d5bfc5f554a2b1cb23bed4a0744617d1168b3d3d4c08f4f6828b207142996fb8cebc57ca8732d901e3e390c43939eaa504a2ed1cc1fe611b4
+  data.tar.gz: 1b98af8f37acd554f908fdde1257f9c53eaab0a37b21847e619caee5cdda44e9f06e248545ec247cb43c6ac434d5e00bce4b6731eb434c62bd3a60a72c67313f

data/lib/spoom/cli/bump.rb

@@ -71,7 +71,7 @@ module Spoom
         say("\n")
 
         if files_to_bump.empty?
-          say("No file to bump from `#{from}` to `#{to}`")
+          say("No files to bump from `#{from}` to `#{to}`")
           exit(0)
         end
 
@@ -88,7 +88,7 @@ module Spoom
           "--error-url-base=#{error_url_base}",
           path: exec_path,
           capture_err: true,
-          sorbet_bin: options[:sorbet]
+          sorbet_bin: options[:sorbet],
         )
 
         check_sorbet_segfault(result.exit_code) do
@@ -132,13 +132,14 @@ module Spoom
 
       no_commands do
         def print_changes(files, command:, from: "false", to: "true", dry: false, path: File.expand_path("."))
-          if files.empty?
-            say("No file to bump from `#{from}` to `#{to}`")
+          files_count = files.size
+          if files_count.zero?
+            say("No files to bump from `#{from}` to `#{to}`")
             return
           end
           message = StringIO.new
           message << (dry ? "Can bump" : "Bumped")
-          message << " `#{files.size}` file#{"s" if files.size > 1}"
+          message << " `#{files_count}` file#{"s" if files_count > 1}"
           message << " from `#{from}` to `#{to}`:"
           say(message.string)
           files.each do |file|
@@ -146,7 +147,7 @@ module Spoom
             say(" + #{file_path}")
           end
           if dry && command
-            say("\nRun `#{command}` to bump them")
+            say("\nRun `#{command}` to bump #{files_count > 1 ? "them" : "it"}")
           elsif dry
             say("\nRun `spoom bump --from #{from} --to #{to}` locally then `commit the changes` and `push them`")
           end

data/lib/spoom/cli/coverage.rb

@@ -46,7 +46,7 @@ module Spoom
         sorbet = options[:sorbet]
 
         ref_before = Spoom::Git.current_branch
-        ref_before = Spoom::Git.last_commit(path: path) unless ref_before
+        ref_before = Spoom::Git.last_commit(path: path)&.sha unless ref_before
         unless ref_before
           say_error("Not in a git repository")
           say_error("\nSpoom needs to checkout into your previous commits to build the timeline.", status: nil)
@@ -71,9 +71,9 @@ module Spoom
         to = parse_time(options[:to], "--to")
 
         unless from
-          intro_sha = Spoom::Git.sorbet_intro_commit(path: path)
-          intro_sha = T.must(intro_sha) # we know it's in there since in_sorbet_project!
-          from = Spoom::Git.commit_time(intro_sha, path: path)
+          intro_commit = Spoom::Git.sorbet_intro_commit(path: path)
+          intro_commit = T.must(intro_commit) # we know it's in there since in_sorbet_project!
+          from = intro_commit.time
         end
 
         timeline = Spoom::Timeline.new(from, to, path: path)
@@ -84,16 +84,15 @@ module Spoom
           exit(1)
         end
 
-        ticks.each_with_index do |sha, i|
-          date = Spoom::Git.commit_time(sha, path: path)
-          say("Analyzing commit `#{sha}` - #{date&.strftime("%F")} (#{i + 1} / #{ticks.size})")
+        ticks.each_with_index do |commit, i|
+          say("Analyzing commit `#{commit.sha}` - #{commit.time.strftime("%F")} (#{i + 1} / #{ticks.size})")
 
-          Spoom::Git.checkout(sha, path: path)
+          Spoom::Git.checkout(commit.sha, path: path)
 
           snapshot = T.let(nil, T.nilable(Spoom::Coverage::Snapshot))
           if options[:bundle_install]
             Bundler.with_unbundled_env do
-              next unless bundle_install(path, sha)
+              next unless bundle_install(path, commit.sha)
 
               snapshot = Spoom::Coverage.snapshot(path: path, sorbet_bin: sorbet)
             end
@@ -107,7 +106,7 @@ module Spoom
 
           next unless save_dir
 
-          file = "#{save_dir}/#{sha}.json"
+          file = "#{save_dir}/#{commit.sha}.json"
           File.write(file, snapshot.to_json)
           say("  Snapshot data saved under `#{file}`\n\n")
         end
@@ -148,7 +147,7 @@ module Spoom
           false: options[:color_false],
           true: options[:color_true],
           strict: options[:color_strict],
-          strong: options[:color_strong]
+          strong: options[:color_strong],
         )
 
         report = Spoom::Coverage.report(snapshots, palette: palette, path: exec_path)

data/lib/spoom/cli/helper.rb

@@ -33,7 +33,7 @@ module Spoom
         params(
           message: String,
           status: T.nilable(String),
-          nl: T::Boolean
+          nl: T::Boolean,
         ).void
       end
       def say_error(message, status: "Error", nl: true)
@@ -61,7 +61,7 @@ module Spoom
           say_error(
             "not in a Sorbet project (`#{sorbet_config_file}` not found)\n\n" \
               "When running spoom from another path than the project's root, " \
-              "use `--path PATH` to specify the path to the root."
+              "use `--path PATH` to specify the path to the root.",
           )
           Kernel.exit(1)
         end

data/lib/spoom/cli/lsp.rb

@@ -118,7 +118,7 @@ module Spoom
             "--lsp",
             "--enable-all-experimental-lsp-features",
             "--disable-watchman",
-            path: path
+            path: path,
           )
           client.open(File.expand_path(path))
           client
@@ -128,7 +128,7 @@ module Spoom
           Spoom::LSP::SymbolPrinter.new(
             indent_level: 2,
             colors: options[:color],
-            prefix: "file://#{File.expand_path(exec_path)}"
+            prefix: "file://#{File.expand_path(exec_path)}",
           )
         end
 

data/lib/spoom/cli/run.rb

@@ -40,7 +40,7 @@ module Spoom
             *options[:sorbet_options].split(" "),
             path: path,
             capture_err: false,
-            sorbet_bin: sorbet
+            sorbet_bin: sorbet,
           )
 
           check_sorbet_segfault(result.code)
@@ -54,7 +54,7 @@ module Spoom
           "--error-url-base=#{error_url_base}",
           path: path,
           capture_err: true,
-          sorbet_bin: sorbet
+          sorbet_bin: sorbet,
         )
 
         check_sorbet_segfault(result.exit_code)

data/lib/spoom/coverage/d3/pie.rb

@@ -125,14 +125,14 @@ module Spoom
 
           sig { params(id: String, title: String, snapshot: Snapshot).void }
           def initialize(id, title, snapshot)
-            super(id, title, snapshot.sigils.select { |_k, v| v })
+            super(id, title, snapshot.sigils_excluding_rbis.select { |_k, v| v })
           end
 
           sig { override.returns(String) }
           def tooltip
             <<~JS
               function tooltip_#{id}(d) {
-                tooltipPie(d, "typed: " + d.data.key, "files", sum_#{id});
+                tooltipPie(d, "typed: " + d.data.key, "files excluding RBIs", sum_#{id});
               }
             JS
           end
@@ -161,14 +161,21 @@ module Spoom
 
           sig { params(id: String, title: String, snapshot: Snapshot).void }
           def initialize(id, title, snapshot)
-            super(id, title, { true: snapshot.methods_with_sig, false: snapshot.methods_without_sig })
+            super(
+              id,
+              title,
+              { true: snapshot.methods_with_sig_excluding_rbis, false: snapshot.methods_without_sig_excluding_rbis }
+            )
           end
 
           sig { override.returns(String) }
           def tooltip
             <<~JS
               function tooltip_#{id}(d) {
-                tooltipPie(d, (d.data.key == "true" ? " with" : " without") + " a signature", "methods", sum_#{id})
+                tooltipPie(
+                  d,
+                  (d.data.key == "true" ? " with" : " without") + " a signature", "methods excluding RBIs", sum_#{id}
+                )
               }
             JS
           end

data/lib/spoom/coverage/d3/timeline.rb

@@ -268,7 +268,7 @@ module Spoom
                               d3.min(data_#{id}, (d) => parseVersion(d.runtime))]) - 0.01",
                 max: "d3.max([d3.max(data_#{id}, (d) => parseVersion(d.static)),
                               d3.max(data_#{id}, (d) => parseVersion(d.runtime))]) + 0.01",
-                ticks: "ticks(8)"
+                ticks: "ticks(8)",
               )}
               #{line(y: "parseVersion(d.runtime)", color: "#e83e8c", curve: "curveStepAfter")}
               #{line(y: "parseVersion(d.static)", color: "#007bff", curve: "curveStepAfter")}
@@ -314,7 +314,7 @@ module Spoom
               #{y_scale(
                 min: "0",
                 max: "d3.max(data_#{id}, (d) => d.runtime)",
-                ticks: "ticks(10)"
+                ticks: "ticks(10)",
               )}
               #{area(y: "d.runtime")}
               #{line(y: "d.runtime")}
@@ -428,8 +428,8 @@ module Spoom
               {
                 timestamp: snapshot.commit_timestamp,
                 commit: snapshot.commit_sha,
-                total: snapshot.files,
-                values: snapshot.sigils,
+                total: snapshot.files - snapshot.rbi_files,
+                values: snapshot.sigils_excluding_rbis,
               }
             end
             super(id, data, keys)
@@ -439,7 +439,7 @@ module Spoom
           def tooltip
             <<~JS
               function tooltip_#{id}(d) {
-                tooltipTimeline(d, "files");
+                tooltipTimeline(d, "files excluding RBIs");
               }
             JS
           end
@@ -482,8 +482,11 @@ module Spoom
               {
                 timestamp: snapshot.commit_timestamp,
                 commit: snapshot.commit_sha,
-                total: snapshot.methods_with_sig + snapshot.methods_without_sig,
-                values: { true: snapshot.methods_with_sig, false: snapshot.methods_without_sig },
+                total: snapshot.methods_with_sig_excluding_rbis + snapshot.methods_without_sig_excluding_rbis,
+                values: {
+                  true: snapshot.methods_with_sig_excluding_rbis,
+                  false: snapshot.methods_without_sig_excluding_rbis,
+                },
               }
             end
             super(id, data, keys)
@@ -493,7 +496,7 @@ module Spoom
           def tooltip
             <<~JS
               function tooltip_#{id}(d) {
-                tooltipTimeline(d, "methods");
+                tooltipTimeline(d, "methods excluding RBIs");
               }
             JS
           end

data/lib/spoom/coverage/snapshot.rb

@@ -22,6 +22,9 @@ module Spoom
       prop :calls_untyped, Integer, default: 0
       prop :calls_typed, Integer, default: 0
       prop :sigils, T::Hash[String, Integer], default: Hash.new(0)
+      prop :methods_with_sig_excluding_rbis, Integer, default: 0
+      prop :methods_without_sig_excluding_rbis, Integer, default: 0
+      prop :sigils_excluding_rbis, T::Hash[String, Integer], default: Hash.new(0)
 
       # The strictness name as found in the Sorbet metrics file
       STRICTNESSES = T.let(["ignore", "false", "true", "strict", "strong", "stdlib"].freeze, T::Array[String])
@@ -63,6 +66,8 @@ module Spoom
           snapshot.methods_without_sig = obj.fetch("methods_without_sig", 0)
           snapshot.calls_typed = obj.fetch("calls_typed", 0)
           snapshot.calls_untyped = obj.fetch("calls_untyped", 0)
+          snapshot.methods_with_sig_excluding_rbis = obj.fetch("methods_with_sig_excluding_rbis", 0)
+          snapshot.methods_without_sig_excluding_rbis = obj.fetch("methods_without_sig_excluding_rbis", 0)
 
           sigils = obj.fetch("sigils", {})
           if sigils
@@ -73,6 +78,15 @@ module Spoom
             end
           end
 
+          sigils_excluding_rbis = obj.fetch("sigils_excluding_rbis", {})
+          if sigils_excluding_rbis
+            Snapshot::STRICTNESSES.each do |strictness|
+              next unless sigils_excluding_rbis.key?(strictness)
+
+              snapshot.sigils_excluding_rbis[strictness] = sigils_excluding_rbis[strictness]
+            end
+          end
+
           snapshot
         end
       end
@@ -84,6 +98,7 @@ module Spoom
       sig { params(snapshot: Snapshot).void }
       def print_snapshot(snapshot)
         methods = snapshot.methods_with_sig + snapshot.methods_without_sig
+        methods_excluding_rbis = snapshot.methods_with_sig_excluding_rbis + snapshot.methods_without_sig_excluding_rbis
         calls = snapshot.calls_typed + snapshot.calls_untyped
 
         if snapshot.version_static || snapshot.version_runtime
@@ -93,10 +108,12 @@ module Spoom
         end
         printl("Content:")
         indent
-        printl("files: #{snapshot.files} (including #{snapshot.rbi_files} RBIs)")
+        printl("files: #{snapshot.files}")
+        printl("files excluding rbis: #{snapshot.files - snapshot.rbi_files}")
         printl("modules: #{snapshot.modules}")
         printl("classes: #{snapshot.classes - snapshot.singleton_classes}")
         printl("methods: #{methods}")
+        printl("methods excluding rbis: #{methods_excluding_rbis}")
         dedent
         printn
         printl("Sigils:")
@@ -109,6 +126,13 @@ module Spoom
         }
         print_map(methods_map, methods)
         printn
+        printl("Methods excluding RBIs")
+        methods_excluding_rbis_map = {
+          "with signature" => snapshot.methods_with_sig_excluding_rbis,
+          "without signature" => snapshot.methods_without_sig_excluding_rbis,
+        }
+        print_map(methods_excluding_rbis_map, methods_excluding_rbis)
+        printn
         printl("Calls:")
         calls_map = {
           "typed" => snapshot.calls_typed,

data/lib/spoom/coverage.rb

@@ -19,24 +19,35 @@ module Spoom
 
         new_config = config.copy
         new_config.allowed_extensions.reject! { |ext| !rbi && ext == ".rbi" }
-
-        metrics = Spoom::Sorbet.srb_metrics(
+        flags = [
           "--no-config",
           "--no-error-sections",
           "--no-error-count",
           "--isolate-error-code=0",
           new_config.options_string,
+        ]
+
+        metrics = Spoom::Sorbet.srb_metrics(
+          *flags,
+          path: path,
+          capture_err: true,
+          sorbet_bin: sorbet_bin,
+        )
+        # Collect extra information using a different configuration
+        flags << "--ignore sorbet/rbi/"
+        metrics_without_rbis = Spoom::Sorbet.srb_metrics(
+          *flags,
           path: path,
           capture_err: true,
-          sorbet_bin: sorbet_bin
+          sorbet_bin: sorbet_bin,
         )
 
         snapshot = Snapshot.new
         return snapshot unless metrics
 
-        sha = Spoom::Git.last_commit(path: path)
-        snapshot.commit_sha = sha
-        snapshot.commit_timestamp = Spoom::Git.commit_timestamp(sha, path: path).to_i if sha
+        last_commit = Spoom::Git.last_commit(path: path)
+        snapshot.commit_sha = last_commit&.sha
+        snapshot.commit_timestamp = last_commit&.timestamp
 
         snapshot.files = metrics.fetch("types.input.files", 0)
         snapshot.modules = metrics.fetch("types.input.modules.total", 0)
@@ -50,10 +61,20 @@ module Spoom
         snapshot.duration += metrics.fetch("run.utilization.system_time.us", 0)
         snapshot.duration += metrics.fetch("run.utilization.user_time.us", 0)
 
-        Snapshot::STRICTNESSES.each do |strictness|
-          next unless metrics.key?("types.input.files.sigil.#{strictness}")
+        if metrics_without_rbis
+          snapshot.methods_with_sig_excluding_rbis = metrics_without_rbis.fetch("types.sig.count", 0)
+          snapshot.methods_without_sig_excluding_rbis = metrics_without_rbis.fetch("types.input.methods.total",
+            0) - snapshot.methods_with_sig_excluding_rbis
+        end
 
-          snapshot.sigils[strictness] = T.must(metrics["types.input.files.sigil.#{strictness}"])
+        Snapshot::STRICTNESSES.each do |strictness|
+          if metrics.key?("types.input.files.sigil.#{strictness}")
+            snapshot.sigils[strictness] = T.must(metrics["types.input.files.sigil.#{strictness}"])
+          end
+          if metrics_without_rbis&.key?("types.input.files.sigil.#{strictness}")
+            snapshot.sigils_excluding_rbis[strictness] =
+              T.must(metrics_without_rbis["types.input.files.sigil.#{strictness}"])
+          end
         end
 
         snapshot.version_static = Spoom::Sorbet.version_from_gemfile_lock(gem: "sorbet-static", path: path)
@@ -68,15 +89,14 @@ module Spoom
       sig { params(snapshots: T::Array[Snapshot], palette: D3::ColorPalette, path: String).returns(Report) }
       def report(snapshots, palette:, path: ".")
         intro_commit = Git.sorbet_intro_commit(path: path)
-        intro_date = intro_commit ? Git.commit_time(intro_commit, path: path) : nil
 
         Report.new(
           project_name: File.basename(File.expand_path(path)),
           palette: palette,
           snapshots: snapshots,
           sigils_tree: sigils_tree(path: path),
-          sorbet_intro_commit: intro_commit,
-          sorbet_intro_date: intro_date,
+          sorbet_intro_commit: intro_commit&.sha,
+          sorbet_intro_date: intro_commit&.time,
         )
       end
 

data/lib/spoom/file_tree.rb

@@ -65,7 +65,7 @@ module Spoom
         out: T.any(IO, StringIO),
         show_strictness: T::Boolean,
         colors: T::Boolean,
-        indent_level: Integer
+        indent_level: Integer,
       ).void
     end
     def print(out: $stdout, show_strictness: true, colors: true, indent_level: 0)
@@ -74,7 +74,7 @@ module Spoom
         out: out,
         show_strictness: show_strictness,
         colors: colors,
-        indent_level: indent_level
+        indent_level: indent_level,
       )
       printer.print_tree
     end
@@ -126,7 +126,7 @@ module Spoom
           out: T.any(IO, StringIO),
           show_strictness: T::Boolean,
           colors: T::Boolean,
-          indent_level: Integer
+          indent_level: Integer,
         ).void
       end
       def initialize(tree:, out: $stdout, show_strictness: true, colors: true, indent_level: 0)

data/lib/spoom/git.rb

@@ -6,6 +6,18 @@ require "time"
 module Spoom
   # Execute git commands
   module Git
+    class Commit < T::Struct
+      extend T::Sig
+
+      const :sha, String
+      const :time, Time
+
+      sig { returns(Integer) }
+      def timestamp
+        time.to_i
+      end
+    end
+
     class << self
       extend T::Sig
 
@@ -16,7 +28,7 @@ module Spoom
           out: "",
           err: "Error: `#{path}` is not a directory.",
           status: false,
-          exit_code: 1
+          exit_code: 1,
         ) unless File.directory?(path)
 
         T.unsafe(Open3).popen3(command, *arg, chdir: path) do |_, stdout, stderr, thread|
@@ -25,7 +37,7 @@ module Spoom
             out: stdout.read,
             err: stderr.read,
             status: T.must(status.success?),
-            exit_code: T.must(status.exitstatus)
+            exit_code: T.must(status.exitstatus),
           )
         end
       end
@@ -47,11 +59,6 @@ module Spoom
         exec("git log #{arg.join(" ")}", path: path)
       end
 
-      sig { params(arg: String, path: String).returns(ExecResult) }
-      def rev_parse(*arg, path: ".")
-        exec("git rev-parse --short #{arg.join(" ")}", path: path)
-      end
-
       sig { params(arg: String, path: String).returns(ExecResult) }
       def show(*arg, path: ".")
         exec("git show #{arg.join(" ")}", path: path)
@@ -67,37 +74,16 @@ module Spoom
 
       # Utils
 
-      # Get the commit epoch timestamp for a `sha`
-      sig { params(sha: String, path: String).returns(T.nilable(Integer)) }
-      def commit_timestamp(sha, path: ".")
-        result = show("--no-notes --no-patch --pretty=%at #{sha}", path: path)
-        return nil unless result.status
-
-        result.out.strip.to_i
-      end
-
-      # Get the commit Time for a `sha`
-      sig { params(sha: String, path: String).returns(T.nilable(Time)) }
-      def commit_time(sha, path: ".")
-        timestamp = commit_timestamp(sha, path: path)
-        return nil unless timestamp
-
-        epoch_to_time(timestamp.to_s)
-      end
-
-      # Get the last commit sha
-      sig { params(path: String).returns(T.nilable(String)) }
+      # Get the last commit in the currently checked out branch
+      sig { params(path: String).returns(T.nilable(Commit)) }
       def last_commit(path: ".")
-        result = rev_parse("HEAD", path: path)
+        result = log("HEAD --format='%h %at' -1", path: path)
         return nil unless result.status
 
-        result.out.strip
-      end
+        out = result.out.strip
+        return nil if out.empty?
 
-      # Translate a git epoch timestamp into a Time
-      sig { params(timestamp: String).returns(Time) }
-      def epoch_to_time(timestamp)
-        Time.strptime(timestamp, "%s")
+        parse_commit(out)
       end
 
       # Is there uncommited changes in `path`?
@@ -106,28 +92,38 @@ module Spoom
         diff("HEAD", path: path).out.empty?
       end
 
-      # Get the hash of the commit introducing the `sorbet/config` file
-      sig { params(path: String).returns(T.nilable(String)) }
+      # Get the commit introducing the `sorbet/config` file
+      sig { params(path: String).returns(T.nilable(Commit)) }
       def sorbet_intro_commit(path: ".")
-        result = Spoom::Git.log("--diff-filter=A --format='%h' -1 -- sorbet/config", path: path)
+        result = log("--diff-filter=A --format='%h %at' -1 -- sorbet/config", path: path)
         return nil unless result.status
 
         out = result.out.strip
         return nil if out.empty?
 
-        out
+        parse_commit(out)
       end
 
-      # Get the hash of the commit removing the `sorbet/config` file
-      sig { params(path: String).returns(T.nilable(String)) }
+      # Get the commit removing the `sorbet/config` file
+      sig { params(path: String).returns(T.nilable(Commit)) }
       def sorbet_removal_commit(path: ".")
-        result = Spoom::Git.log("--diff-filter=D --format='%h' -1 -- sorbet/config", path: path)
+        result = log("--diff-filter=D --format='%h %at' -1 -- sorbet/config", path: path)
         return nil unless result.status
 
         out = result.out.strip
         return nil if out.empty?
 
-        out
+        parse_commit(out)
+      end
+
+      # Parse a line formated as `%h %at` into a `Commit`
+      sig { params(string: String).returns(T.nilable(Commit)) }
+      def parse_commit(string)
+        sha, epoch = string.split(" ", 2)
+        return nil unless sha && epoch
+
+        time = Time.strptime(epoch, "%s")
+        Commit.new(sha: sha, time: time)
       end
     end
   end

data/lib/spoom/sorbet/errors.rb

@@ -142,7 +142,7 @@ module Spoom
             line: T.nilable(Integer),
             message: T.nilable(String),
             code: T.nilable(Integer),
-            more: T::Array[String]
+            more: T::Array[String],
           ).void
         end
         def initialize(file, line, message, code, more = [])

data/lib/spoom/sorbet/lsp/errors.rb

@@ -23,7 +23,7 @@ module Spoom
           def from_json(json)
             Diagnostics.new(
               json["uri"],
-              json["diagnostics"].map { |d| Diagnostic.from_json(d) }
+              json["diagnostics"].map { |d| Diagnostic.from_json(d) },
             )
           end
         end
@@ -54,7 +54,7 @@ module Spoom
           ResponseError.new(
             json["code"],
             json["message"],
-            json["data"]
+            json["data"],
           )
         end
       end

data/lib/spoom/sorbet/lsp/structures.rb

@@ -30,7 +30,7 @@ module Spoom
         def from_json(json)
           Hover.new(
             contents: json["contents"]["value"],
-            range: json["range"] ? Range.from_json(json["range"]) : nil
+            range: json["range"] ? Range.from_json(json["range"]) : nil,
           )
         end
       end
@@ -61,7 +61,7 @@ module Spoom
         def from_json(json)
           Position.new(
             line: json["line"].to_i,
-            char: json["character"].to_i
+            char: json["character"].to_i,
           )
         end
       end
@@ -91,7 +91,7 @@ module Spoom
         def from_json(json)
           Range.new(
             start: Position.from_json(json["start"]),
-            end: Position.from_json(json["end"])
+            end: Position.from_json(json["end"]),
           )
         end
       end
@@ -123,7 +123,7 @@ module Spoom
         def from_json(json)
           Location.new(
             uri: json["uri"],
-            range: Range.from_json(json["range"])
+            range: Range.from_json(json["range"]),
           )
         end
       end
@@ -193,7 +193,7 @@ module Spoom
             range: Range.from_json(json["range"]),
             code: json["code"].to_i,
             message: json["message"],
-            informations: json["relatedInformation"]
+            informations: json["relatedInformation"],
           )
         end
       end
@@ -317,7 +317,7 @@ module Spoom
           out: T.any(IO, StringIO),
           colors: T::Boolean,
           indent_level: Integer,
-          prefix: T.nilable(String)
+          prefix: T.nilable(String),
         ).void
       end
       def initialize(out: $stdout, colors: true, indent_level: 0, prefix: nil)

data/lib/spoom/sorbet/lsp.rb

@@ -98,7 +98,7 @@ module Spoom
               "line" => line,
               "character" => column,
             },
-          }
+          },
         ))
 
         return nil unless json && json["result"]
@@ -119,7 +119,7 @@ module Spoom
               "line" => line,
               "character" => column,
             },
-          }
+          },
         ))
 
         return [] unless json && json["result"] && json["result"]["signatures"]
@@ -140,7 +140,7 @@ module Spoom
               "line" => line,
               "character" => column,
             },
-          }
+          },
         ))
 
         return [] unless json && json["result"]
@@ -161,7 +161,7 @@ module Spoom
               "line" => line,
               "character" => column,
             },
-          }
+          },
         ))
 
         return [] unless json && json["result"]
@@ -185,7 +185,7 @@ module Spoom
             "context" => {
               "includeDeclaration" => include_decl,
             },
-          }
+          },
         ))
 
         return [] unless json && json["result"]
@@ -200,7 +200,7 @@ module Spoom
           "workspace/symbol",
           {
             "query" => query,
-          }
+          },
         ))
 
         return [] unless json && json["result"]
@@ -217,7 +217,7 @@ module Spoom
             "textDocument" => {
               "uri" => uri,
             },
-          }
+          },
         ))
 
         return [] unless json && json["result"]

data/lib/spoom/sorbet/sigils.rb

@@ -88,7 +88,7 @@ module Spoom
           params(
             directory: T.any(String, Pathname),
             strictness: String,
-            extension: String
+            extension: String,
           ).returns(T::Array[String])
         end
         def files_with_sigil_strictness(directory, strictness, extension: ".rb")

data/lib/spoom/sorbet.rb

@@ -25,7 +25,7 @@ module Spoom
           arg: String,
           path: String,
           capture_err: T::Boolean,
-          sorbet_bin: T.nilable(String)
+          sorbet_bin: T.nilable(String),
         ).returns(ExecResult)
       end
       def srb(*arg, path: ".", capture_err: false, sorbet_bin: nil)
@@ -42,7 +42,7 @@ module Spoom
           arg: String,
           path: String,
           capture_err: T::Boolean,
-          sorbet_bin: T.nilable(String)
+          sorbet_bin: T.nilable(String),
         ).returns(ExecResult)
       end
       def srb_tc(*arg, path: ".", capture_err: false, sorbet_bin: nil)
@@ -65,7 +65,7 @@ module Spoom
           arg: String,
           path: String,
           capture_err: T::Boolean,
-          sorbet_bin: T.nilable(String)
+          sorbet_bin: T.nilable(String),
         ).returns(T.nilable(String))
       end
       def srb_version(*arg, path: ".", capture_err: false, sorbet_bin: nil)
@@ -75,7 +75,7 @@ module Spoom
           *arg,
           path: path,
           capture_err: capture_err,
-          sorbet_bin: sorbet_bin
+          sorbet_bin: sorbet_bin,
         ), ExecResult)
         return nil unless result.status
 
@@ -87,7 +87,7 @@ module Spoom
           arg: String,
           path: String,
           capture_err: T::Boolean,
-          sorbet_bin: T.nilable(String)
+          sorbet_bin: T.nilable(String),
         ).returns(T.nilable(T::Hash[String, Integer]))
       end
       def srb_metrics(*arg, path: ".", capture_err: false, sorbet_bin: nil)
@@ -99,7 +99,7 @@ module Spoom
           *arg,
           path: path,
           capture_err: capture_err,
-          sorbet_bin: sorbet_bin
+          sorbet_bin: sorbet_bin,
         )
         if File.exist?(metrics_path)
           metrics = Spoom::Sorbet::MetricsParser.parse_file(metrics_path)

data/lib/spoom/timeline.rb

@@ -15,7 +15,7 @@ module Spoom
     end
 
     # Return one commit for each month between `from` and `to`
-    sig { returns(T::Array[String]) }
+    sig { returns(T::Array[Git::Commit]) }
     def ticks
       commits_for_dates(months)
     end
@@ -34,21 +34,21 @@ module Spoom
     end
 
     # Return one commit for each date in `dates`
-    sig { params(dates: T::Array[Time]).returns(T::Array[String]) }
+    sig { params(dates: T::Array[Time]).returns(T::Array[Git::Commit]) }
     def commits_for_dates(dates)
       dates.map do |t|
         result = Spoom::Git.log(
           "--since='#{t}'",
           "--until='#{t.to_date.next_month}'",
-          "--format='format:%h'",
+          "--format='format:%h %at'",
           "--author-date-order",
           "-1",
           path: @path,
         )
         next if result.out.empty?
 
-        result.out
-      end.compact.uniq
+        Git.parse_commit(result.out.strip)
+      end.compact.uniq(&:sha)
     end
   end
 end

data/lib/spoom/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.1.12"
+  VERSION = "1.1.13"
 end

data/lib/spoom.rb

@@ -39,7 +39,7 @@ module Spoom
         cmd: String,
         arg: String,
         path: String,
-        capture_err: T::Boolean
+        capture_err: T::Boolean,
       ).returns(ExecResult)
     end
     def exec(cmd, *arg, path: ".", capture_err: false)
@@ -49,7 +49,7 @@ module Spoom
           out: stdout,
           err: stderr,
           status: status.success?,
-          exit_code: status.exitstatus
+          exit_code: status.exitstatus,
         )
       else
         stdout, status = T.unsafe(Open3).capture2([cmd, *arg].join(" "), chdir: path)
@@ -57,7 +57,7 @@ module Spoom
           out: stdout,
           err: "",
           status: status.success?,
-          exit_code: status.exitstatus
+          exit_code: status.exitstatus,
         )
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.13
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler