qspec 0.1.3 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 60f88a4ea3ba943add6780bee19d0aeda39e56a9
+  data.tar.gz: 303ff003aaf98ad67bc9aba6206c0bbb3d24ef56
+SHA512:
+  metadata.gz: 11d3fb8ff5803f5a06dc607a3f5443a02a554eeea6c8c4463b4753a4904bee1955533136076cdfb3ec27e756db1f09bba6af1bc957c886539118e407eeff51b9
+  data.tar.gz: 7f5de6de95d530444e49665ad410d52b879523c40ea75035dcdbb89aed257dff024af1bbeb67709b1234c27a22de3ebe4b43bf47f813747168525b6ddf72b271

data/lib/qspec.rb

@@ -1,8 +1,15 @@
 require 'rspec/core'
+
+# workaround https://github.com/rspec/rspec-core/pull/1637
+require 'rspec/core/notifications'
+class RSpec::Core::Notifications::NullColorizer
+  def wrap(line, ignored)
+    line
+  end
+end
+
 require 'qspec/version'
 require 'qspec/ipc'
-require 'qspec/manager'
-require 'qspec/spork_helper'
 require 'qspec/command_line'
 require 'qspec/formatters/redis_formatter'
 require 'qspec/config'

data/lib/qspec/command_line.rb

@@ -1,54 +1,154 @@
-require 'rspec/core/command_line'
-
+require 'parallel'
 module Qspec
-  class CommandLine < ::RSpec::Core::CommandLine
-    include Manager # defines start_worker
-    include SporkHelper
-    attr_reader :output, :ipc, :config, :id
+  class CommandLine
+    TIME_LOG_NAME = 'elapsed_time'
+    DEFAULT_ELAPSED_TIME = 3.0
+    attr_reader :ipc, :config, :id
 
-    def initialize(options)
+    def initialize(args)
       @config = Config.new()
       @ipc = IPC.from_config(@config)
-      @id = ENV['qspec_id']
-
-      super(options)
+      @id = rand(10000)
+      @stats = []
+      @rspec_options = RSpec::Core::ConfigurationOptions.new(args)
+      @rspec_configuration = RSpec.configuration
+      @rspec_options.configure(@rspec_configuration)
     end
 
     def run(err, out)
-      @configuration.error_stream = err
-      @output = @configuration.output_stream ||= out
-      @options.configure(@configuration)
+      @rspec_configuration.error_stream = err
+      @rspec_configuration.output_stream = out if @rspec_configuration.output_stream == $stdout
+
+      out.puts "ID: #{id}"
+      register_files(id)
+      puts "Forking #{@config['workers']} workers"
 
-      if @id
+      thread = start_progress_thread(id)
+      success = Parallel.map(1..@config['workers'], in_processes: @config['workers']) do |no|
+        ENV['TEST_ENV_NUMBER'] = no == 1 ? '' : no.to_s
         process
-      else
-        start_worker
+      end
+      thread.exit
+
+      pop_stat(id)
+
+      @rspec_configuration.output_stream.puts "Failures: " if ipc.llen("failure_#{id}") > 0
+
+      each_object("failure_#{id}") do |failure|
+        dump_failure(failure)
+      end
+
+      log_elapsed_times
+      dump_summary
+      exit(success ? 0 : 1)
+    ensure
+      if ipc
+        ipc.del("to_run_#{id}")
+        ipc.del("stat_#{id}")
+        ipc.del("failure_#{id}")
       end
     end
 
     def process
+      ipc = IPC.from_config(@config)
       success = true
       while f = ipc.lpop("to_run_#{id}")
-        @configuration.add_formatter(Qspec::Formatters::RedisFormatterFactory.build(id, f))
+        @rspec_configuration.add_formatter(Qspec::Formatters::RedisFormatterFactory.build(id, f))
+
+        require File.expand_path(f)
+        world = RSpec.world
+        example_groups = world.ordered_example_groups
+
         begin
-          load File.expand_path(f)
-          @configuration.reporter.report(@world.example_count, @configuration.randomize? ? @configuration.seed : nil) do |reporter|
+          @rspec_configuration.reporter.report(world.example_count(example_groups)) do |reporter|
             begin
-              GC.disable if @config['no_gc']
-              @configuration.run_hook(:before, :suite)
-              success &&= @world.example_groups.ordered.all? {|g| g.run(reporter)}
+              hook_context = RSpec::Core::SuiteHookContext.new
+              @rspec_configuration.hooks.run(:before, :suite, hook_context)
+              success = example_groups.map { |g| g.run(reporter) }.all? && success
             ensure
-              @configuration.run_hook(:after, :suite)
-              GC.enable if @config['no_gc']
-              GC.start  if @config['no_gc']
+              @rspec_configuration.hooks.run(:after, :suite, hook_context)
             end
           end
         ensure
-          @world.example_groups.clear
-          @configuration.reset # formatter, reporter
+          world.example_groups.clear
+          @rspec_configuration.reset # formatter, reporter
+        end
+      end
+      success
+    end
+
+    private
+    def start_progress_thread(id)
+      Thread.new do
+        loop do
+          pop_stat(id)
+          sleep 1
+        end
+      end
+    end
+
+    def pop_stat(id)
+      o = @rspec_configuration.output_stream
+      each_object("stat_#{id}") do |obj|
+        @stats << obj
+        o.print "!!! " if obj[3] > 0
+        o.puts obj.inspect
+      end
+    end
+
+    def each_object(key)
+      while data = ipc.lpop(key)
+        yield(Marshal.load(data))
+      end
+    end
+
+    def dump_summary
+      sum = @stats.each_with_object({ example: 0, failure: 0, pending: 0 }) do |stat, sum|
+        sum[:example] += stat[2]
+        sum[:failure] += stat[3]
+        sum[:pending] += stat[4]
+      end
+      @rspec_configuration.output_stream.puts "\n#{sum[:example]} examples, #{sum[:failure]} failures, #{sum[:pending]} pendings"
+    end
+
+    def dump_failure(failure)
+      @rspec_configuration.output_stream.puts ""
+      @rspec_configuration.output_stream.puts failure[:exception]
+      failure[:backtrace].each do |line|
+        @rspec_configuration.output_stream.puts "\t#{line}"
+      end
+    end
+
+    def log_elapsed_times
+      File.open(Qspec.path(TIME_LOG_NAME), 'w') do |f|
+        @stats.each do |stat|
+          f.puts "#{File.expand_path(stat[0])}:#{stat[1].to_f}"
         end
       end
-      success ? 0 : @configuration.failure_exit_code
+    end
+
+    def register_files(id)
+      sorted_files_to_run.uniq.each do |f|
+        ipc.rpush "to_run_#{id}", f
+      end
+    end
+
+    def sorted_files_to_run
+      @sorted_files_to_run ||= if @config['sort_by'] == 'time' && File.exists?(Qspec.path(TIME_LOG_NAME))
+                                 sort_by_time(@rspec_configuration.files_to_run)
+                               else
+                                 sort_by_size(@rspec_configuration.files_to_run)
+                               end
+    end
+
+    def sort_by_time(files)
+      log = Hash[File.readlines(Qspec.path(TIME_LOG_NAME)).map { |line| line.strip.split(":") }]
+      files.sort_by { |file| log[File.expand_path(file)].to_f || DEFAULT_ELAPSED_TIME }.reverse
+    end
+
+    # large to small
+    def sort_by_size(files)
+      files.sort_by { |file| -File.stat(file).size }
     end
   end
 end

data/lib/qspec/formatters/redis_formatter.rb

@@ -5,6 +5,7 @@ module Qspec
     module RedisFormatterFactory
       def self.build(id, file)
         Class.new(RSpec::Core::Formatters::BaseFormatter) do
+          RSpec::Core::Formatters.register self, :dump_summary, :dump_failures
           @@id = id
           @@file = file
           include RedisFormatterFactory
@@ -16,32 +17,21 @@ module Qspec
         super
       end
 
-      def dump_failures
-        failed_examples.each do |example|
-          ex = example.execution_result[:exception]
+      def dump_failures(notification)
+        notification.failure_notifications.each do |failure|
           data = {
-            description: example.full_description,
-            exception: format_exception(example, ex),
-            backtrace: format_backtrace(ex.backtrace, example)
+            description: failure.description,
+            exception: failure.message_lines.join("\n"),
+            backtrace: failure.formatted_backtrace
           }
           @ipc.rpush("failure_#{@@id}", Marshal.dump(data))
         end
       end
 
-      def dump_summary(duration, example_count, failure_count, pending_count)
-        data = [@@file, duration, example_count, failure_count, pending_count]
+      def dump_summary(summary)
+        data = [@@file, summary.duration, summary.examples.size, summary.failed_examples.count, summary.pending_examples.count]
         @ipc.rpush("stat_#{@@id}", Marshal.dump(data))
       end
-
-      def format_exception(example, ex)
-        exception_class_name = ex.class.to_s
-        output = StringIO.new
-        output.puts "* #{example.full_description}"
-        output.puts "\tFailure/Error: #{read_failed_line(ex, example)}"
-        output.puts "\t#{exception_class_name}:" unless exception_class_name =~ /RSpec/
-        ex.message.to_s.split("\n").each { |line| output.puts "\t  #{line}" } if ex.message
-        output.string
-      end
     end
   end
 end

data/lib/qspec/helper.rb

@@ -1,9 +1,7 @@
 module Qspec
   class Helper
-    include SporkHelper
-
     def initialize(argv)
-      @argv   = argv
+      @argv = argv
     end
 
     def serve
@@ -11,11 +9,6 @@ module Qspec
       when 'init'
         puts "Creating template"
         Config.create_template
-      when 'spork'
-        Qspec.create_tmp_directory_if_not_exist
-        @config = Config.new
-        puts "Start #{@config['workers']} sporks"
-        start_spork_workers(@config['workers'])
       end
     end
   end

data/lib/qspec/version.rb

@@ -1,3 +1,3 @@
 module Qspec
-  VERSION = "0.1.3"
+  VERSION = "1.0.0"
 end

data/qspec.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |gem|
 
   gem.post_install_message = "Run qspec-helper init to create your config file"
 
-  gem.add_dependency 'rspec-core', '~>2.14.0'
+  gem.add_dependency 'rspec-core', '~>3.0'
+  gem.add_dependency 'parallel'
 end

metadata

@@ -1,32 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: qspec
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - tomykaira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: QSpec inserts spec files to a queue.  Workers process that queue one
   by one.
 email:
@@ -37,7 +48,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -52,39 +63,30 @@ files:
 - lib/qspec/ipc.rb
 - lib/qspec/ipc/file.rb
 - lib/qspec/ipc/redis.rb
-- lib/qspec/manager.rb
-- lib/qspec/spork_helper.rb
 - lib/qspec/version.rb
-- lib/spork/test_framework/qspec.rb
 - qspec.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: Run qspec-helper init to create your config file
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 901026415
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 901026415
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: QSpec is extension of RSpec.  Q is for queue, and quick.
 test_files: []
+has_rdoc: 

data/lib/qspec/manager.rb

@@ -1,131 +0,0 @@
-require 'rspec/core/formatters/helpers'
-
-module Qspec
-  module Manager
-    TIME_LOG_NAME = 'elapsed_time'
-    DEFAULT_ELAPSED_TIME = 3.0
-    attr_reader :output
-    attr_reader :id
-
-    def start_worker
-      @id = rand(10000)
-      output.puts "ID: #{id}"
-      register_files(id)
-      if runnning_ports
-        puts "Connecting to spork: #{runnning_ports.inspect}"
-        runnning_ports.each do |port|
-          fork do
-            connect_spork(port, id, @configuration.error_stream, output)
-          end
-        end
-      else
-        puts "Forking #{@config['workers']} workers"
-        command = "qspec #{@options.drb_argv.join " "}"
-        @config['workers'].times do |i|
-          env = {
-            "qspec_id" => id.to_s,
-            "TEST_ENV_NUMBER" => i == 0 ? '' : (i + 1).to_s }
-          spawn(env,
-                command,
-                out: '/dev/null')
-        end
-      end
-
-      @stats = []
-      thread = start_progress_thread(id)
-      success = Process.waitall.all? { |pid, status| status.exitstatus == 0 }
-      thread.exit
-
-      pop_stat(id)
-
-      output.puts "Failures: " if ipc.llen("failure_#{id}") > 0
-
-      each_object("failure_#{id}") do |failure|
-        dump_failure(failure)
-      end
-
-      log_elapsed_times
-      dump_summary
-      exit(success ? 0 : 1)
-    ensure
-      if ipc
-        ipc.del("to_run_#{id}")
-        ipc.del("stat_#{id}")
-        ipc.del("failure_#{id}")
-      end
-    end
-
-    private
-    def start_progress_thread(id)
-      Thread.new do
-        loop do
-          pop_stat(id)
-          sleep 1
-        end
-      end
-    end
-
-    def pop_stat(id)
-      each_object("stat_#{id}") do |obj|
-        @stats << obj
-        output.print "!!! " if obj[3] > 0
-        output.puts obj.inspect
-      end
-    end
-
-    def each_object(key)
-      while data = ipc.lpop(key)
-        yield(Marshal.load(data))
-      end
-    end
-
-    def dump_summary
-      sum = @stats.each_with_object({ example: 0, failure: 0, pending: 0 }) do |stat, sum|
-        sum[:example] += stat[2]
-        sum[:failure] += stat[3]
-        sum[:pending] += stat[4]
-      end
-      output.puts "\n#{sum[:example]} examples, #{sum[:failure]} failures, #{sum[:pending]} pendings"
-    end
-
-    def dump_failure(failure)
-      puts ""
-      puts failure[:exception]
-      failure[:backtrace].each do |line|
-        output.puts "\t#{line}"
-      end
-    end
-
-    def log_elapsed_times
-      File.open(Qspec.path(TIME_LOG_NAME), 'w') do |f|
-        @stats.each do |stat|
-          f.puts "#{File.expand_path(stat[0])}:#{stat[1].to_f}"
-        end
-      end
-    end
-
-    def register_files(id)
-      sorted_files_to_run.uniq.each do |f|
-        ipc.rpush "to_run_#{id}", f
-      end
-    end
-
-    def sorted_files_to_run
-      @sorted_files_to_run ||= if @config['sort_by'] == 'time' && File.exists?(Qspec.path(TIME_LOG_NAME))
-                                 sort_by_time(@configuration.files_to_run)
-                               else
-                                 sort_by_size(@configuration.files_to_run)
-                               end
-    end
-
-    def sort_by_time(files)
-      log = Hash[File.readlines(Qspec.path(TIME_LOG_NAME)).map { |line| line.strip.split(":") }]
-      files.sort_by { |file| log[File.expand_path(file)].to_f || DEFAULT_ELAPSED_TIME }.reverse
-    end
-
-    # large to small
-    def sort_by_size(files)
-      files.sort_by { |file| -File.stat(file).size }
-    end
-  end
-end

data/lib/qspec/spork_helper.rb

@@ -1,65 +0,0 @@
-# spork is optional
-begin
-  require 'drb/drb'
-  require 'spork/test_framework/qspec'
-rescue LoadError
-end
-
-require 'rspec/core/drb_options'
-
-module Qspec
-  module SporkHelper
-    def start_spork_workers(count)
-      Signal.trap(:INT){
-        puts "Stop spork processes"
-        remove_port_file
-        exit(0)
-      }
-
-      default_port = (@config['spork_port'] || ::Spork::TestFramework::Qspec::DEFAULT_PORT).to_i
-      ports = []
-      count.times do |i|
-        port = default_port+i
-        spawn({ "TEST_ENV_NUMBER" => i == 0 ? '' : (i + 1).to_s },
-              "spork qspec --port #{port}")
-        ports << port
-      end
-      create_port_file(ports)
-      Process.waitall.all? { |pid, status| status.exitstatus == 0 } ? 0 : 1
-    end
-
-    def connect_spork(port, id, err, out)
-      begin
-        DRb.start_service("druby://localhost:0")
-      rescue SocketError, Errno::EADDRNOTAVAIL
-        DRb.start_service("druby://:0")
-      end
-      spec_server = DRbObject.new_with_uri("druby://127.0.0.1:#{port||PORT}")
-      exit spec_server.run(@options.drb_argv + [id], err, out).to_i
-    end
-
-    def create_port_file(ports)
-      File.open(port_file, 'w') do |f|
-        f.puts ports.join("\n")
-      end
-    end
-
-    def runnning_ports
-      @runnning_ports ||= begin
-        ports = File.readlines(port_file).map { |line| line.strip.to_i }
-        ports.empty? ? nil : ports
-      rescue Errno::ENOENT
-        nil
-      end
-    end
-
-    def remove_port_file
-      File.unlink(port_file)
-    end
-
-    private
-    def port_file
-      @port_file ||= Qspec.path('spork_ports')
-    end
-  end
-end

data/lib/spork/test_framework/qspec.rb

@@ -1,11 +0,0 @@
-require 'spork'
-class Spork::TestFramework::Qspec < Spork::TestFramework
-  DEFAULT_PORT = 9240
-  HELPER_FILE = File.join(Dir.pwd, "spec/spec_helper.rb")
-
-  def run_tests(argv, stderr, stdout)
-    require 'qspec'
-    ENV['qspec_id'] = argv.pop.to_s
-    ::Qspec::CommandLine.new(argv).run(stderr, stdout)
-  end
-end