devloop 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdbcf2a0d7f3ee56a98ad2db128f8835b348f990efab6fd77ab9a57dbc2f6aa3
-  data.tar.gz: 7b041ec78b9ac2c25e6423e9d3dc4b8be64c1283668d88a259200efa4feade24
+  metadata.gz: 329272a8c3033e7d6d4cb63d2ca284b87f8d4883e64fc613ad00e2f2eaf7ca8b
+  data.tar.gz: 3fa337ca6600ffd440c53170ed6d1aa59cdf09207d64738c8248cf3f027e2ab6
 SHA512:
-  metadata.gz: 381c4b59391e866838d90084e8251f193d7d3ba31da4ddc7905e28311e6e0d7ab42fb2a5ca18773fe58706f62a270e8a6b7ff9d4412e842954dbb4a86e6a9108
-  data.tar.gz: 6f1d6304053545f310d5416a5649e704d84481a1d654d0c2e4530e64b5f0ee429d41c5106f5465a4c174f097df8a9f5402c0c6890491fe4f29a5283f50139c0a
+  metadata.gz: 48664a8ba229cd1730994c47d60f1a1f0fcb7e225f038c6903ae17125f27ae3091b8ef75d75558932b21e6e82ad15e5e3de47fdfc337450b15dacf3b88644a29
+  data.tar.gz: c75e9d90a51e8aa003e0f069490004957241dbc54543fe202058efd82ab943678b094d7ff45f2a1aad44fd31240f9d7c656b8b7e08a8fa9f2f4432f37596ae21

data/lib/devloop/diff_parser.rb

@@ -5,18 +5,31 @@ module Devloop
     end
 
     def call(diff)
-      lines = diff.split("\n")
-      results = []
-      file = ""
-      lines.each_with_index do |line, index|
+      _, results = diff.split("\n").reduce(["", []]) do |(file, results), line|
         if line.start_with?("+++ b/")
-          file = line[6..-1]
+          [line[6..-1], results]
         elsif line.start_with?("@@ -")
           line_number = line.match(/@@ -(\d+)/)[1]
-          results << "#{file}:#{line_number}"
+          [file, results << "#{relative_path(file)}:#{line_number}"]
+        else
+          [file, results]
         end
       end
       results
     end
+
+    private
+
+    def relative_path(path)
+      path.gsub(project_path, "")
+    end
+
+    def project_path
+      @project_path ||= Dir.pwd.gsub("#{git_root_path}/", "") + "/"
+    end
+
+    def git_root_path
+      @git_root_path ||= `git rev-parse --show-toplevel`.strip
+    end
   end
 end

data/lib/devloop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Devloop
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/diff_parser_spec.rb

@@ -4,46 +4,73 @@ require "spec_helper"
 require "devloop/diff_parser"
 
 describe Devloop::DiffParser do
-  let(:diff1) do
-    <<~DIFF
-      diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
-      index 19772f2a..a32824f9 100644
-      --- a/spec/models/team_spec.rb
-      +++ b/spec/models/team_spec.rb
-      @@ -10,2 +10,2 @@ describe Team do
-      -  it "has a valid factory" do
-      -    expect(team).to be_valid
-      +  it "has valid factory" do
-      +    expect(team).not_to be_valid
-      diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
-      index 410ffa8c..610d9e19 100644
-      --- a/spec/models/user_spec.rb
-      +++ b/spec/models/user_spec.rb
-      @@ -167 +167 @@ describe User do
-      -          web_auth_token_generated_at: 50.minutes.ago,
-      +          web_auth_token_generated_at: 10.minutes.ago,
-    DIFF
-  end
+  context "when the project root is the same as git root" do
+    let(:diff1) do
+      <<~DIFF
+        diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
+        index 19772f2a..a32824f9 100644
+        --- a/spec/models/team_spec.rb
+        +++ b/spec/models/team_spec.rb
+        @@ -10,2 +10,2 @@ describe Team do
+        -  it "has a valid factory" do
+        -    expect(team).to be_valid
+        +  it "has valid factory" do
+        +    expect(team).not_to be_valid
+        diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
+        index 410ffa8c..610d9e19 100644
+        --- a/spec/models/user_spec.rb
+        +++ b/spec/models/user_spec.rb
+        @@ -167 +167 @@ describe User do
+        -          web_auth_token_generated_at: 50.minutes.ago,
+        +          web_auth_token_generated_at: 10.minutes.ago,
+      DIFF
+    end
+
+    let(:diff2) do
+      <<~DIFF
+            diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
+        index 19772f2a..9f614e20 100644
+        --- a/spec/models/team_spec.rb
+        +++ b/spec/models/team_spec.rb
+        @@ -19 +19 @@ describe Team do
+        -    it "has_many emojis" do
+        +    it "has_many eojis" do
+        @@ -24,2 +24,2 @@ describe Team do
+        -  describe "normalize attributes" do
+        -    it "does not allow empty string values" do
+        +  describe "normalize attrbtes" do
+        +    it "does not allw empty sting values" do
+      DIFF
+    end
 
-  let(:diff2) do
-    <<~DIFF
-          diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
-      index 19772f2a..9f614e20 100644
-      --- a/spec/models/team_spec.rb
-      +++ b/spec/models/team_spec.rb
-      @@ -19 +19 @@ describe Team do
-      -    it "has_many emojis" do
-      +    it "has_many eojis" do
-      @@ -24,2 +24,2 @@ describe Team do
-      -  describe "normalize attributes" do
-      -    it "does not allow empty string values" do
-      +  describe "normalize attrbtes" do
-      +    it "does not allw empty sting values" do
-    DIFF
+    it "parses the diff correctly" do
+      expect(Devloop::DiffParser.call(diff1)).to eq(["spec/models/team_spec.rb:10", "spec/models/user_spec.rb:167"])
+      expect(Devloop::DiffParser.call(diff2)).to eq(["spec/models/team_spec.rb:19", "spec/models/team_spec.rb:24"])
+    end
   end
 
-  it "parses the diff correctly" do
-    expect(Devloop::DiffParser.call(diff1)).to eq(["spec/models/team_spec.rb:10", "spec/models/user_spec.rb:167"])
-    expect(Devloop::DiffParser.call(diff2)).to eq(["spec/models/team_spec.rb:19", "spec/models/team_spec.rb:24"])
+  context "when the project root is different from the git root" do
+    let(:diff) do
+      <<~DIFF
+        diff --git a/src/spec/models/team_spec.rb b/src/spec/models/team_spec.rb
+        index 19772f2a..9f614e20 100644
+        --- a/src/spec/models/team_spec.rb
+        +++ b/src/spec/models/team_spec.rb
+        @@ -19 +19 @@ describe Team do
+        -    it "has_many emojis" do
+        +    it "has_many eojis" do
+        @@ -24,2 +24,2 @@ describe Team do
+        -  describe "normalize attributes" do
+        -    it "does not allow empty string values" do
+        +  describe "normalize attrbtes" do
+        +    it "does not allw empty sting values" do
+      DIFF
+    end
+
+    it "parses the diff correctly" do
+      allow_any_instance_of(Devloop::DiffParser).to receive(:git_root_path).and_return("/Users/username/projects/")
+      allow_any_instance_of(Devloop::DiffParser).to receive(:project_path).and_return("src/")
+      expect(Devloop::DiffParser.call(diff)).to eq(["spec/models/team_spec.rb:19", "spec/models/team_spec.rb:24"])
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devloop
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-07 00:00:00.000000000 Z
+date: 2024-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake