rspeed 0.4.0 → 0.7.0

data/lib/rspeed/runner.rb

@@ -5,24 +5,13 @@ module RSpeed
     module_function
 
     def run(shell)
-      splitter = ::RSpeed::Splitter.new
-
-      if splitter.first_pipe?
-        # splitter.destroy "rspeed_*"
-        splitter.destroy 'rspeed_tmp'
+      if RSpeed::Redis.result? || RSpeed::Splitter.first_pipe?
+        return shell.call(['bundle exec rspec', RSpeed::Splitter.pipe_files].compact.join(' '))
       end
 
-      if splitter.result?
-        splitter.save if splitter.first_pipe?
-
-        files = splitter.get("rspeed_#{splitter.pipe}")[0]['files'].map { |item| item['file'] }.join(' ')
-      end
-
-      shell.call ['bundle exec rspec', files].compact.join(' ')
-
-      splitter.append
+      RSpeed::Logger.log(self, __method__, 'Skipped! Only Pipe 1 can warm.')
 
-      splitter.rename if splitter.last_pipe?
+      RSpeed::Observer.after_suite
     end
   end
 end

data/lib/rspeed/splitter.rb

@@ -1,112 +1,56 @@
 # frozen_string_literal: true
 
 module RSpeed
-  class Splitter
-    DEFAULT_PATTERN = 'rspeed_*'
+  module Splitter
+    module_function
 
-    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")
+    require 'json'
 
-            lines&.each.with_index do |item, index|
-              examples << "#{file}:#{index + 1}" if item.gsub(/\s+/, '') =~ /^it/
-            end
-          end
+    require 'rspeed/differ'
 
-          stream(:actual_examples, examples)
-        end
-      end
+    def append(items:, key:)
+      items.each { |item| RSpeed::Redis.client.rpush(key, item) }
     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
-    end
+    def consolidate
+      RSpeed::Logger.log(self, __method__, 'Consolidating profiles.')
 
-    def destroy(pattern = DEFAULT_PATTERN)
-      keys(pattern).each { |key| redis.del key }
-    end
+      RSpeed::Redis.destroy(pattern: RSpeed::Variable.result)
 
-    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
+      append(items: RSpeed::Redis.profiles_content, key: RSpeed::Variable.result)
     end
 
     def first_pipe?
-      pipe == 1
+      RSpeed::Env.pipe == 1
     end
 
-    def get(pattern)
-      @get ||= begin
-        return redis.lrange(pattern, 0, -1) if %w[rspeed rspeed_tmp].include?(pattern)
-
-        keys(pattern).map { |key| JSON.parse(redis.get(key)) }
-      end
+    def need_warm?
+      first_pipe? && !RSpeed::Redis.result?
     end
 
-    def keys(pattern = DEFAULT_PATTERN)
-      cursor = 0
-      result = []
+    def pipe_files
+      return unless RSpeed::Redis.result?
 
-      loop do
-        cursor, results = redis.scan(cursor, match: pattern)
-        result += results
+      splitted = split(data: RSpeed::Differ.diff[:actual_files])
 
-        break if cursor.to_i.zero?
-      end
-
-      result
-    end
-
-    def last_pipe?
-      pipe == pipes
-    end
-
-    def pipe
-      ENV.fetch('RSPEED_PIPE') { 1 }.to_i
+      splitted[RSpeed::Variable.key(RSpeed::Env.pipe)][:files].tap do |items|
+        RSpeed::Reporter.print_files(items)
+      end.map { |item| item[:file] }.join(' ')
     end
 
-    def pipes
-      result? ? ENV.fetch('RSPEED_PIPES') { 1 }.to_i : 1
-    end
-
-    def rename
-      redis.rename('rspeed_tmp', 'rspeed')
-    end
-
-    def result?
-      !keys('rspeed').empty?
-    end
-
-    def save(data = diff)
-      split(data).each { |key, value| redis.set(key, value.to_json) }
-    end
-
-    def split(data)
+    def split(data:)
       json = {}
 
-      pipes.times do |index|
-        json["rspeed_#{index + 1}".to_sym] ||= []
-        json["rspeed_#{index + 1}".to_sym] = { total: 0, files: [], number: index + 1 }
+      RSpeed::Env.pipes.times do |index|
+        json[RSpeed::Variable.key(index + 1)] ||= []
+        json[RSpeed::Variable.key(index + 1)] = { total: 0, files: [], number: index + 1 }
       end
 
-      sorted_data = data.sort_by { |item| item[:time] }.reverse
+      sorted_data = data.sort_by { |item| item[:time] || 0.0 }.reverse
 
       sorted_data.each do |record|
         selected_pipe_data = json.min_by { |pipe| pipe[1][:total] }
-        selected_pipe      = json["rspeed_#{selected_pipe_data[1][:number]}".to_sym]
+        selected_pipe      = json[RSpeed::Variable.key(selected_pipe_data[1][:number])]
         time               = record[:time].to_f
 
         selected_pipe[:total] += time
@@ -115,39 +59,5 @@ module RSpeed
 
       json
     end
-
-    private
-
-    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_examples
-      @removed_examples ||= begin
-        (rspeed_examples - actual_examples).tap { |examples| stream(:removed_examples, examples) }
-      end
-    end
-
-    def removed_time
-      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/variable.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module RSpeed
+  module Variable
+    module_function
+
+    PIPES_PATTERN   = 'rspeed:pipe_*'
+    PROFILE_PATTERN = 'rspeed:profile_*'
+
+    def append_app_name(value, plus: nil)
+      [value, RSpeed::Env.app, plus].compact.join('_')
+    end
+
+    def key(number)
+      append_app_name('rspeed', plus: number).to_sym
+    end
+
+    def result
+      append_app_name('rspeed')
+    end
+
+    def pipe
+      append_app_name('rspeed:pipe', plus: format('%02d', RSpeed::Env.pipe))
+    end
+
+    def previous_result
+      append_app_name('rspeed', plus: 'previous')
+    end
+
+    def profile
+      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.4.0'
+  VERSION = '0.7.0'
 end

data/spec/common_helper.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+ENV['RAILS_ENV'] ||= 'test'
+
+require 'support/coverage'
+
+require 'pry-byebug'
+require 'rspeed'
+require 'support/common'
+require 'support/fakeredis'

data/spec/fixtures/empty.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+RSpec.describe 'empty' do
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+RSpec.describe RSpeed::Database, '#list' do
+  before do
+    redis_object.rpush(RSpeed::Variable.result, { file: '1_spec.rb', time: 1.0 }.to_json)
+    redis_object.rpush(RSpeed::Variable.result, { file: '2_spec.rb', time: 2.0 }.to_json)
+  end
+
+  it 'list and parse the given key' do
+    expect(described_class.list(RSpeed::Variable.result)).to eq [
+      { file: '1_spec.rb', time: 1.0 },
+      { file: '2_spec.rb', time: 2.0 },
+    ]
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+RSpec.describe RSpeed::Database, '#previous_result' do
+  let!(:redis) { redis_object }
+
+  before do
+    redis.rpush(RSpeed::Variable.previous_result, { file: '1_spec.rb', time: 1.0 }.to_json)
+    redis.rpush(RSpeed::Variable.previous_result, { file: '2_spec.rb', time: 2.0 }.to_json)
+  end
+
+  it 'returns the previous results data as json' do
+    expect(described_class.previous_result).to eq [
+      { file: '1_spec.rb', time: 1.0 },
+      { file: '2_spec.rb', time: 2.0 },
+    ]
+  end
+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' do
+    expect(described_class.added_data(files: files, result: result)).to eq [
+      { file: './spec/fixtures/new_spec.rb:4', time: nil },
+    ]
+  end
+end

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

@@ -0,0 +1,77 @@
+# 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(
+        actual_files: [
+          { 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: nil },
+        ],
+
+        actual_time: 7.2,
+        added_files: [{ file: './spec/fixtures/new_spec.rb:1', time: nil }],
+        added_time:  '?',
+
+        removed_files: [
+          { file: './spec/fixtures/x_spec.rb:1', time: 3 },
+          { file: './spec/fixtures/2_spec.rb:666', time: 6 },
+        ],
+
+        removed_time: 9.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(
+          actual_files: [
+            { 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: nil },
+          ],
+
+          actual_time: 7.2,
+          added_files: [{ file: './spec/fixtures/new_spec.rb:1', time: nil }],
+          added_time:  '?',
+
+          removed_files: [
+            { file: './spec/fixtures/x_spec.rb:1', time: 3 },
+            { file: './spec/fixtures/2_spec.rb:666', time: 6 },
+          ],
+
+          removed_time: 9.0
+        )
+      end
+    end
+  end
+end