torquespec 0.0.6 → 0.1.0

data/lib/torquespec/as6.rb

@@ -0,0 +1,55 @@
+module TorqueSpec
+  module AS6
+
+    def port
+      8080
+    end
+
+    def start_command
+      "#{ENV['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"
+    end
+
+    def shutdown
+      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]
+    rescue
+      false
+    end
+
+    def _deploy(url)
+      success?( deployer( 'redeploy', url ) )
+    end
+
+    def _undeploy(url)
+      success?( deployer( 'undeploy', url ) )
+    end
+
+
+
+    private
+
+    def success?(response)
+      response.include?( "Operation completed successfully" )
+    end
+
+    def deployer(method, url)
+      jmx_console( :action     => 'invokeOpByName', 
+                   :name       => 'jboss.system:service=MainDeployer', 
+                   :methodName => method,
+                   :argType    => 'java.net.URL', 
+                   :arg0       => url )
+    end
+
+    def jmx_console(params)
+      post('/jmx-console/HtmlAdaptor', params)
+    end
+
+  end
+end

data/lib/torquespec/as7.rb

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'json'
+require 'uri'
+
+module TorqueSpec
+  module AS7
+
+    def port
+      9990
+    end
+
+    def start_command
+      "#{ENV['JAVA_HOME']}/bin/java #{TorqueSpec.jvm_args} -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dorg.jboss.boot.log.file=#{TorqueSpec.jboss_home}/standalone/log/boot.log -Dlogging.configuration=file:#{TorqueSpec.jboss_home}/standalone/configuration/logging.properties -jar #{TorqueSpec.jboss_home}/jboss-modules.jar -mp #{TorqueSpec.jboss_home}/modules -logmodule org.jboss.logmanager -jaxpmodule javax.xml.jaxp-provider org.jboss.as.standalone -Djboss.home.dir=#{TorqueSpec.jboss_home}"
+    end
+
+    def shutdown
+      domain_api( :operation => "shutdown" )
+    rescue EOFError
+      # ignorable
+    end
+
+    def _deploy(path)
+      url = urlify(path)
+      domain_api( :operation => "add",
+                  :address   => [ "deployment", url ],
+                  :url       => url )
+      domain_api( :operation => "deploy",
+                  :address   => [ "deployment", url ] )
+    end
+
+    def _undeploy(path)
+      domain_api( :operation => "remove",
+                  :address   => [ "deployment", urlify(path) ] )
+    end
+
+    def ready?
+      response = JSON.parse( domain_api( :operation => "read-attribute",
+                                         :name      => "server-state") )
+      response['outcome']=='success' && response['result']=='RUNNING'
+    rescue
+      false
+    end
+
+    private
+
+    def domain_api(params)
+      post('/domain-api', params.to_json)
+    end
+
+    def urlify(path)
+      URI.parse(path).scheme.nil? ? "file:#{path}" : path
+    end
+
+  end
+end

data/lib/torquespec/server.rb

@@ -1,8 +1,18 @@
 require 'net/http'
+require 'torquespec/as6'
+require 'torquespec/as7'
 
 module TorqueSpec
   class Server
-    
+
+    def initialize
+      if File.exist?( File.join( TorqueSpec.jboss_home, "bin/run.sh" ) )
+        self.extend AS6
+      else
+        self.extend AS7
+      end
+    end
+
     def start(opts={})
       if ready?
         if TorqueSpec.lazy
@@ -13,12 +23,15 @@ module TorqueSpec
           puts "Waiting for running JBoss to shutdown"
           sleep(5)
           sleep(1) while ready?
+          self.stopped = false
         end
       end
       startup(opts)
     end
 
     def stop
+      return if stopped
+      self.stopped = true
       if TorqueSpec.lazy
         puts "JBoss won't be stopped (lazy=true)"
       else
@@ -30,26 +43,19 @@ module TorqueSpec
     def deploy(url)
       t0 = Time.now
       puts "#{url}"
-      success?( deployer( 'redeploy', url ) )
+      _deploy(url)
       puts "  deployed in #{(Time.now - t0).to_i}s"
     end
 
     def undeploy(url)
-      success?( deployer( 'undeploy', url ) )
+      _undeploy(url)
       puts "  undeployed #{url.split('/')[-1]}"
     end
 
-    def ready?
-      response = jmx_console( :action => 'inspectMBean', :name => 'jboss.system:type=Server' )
-      "True" == response.match(/>Started<.*?<pre>\s+^(\w+)/m)[1]
-    rescue
-      false
-    end
-
     def wait_for_ready(timeout)
       puts "Waiting up to #{timeout}s for JBoss to boot"
       t0 = Time.now
-      while (Time.now - t0 < timeout) do
+      while (Time.now - t0 < timeout && !stopped) do
         if ready?
           puts "JBoss started in #{(Time.now - t0).to_i}s"
           return true
@@ -63,7 +69,7 @@ module TorqueSpec
 
     def startup(opts)
       wait = opts[:wait].to_i
-      cmd = command
+      cmd = start_command
       process = IO.popen( cmd )
       Thread.new(process) { |console| while(console.gets); end }
       %w{ INT TERM KILL }.each { |signal| trap(signal) { stop } }
@@ -71,37 +77,18 @@ module TorqueSpec
       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}"
-    end
-
-    def deployer(method, url)
-      jmx_console( :action     => 'invokeOpByName', 
-                   :name       => 'jboss.system:service=MainDeployer', 
-                   :methodName => method,
-                   :argType    => 'java.net.URL', 
-                   :arg0       => url )
-    end
-
-    def success?(response)
-      response.include?( "Operation completed successfully" )
-    end
-
-    def jmx_console(params)
-      req = Net::HTTP::Post.new('/jmx-console/HtmlAdaptor')
-      req.set_form_data( params )
+    def post(path, params)
+      req = Net::HTTP::Post.new(path)
+      if (params.is_a? Hash)
+        req.set_form_data( params )
+      else
+        req.body = params
+      end
       http( req )
     end
 
     def http req
-      res = Net::HTTP.start(TorqueSpec.host, TorqueSpec.port) do |http| 
+      res = Net::HTTP.start('localhost', port) do |http| 
         http.read_timeout = 180
         http.request(req)
       end
@@ -112,6 +99,7 @@ module TorqueSpec
       res.body
     end
 
+    attr_accessor :stopped
   end
 
 end

data/lib/torquespec/torquespec.rb

@@ -28,11 +28,9 @@ end
 # Default TorqueSpec options
 TorqueSpec.configure do |config|
   config.knob_root = ".torquespec"
-  config.lazy = true
-  config.host = 'localhost'
-  config.port = 8080
+  config.lazy = false
   config.jboss_home = ENV['JBOSS_HOME']
   config.jboss_conf = 'default'
-  config.jvm_args = "-Xmx1024m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -Djruby_home.env.ignore=true -Dgem.path=default"
+  config.jvm_args = "-Xms64m -Xmx1024m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -Djruby_home.env.ignore=true -Dgem.path=default"
 end
 

data/lib/torquespec/version.rb

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

data/spec/hello_world_spec.rb

@@ -0,0 +1,14 @@
+require 'torquespec'
+require 'open-uri'
+
+TorqueSpec.lazy = false
+
+describe "simple deployment" do
+  
+  deploy File.join( File.dirname(__FILE__), "../apps/simple.knob" )
+
+  it "should greet the world" do
+    response = open("http://localhost:8080") {|f| f.read}
+    response.strip.should == "Hello World!"
+  end
+end

data/torquespec.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "rspec"
+  s.add_dependency "json"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torquespec
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 6
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jim Crossley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 -04:00
+date: 2011-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Write integration tests around the deployment of your app to a real JBoss app server
 email: team@projectodd.org
 executables: []
@@ -46,12 +60,16 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- apps/simple.knob
 - lib/torquespec.rb
+- lib/torquespec/as6.rb
+- lib/torquespec/as7.rb
 - lib/torquespec/deployment_descriptor.rb
 - lib/torquespec/rspec.rb
 - lib/torquespec/server.rb
 - lib/torquespec/torquespec.rb
 - lib/torquespec/version.rb
+- spec/hello_world_spec.rb
 - torquespec.gemspec
 has_rdoc: true
 homepage: http://github.com/torquebox/torquespec
@@ -87,5 +105,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Deploy TorqueBox knobs to a running JBoss instance
-test_files: []
-
+test_files: 
+- spec/hello_world_spec.rb