spoom 1.1.16 → 1.2.1

data/lib/spoom/timeline.rb

@@ -1,17 +1,15 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative "git"
-
 module Spoom
   class Timeline
     extend T::Sig
 
-    sig { params(from: Time, to: Time, path: String).void }
-    def initialize(from, to, path: ".")
+    sig { params(context: Context, from: Time, to: Time).void }
+    def initialize(context, from, to)
+      @context = context
       @from = from
       @to = to
-      @path = path
     end
 
     # Return one commit for each month between `from` and `to`
@@ -37,17 +35,16 @@ module Spoom
     sig { params(dates: T::Array[Time]).returns(T::Array[Git::Commit]) }
     def commits_for_dates(dates)
       dates.map do |t|
-        result = Spoom::Git.log(
+        result = @context.git_log(
           "--since='#{t}'",
           "--until='#{t.to_date.next_month}'",
           "--format='format:%h %at'",
           "--author-date-order",
           "-1",
-          path: @path,
         )
         next if result.out.empty?
 
-        Git.parse_commit(result.out.strip)
+        Spoom::Git::Commit.parse_line(result.out.strip)
       end.compact.uniq(&:sha)
     end
   end

data/lib/spoom/version.rb

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

data/lib/spoom.rb

@@ -10,60 +10,9 @@ module Spoom
   SPOOM_PATH = T.let((Pathname.new(__FILE__) / ".." / "..").to_s, String)
 
   class Error < StandardError; end
-
-  class ExecResult < T::Struct
-    extend T::Sig
-
-    const :out, String
-    const :err, T.nilable(String)
-    const :status, T::Boolean
-    const :exit_code, Integer
-
-    sig { returns(String) }
-    def to_s
-      <<~STR
-        ########## STDOUT ##########
-        #{out.empty? ? "<empty>" : out}
-        ########## STDERR ##########
-        #{err&.empty? ? "<empty>" : err}
-        ########## STATUS: #{status} ##########
-      STR
-    end
-  end
-
-  class << self
-    extend T::Sig
-
-    sig do
-      params(
-        cmd: String,
-        arg: String,
-        path: String,
-        capture_err: T::Boolean,
-      ).returns(ExecResult)
-    end
-    def exec(cmd, *arg, path: ".", capture_err: true)
-      if capture_err
-        stdout, stderr, status = T.unsafe(Open3).capture3([cmd, *arg].join(" "), chdir: path)
-        ExecResult.new(
-          out: stdout,
-          err: stderr,
-          status: status.success?,
-          exit_code: status.exitstatus,
-        )
-      else
-        stdout, status = T.unsafe(Open3).capture2([cmd, *arg].join(" "), chdir: path)
-        ExecResult.new(
-          out: stdout,
-          err: nil,
-          status: status.success?,
-          exit_code: status.exitstatus,
-        )
-      end
-    end
-  end
 end
 
+require "spoom/file_collector"
 require "spoom/context"
 require "spoom/colors"
 require "spoom/sorbet"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.2.1
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,6 +130,11 @@ files:
 - lib/spoom/cli/run.rb
 - lib/spoom/colors.rb
 - lib/spoom/context.rb
+- lib/spoom/context/bundle.rb
+- lib/spoom/context/exec.rb
+- lib/spoom/context/file_system.rb
+- lib/spoom/context/git.rb
+- lib/spoom/context/sorbet.rb
 - lib/spoom/coverage.rb
 - lib/spoom/coverage/d3.rb
 - lib/spoom/coverage/d3/base.rb
@@ -138,8 +143,8 @@ files:
 - lib/spoom/coverage/d3/timeline.rb
 - lib/spoom/coverage/report.rb
 - lib/spoom/coverage/snapshot.rb
+- lib/spoom/file_collector.rb
 - lib/spoom/file_tree.rb
-- lib/spoom/git.rb
 - lib/spoom/printer.rb
 - lib/spoom/sorbet.rb
 - lib/spoom/sorbet/config.rb
@@ -175,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.9
 signing_key: 
 specification_version: 4
 summary: Useful tools for Sorbet enthusiasts.

data/lib/spoom/git.rb

@@ -1,109 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-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
-
-      # Git commands
-
-      sig { params(arg: String, path: String).returns(ExecResult) }
-      def checkout(*arg, path: ".")
-        Spoom.exec("git checkout -q #{arg.join(" ")}", path: path)
-      end
-
-      sig { params(arg: String, path: String).returns(ExecResult) }
-      def diff(*arg, path: ".")
-        Spoom.exec("git diff #{arg.join(" ")}", path: path)
-      end
-
-      sig { params(arg: String, path: String).returns(ExecResult) }
-      def log(*arg, path: ".")
-        Spoom.exec("git log #{arg.join(" ")}", path: path)
-      end
-
-      sig { params(arg: String, path: String).returns(ExecResult) }
-      def show(*arg, path: ".")
-        Spoom.exec("git show #{arg.join(" ")}", path: path)
-      end
-
-      sig { params(path: String).returns(T.nilable(String)) }
-      def current_branch(path: ".")
-        result = Spoom.exec("git branch --show-current", path: path)
-        return nil unless result.status
-
-        result.out.strip
-      end
-
-      # Utils
-
-      # Get the last commit in the currently checked out branch
-      sig { params(path: String, short_sha: T::Boolean).returns(T.nilable(Commit)) }
-      def last_commit(path: ".", short_sha: true)
-        result = log("HEAD --format='%#{short_sha ? "h" : "H"} %at' -1", path: path)
-        return nil unless result.status
-
-        out = result.out.strip
-        return nil if out.empty?
-
-        parse_commit(out)
-      end
-
-      # Is there uncommited changes in `path`?
-      sig { params(path: String).returns(T::Boolean) }
-      def workdir_clean?(path: ".")
-        diff("HEAD", path: path).out.empty?
-      end
-
-      # Get the commit introducing the `sorbet/config` file
-      sig { params(path: String).returns(T.nilable(Commit)) }
-      def sorbet_intro_commit(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?
-
-        parse_commit(out)
-      end
-
-      # Get the commit removing the `sorbet/config` file
-      sig { params(path: String).returns(T.nilable(Commit)) }
-      def sorbet_removal_commit(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?
-
-        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
-end