devloop 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aacef492d0bf184908275bc5df40ba6915cf3a1215edc39fb41374fa18574e0
-  data.tar.gz: aa92fd7489fcd1fbefaf1ad01e7fddcf9b39b8ab9ba9d9964794ba15cba15559
+  metadata.gz: 41dcab2a2c737d831c773f69df17a5b3f940bf3afd17a7b28aa43d0d2babff28
+  data.tar.gz: 959cab9d951a675abead4c652b2265140b32536d76bd69beaaf123fd5d06a06e
 SHA512:
-  metadata.gz: a26d307a8957fba390304bdcacbb6e3b2b23c4f86bb3fcbbc9b3a2fc0e14b69a16836cf7f4cb9e6b68efcc24a775113bdc5b64b639c0da3921ab9f2a835f006e
-  data.tar.gz: 4444e6eede7525a922044f6c2f7c7d1363b5d9490d94dce08499b52d2021338d04acdb1a95eaf3dfc43fed50edfd2a800a006a3b4d8701dcb152c1caa9e958dc
+  metadata.gz: 185b68859cb4a1b50f0b532a63922f9ada0cbae2b14cfb0f39c5ae045f10adeac219a15e11bc71a483b91e40b458146c42cd3c53da61b4094506db71a7f488f8
+  data.tar.gz: 7d1f59eff8df744568ad744d5812749e543d41ef4156eeb9d87bdc7afa47b84866b16be469aea3fb4dff6140c860690cc7f804966fc8ec7567ab2c2847959323

data/bin/devloop

@@ -3,9 +3,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib") unless $LOAD_PATH.include?(File.dirname(__FILE__) + "/../lib")
 
 require "devloop"
+require "devloop/version"
 require "listen"
 
 begin
+  if %w[--version -v].include?(ARGV[0])
+    puts "Devloop version #{Devloop::VERSION}"
+  end
+
   system("bundle exec spring > /dev/null 2>&1")
   is_bundled = `bundle list`.include?("devloop")
   run_command = is_bundled ? "bundle exec devloop_run" : "devloop_run"

data/lib/devloop/diff_parser.rb

@@ -4,30 +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
 
-      # Remove filenames with line number if filename without line number is present
-      res = results.reject { |result| results.include?(result.split(":").first) && result.include?(":") }.map do |el|
-        if el.split(":").last == "0"
-          el.split(":").first
+      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
-          el
+          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
+      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.2"
+  VERSION = "0.1.4"
 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,7 @@ 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
 
@@ -142,7 +142,37 @@ describe Devloop::DiffParser do
     end
 
     it "parses the diff correctly" do
-      expect(Devloop::DiffParser.call(diff)).to eq(["spec/config_spec.rb:5", "spec/config_spec.rb:8", "spec/config_spec.rb:14", "spec/config_spec.rb:17", "spec/default_notifier_spec.rb"])
+      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.2
+  version: 0.1.4
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-26 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen