torquebox-console 0.2.2 → 0.2.3

data/README.md

@@ -5,17 +5,20 @@ the TorqueBox server, giving you a Pry interface to work with.
 
 ## Installation
 
-    gem install torquebox-console
+    $ gem install torquebox-console
 
 ## Usage
 
-First deploy to a TorqueBox server.
+Make sure you have a running TorqueBox server where you installed
+torquebox-console, then issue the following command.
 
-    tbconsole deploy --dir=/some/path
+  $ tbconsole connect
 
-Then you can connect with a web browser at
-`http://<servername>:<portnumber>/console`, or on the command line with
-`tbconsole connect`.
+This will deploy torquebox-console as an application into the running TorqueBox
+server, if it hasn't already been installed, and present you with an enhanced
+pry console into your TorqueBox server. Once you have connected on the command
+line, and you know the torquebox-console server is working, then you can
+connect with a web browser at `http://<servername>:<portnumber>/console`.
 
 To list and connect to other running applications, use the commands:
 
@@ -30,4 +33,4 @@ commonly used.
 
 The console, especially runtime switching, is still pretty
 experimental so don't go doing anything crazy with it in a production
-environment.
+environment.

data/bin/tbconsole

@@ -16,6 +16,8 @@
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
+require File.join(File.dirname(__FILE__), '..', 'dependencies')
+
 require 'thor'
 require 'fileutils'
 require 'torquebox-rake-support'
@@ -25,46 +27,55 @@ class TorqueBoxConsoleCommand < Thor
 
   DEPLOYMENT_NAME = 'torquebox-console-knob.yml'
 
-  desc "deploy --dir=DIR", <<-EOT
-Writes the torquebox-console application to disk in the directory specified by 
---dir, and deploys the app to the TorqueBox instance detected on the local host,
-(currently #{TorqueBox::DeployUtils.torquebox_home}).
-
-If --dir is not provided, the torquebox-console app will be written to Dir.pwd/torquebox-console
-(currently #{Dir.pwd}/torquebox-console). 
-EOT
-  method_option :dir, :type => :string, :default => "#{Dir.pwd}/torquebox-console"
+  desc "deploy", "Deploys the torquebox-console application to #{TorqueBox::DeployUtils.torquebox_home}."
   def deploy
     check
-    deploy_dir = File.expand_path options[:dir]
-    descriptor = TorqueBox::DeployUtils.basic_deployment_descriptor( :root => deploy_dir,
-                                                                     :env => 'production' )
-    Dir.mkdir( deploy_dir ) unless File.exist?( deploy_dir )
-    puts "Copying torquebox-console app to #{deploy_dir}"
-    files = Dir.glob("#{root_dir}/*") - ["#{root_dir}/bin"]
-    FileUtils.cp_r( files, "#{deploy_dir}/" )
-    name, dir = TorqueBox::DeployUtils.deploy_yaml( descriptor, :name => DEPLOYMENT_NAME )
-    puts ">> Deployed to #{dir}/#{name}"
+    deploy_app
   end
 
-  desc "undeploy", "Undeploys TorqueBox::Console from the TorqueBox instance specified by $TORQUEBOX_HOME"
+  desc "undeploy", "Undeploys torquebox-console from #{TorqueBox::DeployUtils.torquebox_home}."
   def undeploy
     check
     name, dir = TorqueBox::DeployUtils.undeploy_yaml( :name => DEPLOYMENT_NAME )
   end
 
-  desc "connect", "Runs the CLI console"
+  desc "connect", "Runs the torquebox-console CLI. If torquebox-console is not already deployed, it will be."
   method_option :hostname, :type => :string, :default => "localhost"
   method_option :port, :type => :numeric, :default => 8675
   def connect
+    check
+    deploy_app(true)
     TorqueBox::Console::Client.connect({ :host => options[:hostname], :port => options[:port] })
   end
 
   protected
+  def deploy_app( wait = false )
+    if (!TorqueBox::DeployUtils.is_deployed?(TorqueBox::DeployUtils.deployment_name('torquebox-console')))
+      puts "Deploying torquebox-console to #{TorqueBox::DeployUtils.torquebox_home}"
+      descriptor = TorqueBox::DeployUtils.basic_deployment_descriptor( :root => root_dir,
+                                                                       :env => 'production' )
+      name, dir = TorqueBox::DeployUtils.deploy_yaml( descriptor, :name => DEPLOYMENT_NAME )
+      puts "Deployed torquebox-console to #{dir}/#{name}"
+      if (wait)
+        print "Giving TorqueBox a few seconds to initialize the console. Please be patient."
+        counter = 5
+        while counter > 0
+          sleep 2
+          print "."
+          counter = counter - 1
+        end
+        puts ""
+      end
+    else
+      puts "torquebox-console is already deployed"
+    end
+  end
+
   def check
     if !TorqueBox::DeployUtils.torquebox_home
       raise Exception.new("Can't find a local TorqueBox instance. Try setting TORQUEBOX_HOME.")
     end
+    ENV['JBOSS_HOME'] = File.join(TorqueBox::DeployUtils.torquebox_home, 'jboss') unless ENV['JBOSS_HOME']
   end
 
   def root_dir

data/config/torquebox_init.rb

@@ -0,0 +1,3 @@
+# Make sure we have all our ducks in a row
+require File.join(File.dirname(__FILE__), '..', 'dependencies')
+

data/dependencies.rb

@@ -0,0 +1,15 @@
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/coderay-1.0.9/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/haml-3.1.8/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/haml-3.1.8/vendor/sass/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/haml-3.1.8/vendor/sass/vendor/fssm/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/method_source-0.8.1/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/pry-0.9.12-java/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/rack-1.5.2/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/rack-protection-1.4.0/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/rake-10.0.3/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/sinatra-1.3.5/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/slop-3.4.3/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/spoon-0.0.1/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/stomp-1.2.8/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/thor-0.17.0/lib')
+$:.unshift File.join(File.dirname(__FILE__), './vendor/bundle/jruby/1.9/gems/tilt-1.3.4/lib')

data/lib/torquebox/console/client.rb

@@ -58,14 +58,14 @@ module TorqueBox
           while !received_prompt && !closed
             sleep 0.05
           end
-          while !closed && (input = Readline.readline(prompt, true))
+          while !closed && client.open? && (input = Readline.readline(prompt, true))
             received_prompt = false
             client.publish("/stomplet/console", input) unless closed
             while !received_prompt && !closed
               sleep 0.05 # again with the async
             end
           end
-          client.unsubscribe('/stomplet/console')
+          client.unsubscribe('/stomplet/console') if client.open?
           # Hide any errors printed after we've unsubscribed
           $stderr.close
         end

data/lib/torquebox/console/version.rb

@@ -1,5 +1,5 @@
 module TorqueBox
   module Console
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/stomplets/torque_box_console.rb

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require File.join(File.dirname(__FILE__), '..', 'dependencies')
 require 'torquebox-cache'
 require 'torquebox-messaging'
 require 'torquebox-stomp'
@@ -83,16 +84,9 @@ class TorqueBoxConsole < TorqueBox::Stomp::JmsStomplet
       input_queue = TorqueBox::Messaging::Queue.new( existing_server.input_queue.name )
       send_to( input_queue, "" )
     else
+      deps = File.join(File.dirname(__FILE__), '..', 'dependencies') 
       pool = lookup_runtime( app, runtime )
-      dependencies = Gem::Specification.find_by_name('pry').runtime_dependencies.map(&:name)
-      dependencies << 'pry'
-      load_paths = $:.select do |path|
-        dependencies.any? { |dep| path.include?(dep) }
-      end
-      load_paths << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-      load_paths.each do |path|
-        pool.evaluate(%Q{$: << '#{path}' unless $:.include?('#{path}')})
-      end
+      pool.evaluate("require '#{deps}'")
       pool.evaluate("require 'torquebox/console/server'")
       pool.evaluate("require 'torquebox/console/builtin'")
 

data/vendor/bundle/jruby/1.9/bin/catstomp

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'stomp' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'stomp', version
+load Gem.bin_path('stomp', 'catstomp', version)

data/vendor/bundle/jruby/1.9/bin/coderay

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'coderay' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'coderay', version
+load Gem.bin_path('coderay', 'coderay', version)

data/vendor/bundle/jruby/1.9/bin/haml

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'haml' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'haml', version
+load Gem.bin_path('haml', 'haml', version)

data/vendor/bundle/jruby/1.9/bin/html2haml

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'haml' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'haml', version
+load Gem.bin_path('haml', 'html2haml', version)

data/vendor/bundle/jruby/1.9/bin/pry

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'pry', version
+load Gem.bin_path('pry', 'pry', version)

data/vendor/bundle/jruby/1.9/bin/rackup

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rack' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'rack', version
+load Gem.bin_path('rack', 'rackup', version)

data/vendor/bundle/jruby/1.9/bin/rake

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'rake', version
+load Gem.bin_path('rake', 'rake', version)

data/vendor/bundle/jruby/1.9/bin/rake2thor

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'thor', version
+load Gem.bin_path('thor', 'rake2thor', version)

data/vendor/bundle/jruby/1.9/bin/stompcat

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'stomp' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'stomp', version
+load Gem.bin_path('stomp', 'stompcat', version)

data/vendor/bundle/jruby/1.9/bin/thor

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'thor', version
+load Gem.bin_path('thor', 'thor', version)

data/vendor/bundle/jruby/1.9/bin/tilt

@@ -0,0 +1,23 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'tilt' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'tilt', version
+load Gem.bin_path('tilt', 'tilt', version)