lib/rspeed/splitter.rb in rspeed-0.5.1 vs lib/rspeed/splitter.rb in rspeed-0.5.2

- old
+ new

@@ -27,14 +27,12 @@ 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) - end + def append(items:, key:) + items.each { |item| redis.rpush(key, item) } end def diff actual_data = rspeed_data.select { |item| actual_examples.include?(item[:file]) } added_data = added_examples.map { |item| { file: item, time: 0 } } @@ -48,11 +46,11 @@ RSpeed::Env.pipe == 1 end def get(pattern) @get ||= begin - return redis.lrange(pattern, 0, -1) if [RSpeed::Variable.result, RSpeed::Variable.tmp].include?(pattern) + return redis.lrange(pattern, 0, -1) if [RSpeed::Variable.result].include?(pattern) RSpeed::Redis.keys(pattern).map { |key| ::JSON.parse(redis.get(key)) } end end @@ -65,10 +63,17 @@ split[RSpeed::Variable.key(RSpeed::Env.pipe)][:files].map { |item| item[:file] }.join(' ') end def rename - redis.rename(RSpeed::Env.tmp_key, RSpeed::Env.result_key) + RSpeed::Logger.log('[RSpeed::Splitter#consolidate] Consolidating profiles.') + + RSpeed::Redis.destroy(RSpeed::Env.result_key) + + append( + items: RSpeed::Redis.client.keys('rspeed_profile_*').map { |key| redis.lrange(key, 0, -1) }, + key: RSpeed::Env.result_key + ) end def split(data = diff) json = {}