torquebox 2.0.0.beta3 → 2.0.0.cr1

data/bin/torquebox

@@ -29,13 +29,23 @@ class TorqueBoxCommand < Thor
   map "run" => "start"
   desc "run", "Run TorqueBox"
   method_option :clustered, :type => :boolean, :desc => "Run TorqueBox in clustered mode"
+  method_option 'data-directory', :type => :string, :desc => 'Override the directory TorqueBox uses to store it runtime data'
+  method_option 'extra', :aliases => '-e', :type => :string, :desc => 'Extra options to pass through to JBoss AS, you will to escape dashes with \ (e.g. \--help)'
   method_option 'max-threads', :type => :numeric, :desc => "Maximum number of HTTP threads"
   method_option 'bind-address', :aliases => '-b', :type => :string, :desc => "IP address to bind to"
+  method_option 'node-name', :type => :string, :desc => 'Override the name of the node (which by default is the hostname)'
+  method_option 'port-offset', :type => :numeric, :desc => 'Offset all port numbers listened on by TorqueBox by this number'
+  method_option 'jvm-options', :aliases => '-J', :type => :string, :desc => 'Pass options on to the JVM'
   def start
     TorqueBox::Server.setup_environment
     TorqueBox::DeployUtils.run_server(:clustered => options.clustered,
                                       :max_threads => options['max-threads'],
-                                      :bind_address => options['bind-address'])
+                                      :bind_address => options['bind-address'],
+                                      :port_offset => options['port-offset'],
+                                      :pass_through => options['extra'],
+                                      :node_name => options['node-name'],
+                                      :data_directory => options['data-directory'],
+                                      :jvm_options => options['jvm-options'])
   end
 
   desc "rails ROOT", "Create a Rails application at ROOT using the TorqueBox Rails template, or apply the TorqueBox template to an existing application at ROOT."
@@ -85,6 +95,11 @@ class TorqueBoxCommand < Thor
     opts = {:root => root}.merge(options)
     descriptor = TorqueBox::DeployUtils.basic_deployment_descriptor(opts)
     deployed_name, deploy_dir = TorqueBox::DeployUtils.deploy_yaml(descriptor, opts)
+    failed_file = File.join( deploy_dir, "#{deployed_name}.failed" )
+    if File.exists? failed_file
+      puts "Removing failed descriptor: #{failed_file}" 
+      FileUtils.rm( failed_file ) 
+    end
     puts "Deployed: #{deployed_name}"
     puts "    into: #{deploy_dir}"
   end
@@ -108,15 +123,27 @@ class TorqueBoxCommand < Thor
     end
   end
 
+  desc "list applications", "List applications deployed to TorqueBox and their deployment status"
+  def list(root = ".")
+    TorqueBox::Server.setup_environment
+    apps = TorqueBox::DeployUtils.deployment_status
+    puts "Nothing deployed." if apps.empty?
+    apps.each do |k,v|
+      puts k
+      puts "  Descriptor: #{v[:descriptor]}"
+      puts "  Status: #{v[:status]}"
+    end
+  end
+
   desc "cli", "Run the JBoss AS7 CLI"
   def cli
     TorqueBox::Server.setup_environment
     options = "--connect"
     if Config::CONFIG['host_os'] =~ /mswin/
-      path = File.join(TorqueBox::Server.jboss_home, "bin\\jboss-admin")
+      path = File.join(ENV['JBOSS_HOME'], "bin\\jboss-cli")
       exec(path, options)
     else
-      path = "/bin/sh #{File.join(TorqueBox::Server.jboss_home, 'bin/jboss-admin.sh')}"
+      path = "/bin/sh #{File.join(ENV['JBOSS_HOME'], 'bin/jboss-cli.sh')}"
       exec "#{path} #{options}"
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: torquebox
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta3
+  version: 2.0.0.cr1
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 Z
+date: 2012-03-02 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: torquebox-core
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
@@ -75,7 +75,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id006
   - !ruby/object:Gem::Dependency 
@@ -86,7 +86,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id007
   - !ruby/object:Gem::Dependency 
@@ -97,7 +97,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id008
   - !ruby/object:Gem::Dependency 
@@ -108,7 +108,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id009
   - !ruby/object:Gem::Dependency 
@@ -119,7 +119,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.0.beta3
+            version: 2.0.0.cr1
     type: :runtime
     version_requirements: *id010
   - !ruby/object:Gem::Dependency 
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: TorqueBox Gem