torquespec 0.4.8 → 0.4.9

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

@@ -53,8 +53,10 @@ require 'torquespec/daemon'
 module TorqueSpec
   module ObjectExtensions
     def remote_describe(*args, &example_group_block)
-      group = describe(*args, &example_group_block)
-      TorqueSpec.remote? ? group : group.extend( TorqueSpec::Daemon::Client )
+      unless TorqueSpec.domain_mode
+        group = describe(*args, &example_group_block)
+        TorqueSpec.remote? ? group : group.extend( TorqueSpec::Daemon::Client )
+      end
     end
   end
 end

data/lib/torquespec/as7.rb

@@ -19,28 +19,23 @@ module TorqueSpec
       # ignorable
     end
 
+    def deployed?(path)
+      response = JSON.parse(api(:operation => "read-children-names", "child-type" => "deployment"))
+      response['result'].include? addressify(path)
+    end
+    
     def _deploy(path)
-      once = true
-      begin
-        api( :operation => "add",
-             :address   => [ "deployment", addressify(path) ],
-             :content   => [ { :url=>urlify(path)} ] )
-      rescue Exception
-        _undeploy(path)
-        if once
-          once = false
-          retry
-        else
-          raise
-        end
-      end
+      _undeploy(path) if deployed?(path)
+      api( :operation => "add",
+           :address   => [{ :deployment => addressify(path) }],
+           :content   => [{ :url => urlify(path) }] )
       api( :operation => "deploy",
-           :address   => [ "deployment", addressify(path) ] )
+           :address   => [{ :deployment => addressify(path) }] )
     end
 
     def _undeploy(path)
       api( :operation => "remove",
-           :address   => [ "deployment", addressify(path) ] )
+           :address   => [{ "deployment" => addressify(path) }] )
     end
 
     def ready?
@@ -66,4 +61,52 @@ module TorqueSpec
       File.basename(path)
     end
   end
+
+  module Domain
+
+    def host_controller
+      JSON.parse(api(:operation => "read-children-resources", "child-type" => "host"))['result'].first
+    end
+    
+    def server_group
+      @server_group ||= JSON.parse(api(:operation => "read-children-names", "child-type" => "server-group"))['result'].first
+    end
+
+    def start_command
+      "#{TorqueSpec.java_home}/bin/java -D\"[Process Controller]\" #{TorqueSpec.jvm_args} -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -Djboss.domain.default.config=domain.xml -Djboss.host.default.config=host.xml -Dorg.jboss.boot.log.file=#{TorqueSpec.jboss_home}/domain/log/process-controller.log -Dlogging.configuration=file:#{TorqueSpec.jboss_home}/domain/configuration/logging.properties -jar #{TorqueSpec.jboss_home}/jboss-modules.jar -mp #{TorqueSpec.jboss_home}/modules org.jboss.as.process-controller -jboss-home #{TorqueSpec.jboss_home} -jvm #{TorqueSpec.java_home}/bin/java -mp #{TorqueSpec.jboss_home}/modules -- -Dorg.jboss.boot.log.file=#{TorqueSpec.jboss_home}/domain/log/host-controller.log -Dlogging.configuration=file:#{TorqueSpec.jboss_home}/domain/configuration/logging.properties #{TorqueSpec.jvm_args} -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -Djboss.domain.default.config=domain.xml -Djboss.host.default.config=host.xml -- -default-jvm #{TorqueSpec.java_home}/bin/java"
+    end
+    
+    def ready?
+      host = host_controller[1]
+      host["server-config"] == host["server"]
+    rescue
+      false
+    end
+
+    def _deploy(path)
+      _undeploy(path) if deployed?(path)
+      api( :operation => "add",
+           :address   => [{ :deployment => addressify(path) }],
+           :content   => [{ :url => urlify(path) }] )
+      api( :operation => "add",
+           :address   => [{"server-group" => server_group}, {:deployment => addressify(path)}],
+           :content   => [{ :url => urlify(path) }] )
+      api( :operation => "deploy",
+           :address   => [{"server-group" => server_group}, {:deployment => addressify(path)}] )
+    end
+
+    def _undeploy(path)
+      api( :operation => "remove",
+           :address   => [{"server-group" => server_group}, {:deployment => addressify(path)}] )
+      api( :operation => "remove",
+           :address   => [{"deployment" => addressify(path)}] )
+    end
+
+    def shutdown
+      api( :operation => "shutdown", :address => [ "host", host_controller[0] ] )
+    rescue EOFError
+      # ignorable
+    end
+
+  end
 end

data/lib/torquespec/server.rb

@@ -7,6 +7,7 @@ module TorqueSpec
 
     def initialize
       self.extend( TorqueSpec.as7? ? AS7 : AS6 )
+      self.extend( Domain ) if TorqueSpec.domain_mode
     end
 
     def start(opts={})

data/lib/torquespec/torquespec.rb

@@ -1,4 +1,5 @@
 require 'torquespec/deployment_descriptor'
+require 'java'
 
 module TorqueSpec
 
@@ -19,7 +20,7 @@ module TorqueSpec
   end
 
   class << self
-    attr_accessor :knob_root, :jboss_home, :jvm_args, :max_heap, :lazy, :drb_port, :spec_dir
+    attr_accessor :knob_root, :jboss_home, :jvm_args, :max_heap, :lazy, :drb_port, :spec_dir, :domain_mode
     def configure
       yield self
     end
@@ -33,7 +34,6 @@ module TorqueSpec
       @jboss_home ||= ENV['JBOSS_HOME'] || jboss_home_from_server_gem
     end
     def jruby_home
-      require 'java'
       File.expand_path(java.lang.System.getProperty('jruby.home'))
     end
     def java_home
@@ -91,6 +91,7 @@ end
 TorqueSpec.configure do |config|
   config.drb_port = 7772
   config.knob_root = ".torquespec"
+  config.domain_mode = %w(yes true 1).include?(java.lang.System.getProperty('domain.mode') || ENV['DOMAIN_MODE'])
   config.jvm_args = "-Xms64m -Xmx1024m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -Djruby.home=#{config.jruby_home}"
 end
 

data/lib/torquespec/version.rb

@@ -1,3 +1,3 @@
 module TorqueSpec
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 4
-  - 8
-  version: 0.4.8
+  - 9
+  version: 0.4.9
 platform: ruby
 authors: 
 - Jim Crossley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 -05:00
+date: 2012-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency