winstone 0.2.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/bin/winstone

@@ -13,6 +13,7 @@ class WinstoneStarter
       winstone install              - installs winstone
       winstone <server-params>      - runs the winstone server
       winstone lite <server-params> - runs winstone (lite) server
+      winstone tool <tool-params>   - runs winstone tool
   TEXT
 
   def initialize
@@ -32,7 +33,9 @@ class WinstoneStarter
     jar_file1 = install_dir + "/winstone-#{verion}.jar"
     jar_file2 = install_dir + "/winstone-lite-#{verion}.jar"
 
-    case ARGV.shift
+    param = ARGV.length == 0 ? "" : ARGV.first
+
+    case param
       when /(-v)|(--version)/ then
         puts "Version: #{File.open(File::dirname(__FILE__) + "/../VERSION").readlines().first}"
       when 'install' then
@@ -42,9 +45,14 @@ class WinstoneStarter
       when 'help' then
         puts USAGE and return
       when 'lite' then
-        @wrapper.run 'winstone', jar_file2, ["-Xmx1024m", "-Xss1024k" ], ARGV
+        @wrapper.run_jar 'winstone', jar_file2, ["-Xmx1024m", "-Xss1024k" ], ARGV
+       when 'tool' then
+        ARGV.shift
+        main_class = ARGV.shift
+        class_path = jar_file1
+        @wrapper.run_cp 'winstone', class_path, main_class, ["-Xmx1024m", "-Xss1024k" ], ARGV
       else
-        @wrapper.run 'winstone', jar_file1, ["-Xmx1024m", "-Xss1024k" ], ARGV
+        @wrapper.run_jar 'winstone', jar_file1, ["-Xmx1024m", "-Xss1024k" ], ARGV
     end
   end
 end

data/lib/jar_wrapper/jar_wrapper.rb

@@ -58,11 +58,17 @@ class JarWrapper
      unzip_file(destination) if destination =~ /\.zip$/
    end
    
-   def run name, jar_file, java_opts, args
+   def run_jar name, jar_file, java_opts, args
      runner = Runner.new
 
-     runner.run name, jar_file, java_opts, args    
+     runner.run_jar name, jar_file, java_opts, args    
    end
+
+    def run_cp name, class_path, main_class, java_opts, args
+     runner = Runner.new
+
+     runner.run_cp name, class_path, main_class, java_opts, args    
+   end  
 end
 
  

data/lib/jar_wrapper/runner.rb

@@ -1,6 +1,6 @@
 
   class Runner
-    def run name, jar_file, java_opts, args
+    def run_jar name, jar_file, java_opts, args
       @jar_file = jar_file
        
       #  forking = ARGV.include?("--fork") and ARGV.first != "install"
@@ -41,19 +41,28 @@
       #  return if no_runner
       #  return if jruby and not osx
       
-      construct_command(name, java_opts, args) do |command|
+      construct_command(true, name, java_opts, args) do |command|
         exec(command.join(" "))
       end
 
     end
-    
+
+    def run_cp name, class_path, main_class, java_opts, args
+      @main_class = main_class
+      @class_path = class_path
+      
+      construct_command(false, name, java_opts, args) do |command|
+        exec(command.join(" "))
+      end
+
+    end    
     # Trade in this Ruby instance for a JRuby instance, loading in a 
     # starter script and passing it some arguments.
     # If --jruby is passed, use the installed version of jruby, instead of 
     # our vendored jarred one (useful for gems).
-    def construct_command(name, java_opts=[], args="")
+    def construct_command(exec_mode, name, java_opts=[], args="")
       bin = File.expand_path(File.join(File.dirname(__FILE__), %w{.. .. bin #{name}}))
-      ENV['RUBYOPT'] = nil # disable other native args
+      #ENV['RUBYOPT'] = nil # disable other native args
 
       # Windows XP updates
 
@@ -67,7 +76,14 @@
       command.push(*java_args)
 
       command.push(*java_opts) if java_opts.length > 0
-       command.push("-jar", @jar_file)
+
+      if exec_mode
+        command.push("-jar", @jar_file)
+      else
+        command.push("-cp", @class_path)
+        command.push(@main_class)
+      end
+
       #command.push("-Djruby.memory.max=500m", "-Djruby.stack.max=1024k", "-cp", jruby_complete, "org.jruby.Main")
 
       command.push "--debug" if debug_mode?

data/winstone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{winstone}
-  s.version = "0.2.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Alexander Shvets}]
-  s.date = %q{2011-09-22}
+  s.date = %q{2011-09-23}
   s.description = %q{Gem wrapper for winstone server.}
   s.email = %q{alexander.shvets@gmail.com}
   s.executables = [%q{winstone}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winstone
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-09-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156205460 !ruby/object:Gem::Requirement
+  requirement: &2153166760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156205460
+  version_requirements: *2153166760
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &2156204120 !ruby/object:Gem::Requirement
+  requirement: &2153166040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156204120
+  version_requirements: *2153166040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156202340 !ruby/object:Gem::Requirement
+  requirement: &2153165260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156202340
+  version_requirements: *2153165260
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &2156200720 !ruby/object:Gem::Requirement
+  requirement: &2153164420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156200720
+  version_requirements: *2153164420
 description: Gem wrapper for winstone server.
 email: alexander.shvets@gmail.com
 executables: