torquespec 0.2.7 → 0.2.8

data/lib/rspec/core/torquespec-extensions.rb

@@ -28,19 +28,15 @@ else
     end
     
     config.before(:all) do
-      if self.class.respond_to?( :deploy_paths )
-        self.class.deploy_paths.each do |path|
-          Thread.current[:app_server].deploy(path)
-        end
-      end
+      self.class.deploy_paths.each do |path|
+        Thread.current[:app_server].deploy(path)
+      end if self.class.respond_to?( :deploy_paths )
     end
 
     config.after(:all) do
-      if self.class.respond_to?( :deploy_paths )
-        self.class.deploy_paths.each do |path|
-          Thread.current[:app_server].undeploy(path)
-        end
-      end
+      self.class.deploy_paths.each do |path|
+        Thread.current[:app_server].undeploy(path)
+      end if self.class.respond_to?( :deploy_paths )
     end
 
     config.after(:suite) do

data/lib/torquespec/daemon.rb

@@ -8,7 +8,7 @@ module TorqueSpec
     def initialize(opts={})
       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)
+      raise "The 'pwd' option must contain a valid directory name" if dir.empty? || !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 )

data/lib/torquespec/deployment_descriptor.rb

@@ -5,12 +5,13 @@ require 'yaml'
 module TorqueSpec
 
   class DeploymentDescriptor
-    def initialize(descriptor, name)
+    def initialize(descriptor, name, daemonify = false)
       @descriptor = descriptor
       @path = Pathname.new( name.gsub(/\W/,'_') + "-knob.yml" ).expand_path( TorqueSpec.knob_root )
+      @daemonify = daemonify
     end
     def path
-      hash || filename || heredoc
+      daemonify( hash || filename || heredoc )
     end
     def hash
       if @descriptor.is_a? Hash
@@ -35,6 +36,25 @@ module TorqueSpec
     def stringify_keys(x)
       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
+          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}"}
+          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
+      end
+      path
+    end
   end
 
 end

data/lib/torquespec/torquespec.rb

@@ -11,7 +11,10 @@ module TorqueSpec
       descriptors << block.call if block
       i = descriptors.size > 1 ? 0 : nil
       @deploy_paths = descriptors.map do |descriptor| 
-        DeploymentDescriptor.new(descriptor, "#{self.display_name}#{i&&i-=1}").path
+        DeploymentDescriptor.new(descriptor, 
+                                 "#{self.display_name}#{i&&i-=1}", 
+                                 self.is_a?(TorqueSpec::Daemon::Client)
+                                 ).path
       end
     end
   end
@@ -39,7 +42,7 @@ module TorqueSpec
 
   # We must initialize the daemon with the same params as passed to the client
   def self.argv
-    ( ARGV.empty? ? [ 'spec' ] : ARGV ).inspect
+    ( ARGV.empty? ? [ 'spec' ] : ARGV )
   end
 end
 

data/lib/torquespec/version.rb

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

data/spec/remote_spec.rb

@@ -5,12 +5,6 @@ remote_describe "in-container tests" do
   deploy <<-END.gsub(/^ {4}/,'')
     application:
       root: #{File.dirname(__FILE__)}/../apps/simple
-    services:
-      TorqueSpec::Daemon:
-        argv: #{TorqueSpec.argv}
-        pwd: #{Dir.pwd}
-    environment:
-      RUBYLIB: #{TorqueSpec.rubylib}
   END
 
   it "should work" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Jim Crossley