rspeed 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2d2d14366ee70f0cf449f6fbf6bc6c7cedd57edc8497b646721afa4b098720a
-  data.tar.gz: 0ac5789e67ba474055620780a0311525bbe29c801b2c09344218888b33de55ac
+  metadata.gz: de6e5d6c3ca630b15b835939ec2b01adbeec526480efde16052c294f297457af
+  data.tar.gz: 4c4d1efdf65c9f4c01106f1fe109d8ffb2160e40b6f90813b4bdc813061613dc
 SHA512:
-  metadata.gz: 00adb24277015b707cfbd1d5ea0f2cd9b220701344654a107471ab6683ea4876830a34cb34262a42b425078a5dab85efaee16cb2252da1027b807a3409eb22ac
-  data.tar.gz: aa4932a206cd9a5ab93e4b4217099ebad1a110b8ee9d48c6c0dd9addaf9073d561249480cfe1f74137f484c27a649b05afc4720fde679abb825ef43ba59feb4a
+  metadata.gz: 5ab45f421853bee217c88cfad0efd5d2bd16b9968b17b7676593b4ae0a2e708ac6b646f40845b8f186adfc000c505cef4e95f77c7c8273e6964203b0de22420a
+  data.tar.gz: 7e32c34c76fcdaff18e2aa2726c232d42c32fb4e3fc55b452f0d9b62f2dff0e5f458acd4c3dbacae75b5ca0c330e4b2792618179675c11adcf8aa566d13106c9

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 - None;
 
+## v0.5.1
+
+#### Fix
+
+- Only pipe number 1 will warm up avoiding duplicated spec entries;
+
 ## v0.5.0
 
 #### Fix

data/lib/rspeed.rb

@@ -5,6 +5,7 @@ module RSpeed
 
   require 'rspeed/env'
   require 'rspeed/extension'
+  require 'rspeed/logger'
   require 'rspeed/observer'
   require 'rspeed/redis'
   require 'rspeed/runner'

data/lib/rspeed/env.rb

@@ -21,7 +21,7 @@ module RSpeed
     end
 
     def pipes
-      RSpeed::Redis.result? ? ENV.fetch('RSPEED_PIPES', 1).to_i : 1
+      ENV.fetch('RSPEED_PIPES', 1).to_i
     end
 
     def port

data/lib/rspeed/logger.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module RSpeed
+  module Logger
+    module_function
+
+    def log(message)
+      puts(message)
+    end
+  end
+end

data/lib/rspeed/observer.rb

@@ -17,13 +17,13 @@ module RSpeed
     def after_suite(splitter = ::RSpeed::Splitter.new)
       RSpeed::Redis.set(RSpeed::Variable.pipe_name, true)
 
-      splitter.append
+      splitter.append if splitter.append?
 
       return unless RSpeed::Redis.specs_finished?
 
       splitter.rename
 
-      RSpeed::Redis.clean_pipes_flag
+      RSpeed::Redis.clean
     end
 
     def before(example)

data/lib/rspeed/redis.rb

@@ -6,7 +6,7 @@ module RSpeed
 
     module_function
 
-    def clean_pipes_flag
+    def clean
       destroy(RSpeed::Variable::PIPES_PATTERN)
     end
 

data/lib/rspeed/runner.rb

@@ -5,9 +5,11 @@ module RSpeed
     module_function
 
     def run(shell, splitter: ::RSpeed::Splitter.new)
-      return if splitter.redundant_run?
+      return shell.call(['bundle exec rspec', splitter.pipe_files].compact.join(' ')) if splitter.need_warm?
 
-      shell.call(['bundle exec rspec', splitter.pipe_files].compact.join(' '))
+      RSpeed::Logger.log("Pipe #{RSpeed::Env.pipe} skipped. Only Pipe 1 can warm.")
+
+      RSpeed::Observer.after_suite
     end
   end
 end

data/lib/rspeed/splitter.rb

@@ -25,6 +25,10 @@ module RSpeed
       end
     end
 
+    def append?
+      RSpeed::Redis.result? || first_pipe?
+    end
+
     def append(files = CSV.read(RSpeed::Variable::CSV))
       files.each do |time, file|
         redis.lpush(RSpeed::Env.tmp_key, { file: file, time: time.to_f }.to_json)
@@ -52,16 +56,16 @@ module RSpeed
       end
     end
 
+    def need_warm?
+      first_pipe? && !RSpeed::Redis.result?
+    end
+
     def pipe_files
       return unless RSpeed::Redis.result?
 
       split[RSpeed::Variable.key(RSpeed::Env.pipe)][:files].map { |item| item[:file] }.join(' ')
     end
 
-    def redundant_run?
-      !first_pipe? && !exists?(RSpeed::Env.result_key)
-    end
-
     def rename
       redis.rename(RSpeed::Env.tmp_key, RSpeed::Env.result_key)
     end
@@ -96,11 +100,6 @@ module RSpeed
       end
     end
 
-    # TODO: exists? does not work: undefined method `>' for false:FalseClass
-    def exists?(key)
-      redis.keys.include?(key)
-    end
-
     def redis
       @redis ||= ::RSpeed::Redis.client
     end
@@ -124,7 +123,7 @@ module RSpeed
     end
 
     def stream(type, data)
-      puts "PIPE: #{RSpeed::Env.pipe} with #{type}: #{data}"
+      RSpeed::Logger.log("PIPE: #{RSpeed::Env.pipe} with #{type}: #{data}")
     end
   end
 end

data/lib/rspeed/version.rb

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

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

@@ -3,39 +3,17 @@
 require 'support/env_mock'
 
 RSpec.describe RSpeed::Env, '.pipes' do
-  context 'when result is false' do
-    before { allow(RSpeed::Redis).to receive(:result?).and_return(false) }
-
-    context 'when env is setted' do
-      it 'returns number 1' do
-        EnvMock.mock(rspeed_pipes: '2') do
-          expect(described_class.pipes).to be(1)
-        end
-      end
-    end
-
-    context 'when env is not setted' do
-      it 'returns number 1' do
-        expect(described_class.pipes).to be(1)
+  context 'when env is setted' do
+    it 'returns the env value' do
+      EnvMock.mock(rspeed_pipes: '2') do
+        expect(described_class.pipes).to be(2)
       end
     end
   end
 
-  context 'when result is true' do
-    before { allow(RSpeed::Redis).to receive(:result?).and_return(true) }
-
-    context 'when env is setted' do
-      it 'returns the env value as integer' do
-        EnvMock.mock(rspeed_pipes: '2') do
-          expect(described_class.pipes).to be(2)
-        end
-      end
-    end
-
-    context 'when env is not setted' do
-      it 'returns number 1' do
-        expect(described_class.pipes).to be(1)
-      end
+  context 'when env is not setted' do
+    it 'returns number 1' do
+      expect(described_class.pipes).to be(1)
     end
   end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe RSpeed::Observer, '.after' do
+RSpec.describe RSpeed::Observer, '.after_suite' do
   let!(:splitter) { instance_double('RSpeed::Splitter') }
 
   before do
@@ -8,27 +8,51 @@ RSpec.describe RSpeed::Observer, '.after' do
     allow(splitter).to receive(:append)
   end
 
-  context 'when all specs is not finished' do
-    before { allow(RSpeed::Redis).to receive(:specs_finished?).and_return(false) }
+  context 'when append? returns true' do
+    before do
+      allow(splitter).to receive(:append?).and_return(true)
+      allow(splitter).to receive(:rename)
+    end
 
-    it 'sets true on pipe key to indicates that its finished' do
+    it 'appends the time result on tmp key' do
       described_class.after_suite
 
-      expect(RSpeed::Redis.get('rspeed_pipe_1')).to eq('true')
+      expect(splitter).to have_received(:append)
+    end
+  end
+
+  context 'when append? returns false' do
+    before do
+      allow(splitter).to receive(:append?).and_return(false)
+      allow(splitter).to receive(:rename)
     end
 
-    it 'appends the time result' do
+    it 'does not append the time result on tmp key' do
       described_class.after_suite
 
-      expect(splitter).to have_received(:append)
+      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
+
+    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')
     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::Redis).to receive(:clean_pipes_flag)
+      allow(RSpeed::Redis).to receive(:clean)
     end
 
     it 'renames the tmp data to the permanent key result' do
@@ -40,7 +64,7 @@ RSpec.describe RSpeed::Observer, '.after' do
     it 'destroyes pipe finished flag keys' do
       described_class.after_suite
 
-      expect(RSpeed::Redis).to have_received(:clean_pipes_flag)
+      expect(RSpeed::Redis).to have_received(:clean)
     end
   end
 end

data/spec/models/rspeed/redis/{clean_pipes_flag_spec.rb → clean_spec.rb}

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-RSpec.describe RSpeed::Redis, '.clean_pipes_flag' do
-  before do
+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)
-  end
 
-  it 'destroy all keys that keeps the pipe finished' do
-    described_class.clean_pipes_flag
+    described_class.clean
 
     expect(described_class.keys('*')).to eq([])
   end

data/spec/models/rspeed/runner/run_spec.rb

@@ -4,20 +4,31 @@ RSpec.describe RSpeed::Runner, '#run' do
   let!(:shell) { double('shell') }
   let!(:splitter) { instance_double('RSpeed::Splitter') }
 
-  before { allow(RSpeed::Splitter).to receive(:new).and_return(splitter) }
+  before do
+    allow(shell).to receive(:call)
+    allow(RSpeed::Splitter).to receive(:new).and_return(splitter)
+    allow(RSpeed::Observer).to receive(:after_suite)
+  end
+
+  context 'when does not need warm' do
+    before { allow(splitter).to receive(:need_warm?).and_return(false) }
 
-  context 'when is a redundant run' do
-    before { allow(splitter).to receive(:redundant_run?).and_return(true) }
+    it 'does not run the specs' do
+      described_class.run(shell)
 
-    it 'aborts the run' do
-      expect(described_class.run(shell)).to be(nil)
+      expect(shell).not_to have_received(:call)
+    end
+
+    it 'executes the after suite to complete the current pipe' do
+      described_class.run(shell)
+
+      expect(RSpeed::Observer).to have_received(:after_suite)
     end
   end
 
-  context 'when is not a redundant run' do
+  context 'when need warm' do
     before do
-      allow(splitter).to receive(:redundant_run?).and_return(false)
-      allow(shell).to receive(:call)
+      allow(splitter).to receive(:need_warm?).and_return(true)
       allow(splitter).to receive(:pipe_files).and_return('spec_1.rb spec_2.rb')
     end
 
@@ -26,5 +37,11 @@ RSpec.describe RSpeed::Runner, '#run' do
 
       expect(shell).to have_received(:call).with('bundle exec rspec spec_1.rb spec_2.rb')
     end
+
+    it 'does not execute the after suite to complete the current pipe' do
+      described_class.run(shell)
+
+      expect(RSpeed::Observer).not_to have_received(:after_suite)
+    end
   end
 end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+RSpec.describe RSpeed::Splitter, '#append?' do
+  subject(:splitter) { described_class.new }
+
+  context 'when has no result' do
+    before { allow(RSpeed::Redis).to receive(:result?).and_return(false) }
+
+    context 'when is not the first pipe' do
+      before { allow(splitter).to receive(:first_pipe?).and_return(false) }
+
+      it { expect(splitter.append?).to be(false) }
+    end
+
+    context 'when is the first pipe' do
+      before { allow(splitter).to receive(:first_pipe?).and_return(true) }
+
+      it { expect(splitter.append?).to be(true) }
+    end
+  end
+
+  context 'when has result' do
+    before { allow(RSpeed::Redis).to receive(:result?).and_return(true) }
+
+    context 'when is not the first pipe' do
+      before { allow(splitter).to receive(:first_pipe?).and_return(false) }
+
+      it { expect(splitter.append?).to be(true) }
+    end
+
+    context 'when is the first pipe' do
+      before { allow(splitter).to receive(:first_pipe?).and_return(true) }
+
+      it { expect(splitter.append?).to be(true) }
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+RSpec.describe RSpeed::Splitter, '#need_warm?' do
+  subject(:splitter) { described_class.new }
+
+  context 'when has no result' do
+    before { allow(RSpeed::Redis).to receive(:result?).and_return(false) }
+
+    context 'when is not the first pipe' do
+      before { allow(splitter).to receive(:first_pipe?).and_return(false) }
+
+      it { expect(splitter.need_warm?).to be(false) }
+    end
+
+    context 'when is the first pipe' do
+      before { allow(splitter).to receive(:first_pipe?).and_return(true) }
+
+      it { expect(splitter.need_warm?).to be(true) }
+    end
+  end
+
+  context 'when has result' do
+    before { allow(RSpeed::Redis).to receive(:result?).and_return(true) }
+
+    context 'when is not the first pipe' do
+      before { allow(splitter).to receive(:first_pipe?).and_return(false) }
+
+      it { expect(splitter.need_warm?).to be(false) }
+    end
+
+    context 'when is the first pipe' do
+      before { allow(splitter).to receive(:first_pipe?).and_return(true) }
+
+      it { expect(splitter.need_warm?).to be(false) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspeed
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Washington Botelho
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -167,6 +167,7 @@ files:
 - lib/rspeed.rb
 - lib/rspeed/env.rb
 - lib/rspeed/extension.rb
+- lib/rspeed/logger.rb
 - lib/rspeed/observer.rb
 - lib/rspeed/redis.rb
 - lib/rspeed/runner.rb
@@ -191,7 +192,7 @@ files:
 - spec/models/rspeed/observer/after_suite_spec.rb
 - spec/models/rspeed/observer/before_spec.rb
 - spec/models/rspeed/observer/before_suite_spec.rb
-- spec/models/rspeed/redis/clean_pipes_flag_spec.rb
+- spec/models/rspeed/redis/clean_spec.rb
 - spec/models/rspeed/redis/client_spec.rb
 - spec/models/rspeed/redis/destroy_spec.rb
 - spec/models/rspeed/redis/get_spec.rb
@@ -202,12 +203,13 @@ files:
 - spec/models/rspeed/redis/specs_initiated_spec.rb
 - spec/models/rspeed/runner/run_spec.rb
 - spec/models/rspeed/splitter/actual_examples_spec.rb
+- spec/models/rspeed/splitter/append_question_spec.rb
 - spec/models/rspeed/splitter/append_spec.rb
 - spec/models/rspeed/splitter/diff_spec.rb
 - spec/models/rspeed/splitter/first_pipe_spec.rb
 - spec/models/rspeed/splitter/get_spec.rb
+- spec/models/rspeed/splitter/need_warm_question_spec.rb
 - spec/models/rspeed/splitter/pipe_files_spec.rb
-- spec/models/rspeed/splitter/redundant_run_spec.rb
 - spec/models/rspeed/splitter/rename_spec.rb
 - spec/models/rspeed/splitter/split_spec.rb
 - spec/models/rspeed/variable/append_name_spec.rb
@@ -258,10 +260,10 @@ test_files:
 - spec/models/rspeed/variable/pipe_name_spec.rb
 - spec/models/rspeed/redis/destroy_spec.rb
 - spec/models/rspeed/redis/get_spec.rb
+- spec/models/rspeed/redis/clean_spec.rb
 - spec/models/rspeed/redis/client_spec.rb
 - spec/models/rspeed/redis/specs_finished_spec.rb
 - spec/models/rspeed/redis/set_spec.rb
-- spec/models/rspeed/redis/clean_pipes_flag_spec.rb
 - spec/models/rspeed/redis/specs_initiated_spec.rb
 - spec/models/rspeed/redis/result_spec.rb
 - spec/models/rspeed/redis/keys_spec.rb
@@ -270,11 +272,12 @@ test_files:
 - 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/redundant_run_spec.rb
+- spec/models/rspeed/splitter/need_warm_question_spec.rb
 - spec/models/rspeed/splitter/pipe_files_spec.rb
 - spec/models/rspeed/splitter/first_pipe_spec.rb
 - spec/models/rspeed/splitter/diff_spec.rb
 - spec/models/rspeed/splitter/split_spec.rb
+- spec/models/rspeed/splitter/append_question_spec.rb
 - spec/models/rspeed/observer/before_suite_spec.rb
 - spec/models/rspeed/observer/before_spec.rb
 - spec/models/rspeed/observer/after_suite_spec.rb

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

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe RSpeed::Splitter, '.redundant_run?' do
-  subject(:splitter) { described_class.new }
-
-  context 'when is not pipe 1' do
-    before { allow(RSpeed::Env).to receive(:pipe).and_return(2) }
-
-    context 'when result key exists' do
-      let!(:redis) { redis_object }
-
-      before do
-        redis.set('rspeed', '{}')
-
-        allow(RSpeed::Env).to receive(:pipe).and_return(2)
-      end
-
-      it { expect(splitter.redundant_run?).to be(false) }
-    end
-
-    context 'when result key does not exist' do
-      it { expect(splitter.redundant_run?).to be(true) }
-    end
-  end
-
-  context 'when is the first pipe' do
-    before { allow(RSpeed::Env).to receive(:pipe).and_return(1) }
-
-    context 'when result key exists' do
-      let!(:redis) { redis_object }
-
-      before do
-        redis.set('rspeed', '{}')
-
-        allow(RSpeed::Env).to receive(:pipe).and_return(2)
-      end
-
-      it { expect(splitter.redundant_run?).to be(false) }
-    end
-
-    context 'when result key does not exist' do
-      it { expect(splitter.redundant_run?).to be(false) }
-    end
-  end
-end