devloop 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bdfbb6b5c25d903818042b071bf95090cccb324fd993957d8a6c9232310d6b3
-  data.tar.gz: dc18174f6087bca3656a47d072baa8c9b3ef177252ba20a50bdac21660417d9d
+  metadata.gz: 4c05521d9743b10962d9a0fb72bdbe848684923192ad72b4dccb5cf577481a93
+  data.tar.gz: 850d44822f193f71a61f75846bef409b52e5f9782f1b73a083694a18c0c9610a
 SHA512:
-  metadata.gz: dee4939c6e441d48e24d96d70ae4d215376adbbca9fc31f3f69374d0dfd7cc643dd5e2f2fd41975dd5476f477858b95e8bfe1c49716a5657721b74d28a551edc
-  data.tar.gz: 8f94d9393b420e40028c53748f27415e0e587252ce94cb67b0b7ebf86f4aa6ff05e9bc1c7617c81d75c4835050b4a7d736d0874eb4807915e50968160ec42e7d
+  metadata.gz: 3f9a620c03e1a48ca1e22eb247789b75f828f1991215d2abcc9331bb68b496849b69db06c80968fea0dda6b3d8515022576b7e7ce417083a88fd73862e3032a3
+  data.tar.gz: 0f34eb18349d10c0bf37e08726c1892e56e5d52c70762b7f0405f3839ed3396fda4fbb951a3f1badff3142b2e66734cf2381fa4c4609c13b56002965600fba27

data/lib/devloop/diff_parser.rb

@@ -4,24 +4,35 @@ module Devloop
       new.call(diff)
     end
 
+    Diff = Struct.new(:filename, :line_number)
+
     def call(diff)
-      _, results = diff.split("\n").reduce(["", []]) do |(file, results), line|
+      _, diffs_data = diff.split("\n").reduce(["", []]) do |(file, diffs_data), line|
         if line.start_with?("+++ b/")
-          [line[6..-1], results]
+          [line[6..-1], diffs_data]
         elsif line.start_with?("@@ -")
           line_number = line.match(/@@ -(\d+)/)[1]
-          if line_number == "1"
-            [file, results << "#{relative_path(file)}"]
-          else
-            [file, results << "#{relative_path(file)}:#{line_number}"]
-          end
+          [file, diffs_data << Diff.new(relative_path(file), line_number)]
         else
-          [file, results]
+          [file, diffs_data]
         end
       end.uniq
 
+      results = diffs_data.group_by do |el|
+        el.filename
+      end.map do |key, value|
+        line_numbers = value.map(&:line_number).map(&:to_i)
+        if line_numbers.include?(0) || line_numbers.include?(1)
+          key
+        else
+          lines_range = (line_numbers.min..line_numbers.max).to_a.join(":")
+
+          "#{key}:#{lines_range}"
+        end
+      end
+
       # Remove filenames with line number if filename without line number is present
-      results.reject { |result| results.include?(result.split(":").first) && result.include?(":") }
+      res = results.reject { |result| results.include?(result.split(":").first) && result.include?(":") }
     end
 
     private

data/lib/devloop/version.rb

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

data/spec/diff_parser_spec.rb

@@ -68,7 +68,7 @@ describe Devloop::DiffParser do
 
     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"])
+      expect(Devloop::DiffParser.call(diff2)).to eq(["spec/models/team_spec.rb:19:20:21:22:23:24"])
     end
   end
 
@@ -93,7 +93,86 @@ describe Devloop::DiffParser do
     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"])
+      expect(Devloop::DiffParser.call(diff)).to eq(["spec/models/team_spec.rb:19:20:21:22:23:24"])
+    end
+  end
+
+  context "removes 0 line numbers" do
+    let(:diff) do
+      <<~DIFF
+        diff --git a/spec/config_spec.rb b/spec/config_spec.rb
+        index d9716e7..b470ec2 100644
+        --- a/spec/config_spec.rb
+        +++ b/spec/config_spec.rb
+        @@ -5 +5 @@ require "spec_helper"
+        -describe "PgLocksMonitor::Confiuration" do
+        +describe "PgLocksMonitor::Configuration" do
+        @@ -8,2 +8,5 @@ describe "PgLocksMonitor::Confiuration" do
+        -    expect(config.notify_locks).to eq true
+        -    expect(config.notify_blocking).to eq true
+        +    expect(config.monitor_locks).to eq true
+        +    expect(config.monitor_blocking).to eq true
+        +    expect(config.locks_min_duration_ms).to eq 200
+        +    expect(config.blocking_min_duration_ms).to eq 100
+        +    expect(config.notifier_class).to eq PgLocksMonitor::DefaultNotifier
+        @@ -14 +17 @@ describe "PgLocksMonitor::Confiuration" do
+        -      config.notify_locks = false
+        +      config.monitor_locks = false
+        @@ -17 +20 @@ describe "PgLocksMonitor::Confiuration" do
+        -    expect(PgLocksMonitor.configuration.notify_locks).to eq false
+        +    expect(PgLocksMonitor.configuration.monitor_locks).to eq false
+        diff --git a/spec/default_notifier_spec.rb b/spec/default_notifier_spec.rb
+        new file mode 100644
+        index 0000000..d99d3a1
+        --- /dev/null
+        +++ b/spec/default_notifier_spec.rb
+        @@ -0,0 +1,11 @@
+        +# frozen_string_literal: true
+        +
+        +require "spec_helper"
+        +
+        +describe PgLocksMonitor::DefaultNotifier do
+        +  it "requires correct config if Slack notifications enabled" do
+        +    expect {
+        +      PgLocksMonitor::DefaultNotifier.call({})
+        +    }.not_to raise_error
+        +  end
+        +end
+      DIFF
+    end
+
+    it "parses the diff correctly" do
+      expect(Devloop::DiffParser.call(diff)).to eq(["spec/config_spec.rb:5:6:7:8:9:10:11:12:13:14:15:16:17", "spec/default_notifier_spec.rb"])
+    end
+  end
+
+  context "executes each matching spec" do
+    let(:diff) do
+      <<~DIFF
+        diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
+        index 410ffa8c..0266ea38 100644
+        --- a/spec/models/user_spec.rb
+        +++ b/spec/models/user_spec.rb
+        @@ -10,3 +10,3 @@ describe User do
+        -  it "has a valid factory" do
+        -    expect(user).to be_valid
+        -  end
+        +  it "has a valid factory" do #
+        +    expect(user).to be_valid #
+        +  end #
+        @@ -14,2 +14,2 @@ describe User do
+        -  it "has pending_feedbacks" do
+        -    expect(create(:user).pending_feedbacks).to eq []
+        +  it "has pending_feedbacks" do#
+        +    expect(create(:user).pending_feedbacks).to eq [] #
+        @@ -17 +17 @@ describe User do
+        -
+        +#
+      DIFF
+    end
+
+    it "parses the diff correctly" do
+      expect(Devloop::DiffParser.call(diff)).to eq(["spec/models/user_spec.rb:10:11:12:13:14:15:16:17"])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devloop
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-26 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen