rspeed 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19e3b06a0f6189661598a3db76e740b99b5ab658b3e08119fa6f8a74efb74552
-  data.tar.gz: 813bd8934d23e84bcb0facf56da0bf53c4017d5af03337989a42ffff2dac679d
+  metadata.gz: 9f8fbbef694a5ee56e51580e9969e9e8372d4d93d0e5562f4efbad08fb8df854
+  data.tar.gz: b9cefcd95a86536bcd139ef8df7f47674ad0f4205ecfb0c7bc7dd2b5c33b4efd
 SHA512:
-  metadata.gz: '004081032114288e16f23c176ca49c03e85274ed6b91272144643452ec5f2a648c829dae5539c94215897f67482a6f0cf1e5253acabeafc6cdf5a6e2fe2681e9'
-  data.tar.gz: 2ec7f4991a5702f4bd24000e71eb5426969f0abd3a77cabd521887ad72dac3e3ec5f28f0165193ca806f8e9a9e8fce712ac9923f899c9e8767c8808320400ab4
+  metadata.gz: 66a0fba65b3130c9454abad42a8a0e4554fd49711194a74cf7d5d77d37274469500e29f0d6210c53d92f33aa529799d416281c5556f193b9a9c0a96d3b7babbd
+  data.tar.gz: 59399ef9100cc2353a7dc93b53a152289b79aaac9a5c2ace44925a50c517a94196193ebe25ae5a4148861ace0317dfdd2def59b332ab9c717b6d073dad5df0c0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.4.0
+
+- Now we make diff to discover removed and added examples;
+
 ## v0.3.0
 
 - Removed and added files now is considered on run;

data/lib/rspeed/splitter.rb

@@ -1,9 +1,31 @@
+# frozen_string_literal: true
 
 module RSpeed
   class Splitter
     DEFAULT_PATTERN = 'rspeed_*'
 
-    def append(files = file_data)
+    def initialize(specs_path: './spec/**/*_spec.rb')
+      @specs_path = specs_path
+    end
+
+    def actual_examples
+      @actual_examples ||= begin
+        [].tap do |examples|
+          Dir[@specs_path].each do |file|
+            data     = File.open(file).read
+            lines    = data.split("\n")
+
+            lines&.each.with_index do |item, index|
+              examples << "#{file}:#{index + 1}" if item.gsub(/\s+/, '') =~ /^it/
+            end
+          end
+
+          stream(:actual_examples, examples)
+        end
+      end
+    end
+
+    def append(files = CSV.read('rspeed.csv'))
       files.each do |time, file|
         redis.lpush('rspeed_tmp', { file: file, time: time.to_f }.to_json)
       end
@@ -14,6 +36,11 @@ module RSpeed
     end
 
     def diff
+      actual_data = rspeed_data.select { |item| actual_examples.include?(item[:file]) }
+      added_data  = added_examples.map { |item| { file: item, time: 0 } }
+
+      removed_examples # called just for stream for now
+
       actual_data + added_data
     end
 
@@ -91,44 +118,36 @@ module RSpeed
 
     private
 
-    def actual_data
-      rspeed_data.select { |item| actual_files.include?(item[:file]) }
-    end
-
-    def actual_files
-      @actual_files ||= Dir['./spec/**/*_spec.rb']
-    end
-
-    def added_data
-      added_specs.map { |item| { file: item, time: 0 } }
-    end
-
-    def added_specs
-      actual_files - old_files
-    end
-
-    def file_data
-      CSV.read('rspeed.csv')
-    end
-
-    def old_files
-      rspeed_data.map { |item| item[:file] }
+    def added_examples
+      @added_examples ||= begin
+        (actual_examples - rspeed_examples).tap { |examples| stream(:added_examples, examples) }
+      end
     end
 
     def redis
       @redis ||= ::Redis.new(db: ENV['RSPEED_DB'], host: ENV['RSPEED_HOST'], port: ENV.fetch('RSPEED_PORT') { 6379 })
     end
 
-    def removed_specs
-      old_files - actual_files
+    def removed_examples
+      @removed_examples ||= begin
+        (rspeed_examples - actual_examples).tap { |examples| stream(:removed_examples, examples) }
+      end
     end
 
     def removed_time
-      removed_specs.map { |item| item[0].to_f }.sum
+      removed_examples.map { |item| item[0].to_f }.sum
     end
 
     def rspeed_data
       @rspeed_data ||= get('rspeed').map { |item| JSON.parse(item, symbolize_names: true) }
     end
+
+    def rspeed_examples
+      rspeed_data.map { |item| item[:file] }
+    end
+
+    def stream(type, data)
+      puts "PIPE: #{pipe} with #{type}: #{data}"
+    end
   end
 end

data/lib/rspeed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RSpeed
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/fixtures/1_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.describe 'fixture_1' do
+  it { sleep 0.1 }
+
+  it { sleep 0.2 }
+
+  it { sleep 0.3 }
+end

data/spec/fixtures/2_spec.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+RSpec.describe 'fixture_2' do
+  it { sleep 2 }
+end

data/spec/fixtures/new_spec.rb.csv

@@ -0,0 +1 @@
+10,./spec/fixtures/new_spec.rb.csv:1010,./spec/fixtures/new_spec.rb.csv:10

data/spec/models/rspeed/observer/after_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe RSpeed::Observer, '.after' do
   let!(:metadata) { { file_path: 'file_path', line_number: 7, start_at: now - 1 } }
   let!(:example) { instance_double(RSpec::Core::Example, clock: clock, metadata: metadata) }
 
-  before { clean_csv_file }
+  before { truncate_file }
 
   it 'appends the time of example on csv file' do
     described_class.after(example)

data/spec/models/rspeed/observer/before_suite_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe RSpeed::Observer, '.before_suite' do
-  before { clean_csv_file }
+  before { truncate_file }
 
   it 'cleans the csv file' do
     File.open('rspeed.csv', 'a') { |file| file.write('content') }

data/spec/models/rspeed/splitter/actual_examples_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe RSpeed::Splitter, '#actual_examples' do
+  it 'returns all examples' do
+    splitter = described_class.new(specs_path: 'spec/fixtures/**/*_spec.rb')
+
+    expect(splitter.actual_examples).to eq [
+      'spec/fixtures/1_spec.rb:4',
+      'spec/fixtures/1_spec.rb:6',
+      'spec/fixtures/1_spec.rb:8',
+      'spec/fixtures/2_spec.rb:4',
+    ]
+  end
+
+  it 'does not raise when no file match' do
+    splitter = described_class.new(specs_path: 'spec/fixtures/**/*_missing.rb')
+
+    expect(splitter.actual_examples).to eq []
+  end
+end

data/spec/models/rspeed/splitter/append_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe RSpeed::Splitter, '#append' do
 
   context 'when files is not given' do
     before do
-      clean_csv_file
+      truncate_file
       populate_csv_file
     end
 

data/spec/models/rspeed/splitter/diff_spec.rb

@@ -3,27 +3,30 @@
 require 'rails_helper'
 
 RSpec.describe RSpeed::Splitter, '#diff' do
-  subject(:splitter) { described_class.new }
+  subject(:splitter) { described_class.new(specs_path: './spec/fixtures/*_spec.rb') }
 
   let!(:redis) { redis_object }
 
   before do
-    redis.lpush 'rspeed', { file: '1_spec.rb', time: 1 }.to_json
-    redis.lpush 'rspeed', { file: '2_spec.rb', time: 2 }.to_json
-    redis.lpush 'rspeed', { file: '3_spec.rb', time: 3 }.to_json
+    redis.lpush 'rspeed', { file: './spec/fixtures/1_spec.rb:4', time: '1.4' }.to_json
+    redis.lpush 'rspeed', { file: './spec/fixtures/1_spec.rb:6', time: '1.6' }.to_json
+    redis.lpush 'rspeed', { file: './spec/fixtures/1_spec.rb:8', time: '1.8' }.to_json
+    redis.lpush 'rspeed', { file: './spec/fixtures/2_spec.rb:4', time: '2.4' }.to_json
+    redis.lpush 'rspeed', { file: './spec/fixtures/2_spec.rb:666', time: '6' }.to_json
+    redis.lpush 'rspeed', { file: './spec/fixtures/x_spec.rb:1', time: 3 }.to_json
 
-    allow(Dir).to receive(:[]).with('./spec/**/*_spec.rb').and_return %w[
-      2_spec.rb
-      3_spec.rb
-      4_spec.rb
-    ]
+    File.open('spec/fixtures/new_spec.rb', 'a') { |file| file.write("it") }
   end
 
+  after { delete_file('spec/fixtures/new_spec.rb') }
+
   it 'removes removed specs and adds new spec and keeps keeped specs based on rspeed key values' do
     expect(splitter.diff).to eq [
-      { file: '3_spec.rb', time: 3 },
-      { file: '2_spec.rb', time: 2 },
-      { file: '4_spec.rb', time: 0 },
+      { file: './spec/fixtures/2_spec.rb:4', time: '2.4' },
+      { file: './spec/fixtures/1_spec.rb:8', time: '1.8' },
+      { file: './spec/fixtures/1_spec.rb:6', time: '1.6' },
+      { file: './spec/fixtures/1_spec.rb:4', time: '1.4' },
+      { file: './spec/fixtures/new_spec.rb:1', time: 0 },
     ]
   end
 end

data/spec/rails_helper.rb

@@ -20,8 +20,12 @@ RSpec.configure do |config|
   config.profile_examples = 10
 end
 
-def clean_csv_file
-  File.open('rspeed.csv', 'w') { |file| file.truncate(0) }
+def delete_file(file_path = 'rspeed.csv')
+  File.delete(file_path) if File.exist?(file_path)
+end
+
+def truncate_file(file_path = 'rspeed.csv')
+  File.open(file_path, 'w') { |file| file.truncate(0) }
 end
 
 def populate_csv_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspeed
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Washington Botelho
@@ -114,9 +114,13 @@ files:
 - lib/rspeed/runner.rb
 - lib/rspeed/splitter.rb
 - lib/rspeed/version.rb
+- spec/fixtures/1_spec.rb
+- spec/fixtures/2_spec.rb
+- spec/fixtures/new_spec.rb.csv
 - spec/models/rspeed/observer/after_spec.rb
 - spec/models/rspeed/observer/before_spec.rb
 - spec/models/rspeed/observer/before_suite_spec.rb
+- spec/models/rspeed/splitter/actual_examples_spec.rb
 - spec/models/rspeed/splitter/append_spec.rb
 - spec/models/rspeed/splitter/destroy_spec.rb
 - spec/models/rspeed/splitter/diff_spec.rb
@@ -158,6 +162,7 @@ test_files:
 - spec/models/rspeed/splitter/append_spec.rb
 - spec/models/rspeed/splitter/destroy_spec.rb
 - spec/models/rspeed/splitter/pipe_spec.rb
+- spec/models/rspeed/splitter/actual_examples_spec.rb
 - spec/models/rspeed/splitter/get_spec.rb
 - spec/models/rspeed/splitter/rename_spec.rb
 - spec/models/rspeed/splitter/last_pipe_spec.rb
@@ -171,4 +176,7 @@ test_files:
 - spec/models/rspeed/observer/before_suite_spec.rb
 - spec/models/rspeed/observer/before_spec.rb
 - spec/models/rspeed/observer/after_spec.rb
+- spec/fixtures/new_spec.rb.csv
+- spec/fixtures/1_spec.rb
+- spec/fixtures/2_spec.rb
 - spec/rails_helper.rb