torquespec 0.3.0 → 0.3.1

data/lib/torquespec/daemon.rb

@@ -27,6 +27,13 @@ module TorqueSpec
     def start
       puts "JC: start daemon"
       DRb.start_service("druby://127.0.0.1:#{TorqueSpec.drb_port}", self)
+      10.times do
+        if DRb.current_server
+          break
+        else
+          sleep(0.1)
+        end
+      end
     end
 
     def stop
@@ -47,6 +54,8 @@ module TorqueSpec
         begin
           eval_before_alls(new)
           run_remotely(reporter)
+        rescue Exception => ex
+          fail_filtered_examples(ex, reporter)
         ensure
           eval_after_alls(new)
         end
@@ -56,30 +65,15 @@ module TorqueSpec
       def run_remotely(reporter)
         DRb.start_service("druby://127.0.0.1:0")
         daemon = DRbObject.new_with_uri("druby://127.0.0.1:#{TorqueSpec.drb_port}")
-        # TODO: maybe fall back to local if can't run?
         begin
           daemon.run( name, reporter )
-        rescue Exception
-          puts $!, $@
         ensure
           DRb.stop_service
         end
       end
       
       def deploy_paths
-        descriptor = <<-END.gsub(/^ {10}/,'')
-          application:
-            root: #{TorqueSpec.app_root}
-          ruby:
-            version: #{RUBY_VERSION[0,3]}
-          services:
-            TorqueSpec::Daemon:
-              argv: #{TorqueSpec.argv}
-              pwd:  #{Dir.pwd}
-          environment:
-            RUBYLIB: #{TorqueSpec.rubylib}
-        END
-        [ DeploymentDescriptor.new(descriptor, display_name).path ]
+        [ DeploymentDescriptor.new({}, display_name, true).path ]
       end
 
     end

data/lib/torquespec/deployment_descriptor.rb

@@ -12,7 +12,7 @@ module TorqueSpec
       FileUtils.mkdir_p(TorqueSpec.knob_root) unless File.exist?(TorqueSpec.knob_root)
     end
     def path
-      daemonify( hash || filename || heredoc )
+      verify( hash || filename || heredoc )
     end
     def hash
       if @descriptor.is_a? Hash
@@ -38,21 +38,28 @@ module TorqueSpec
       x.is_a?(Hash) ? x.inject({}) {|h,(k,v)| h[k.to_s] = stringify_keys(v); h} : x
     end
 
-    def daemonify( path )
-      if @daemonify
-        yaml = YAML.load_file( path )
-        if yaml.is_a? Hash
+    def verify( path )
+      original = YAML.load_file( path )
+      if original.is_a? Hash
+        yaml = original.dup
+        if @daemonify
+          yaml['application'] ||= {}
+          yaml['application']['root'] ||= TorqueSpec.app_root
           yaml['services'] ||= {}
           yaml['services'].update( 'TorqueSpec::Daemon' => { 'argv' => TorqueSpec.argv, 'pwd' => Dir.pwd } )
           yaml['environment'] ||= {}
           env = { 'RUBYLIB' => TorqueSpec.rubylib }
           yaml['environment'].update(env) {|k,oldval,newval| "#{oldval}:#{newval}"}
+        end
+        yaml['ruby'] ||= {}
+        yaml['ruby']['version'] ||= RUBY_VERSION[0,3]
+        if original != yaml
           File.open( path, 'w' ) do |file|
             YAML.dump( yaml, file )
           end
-        else
-          $stderr.puts "WARN: Unable to decorate your deployment descriptor with TorqueSpec::Daemon"
         end
+      else
+        $stderr.puts "WARN: Unable to decorate your deployment descriptor with TorqueSpec::Daemon"
       end
       path
     end

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jim Crossley