winstone 0.3.1 → 0.3.2

data/README

@@ -7,7 +7,8 @@
 
 == Usage
 
-    winstone install  - installs winstone
-    winstone <params> -  runs the winstone server 
-    winstone lite <params> -  runs the winstone (lite) server 
+    winstone install            - installs winstone
+    winstone <params>           -  runs the winstone server
+    winstone lite <params>      -  runs the winstone (lite) server
+    winstone tool <tool-params> - runs winstone tool
       

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bin/winstone

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 
-$:.unshift(File::join(File::dirname(File::dirname(__FILE__)), "lib"))
+#$:.unshift(File::join(File::dirname(File::dirname(__FILE__)), "lib"))
 
 require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
 require 'jar_wrapper'
 
 class WinstoneStarter
+  WINSTONE_VERSION = "0.9.10"
 
   USAGE= <<-TEXT
     Usage:
@@ -18,20 +19,20 @@ class WinstoneStarter
 
   def initialize
     @wrapper = JarWrapper.new
+    @wrapper.java_opts = ["-Xmx1024m", "-Xss1024k" ]
   end
 
   def run
     install_dir = ENV['HOME'] + "/.winstone/assets"
-    verion = "0.9.10"
-    
-    source1 = "http://surfnet.dl.sourceforge.net/project/winstone/winstone/v#{verion}/winstone-#{verion}.jar"
-    source2 = "http://surfnet.dl.sourceforge.net/project/winstone/winstone/v#{verion}/winstone-lite-#{verion}.jar"
 
-    target1 = install_dir + "/winstone-#{verion}.jar"
-    target2 = install_dir + "/winstone-lite-#{verion}.jar"
+    source1 = "http://surfnet.dl.sourceforge.net/project/winstone/winstone/v#{WINSTONE_VERSION}/winstone-#{WINSTONE_VERSION}.jar"
+    source2 = "http://surfnet.dl.sourceforge.net/project/winstone/winstone/v#{WINSTONE_VERSION}/winstone-lite-#{WINSTONE_VERSION}.jar"
 
-    jar_file1 = install_dir + "/winstone-#{verion}.jar"
-    jar_file2 = install_dir + "/winstone-lite-#{verion}.jar"
+    target1 = install_dir + "/winstone-#{WINSTONE_VERSION}.jar"
+    target2 = install_dir + "/winstone-lite-#{WINSTONE_VERSION}.jar"
+
+    jar_file1 = install_dir + "/winstone-#{WINSTONE_VERSION}.jar"
+    jar_file2 = install_dir + "/winstone-lite-#{WINSTONE_VERSION}.jar"
 
     param = ARGV.length == 0 ? "" : ARGV.first
 
@@ -45,14 +46,16 @@ class WinstoneStarter
       when 'help' then
         puts USAGE and return
       when 'lite' then
-        @wrapper.run_jar 'winstone', jar_file2, ["-Xmx1024m", "-Xss1024k" ], ARGV
+        @wrapper.jar_file = jar_file2
+        @wrapper.run 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
+        @wrapper.classpath = jar_file1
+        @wrapper.main_class = ARGV.shift
+        @wrapper.run ARGV
       else
-        @wrapper.run_jar 'winstone', jar_file1, ["-Xmx1024m", "-Xss1024k" ], ARGV
+         @wrapper.jar_file = jar_file1
+        @wrapper.run ARGV
     end
   end
 end

data/winstone.gemspec

@@ -5,14 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{winstone}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Alexander Shvets}]
+  s.authors = ["Alexander Shvets"]
   s.date = %q{2011-09-23}
+  s.default_executable = %q{winstone}
   s.description = %q{Gem wrapper for winstone server.}
   s.email = %q{alexander.shvets@gmail.com}
-  s.executables = [%q{winstone}]
+  s.executables = ["winstone"]
   s.extra_rdoc_files = [
     "README"
   ]
@@ -24,10 +25,6 @@ Gem::Specification.new do |s|
     "bin/Gemfile",
     "bin/winstone",
     "bin/winstone.bat",
-    "lib/jar_wrapper.rb",
-    "lib/jar_wrapper/jar_wrapper.rb",
-    "lib/jar_wrapper/jvm_options_probe.rb",
-    "lib/jar_wrapper/runner.rb",
     "winstone.gemspec"
   ]
   s.homepage = %q{http://github.com/shvets/winstone}
@@ -43,9 +40,9 @@ Gem::Specification.new do |s|
 
       -------------------------------------------------------------------------------
 }
-  s.require_paths = [%q{lib}]
-  s.requirements = [%q{none}]
-  s.rubygems_version = %q{1.8.6}
+  s.require_paths = ["lib"]
+  s.requirements = ["none"]
+  s.rubygems_version = %q{1.5.1}
   s.summary = %q{Gem wrapper for winstone server (Summary).}
 
   if s.respond_to? :specification_version then
@@ -54,19 +51,25 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<zip>, [">= 0"])
+      s.add_runtime_dependency(%q<jar_wrapper>, [">= 0"])
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<zip>, [">= 0"])
+      s.add_runtime_dependency(%q<jar_wrapper>, [">= 0"])
     else
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<zip>, [">= 0"])
+      s.add_dependency(%q<jar_wrapper>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<zip>, [">= 0"])
+      s.add_dependency(%q<jar_wrapper>, [">= 0"])
     end
   else
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<zip>, [">= 0"])
+    s.add_dependency(%q<jar_wrapper>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<zip>, [">= 0"])
+    s.add_dependency(%q<jar_wrapper>, [">= 0"])
   end
 end
 

metadata

@@ -1,106 +1,140 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: winstone
-version: !ruby/object:Gem::Version
-  version: 0.3.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.3.2
 platform: ruby
-authors:
-- Alexander Shvets
+authors: 
+  - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2153166760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2153166760
-- !ruby/object:Gem::Dependency
-  name: zip
-  requirement: &2153166040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2153166040
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2153165260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2153165260
-- !ruby/object:Gem::Dependency
-  name: zip
-  requirement: &2153164420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2153164420
+
+date: 2011-09-23 00:00:00 -04:00
+default_executable: winstone
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: jeweler
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id001
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: zip
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id002
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: jar_wrapper
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id003
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: jeweler
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id004
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: zip
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id005
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: jar_wrapper
+    version_requirements: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id006
+    prerelease: false
+    type: :runtime
 description: Gem wrapper for winstone server.
 email: alexander.shvets@gmail.com
-executables:
-- winstone
+executables: 
+  - winstone
 extensions: []
-extra_rdoc_files:
-- README
-files:
-- CHANGES
-- README
-- Rakefile
-- VERSION
-- bin/Gemfile
-- bin/winstone
-- bin/winstone.bat
-- lib/jar_wrapper.rb
-- lib/jar_wrapper/jar_wrapper.rb
-- lib/jar_wrapper/jvm_options_probe.rb
-- lib/jar_wrapper/runner.rb
-- winstone.gemspec
+
+extra_rdoc_files: 
+  - README
+files: 
+  - CHANGES
+  - README
+  - Rakefile
+  - VERSION
+  - bin/Gemfile
+  - bin/winstone
+  - bin/winstone.bat
+  - winstone.gemspec
+has_rdoc: true
 homepage: http://github.com/shvets/winstone
 licenses: []
-post_install_message: ! "\n      -------------------------------------------------------------------------------\n\n
-  \     Please now run:\n\n        $ winstone install\n\n      NB. This will download
-  jars that this gem needs to run from the internet.\n      It will put them into
-  ~/.winstone/assets.\n\n      -------------------------------------------------------------------------------\n"
+
+post_install_message: |
+  
+        -------------------------------------------------------------------------------
+  
+        Please now run:
+  
+          $ winstone install
+  
+        NB. This will download jars that this gem needs to run from the internet.
+        It will put them into ~/.winstone/assets.
+  
+        -------------------------------------------------------------------------------
+
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
-- none
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+requirements: 
+  - none
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Gem wrapper for winstone server (Summary).
 test_files: []
+

data/lib/jar_wrapper.rb

@@ -1,16 +0,0 @@
-require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
-
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'fileutils'
-require 'net/http'
-
-require 'jar_wrapper/jar_wrapper'
-require 'jar_wrapper/runner'
-require 'jar_wrapper/jvm_options_probe'
-
-require 'rbconfig'
-WINDOZE = Config::CONFIG['host_os'] =~ /mswin|mingw|windows/
-
-WINDOZE ? (require "zip/zipfilesystem") : (require 'zip/zip')

data/lib/jar_wrapper/jar_wrapper.rb

@@ -1,74 +0,0 @@
-require 'open-uri'
-
-class JarWrapper
-  def download_file_to(uri, destination_file)
-    print "  downloading #{uri}... "; $stdout.flush
-    
-    temp = destination_file + ".part"
-    FileUtils.mkdir_p(File.dirname(destination_file))
-    
-    File.open(temp, "wb") do |out_file|
-      open(uri) do |in_file| 
-        done = false
-        
-        while(!done) do
-          buffer = in_file.read(1024*1000)
-          out_file.write(buffer)
-            
-          if buffer.nil? || buffer.size == 0
-            done = true
-          else
-            print("#"); $stdout.flush             
-          end
-        end
-      end
-    end
-
-    if File.open(temp).read(200) =~ /Access Denied/
-      puts "\n\n*** Error downloading #{uri}, got Access Denied from S3."
-      FileUtils.rm_rf(temp)
-      exit
-    end
-
-     FileUtils.cp(temp, destination_file)
-     FileUtils.rm_rf(temp)
-     puts "\ndone!"
-   end
-
-   # unzip a .zip file into the directory it is located
-   def unzip_file(path)
-     print "unzipping #{path}..."; $stdout.flush
-     source = File.expand_path(path)
-     Dir.chdir(File.dirname(source)) do
-       Zip::ZipFile.open(source) do |zipfile|
-         zipfile.entries.each do |entry|
-           FileUtils.mkdir_p(File.dirname(entry.name))
-           begin
-             entry.extract
-           rescue Zip::ZipDestinationFileExistsError
-           end
-         end
-       end
-     end
-   end
-   
-   def install source, destination
-     download_file_to(source, destination)
-     
-     unzip_file(destination) if destination =~ /\.zip$/
-   end
-   
-   def run_jar name, jar_file, java_opts, args
-     runner = Runner.new
-
-     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/jvm_options_probe.rb

@@ -1,35 +0,0 @@
-require 'rbconfig'
-
-require 'open3' unless Config::CONFIG['host_os'] =~ /mswin|mingw|windows/
- 
-class JvmOptionsProbe
- 
-  def initialize
-    @d32 = @d64 = @client = false
-
-    if WINDOZE
-      @help = `java -h`
-      @d32 = (@help == `java -d32`) ? true : false
-      @d64 = (@help == `java -d64`) ? true : false
-      @client = (@help == `java -client`) ? true : false
-    else
-      @help = Open3.popen3("java -h")[2].readlines
-      @d32 = (@help == Open3.popen3("java -d32")[2].readlines) ? true : false
-      @d64 = (@help == Open3.popen3("java -d64")[2].readlines) ? true : false
-      @client = (@help == Open3.popen3("java -client")[2].readlines) ? true : false
-    end
-  end
- 
-  def can_use_d32?
-    @d32
-  end
- 
-  def can_use_d64?
-    @d64
-  end
- 
-  def can_use_client?
-    @client
-  end
-end
-

data/lib/jar_wrapper/runner.rb

@@ -1,134 +0,0 @@
-
-  class Runner
-    def run_jar name, jar_file, java_opts, args
-      @jar_file = jar_file
-       
-      #  forking = ARGV.include?("--fork") and ARGV.first != "install"
-      #  no_runner = ARGV.include?("--no-sub-jruby")
-      #  jruby = Config::CONFIG["RUBY_INSTALL_NAME"] == "jruby"
-      #  osx = !(RUBY_PLATFORM =~/(windows|linux)/)
-      #  begin
-      #    if forking and not jruby
-      #      # jRuby doesn't support fork() because of the runtime stuff...
-      #      forking = false
-      #      puts 'Forking failed, attempting to start anyway...' if (pid = fork) == -1
-      #      exit unless pid.nil? # kill the parent process
-      #      
-      #      if pid.nil?
-      #        # reopen the standard pipes to nothingness
-      #        # STDIN.reopen Redcar.null_device
-      #        # STDOUT.reopen Redcar.null_device, 'a'
-      #        STDERR.reopen STDOUT
-      #      end
-      #    elsif forking and SPOON_AVAILABLE and ::Spoon.supported?
-      #      # so we need to try something different...
-      #      
-      #      forking = false
-      #      construct_command do |command|
-      #        command.push('--silent')
-      #        ::Spoon.spawnp(*command)
-      #      end
-      #      exit 0
-      #    elsif forking
-      #      raise NotImplementedError, "Something weird has happened. Please contact us."
-      #    end
-      #  rescue NotImplementedError
-      #    puts $!.class.name + ": " + $!.message
-      #    puts "Forking isn't supported on this system. Sorry."
-      #    puts "Starting normally..."
-      #  end
-      #  
-      #  return if no_runner
-      #  return if jruby and not osx
-      
-      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(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
-
-      # Windows XP updates
-
-  #       if RUBY_PLATFORM =~ /window/
-  # bin = "\"#{bin}\""
-  # jruby_complete = "\"#{jruby_complete}\""
-  #       end      
-
-      # unfortuanately, ruby doesn't support [a, *b, c]
-      command = ["java"]
-      command.push(*java_args)
-
-      command.push(*java_opts) if java_opts.length > 0
-
-      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?
-      # command.push(bin)
-      # command.push(*cleaned_args)
-      # command.push("--no-sub-jruby", "--ignore-stdin")
-      command.push(*args)
-      
-      puts command.join(' ')
-      yield command
-    end
-    
-    # def cleaned_args
-    #   # We should never pass --fork to a subprocess
-    #   result = ARGV.find_all {|arg| arg != '--fork'}.map do |arg|
-    #     if arg =~ /--(.+)=(.+)/
-    #       "--" + $1 + "=\"" + $2 + "\""
-    #     else
-    #       arg
-    #     end
-    #   end
-    #   result.delete("install")
-    #   result
-    # end
-    
-    def debug_mode?
-      ARGV.include?("--debug")
-    end
-    
-    def java_args
-      str = []
-      if Config::CONFIG["host_os"] =~ /darwin/
-        str.push "-XstartOnFirstThread"
-      end
-      
-      # if ARGV.include?("--load-timings")
-      #   str.push "-Djruby.debug.loadService.timing=true"
-      # end
-      
-      jvm_options_probe = JvmOptionsProbe.new
-      
-      str.push "-d32" if jvm_options_probe.can_use_d32?
-      str.push "-client" if jvm_options_probe.can_use_client?
-      
-      str
-    end
-  end
-