torquespec 0.2.6 → 0.2.7

data/lib/torquespec/daemon.rb

@@ -6,19 +6,22 @@ module TorqueSpec
   class Daemon
 
     def initialize(opts={})
-      puts "JC: create daemon opts=#{opts}"
-      @argv = opts['argv'].to_a
+      puts "JC: create daemon opts=#{opts.inspect}"
+      dir = opts['pwd'].to_s
+      raise "The 'pwd' option must contain a valid directory name" unless dir.any? && File.exist?(dir)
+      Dir.chdir( dir ) do
+        RSpec::Core::Runner.disable_autorun! # avoid a bunch of at_exit finalizer errors
+        @options = RSpec::Core::ConfigurationOptions.new( opts['argv'].to_a )
+        @options.parse_options
 
-      @options = RSpec::Core::ConfigurationOptions.new(@argv)
-      @options.parse_options
+        @configuration = RSpec::configuration
+        @world         = RSpec::world
 
-      @configuration = RSpec::configuration
-      @world         = RSpec::world
-
-      @options.configure(@configuration)
-      @configuration.load_spec_files
-      @configuration.configure_mock_framework
-      @configuration.configure_expectation_framework
+        @options.configure(@configuration)
+        @configuration.load_spec_files
+        @configuration.configure_mock_framework
+        @configuration.configure_expectation_framework
+      end
     end
 
     def start

data/lib/torquespec/torquespec.rb

@@ -30,22 +30,16 @@ module TorqueSpec
   end
 
   # A somewhat hackish way of exposing client-side gems to the server-side daemon
-  #
-  # TODO: Fix it so I don't include old versions of TorqueSpec
-  #
   def self.rubylib
-    Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "../../..", "*{spec,diff-lcs}*/lib"))).join(":")
+    here = File.dirname(__FILE__)
+    rspec_libs = Dir.glob(File.expand_path(File.join(here, "../../..", "*{rspec,diff-lcs}*/lib")))
+    this_lib = File.expand_path(File.join(here, ".."))
+    rspec_libs.unshift( this_lib ).join(":")
   end
 
-  # The way client-side specs are passed to the daemon 
-  #
-  # TODO: This won't work because we need to pass ARGV to the daemon,
-  # and we can't just map its items to their expanded path, e.g. -l
-  # 42, so we must pass (ARGV || spec) and Dir.pwd so that the daemon
-  # may initialize itself within that directory.
-  #
-  def self.specs
-    RSpec::configuration.files_to_run.map {|f| File.expand_path(f) }.inspect
+  # We must initialize the daemon with the same params as passed to the client
+  def self.argv
+    ( ARGV.empty? ? [ 'spec' ] : ARGV ).inspect
   end
 end
 

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/remote_spec.rb

@@ -7,7 +7,8 @@ remote_describe "in-container tests" do
       root: #{File.dirname(__FILE__)}/../apps/simple
     services:
       TorqueSpec::Daemon:
-        argv: #{ARGV.map{|x|File.expand_path(x)}.inspect}
+        argv: #{TorqueSpec.argv}
+        pwd: #{Dir.pwd}
     environment:
       RUBYLIB: #{TorqueSpec.rubylib}
   END

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jim Crossley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -04:00
+date: 2011-06-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency