spork 0.9.2 → 1.0.0rc0

data/lib/spork/app_framework/unknown.rb

@@ -3,4 +3,8 @@ class Spork::AppFramework::Unknown < Spork::AppFramework
   def entry_point
     nil
   end
-end
+
+  def self.present?
+    false
+  end
+end

data/lib/spork/diagnoser.rb

@@ -32,7 +32,7 @@ class Spork::Diagnoser
         end
         private :require
         
-        def load(string, wrap = false)
+        def load(string)
           ::Spork::Diagnoser.add_included_file(string, caller)
           load_without_diagnoser(string)
         end

data/lib/spork/runner.rb

@@ -56,7 +56,7 @@ module Spork
     def run
       return false unless test_framework = find_test_framework
       ENV["DRB"] = 'true'
-      @error.puts "Using #{test_framework.short_name}"
+      @error.puts "Using #{test_framework.short_name}, #{test_framework.app_framework.short_name}"
       @error.flush
 
       case

data/lib/spork/test/cucumber_helpers.rb

@@ -0,0 +1,5 @@
+SPORK_CUCUMBER_DIR = File.expand_path( "../../../features/", File.dirname(__FILE__))
+require("#{SPORK_CUCUMBER_DIR}/support/background_job.rb")
+require("#{SPORK_CUCUMBER_DIR}/support/spork_world.rb")
+require("#{SPORK_CUCUMBER_DIR}/support/bundler_helpers.rb")
+Dir.glob("#{SPORK_CUCUMBER_DIR}/steps/**/*.rb").each { |f| load f }

data/lib/spork/test/test_helpers.rb

@@ -0,0 +1,2 @@
+SPORK_SPEC_DIR = File.expand_path( "../../../spec/", File.dirname(__FILE__))
+Dir.glob("#{SPORK_SPEC_DIR}/support/*.rb").each { |f| require(f) }

data/lib/spork/test_framework.rb

@@ -122,16 +122,16 @@ class Spork::TestFramework
         stderr.puts "#{helper_file} has not been bootstrapped.  Run spork --bootstrap to do so."
         stderr.flush
 
-        if framework.bootstrap_required?
-          stderr.puts "I can't do anything for you by default for the framework you're using: #{framework.short_name}.\nYou must bootstrap #{helper_file} to continue."
+        if app_framework.bootstrap_required?
+          stderr.puts "I can't do anything for you by default for the app framework you're using: #{app_framework.short_name}.\nYou must bootstrap #{helper_file} to continue."
           stderr.flush
           return false
         else
-          load(framework.entry_point)
+          load(app_framework.entry_point)
         end
       end
 
-      framework.preload do
+      app_framework.preload do
         if bootstrapped?
           stderr.puts "Loading Spork.prefork block..."
           stderr.flush
@@ -147,21 +147,21 @@ class Spork::TestFramework
   end
 
   def entry_point
-    bootstrapped? ? helper_file : framework.entry_point
+    bootstrapped? ? helper_file : app_framework.entry_point
   end
 
   def default_port
     self.class.default_port
   end
 
+  def app_framework
+    @app_framework ||= Spork::AppFramework.detect_framework
+  end
+
   protected
     def self.inherited(subclass)
       @@supported_test_frameworks << subclass
     end
-
-    def framework
-      @framework ||= Spork::AppFramework.detect_framework
-    end
 end
 
 Spork.detect_and_require('spork/test_framework/*.rb')

data/spec/spec_helper.rb

@@ -6,102 +6,21 @@ require 'stringio'
 require 'fileutils'
 require 'rspec'
 
+Dir.glob("#{File.dirname(__FILE__)}/support/*.rb").each { |f| require(f) }
+
 RSpec.configure do |config|
+  include(TmpProjectHelpers)
+
   config.before(:each) do
-    $test_stdout = StringIO.new
-    $test_stderr = StringIO.new
+    TestIOStreams.set_streams(StringIO.new, StringIO.new)
+    
     @current_dir = nil
-  end
-
-  config.after(:each) do
-    FileUtils.rm_rf(SPEC_TMP_DIR) if File.directory?(SPEC_TMP_DIR)
-  end
-end
-
-def create_file(filename, contents)
-  FileUtils.mkdir_p(SPEC_TMP_DIR) unless File.directory?(SPEC_TMP_DIR)
-
-  in_current_dir do
-    FileUtils.mkdir_p(File.dirname(filename))
-    File.open(filename, 'wb') { |f| f << contents }
+    clear_tmp_dir
   end
 end
 
-def create_helper_file(test_framework = FakeFramework)
-  create_file(test_framework.helper_file, "# stub spec helper file")
-end
-
-def in_current_dir(&block)
-  Dir.chdir(current_dir, &block)
-end
-
-def current_dir
-  @current_dir ||= SPEC_TMP_DIR
-end
-
-def change_current_dir(sub_path)
-  @current_dir = File.expand_path(sub_path, SPEC_TMP_DIR)
-end
 
 def windows?
   ENV['OS'] == 'Windows_NT'
 end
 
-
-module RSpec
-  module Matchers
-    class IncludeAStringLike
-      def initialize(substring_or_regex)
-        case substring_or_regex
-        when String
-          @regex = Regexp.new(Regexp.escape(substring_or_regex))
-        when Regexp
-          @regex = substring_or_regex
-        else
-          raise ArgumentError, "don't know what to do with the #{substring_or_regex.class} you provided"
-        end
-      end
-
-      def matches?(list_of_strings)
-        @list_of_strings = list_of_strings
-        @list_of_strings.any? { |s| s =~ @regex }
-      end
-      def failure_message
-        "#{@list_of_strings.inspect} expected to include a string like #{@regex.inspect}"
-      end
-      def negative_failure_message
-        "#{@list_of_strings.inspect} expected to not include a string like #{@regex.inspect}, but did"
-      end
-    end
-
-    def include_a_string_like(substring_or_regex)
-      IncludeAStringLike.new(substring_or_regex)
-    end
-  end
-end
-
-module Spork::TestIOStreams
-  def self.included(klass)
-    klass.send(:extend, ::Spork::TestIOStreams::ClassMethods)
-  end
-
-  def stderr
-    self.class.stderr
-  end
-
-  def stdout
-    self.class.stdout
-  end
-
-  module ClassMethods
-    def stderr
-      $test_stderr
-    end
-
-    def stdout
-      $test_stdout
-    end
-  end
-end
-
-Dir.glob(File.dirname(__FILE__) + "/support/*.rb").each { |f| require(f) }

data/spec/spork/app_framework_spec.rb

@@ -2,13 +2,6 @@ require 'spec_helper'
 
 describe Spork::AppFramework do
   describe ".detect_framework" do
-    it "detects when rails is installed and available" do
-      create_file("config/environment.rb", "RAILS_GEM_VERSION = '2.1.0'")
-      in_current_dir do
-        Spork::AppFramework.detect_framework.short_name.should == "Rails"
-      end
-    end
-  
     it "returns Unknown when no framework known detected" do
       Spork::AppFramework.detect_framework.short_name.should == "Unknown"
     end

data/spec/spork/diagnoser_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 describe Spork::Diagnoser do
   after(:each) do
     Spork::Diagnoser.remove_hook!

data/spec/spork/test_framework_spec.rb

@@ -66,9 +66,9 @@ describe Spork::TestFramework do
       create_helper_file
       @fake.bootstrap
 
-      $test_stderr.string.should include("Bootstrapping")
-      $test_stderr.string.should include("Edit")
-      $test_stderr.string.should include("favorite text editor")
+      TestIOStreams.stderr.string.should include("Bootstrapping")
+      TestIOStreams.stderr.string.should include("Edit")
+      TestIOStreams.stderr.string.should include("favorite text editor")
 
       File.read(@fake.helper_file).should include(File.read(FakeFramework::BOOTSTRAP_FILE))
     end

data/spec/support/fake_framework.rb

@@ -1,5 +1,7 @@
+require "#{File.dirname(__FILE__)}/test_io_streams.rb"
+
 class FakeFramework < Spork::TestFramework
-  include Spork::TestIOStreams
+  include TestIOStreams
 
   attr_accessor :wait_time
   DEFAULT_PORT = 1000

data/spec/support/should_include_a_string_like.rb

@@ -0,0 +1,31 @@
+module RSpec
+  module Matchers
+    class IncludeAStringLike
+      def initialize(substring_or_regex)
+        case substring_or_regex
+        when String
+          @regex = Regexp.new(Regexp.escape(substring_or_regex))
+        when Regexp
+          @regex = substring_or_regex
+        else
+          raise ArgumentError, "don't know what to do with the #{substring_or_regex.class} you provided"
+        end
+      end
+
+      def matches?(list_of_strings)
+        @list_of_strings = list_of_strings
+        @list_of_strings.any? { |s| s =~ @regex }
+      end
+      def failure_message
+        "#{@list_of_strings.inspect} expected to include a string like #{@regex.inspect}"
+      end
+      def negative_failure_message
+        "#{@list_of_strings.inspect} expected to not include a string like #{@regex.inspect}, but did"
+      end
+    end
+
+    def include_a_string_like(substring_or_regex)
+      IncludeAStringLike.new(substring_or_regex)
+    end
+  end
+end

data/spec/support/test_io_streams.rb

@@ -0,0 +1,17 @@
+module TestIOStreams
+  def stderr
+    ::TestIOStreams.stderr
+  end
+
+  def stdout
+    ::TestIOStreams.stdout
+  end
+
+  class << self
+    attr_accessor :stderr, :stdout
+
+    def set_streams(stderr, stdout)
+      self.stderr, self.stdout = stderr, stdout
+    end
+  end
+end

data/spec/support/tmp_project_helpers.rb

@@ -0,0 +1,30 @@
+module TmpProjectHelpers
+  def clear_tmp_dir
+    FileUtils.rm_rf(SPEC_TMP_DIR) if File.directory?(SPEC_TMP_DIR)
+  end
+
+  def create_file(filename, contents)
+    FileUtils.mkdir_p(SPEC_TMP_DIR) unless File.directory?(SPEC_TMP_DIR)
+
+    in_current_dir do
+      FileUtils.mkdir_p(File.dirname(filename))
+      File.open(filename, 'wb') { |f| f << contents }
+    end
+  end
+
+  def create_helper_file(test_framework = FakeFramework)
+    create_file(test_framework.helper_file, "# stub spec helper file")
+  end
+
+  def in_current_dir(&block)
+    Dir.chdir(current_dir, &block)
+  end
+
+  def current_dir
+    @current_dir ||= SPEC_TMP_DIR
+  end
+
+  def change_current_dir(sub_path)
+    @current_dir = File.expand_path(sub_path, SPEC_TMP_DIR)
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: spork
 version: !ruby/object:Gem::Version
-  version: 0.9.2
-  prerelease: 
+  version: 1.0.0rc0
+  prerelease: 5
 platform: ruby
 authors:
 - Tim Harper
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000Z
+date: 2012-01-22 00:00:00.000000000Z
 dependencies: []
 description: A forking Drb spec server
 email:
@@ -25,16 +25,12 @@ files:
 - Gemfile
 - README.rdoc
 - MIT-LICENSE
-- lib/spork/app_framework/padrino.rb
-- lib/spork/app_framework/rails.rb
 - lib/spork/app_framework/unknown.rb
 - lib/spork/app_framework.rb
 - lib/spork/custom_io_streams.rb
 - lib/spork/diagnoser.rb
-- lib/spork/ext/rails-reloader.rb
 - lib/spork/ext/ruby-debug.rb
 - lib/spork/forker.rb
-- lib/spork/gem_helpers.rb
 - lib/spork/run_strategy/forking.rb
 - lib/spork/run_strategy/magazine/magazine_slave.rb
 - lib/spork/run_strategy/magazine/magazine_slave_provider.rb
@@ -43,28 +39,13 @@ files:
 - lib/spork/run_strategy.rb
 - lib/spork/runner.rb
 - lib/spork/server.rb
+- lib/spork/test/cucumber_helpers.rb
+- lib/spork/test/test_helpers.rb
 - lib/spork/test_framework/cucumber.rb
 - lib/spork/test_framework/rspec.rb
 - lib/spork/test_framework.rb
 - lib/spork.rb
-- assets/bootstrap.rb
-- features/at_exit_during_each_run.feature
-- features/cucumber_rails_integration.feature
-- features/diagnostic_mode.feature
-- features/gemfiles/rails3.0/Gemfile
-- features/gemfiles/rails3.0/Gemfile.lock
-- features/rails_delayed_loading_workarounds.feature
-- features/rspec_rails_integration.feature
-- features/spork_debugger.feature
-- features/steps/general_steps.rb
-- features/steps/rails_steps.rb
-- features/steps/sandbox_steps.rb
-- features/support/background_job.rb
-- features/support/bundler_helpers.rb
-- features/support/env.rb
-- features/unknown_app_framework.feature
 - spec/spec_helper.rb
-- spec/spork/app_framework/rails_spec.rb
 - spec/spork/app_framework/unknown_spec.rb
 - spec/spork/app_framework_spec.rb
 - spec/spork/diagnoser_spec.rb
@@ -79,8 +60,21 @@ files:
 - spec/spork_spec.rb
 - spec/support/fake_framework.rb
 - spec/support/fake_run_strategy.rb
+- spec/support/should_include_a_string_like.rb
+- spec/support/test_io_streams.rb
+- spec/support/tmp_project_helpers.rb
+- features/at_exit_during_each_run.feature
+- features/diagnostic_mode.feature
+- features/spork_debugger.feature
+- features/steps/general_steps.rb
+- features/steps/sandbox_steps.rb
+- features/support/background_job.rb
+- features/support/bundler_helpers.rb
+- features/support/env.rb
+- features/support/spork_world.rb
+- features/unknown_app_framework.feature
 - bin/spork
-homepage: http://github.com/timcharper/spork
+homepage: http://github.com/sporkrb/spork
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -101,29 +95,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: spork
+rubyforge_project: 
 rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: spork
 test_files:
 - features/at_exit_during_each_run.feature
-- features/cucumber_rails_integration.feature
 - features/diagnostic_mode.feature
-- features/gemfiles/rails3.0/Gemfile
-- features/gemfiles/rails3.0/Gemfile.lock
-- features/rails_delayed_loading_workarounds.feature
-- features/rspec_rails_integration.feature
 - features/spork_debugger.feature
 - features/steps/general_steps.rb
-- features/steps/rails_steps.rb
 - features/steps/sandbox_steps.rb
 - features/support/background_job.rb
 - features/support/bundler_helpers.rb
 - features/support/env.rb
+- features/support/spork_world.rb
 - features/unknown_app_framework.feature
 - spec/spec_helper.rb
-- spec/spork/app_framework/rails_spec.rb
 - spec/spork/app_framework/unknown_spec.rb
 - spec/spork/app_framework_spec.rb
 - spec/spork/diagnoser_spec.rb
@@ -138,4 +126,7 @@ test_files:
 - spec/spork_spec.rb
 - spec/support/fake_framework.rb
 - spec/support/fake_run_strategy.rb
+- spec/support/should_include_a_string_like.rb
+- spec/support/test_io_streams.rb
+- spec/support/tmp_project_helpers.rb
 has_rdoc: