rrrspec-client 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68980fcfaebf4d6eecc9ab312862add3222cefb4
-  data.tar.gz: 0024f08d44f75f481645d833d84a41d5acbeb337
+  metadata.gz: 0e56a821f500236e0b3045d395905afd91337cbd
+  data.tar.gz: 491eaccfa8a43c4564cce40fff21adcd6af147a4
 SHA512:
-  metadata.gz: c36f5504895a7cf0dcbb39aec58c8c0c572202f8408efd0c6bdec275b9a40ba4eb13dd3ce99d30dee36d9aa4ad7721b66022dc7da71b742d21494f6e68059799
-  data.tar.gz: 0de784b636ce34ba850a38fdd0a782ca36bb1c7138aa25998b1acf7f641e47b54ad94f2659983d80b0bf904bad33ab3fc4eb6c84a0b4a09cd99abaafdf6dae1b
+  metadata.gz: f834f798a0b91e4505f542db7ac549ae68f4d56d739b030e3d85330937af3d62de3fe42a3a891c6ac7ebe16249df62dc0aa99918ef2c06381929def1324183bd
+  data.tar.gz: 81c45ae93e18aa2639db4eb5d9ecc2128267d45168a9d5325ff5ec2f059eb6187280f285b7a4e8edd1f72fcc2dd19dc9bf42eb3485b6ea3bbbee894b652d1049

data/lib/rrrspec/client/base_text_formatter.rb

@@ -0,0 +1,13 @@
+require 'rspec/core/formatters/base_text_formatter'
+
+module RRRSpec
+  module Client
+    class BaseTextFormatter < RSpec::Core::Formatters::BaseTextFormatter
+      RSpec::Core::Formatters.register(self, :message, :dump_summary, :dump_failures, :dump_pending, :seed)
+
+      def close(_notification)
+        # Do not close `output` .
+      end
+    end
+  end
+end

data/lib/rrrspec/client/rspec_runner.rb

@@ -1,5 +1,5 @@
 require 'rspec'
-require 'rspec/core/formatters/base_text_formatter'
+require 'rrrspec/client/base_text_formatter'
 
 module RRRSpec
   module Client
@@ -9,19 +9,23 @@ module RRRSpec
         @configuration = RSpec.configuration
         @world = RSpec.world
         @before_suite_run = false
+        @stdout_buffer = StringIO.new
+        @stderr_buffer = StringIO.new
       end
 
       def exc_safe_replace_stdouts
-        outbuf = ''
-        errbuf = ''
-        $stdout = StringIO.new(outbuf)
-        $stderr = StringIO.new(errbuf)
+        @stdout_buffer.string = ''
+        @stderr_buffer.string = ''
+        $stdout = @stdout_buffer
+        $stderr = @stderr_buffer
         begin
           yield
         rescue Exception
           $stdout.puts $!
           $stdout.puts $!.backtrace.join("\n")
         end
+        outbuf = @stdout_buffer.string
+        errbuf = @stderr_buffer.string
         [outbuf, errbuf]
       ensure
         $stdout = STDOUT
@@ -33,6 +37,9 @@ module RRRSpec
         outbuf, errbuf = exc_safe_replace_stdouts do
           begin
             @options.configure(@configuration)
+            @configuration.output_stream = $stdout
+            @configuration.error_stream = $stderr
+            @configuration.default_formatter = BaseTextFormatter
             @configuration.files_to_run = [filepath]
             @configuration.load_spec_files
             @world.announce_filters
@@ -54,9 +61,6 @@ module RRRSpec
       def run(*formatters)
         status = false
         outbuf, errbuf = exc_safe_replace_stdouts do
-          @configuration.output_stream = $stdout
-          @configuration.error_stream = $stderr
-          @configuration.add_formatter(RSpec::Core::Formatters::BaseTextFormatter)
           formatters.each do |formatter|
             @configuration.add_formatter(formatter)
           end

data/lib/rrrspec/client/version.rb

@@ -1,5 +1,5 @@
 module RRRSpec
   module Client
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrrspec-client
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Masaya Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -159,13 +159,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
-- Gemfile
-- Rakefile
 - bin/rrrspec
 - bin/rrrspec-client
 - lib/rrrspec.rb
 - lib/rrrspec/client.rb
+- lib/rrrspec/client/base_text_formatter.rb
 - lib/rrrspec/client/cli.rb
 - lib/rrrspec/client/configuration.rb
 - lib/rrrspec/client/rspec_runner.rb
@@ -175,11 +173,6 @@ files:
 - lib/rrrspec/configuration.rb
 - lib/rrrspec/extension.rb
 - lib/rrrspec/redis_models.rb
-- rrrspec-client.gemspec
-- spec/fixture.rb
-- spec/rrrspec/client/cli_spec.rb
-- spec/rrrspec/redis_models_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/cookpad/rrrspec
 licenses:
 - MIT
@@ -200,12 +193,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Execute RSpec in a distributed manner
-test_files:
-- spec/fixture.rb
-- spec/rrrspec/client/cli_spec.rb
-- spec/rrrspec/redis_models_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/rrrspec-client.gemspec

@@ -1,36 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rrrspec/client/version'
-require 'pathname'
-
-Gem::Specification.new do |spec|
-  spec.name          = "rrrspec-client"
-  spec.version       = RRRSpec::Client::VERSION
-  spec.authors       = ["Masaya Suzuki"]
-  spec.email         = ["draftcode@gmail.com"]
-  spec.description   = "Execute RSpec in a distributed manner"
-  spec.summary       = "Execute RSpec in a distributed manner"
-  spec.homepage      = "https://github.com/cookpad/rrrspec"
-  spec.license       = "MIT"
-
-  gemspec_dir = File.expand_path('..', __FILE__)
-  spec.files  = `git ls-files`.split($/).
-    map { |f| File.absolute_path(f) }.
-    select { |f| f.start_with?(gemspec_dir) }.
-    map { |f| Pathname(f).relative_path_from(Pathname(gemspec_dir)).to_s }
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_dependency "activesupport"
-  spec.add_dependency "extreme_timeout"
-  spec.add_dependency "launchy"
-  spec.add_dependency "redis"
-  spec.add_dependency "rspec", ">= 3.0"
-  spec.add_dependency "thor"
-  spec.add_dependency "uuidtools"
-  spec.add_dependency "tzinfo"
-end

data/spec/fixture.rb

@@ -1,32 +0,0 @@
-module RRRSpec
-  def self.finished_fullset
-    worker = Worker.create('default')
-    taskset = Taskset.create(
-      'testuser', 'echo 1', 'echo 2', 'default', 'default', 3, 3, 5, 5
-    )
-    task = Task.create(taskset, 10, 'spec/test_spec.rb')
-    taskset.add_task(task)
-    taskset.enqueue_task(task)
-    ActiveTaskset.add(taskset)
-    worker_log = WorkerLog.create(worker, taskset)
-    worker_log.set_rsync_finished_time
-    worker_log.append_log('worker_log log body')
-    worker_log.set_setup_finished_time
-    slave = Slave.create
-    taskset.add_slave(slave)
-    slave.append_log('slave log body')
-    trial = Trial.create(task, slave)
-    trial.start
-    trial.finish('pending', 'stdout body', 'stderr body', 10, 2, 0)
-    task.update_status('pending')
-    taskset.incr_succeeded_count
-    taskset.finish_task(task)
-    taskset.update_status('succeeded')
-    taskset.set_finished_time
-    ActiveTaskset.remove(taskset)
-    slave.update_status('normal_exit')
-    worker_log.set_finished_time
-
-    return worker, taskset, task, worker_log, slave, trial
-  end
-end

data/spec/rrrspec/client/cli_spec.rb

@@ -1,45 +0,0 @@
-require 'spec_helper'
-require 'rrrspec/client/cli'
-
-module RRRSpec
-  module Client
-    RSpec.describe CLI do
-      before do
-        RRRSpec.configuration = Configuration.new
-        RRRSpec.configuration.redis = @redis
-        described_class.class_eval do
-          no_commands do
-            def setup(arg)
-            end
-          end
-        end
-      end
-
-      describe '#cancelall' do
-        let!(:taskset1) do
-          Taskset.create('rsync_name', '', '', 'default', 'nothing', 3, 3, 3, 3)
-        end
-        let!(:taskset2) do
-          Taskset.create('rsync_name', '', '', 'default', 'nothing', 3, 3, 3, 3)
-        end
-        let!(:taskset3) do
-          Taskset.create('another_rsync_name', '', '', 'default', 'nothing', 3, 3, 3, 3)
-        end
-
-        before do
-          ActiveTaskset.add(taskset1)
-          ActiveTaskset.add(taskset2)
-          ActiveTaskset.add(taskset3)
-        end
-
-        it 'cancels all tasksets' do
-          subject.cancelall('rsync_name')
-          Timeout.timeout(3) do
-            expect(ArbiterQueue.dequeue).to eq(['cancel', taskset1])
-            expect(ArbiterQueue.dequeue).to eq(['cancel', taskset2])
-          end
-        end
-      end
-    end
-  end
-end

data/spec/rrrspec/redis_models_spec.rb

@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-module RRRSpec
-  RSpec.describe Taskset do
-    before do
-      RRRSpec.configuration = Configuration.new
-      RRRSpec.configuration.redis = @redis
-    end
-
-    before do
-      @worker, @taskset, @task, @worker_log, @slave, @trial =
-        RRRSpec.finished_fullset
-    end
-
-    describe '#expire' do
-      it 'expires all keys' do
-        @taskset.expire(60)
-        expect(@redis.ttl(@taskset.key)).to be >= 0
-        expect(@redis.ttl("#{@taskset.key}:rrrspec:worker:testhostname")).to be >= 0
-        expect(@redis.ttl("#{@taskset.key}:rrrspec:worker:testhostname:log")).to be >= 0
-        expect(@redis.ttl("#{@taskset.key}:slave")).to be >= 0
-        expect(@redis.ttl("#{@taskset.key}:task:spec/test_spec.rb")).to be >= 0
-        expect(@redis.ttl("#{@taskset.key}:task:spec/test_spec.rb:trial")).to be >= 0
-        expect(@redis.ttl(@task.trials[0].key)).to be >= 0
-        expect(@redis.ttl("#{@taskset.key}:task_queue")).to be >= 0
-        expect(@redis.ttl("#{@taskset.key}:tasks")).to be >= 0
-        expect(@redis.ttl("#{@taskset.key}:worker_log")).to be >= 0
-        expect(@redis.ttl(@slave.key)).to be >= 0
-        expect(@redis.ttl("#{@slave.key}:log")).to be >= 0
-        expect(@redis.ttl("#{@slave.key}:trial")).to be >= 0
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,55 +0,0 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-require 'rrrspec/client'
-require 'fixture'
-
-RSpec.configure do |config|
-  config.raise_errors_for_deprecations!
-  config.disable_monkey_patching!
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-
-  pid = nil
-  config.before(:suite) do
-    pid = Kernel.spawn("redis-server --port 9999 --save ''",
-                       in: '/dev/null', out: '/dev/null', err: '/dev/null')
-    redis = Redis.new(port: 9999)
-    retry_count = 1
-    loop do
-      begin
-        redis.client.connect
-        break
-      rescue Redis::CannotConnectError
-        if retry_count < 10
-          retry_count += 1
-          sleep 0.01
-          retry
-        end
-        raise
-      end
-    end
-  end
-
-  config.before(:each) do
-    @redis = Redis.new(port: 9999)
-    @redis.flushall
-
-    RRRSpec.configuration = nil
-    RRRSpec.flushredis
-    RRRSpec.hostname = 'testhostname'
-  end
-
-  config.after(:suite) do
-    Process.kill('KILL', pid) if pid
-  end
-end