torquespec 0.0.5 → 0.0.6

data/lib/torquespec/server.rb

@@ -4,15 +4,27 @@ module TorqueSpec
   class Server
     
     def start(opts={})
-      return if TorqueSpec.lazy and ready?
-      wait = opts[:wait].to_i
-      raise "JBoss is already running" if ready?
-      cmd = command
-      @process = IO.popen( cmd )
-      Thread.new(@process) { |console| while(console.gets); end }
-      %w{ INT TERM KILL }.each { |signal| trap(signal) { stop } }
-      puts "#{cmd}\npid=#{@process.pid}"
-      wait > 0 ? wait_for_ready(wait) : @process.pid
+      if ready?
+        if TorqueSpec.lazy
+          puts "Using running JBoss (try lazy=false if you get errors)"
+          return
+        else
+          stop
+          puts "Waiting for running JBoss to shutdown"
+          sleep(5)
+          sleep(1) while ready?
+        end
+      end
+      startup(opts)
+    end
+
+    def stop
+      if TorqueSpec.lazy
+        puts "JBoss won't be stopped (lazy=true)"
+      else
+        shutdown
+        puts "Shutdown message sent to JBoss"
+      end
     end
 
     def deploy(url)
@@ -27,25 +39,6 @@ module TorqueSpec
       puts "  undeployed #{url.split('/')[-1]}"
     end
 
-    def stop
-      if TorqueSpec.lazy
-        puts "JBoss still running, pid=#{@process.pid}"
-      elsif @process
-        unless clean_stop
-          puts "Unable to shutdown JBoss cleanly, interrupting process"
-          Process.kill("INT", @process.pid) 
-        end
-        @process = nil
-        puts "JBoss stopped"
-      end
-    end
-
-    def clean_stop
-      success?( jmx_console( :action     => 'invokeOpByName', 
-                             :name       => 'jboss.system:type=Server', 
-                             :methodName => 'shutdown' ) )
-    end
-
     def ready?
       response = jmx_console( :action => 'inspectMBean', :name => 'jboss.system:type=Server' )
       "True" == response.match(/>Started<.*?<pre>\s+^(\w+)/m)[1]
@@ -56,7 +49,7 @@ module TorqueSpec
     def wait_for_ready(timeout)
       puts "Waiting up to #{timeout}s for JBoss to boot"
       t0 = Time.now
-      while (Time.now - t0 < timeout && @process) do
+      while (Time.now - t0 < timeout) do
         if ready?
           puts "JBoss started in #{(Time.now - t0).to_i}s"
           return true
@@ -68,6 +61,22 @@ module TorqueSpec
 
     protected
 
+    def startup(opts)
+      wait = opts[:wait].to_i
+      cmd = command
+      process = IO.popen( cmd )
+      Thread.new(process) { |console| while(console.gets); end }
+      %w{ INT TERM KILL }.each { |signal| trap(signal) { stop } }
+      puts "#{cmd}\npid=#{process.pid}"
+      wait > 0 ? wait_for_ready(wait) : process.pid
+    end
+
+    def shutdown
+      success?( jmx_console( :action     => 'invokeOpByName', 
+                             :name       => 'jboss.system:type=Server', 
+                             :methodName => 'shutdown' ) )
+    end
+
     def command
       java_home = java.lang::System.getProperty( 'java.home' )
       "#{java_home}/bin/java -cp #{TorqueSpec.jboss_home}/bin/run.jar #{TorqueSpec.jvm_args} -Djava.endorsed.dirs=#{TorqueSpec.jboss_home}/lib/endorsed org.jboss.Main -c #{TorqueSpec.jboss_conf} -b #{TorqueSpec.host}"

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jim Crossley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -04:00
+date: 2011-05-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency