rspeed 0.5.2 → 0.6.0

data/lib/rspeed/variable.rb

@@ -4,28 +4,27 @@ module RSpeed
   module Variable
     module_function
 
-    DEFAULT_PATTERN = 'rspeed_*'
-    PIPES_PATTERN   = 'rspeed_pipe_*'
-    PROFILE_PATTERN = 'rspeed_profile_*'
+    PIPES_PATTERN   = 'rspeed:pipe_*'
+    PROFILE_PATTERN = 'rspeed:profile_*'
 
-    def append_name(value, suffix = nil)
-      [value, RSpeed::Env.name, suffix].compact.join('_')
+    def append_app_name(value, plus: nil)
+      [value, RSpeed::Env.app, plus].compact.join('_')
     end
 
     def key(number)
-      append_name('rspeed', number).to_sym
+      append_app_name('rspeed', plus: number).to_sym
     end
 
     def result
-      append_name('rspeed')
+      append_app_name('rspeed')
     end
 
-    def pipe_name
-      append_name('rspeed_pipe', RSpeed::Env.pipe)
+    def pipe
+      append_app_name('rspeed:pipe', plus: format('%02d', RSpeed::Env.pipe))
     end
 
     def profile
-      append_name('rspeed_profile', RSpeed::Env.pipe)
+      append_app_name('rspeed:profile', plus: format('%02d', RSpeed::Env.pipe))
     end
   end
 end

data/lib/rspeed/version.rb

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

data/spec/models/rspeed/database/result_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+RSpec.describe RSpeed::Database, '#result' do
+  let!(:redis) { redis_object }
+
+  before do
+    redis.rpush('rspeed', { file: '1_spec.rb', time: 1.0 }.to_json)
+    redis.rpush('rspeed', { file: '2_spec.rb', time: 2.0 }.to_json)
+  end
+
+  it 'returns the results data as json' do
+    expect(described_class.result).to eq [
+      { file: '1_spec.rb', time: 1.0 },
+      { file: '2_spec.rb', time: 2.0 },
+    ]
+  end
+end

data/spec/models/rspeed/differ/actual_data_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.describe RSpeed::Differ, '#actual_data' do
+  let!(:files) { ['./spec/fixtures/1_spec.rb:4', './spec/fixtures/1_spec.rb:6', './spec/fixtures/new_spec.rb:1'] }
+
+  let!(:result) do
+    [
+      { file: './spec/fixtures/1_spec.rb:4', time: 1.4 },
+      { file: './spec/fixtures/1_spec.rb:6', time: 1.6 },
+      { file: './spec/fixtures/2_spec.rb:4', time: 2.4 },
+    ]
+  end
+
+  it 'returns only consolidated data still existent as spec' do
+    expect(described_class.actual_data(files: files, result: result)).to eq [
+      { file: './spec/fixtures/1_spec.rb:4', time: 1.4 },
+      { file: './spec/fixtures/1_spec.rb:6', time: 1.6 },
+    ]
+  end
+end

data/spec/models/rspeed/differ/actual_files_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.describe RSpeed::Differ, '#actual_files' do
+  it 'returns all examples' do
+    expect(described_class.actual_files(spec_path: './spec/fixtures/**/*_spec.rb')).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
+    expect(described_class.actual_files(spec_path: './spec/fixtures/**/*_missing.rb')).to eq []
+  end
+
+  it 'does not raise when file is empty' do
+    expect(described_class.actual_files(spec_path: './spec/fixtures/**/empty.rb')).to eq []
+  end
+end

data/spec/models/rspeed/differ/added_data_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+RSpec.describe RSpeed::Differ, '#added_data' do
+  let!(:files) { ['./spec/fixtures/1_spec.rb:4', './spec/fixtures/1_spec.rb:6', './spec/fixtures/new_spec.rb:4'] }
+
+  let!(:result) do
+    [
+      { file: './spec/fixtures/1_spec.rb:4', time: 1.4 },
+      { file: './spec/fixtures/1_spec.rb:6', time: 1.6 },
+      { file: './spec/fixtures/2_spec.rb:4', time: 2.4 },
+    ]
+  end
+
+  it 'returns the added data files with time as zero since we do not know yet' do
+    expect(described_class.added_data(files: files, result: result)).to eq [
+      { file: './spec/fixtures/new_spec.rb:4', time: 0 },
+    ]
+  end
+end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'support/env_mock'
+
+RSpec.describe RSpeed::Differ, '#diff' do
+  let!(:redis) { redis_object }
+
+  before do
+    redis.rpush('rspeed', { file: './spec/fixtures/1_spec.rb:4', time: '1.4' }.to_json)
+    redis.rpush('rspeed', { file: './spec/fixtures/1_spec.rb:6', time: '1.6' }.to_json)
+    redis.rpush('rspeed', { file: './spec/fixtures/1_spec.rb:8', time: '1.8' }.to_json)
+    redis.rpush('rspeed', { file: './spec/fixtures/2_spec.rb:4', time: '2.4' }.to_json)
+    redis.rpush('rspeed', { file: './spec/fixtures/x_spec.rb:1', time: 3 }.to_json)
+    redis.rpush('rspeed', { file: './spec/fixtures/2_spec.rb:666', time: '6' }.to_json)
+
+    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
+    EnvMock.mock(rspeed_spec_path: './spec/fixtures/*_spec.rb') do
+      expect(described_class.diff).to eq [
+        { file: './spec/fixtures/1_spec.rb:4', time: '1.4' },
+        { file: './spec/fixtures/1_spec.rb:6', time: '1.6' },
+        { file: './spec/fixtures/1_spec.rb:8', time: '1.8' },
+        { file: './spec/fixtures/2_spec.rb:4', time: '2.4' },
+        { file: './spec/fixtures/new_spec.rb:1', time: 0 },
+      ]
+    end
+  end
+
+  context 'when has duplicated example' do
+    before do
+      redis.rpush('rspeed', { file: './spec/fixtures/1_spec.rb:4', time: '1.4' }.to_json)
+      redis.rpush('rspeed', { file: './spec/fixtures/1_spec.rb:4', time: '1.4' }.to_json)
+    end
+
+    it 'is removed' do
+      EnvMock.mock(rspeed_spec_path: './spec/fixtures/*_spec.rb') do
+        expect(described_class.diff).to eq [
+          { file: './spec/fixtures/1_spec.rb:4', time: '1.4' },
+          { file: './spec/fixtures/1_spec.rb:6', time: '1.6' },
+          { file: './spec/fixtures/1_spec.rb:8', time: '1.8' },
+          { file: './spec/fixtures/2_spec.rb:4', time: '2.4' },
+          { file: './spec/fixtures/new_spec.rb:1', time: 0 },
+        ]
+      end
+    end
+  end
+end

data/spec/models/rspeed/differ/removed_data_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.describe RSpeed::Differ, '#removed_data' do
+  let!(:files) { ['./spec/fixtures/2_spec.rb:4'] }
+
+  let!(:result) do
+    [
+      { file: './spec/fixtures/1_spec.rb:4', time: 1.4 },
+      { file: './spec/fixtures/1_spec.rb:6', time: 1.6 },
+      { file: './spec/fixtures/2_spec.rb:4', time: 2.4 },
+    ]
+  end
+
+  it 'returns only removed data' do
+    expect(described_class.removed_data(files: files, result: result)).to eq [
+      { file: './spec/fixtures/1_spec.rb:4', time: 1.4 },
+      { file: './spec/fixtures/1_spec.rb:6', time: 1.6 },
+    ]
+  end
+end

data/spec/models/rspeed/differ/removed_time_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+RSpec.describe RSpeed::Differ, '#removed_time' do
+  let!(:data) do
+    [
+      { file: './spec/fixtures/1_spec.rb:4', time: 1.4 },
+      { file: './spec/fixtures/1_spec.rb:6', time: 1.6 },
+    ]
+  end
+
+  it 'returns the sum of removed examples' do
+    expect(described_class.removed_time(data: data)).to be(3.0)
+  end
+end

data/spec/models/rspeed/env/{name_spec.rb → app_spec.rb}

@@ -2,16 +2,16 @@
 
 require 'support/env_mock'
 
-RSpec.describe RSpeed::Env, '.name' do
+RSpec.describe RSpeed::Env, '.app' do
   context 'when env is given' do
     it 'returns the env value' do
-      EnvMock.mock(rspeed_name: 'name') do
-        expect(described_class.name).to eq('name')
+      EnvMock.mock(rspeed_app: 'app') do
+        expect(described_class.app).to eq('app')
       end
     end
   end
 
   context 'when env is not given' do
-    it { expect(described_class.name).to be(nil) }
+    it { expect(described_class.app).to be(nil) }
   end
 end

data/spec/models/rspeed/env/spec_path_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'support/env_mock'
+
+RSpec.describe RSpeed::Env, '.spec_path' do
+  context 'when env is given' do
+    it 'is returned' do
+      EnvMock.mock(rspeed_spec_path: './test/**/*test.rb') do
+        expect(described_class.spec_path).to eq('./test/**/*test.rb')
+      end
+    end
+  end
+
+  context 'when env is not given' do
+    it 'returns the default' do
+      expect(described_class.spec_path).to eq('./spec/**/*spec.rb')
+    end
+  end
+end

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

@@ -1,51 +1,29 @@
 # frozen_string_literal: true
 
 RSpec.describe RSpeed::Observer, '.after_suite' do
-  let!(:splitter) { instance_double('RSpeed::Splitter') }
-
-  before do
-    allow(RSpeed::Splitter).to receive(:new).and_return(splitter)
-    allow(splitter).to receive(:append)
-  end
-
-  context 'when append? returns false' do
-    before do
-      allow(splitter).to receive(:append?).and_return(false)
-      allow(splitter).to receive(:rename)
-    end
-
-    it 'does not append the time result' do
-      described_class.after_suite
-
-      expect(splitter).not_to have_received(:append)
-    end
-  end
-
   context 'when all specs is not finished' do
-    before do
-      allow(splitter).to receive(:append?)
-      allow(RSpeed::Redis).to receive(:specs_finished?).and_return(false)
-    end
+    let!(:redis) { redis_object }
+
+    before { allow(RSpeed::Redis).to receive(:specs_finished?).and_return(false) }
 
     it 'sets true on pipe key to indicates that its finished' do
       described_class.after_suite
 
-      expect(RSpeed::Redis.get('rspeed_pipe_1')).to eq('true')
+      expect(redis.get('rspeed:pipe_01')).to eq('true')
     end
   end
 
   context 'when all specs finished' do
     before do
-      allow(splitter).to receive(:append?)
       allow(RSpeed::Redis).to receive(:specs_finished?).and_return(true)
-      allow(splitter).to receive(:rename)
+      allow(RSpeed::Splitter).to receive(:consolidate)
       allow(RSpeed::Redis).to receive(:clean)
     end
 
     it 'consolidates profiles' do
       described_class.after_suite
 
-      expect(splitter).to have_received(:rename)
+      expect(RSpeed::Splitter).to have_received(:consolidate)
     end
 
     it 'destroyes pipe finished flag keys' do

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

@@ -4,23 +4,24 @@ RSpec.describe RSpeed::Observer, '.before_suite' do
   let!(:redis) { redis_object }
 
   before { truncate_profiles }
+
   after { truncate_profiles }
 
   it 'cleans only the current pipe profile' do
-    redis.lpush('rspeed_profile_1', { file: '1_spec.rb', time: 1 }.to_json)
-    redis.lpush('rspeed_profile_2', { file: '2_spec.rb', time: 2 }.to_json)
+    redis.rpush('rspeed:profile_01', { file: '1_spec.rb', time: 1 }.to_json)
+    redis.rpush('rspeed:profile_02', { file: '2_spec.rb', time: 2 }.to_json)
 
     described_class.before_suite
 
-    expect(redis.keys).to eq ['rspeed_profile_2']
+    expect(redis.keys).to eq ['rspeed:profile_02']
   end
 
   it 'cleans the pipe flag' do
-    redis.set('rspeed_pipe_1', true)
-    redis.set('rspeed_pipe_2', true)
+    redis.set('rspeed:pipe_01', true)
+    redis.set('rspeed:pipe_02', true)
 
     described_class.before_suite
 
-    expect(redis.keys).to eq ['rspeed_pipe_2']
+    expect(redis.keys).to eq ['rspeed:pipe_02']
   end
 end

data/spec/models/rspeed/redis/clean_spec.rb

@@ -2,19 +2,19 @@
 
 RSpec.describe RSpeed::Redis, '.clean' do
   it 'destroys all keys that keeps the pipe finished info' do
-    described_class.set('rspeed_pipe_1', true)
-    described_class.set('rspeed_pipe_2', true)
+    redis_object.set('rspeed:pipe_01', true)
+    redis_object.set('rspeed:pipe_02', true)
 
     described_class.clean
 
-    expect(described_class.keys('*')).to eq([])
+    expect(redis_object.keys('*')).to eq([])
   end
 
   it 'destroys the pipe profiles' do
-    described_class.set('rspeed_profile_1', true)
+    redis_object.set('rspeed:profile_01', true)
 
     described_class.clean
 
-    expect(described_class.keys('*')).to eq([])
+    expect(redis_object.keys('*')).to eq([])
   end
 end

data/spec/models/rspeed/redis/destroy_spec.rb

@@ -1,29 +1,21 @@
 # frozen_string_literal: true
 
 RSpec.describe RSpeed::Redis, '#destroy' do
-  let!(:redis) { described_class }
-
   before do
-    redis.set('rspeed', '{}')
-    redis.set('rspeed_1', '{}')
-    redis.set('rspeed_2', '{}')
+    redis_object.set('rspeed', '{}')
+    redis_object.set('rspeed_1', '{}')
+    redis_object.set('rspeed_2', '{}')
   end
 
   it 'destroys via wildcard' do
-    redis.destroy('rspeed_*')
+    described_class.destroy(pattern: 'rspeed_*')
 
-    expect(redis.keys('*')).to eq %w[rspeed]
+    expect(redis_object.keys('*')).to eq %w[rspeed]
   end
 
   it 'destroys via single name' do
-    redis.destroy('rspeed')
-
-    expect(redis.keys('*')).to eq %w[rspeed_1 rspeed_2]
-  end
-
-  it 'destroys default partner when no pattern is given' do
-    redis.destroy
+    described_class.destroy(pattern: 'rspeed')
 
-    expect(redis.keys('*')).to eq %w[rspeed]
+    expect(redis_object.keys('*')).to eq %w[rspeed_1 rspeed_2]
   end
 end

data/spec/models/rspeed/redis/get_spec.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe RSpeed::Redis, '.set' do
+  let!(:redis) { redis_object }
+
   it 'sets a key on redis' do
-    described_class.client.set('key', 'value')
+    redis_object.set('key', 'value')
 
     expect(described_class.get('key')).to eq('value')
   end

data/spec/models/rspeed/redis/keys_spec.rb

@@ -1,29 +1,13 @@
 # frozen_string_literal: true
 
 RSpec.describe RSpeed::Redis, '.keys' do
-  subject(:redis) { described_class }
-
-  context 'with default config' do
-    before do
-      described_class.set('rspeed_1', 'value_1')
-      described_class.set('rspeed_2', 'value_2')
-      described_class.set('rspeed_3', 'value_3')
-    end
-
-    it 'shows keys' do
-      expect(redis.keys).to eq %w[rspeed_1 rspeed_2 rspeed_3]
-    end
+  before do
+    redis_object.set('custom_key_1', 'value_1')
+    redis_object.set('custom_key_2', 'value_2')
+    redis_object.set('custom_key_3', 'value_3')
   end
 
-  context 'with custom key' do
-    before do
-      described_class.set('custom_key_1', 'value_1')
-      described_class.set('custom_key_2', 'value_2')
-      described_class.set('custom_key_3', 'value_3')
-    end
-
-    it 'shows keys' do
-      expect(redis.keys('custom_key_*')).to eq %w[custom_key_1 custom_key_2 custom_key_3]
-    end
+  it 'shows keys' do
+    expect(described_class.keys(pattern: 'custom_key_*')).to eq %w[custom_key_1 custom_key_2 custom_key_3]
   end
 end