rspeed 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27a64c0a7ba3f1c113bbdf8f060be44dad913a684d234663b342a537937ac7f2
-  data.tar.gz: 47d3a190302b361c6bb76279094a7c04982492e59d099d6acdbe92fcbd26d648
+  metadata.gz: 19e3b06a0f6189661598a3db76e740b99b5ab658b3e08119fa6f8a74efb74552
+  data.tar.gz: 813bd8934d23e84bcb0facf56da0bf53c4017d5af03337989a42ffff2dac679d
 SHA512:
-  metadata.gz: ac35df999459a32e06989e84d0e703f52a61b896e3a68ef7993c6eaf70952dd05826dffdf36f01fe5843b3916e57b24112708cbcadd19b83eb018c990f2bda4c
-  data.tar.gz: '09feaa28dc6a306f8ba039bcfbf02b500450b6f117160a726f326daae76c9584524825ffd693a4f3a84a61cb181fef7c00216557ce04ccaea736f42d3e9370d8'
+  metadata.gz: '004081032114288e16f23c176ca49c03e85274ed6b91272144643452ec5f2a648c829dae5539c94215897f67482a6f0cf1e5253acabeafc6cdf5a6e2fe2681e9'
+  data.tar.gz: 2ec7f4991a5702f4bd24000e71eb5426969f0abd3a77cabd521887ad72dac3e3ec5f28f0165193ca806f8e9a9e8fce712ac9923f899c9e8767c8808320400ab4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.3.0
+
+- Removed and added files now is considered on run;
+
 ## v0.2.0
 
 - Splits specs by examples over files;

data/lib/rspeed/splitter.rb

@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 
 module RSpeed
   class Splitter
@@ -6,7 +5,7 @@ module RSpeed
 
     def append(files = file_data)
       files.each do |time, file|
-        redis.lpush 'rspeed_tmp', { file: file, time: time.to_f }.to_json
+        redis.lpush('rspeed_tmp', { file: file, time: time.to_f }.to_json)
       end
     end
 
@@ -15,9 +14,7 @@ module RSpeed
     end
 
     def diff
-      (actual_files + added_files).sort_by { |item| item[:time].to_f }.map do |item|
-        [item[:time], item[:file]]
-      end
+      actual_data + added_data
     end
 
     def first_pipe?
@@ -28,7 +25,7 @@ module RSpeed
       @get ||= begin
         return redis.lrange(pattern, 0, -1) if %w[rspeed rspeed_tmp].include?(pattern)
 
-        keys(pattern).map { |key| JSON.parse redis.get(key) }
+        keys(pattern).map { |key| JSON.parse(redis.get(key)) }
       end
     end
 
@@ -59,17 +56,15 @@ module RSpeed
     end
 
     def rename
-      redis.rename 'rspeed_tmp', 'rspeed'
+      redis.rename('rspeed_tmp', 'rspeed')
     end
 
     def result?
       !keys('rspeed').empty?
     end
 
-    def save(data = rspeed_data)
-      split(data).each do |key, value|
-        redis.set key, value.to_json
-      end
+    def save(data = diff)
+      split(data).each { |key, value| redis.set(key, value.to_json) }
     end
 
     def split(data)
@@ -96,32 +91,36 @@ module RSpeed
 
     private
 
-    def actual_files
-      rspeed_data.select { |item| actual_specs.include?(item[:file]) }
+    def actual_data
+      rspeed_data.select { |item| actual_files.include?(item[:file]) }
     end
 
-    def actual_specs
-      Dir['./spec/**/*_spec.rb']
+    def actual_files
+      @actual_files ||= Dir['./spec/**/*_spec.rb']
     end
 
-    def added_files
+    def added_data
       added_specs.map { |item| { file: item, time: 0 } }
     end
 
     def added_specs
-      actual_specs - saved_specs
+      actual_files - old_files
     end
 
     def file_data
       CSV.read('rspeed.csv')
     end
 
+    def old_files
+      rspeed_data.map { |item| item[:file] }
+    end
+
     def redis
       @redis ||= ::Redis.new(db: ENV['RSPEED_DB'], host: ENV['RSPEED_HOST'], port: ENV.fetch('RSPEED_PORT') { 6379 })
     end
 
     def removed_specs
-      saved_specs - actual_specs
+      old_files - actual_files
     end
 
     def removed_time
@@ -129,11 +128,7 @@ module RSpeed
     end
 
     def rspeed_data
-      get('rspeed').map { |item| JSON.parse item, symbolize_names: true }
-    end
-
-    def saved_specs
-      rspeed_data.map { |item| item[:file] }
+      @rspeed_data ||= get('rspeed').map { |item| JSON.parse(item, symbolize_names: true) }
     end
   end
 end

data/lib/rspeed/version.rb

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

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

@@ -21,9 +21,9 @@ RSpec.describe RSpeed::Splitter, '#diff' do
 
   it 'removes removed specs and adds new spec and keeps keeped specs based on rspeed key values' do
     expect(splitter.diff).to eq [
-      [0, '4_spec.rb'],
-      [2, '2_spec.rb'],
-      [3, '3_spec.rb']
+      { file: '3_spec.rb', time: 3 },
+      { file: '2_spec.rb', time: 2 },
+      { file: '4_spec.rb', time: 0 },
     ]
   end
 end

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

@@ -10,19 +10,21 @@ RSpec.describe RSpeed::Splitter, '.save' do
   before do
     allow(splitter).to receive(:pipes).and_return(3)
 
-    redis.lpush 'rspeed', { file: "./spec/0_2_spec.rb", time: '0.2' }.to_json
-    redis.lpush 'rspeed', { file: "./spec/0_3_spec.rb", time: '0.3' }.to_json
-    redis.lpush 'rspeed', { file: "./spec/0_4_spec.rb", time: '0.4' }.to_json
-    redis.lpush 'rspeed', { file: "./spec/0_7_spec.rb", time: '0.7' }.to_json
-    redis.lpush 'rspeed', { file: "./spec/1_1_spec.rb", time: '1.1' }.to_json
-    redis.lpush 'rspeed', { file: "./spec/1_5_spec.rb", time: '1.5' }.to_json
-    redis.lpush 'rspeed', { file: "./spec/2_0_spec.rb", time: '2.0' }.to_json
+    allow(splitter).to receive(:diff).and_return([
+      { file: "./spec/0_2_spec.rb", time: '0.2' },
+      { file: "./spec/0_3_spec.rb", time: '0.3' },
+      { file: "./spec/0_4_spec.rb", time: '0.4' },
+      { file: "./spec/0_7_spec.rb", time: '0.7' },
+      { file: "./spec/1_1_spec.rb", time: '1.1' },
+      { file: "./spec/1_5_spec.rb", time: '1.5' },
+      { file: "./spec/2_0_spec.rb", time: '2.0' },
+    ])
   end
 
   it 'saves the data on redis' do
     splitter.save
 
-    expect(redis.keys('*')).to eq %w[rspeed rspeed_1 rspeed_2 rspeed_3]
+    expect(redis.keys('*')).to eq %w[rspeed_1 rspeed_2 rspeed_3]
 
     expect(JSON.parse(redis.get('rspeed_1'), symbolize_names: true)).to eq(
       files: [{ file: './spec/2_0_spec.rb', time: 2.0 }],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspeed
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Washington Botelho
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis