specjour 0.6.6 → 0.7.0

data/History.markdown

@@ -1,6 +1,14 @@
 History
 =======
 
+0.7.0 / 2012-11-21
+---------------------------
+* [added] Cucumber now distributes individual scenarios instead of files
+* [fixed] Cucumber runs more than one feature (pierreozoux)
+* [fixed] RSpec 2.12 compatible
+
+[Full Changelog](https://github.com/sandro/specjour/compare/v0.6.6...v0.7.0)
+
 0.6.6 / 2012-11-13
 ---------------------------
 * [fixed] Not gathering all listeners (waits a full second for all replies)

data/lib/specjour.rb

@@ -29,7 +29,7 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :RSpec, 'specjour/rspec'
 
-  VERSION ||= "0.6.6"
+  VERSION ||= "0.7.0"
   HOOKS_PATH ||= "./.specjour/hooks.rb"
   PROGRAM_NAME ||= $PROGRAM_NAME # keep a reference of the original program name
 

data/lib/specjour/cucumber/distributed_formatter.rb

@@ -25,7 +25,7 @@ module Specjour::Cucumber
           failure.scenario_outline
         end
       end.each do |failure|
-        @failing_scenarios << format_string("cucumber " + failure.file_colon_line[2..-1], :failed) +
+        @failing_scenarios << format_string("cucumber " + failure.file_colon_line, :failed) +
                               format_string(" # Scenario: " + failure.name, :comment)
       end
     end

data/lib/specjour/cucumber/preloader.rb

@@ -1,13 +1,19 @@
 module Specjour
   module Cucumber
     module Preloader
-      def self.load
+      def self.load(paths, output)
         Specjour.benchmark("Loading Cucumber Environment") do
           require 'cucumber' unless defined?(::Cucumber::Cli)
-          configuration = ::Cucumber::Cli::Configuration.new
-          configuration.parse! []
+          args = paths.unshift '--format', 'Specjour::Cucumber::DistributedFormatter'
+          cli = ::Cucumber::Cli::Main.new(args, output)
+
+          configuration = cli.configuration
+          options = configuration.instance_variable_get(:@options)
+          options.instance_variable_set(:@skip_profile_information, true)
+
           runtime = ::Cucumber::Runtime.new(configuration)
           runtime.send :load_step_definitions
+          runtime.send :fire_after_configuration_hook
           Cucumber.runtime = runtime
         end
       end

data/lib/specjour/cucumber/runner.rb

@@ -1,14 +1,13 @@
 module Specjour
   module Cucumber
     module Runner
-      def self.run(feature, output)
-        cli = ::Cucumber::Cli::Main.new(['--format', 'Specjour::Cucumber::DistributedFormatter', feature], output)
-
-        Cucumber.runtime.instance_variable_set(:@configuration, cli.configuration)
+      def self.run(feature)
         Cucumber.runtime.instance_eval do
+          @loader = nil
+          @configuration.parse!([feature])
           tree_walker = @configuration.build_tree_walker(self)
           self.visitor = tree_walker
-          tree_walker.visit_features(features)
+          tree_walker.visit_features features
         end
       end
     end

data/lib/specjour/loader.rb

@@ -38,9 +38,9 @@ module Specjour
     def spec_files
       @spec_files ||= file_collector(spec_paths) do |path|
         if path == project_path
-          Dir["#{path}/spec/**/*_spec.rb"]
+          Dir["spec/**/*_spec.rb"]
         else
-          Dir["#{path}/**/*_spec.rb"]
+          Dir["**/*_spec.rb"]
         end
       end
     end
@@ -48,9 +48,9 @@ module Specjour
     def feature_files
       @feature_files ||= file_collector(feature_paths) do |path|
         if path == project_path
-          Dir["#{path}/features/**/*.feature"]
+          Dir["features/**/*.feature"]
         else
-          Dir["#{path}/**/*.feature"]
+          Dir["**/*.feature"]
         end
       end
     end
@@ -82,12 +82,12 @@ module Specjour
 
     def load_app
       RSpec::Preloader.load spec_files if spec_files.any?
-      Cucumber::Preloader.load if feature_files.any?
+      Cucumber::Preloader.load(feature_files, connection) if feature_files.any?
       register_tests_with_printer
     end
 
     def register_tests_with_printer
-      tests = rspec_examples | feature_files
+      tests = rspec_examples | cucumber_scenarios
       connection.send_message :tests=, tests
     end
 
@@ -105,7 +105,8 @@ module Specjour
       end.flatten
       locations = examples.map do |e|
         meta = e.metadata
-        shared_group = e.example_group.ancestors.detect do |group|
+        groups = e.example_group.parent_groups + [e.example_group]
+        shared_group = groups.detect do |group|
           group.metadata[:shared_group_name]
         end
         if shared_group
@@ -117,6 +118,22 @@ module Specjour
       ::RSpec.reset
     end
 
+    def cucumber_scenarios
+      if feature_files.any?
+        scenarios
+      else
+        []
+      end
+    end
+
+    def scenarios
+      Cucumber.runtime.send(:features).map do |feature|
+        feature.feature_elements.map do |scenario|
+          "#{feature.file}:#{scenario.instance_variable_get(:@line)}"
+        end
+      end.flatten
+    end
+
     def kill_worker_processes
       signal = Specjour.interrupted? ? 'INT' : 'TERM'
       Process.kill(signal, *worker_pids) rescue Errno::ESRCH

data/lib/specjour/manager.rb

@@ -95,7 +95,7 @@ module Specjour
     end
 
     def project_path
-      File.join("/tmp", project_name)
+      File.expand_path(project_name, File.realpath('/tmp'))
     end
 
     def start

data/lib/specjour/rspec/distributed_formatter.rb

@@ -41,6 +41,8 @@ module Specjour::RSpec
       if exception = execution_result[:exception]
         execution_result[:exception] = MarshalableException.new(exception)
       end
+      execution_result[:started_at] = Time.at(execution_result[:started_at])
+      execution_result[:finished_at] = Time.at(execution_result[:finished_at])
       execution_result
     end
 

data/lib/specjour/rspec/final_report.rb

@@ -31,7 +31,7 @@ module Specjour::RSpec
         metadata_collection.map do |partial_metadata|
           example = ::RSpec::Core::Example.allocate
           example.instance_variable_set(:@example_group_class,
-            OpenStruct.new(:metadata => {}, :ancestors => [])
+            OpenStruct.new(:metadata => {}, :ancestors => [], :parent_groups => [])
           )
           metadata = ::RSpec::Core::Metadata.new
           metadata.merge! partial_metadata

data/lib/specjour/rspec/preloader.rb

@@ -1,7 +1,7 @@
 class Specjour::RSpec::Preloader
   def self.load(paths=[])
     Specjour.benchmark("Loading RSpec environment") do
-      require './spec/spec_helper'
+      require File.expand_path('spec/spec_helper', Dir.pwd)
       load_spec_files paths
     end
   end

data/lib/specjour/worker.rb

@@ -74,7 +74,7 @@ module Specjour
     end
 
     def run_feature(feature)
-      Cucumber::Runner.run(feature, connection)
+      Cucumber::Runner.run(feature)
     end
 
     def run_spec(spec)
@@ -88,7 +88,7 @@ module Specjour
     end
 
     def test_type(test)
-      test =~ /\.feature$/ ? :cucumber : :rspec
+      test =~ /\.feature(:\d+)?$/ ? :cucumber : :rspec
     end
 
     def set_env_variables

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specjour
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -327981842823844715
+      hash: -1349309289117832663
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: