torquebox-core 4.0.0.alpha1-java → 4.0.0.beta1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8cf11a23000d1db2bbf771b2d4a8ae8c177cc2d
-  data.tar.gz: b8875fb8ee9f5d3d144ecad52976ae5aa1e69f05
+  metadata.gz: a214188915ae4edc4146fdbaccc7f2486e90299c
+  data.tar.gz: 44b8ca8c0f8c71b082286e30ee4410fb0f785eae
 SHA512:
-  metadata.gz: 7f867844665d4c0f451b6de698c9b9f3d08ec046a65d0a3992e36c1040c9541990683d02d8373ccdbf22cc00690cf106e72dbb0179084d68054cf026eb449bfe
-  data.tar.gz: d57604b36264857fa2ce6d19db91b962f9450503255ab1c2a90635470a8a04736aeb02143460b654fd19133629e7b5a3aeaf6b6355502b5d90d427febb16e273
+  metadata.gz: ffa0c2cfd42df46a709a8f5dbeb69c76198351845d7d1a997cb04983210b6195478a674e7308225a670e3bf967e2f59e3bbe2860e70c45d66fb3d997130db5b9
+  data.tar.gz: 281bf2ff66a003b39b59ac608f8401dae5748562e56dd79ecb7c0b1ffe9a87b87a915ce649d61deecd96264dee2bb30599d284ced1cf294179db86752530d64f

data/bin/torquebox

@@ -17,4 +17,4 @@ java.lang.System.set_property('logback.configurationFile',
 
 require 'torquebox-core'
 
-cli = TorqueBox::CLI.new(ARGV)
+cli = TorqueBox::CLI.new(ARGV).run

data/lib/torquebox-core.rb

@@ -14,6 +14,11 @@
 
 require "pathname"
 
+# Set the Thread context classloader since many Java libs we
+# bring in use it to locate their classes
+java.lang.Thread.current_thread
+  .set_context_class_loader(JRuby.runtime.jruby_class_loader)
+
 module TorqueBox
 
   # @api private
@@ -38,6 +43,12 @@ module TorqueBox
       end
     end
   end
+
+  class << self
+    def in_wildfly?
+      !org.projectodd.wunderboss.WunderBoss.options.get('wildfly-service').nil?
+    end
+  end
 end
 
 Dir.glob("#{File.dirname(__FILE__)}/wunderboss-jars/*.jar") do |jar|
@@ -46,6 +57,7 @@ end
 
 TorqueBox::Jars.register_and_require("#{File.dirname(__FILE__)}/torquebox-core.jar")
 require 'torquebox/cli'
+require 'torquebox/cli/archive'
 require 'torquebox/cli/jar'
 require 'torquebox/cli/war'
 require 'torquebox/logger'

data/lib/torquebox/cli.rb

@@ -17,6 +17,8 @@ require 'optparse'
 module TorqueBox
   class CLI
 
+    attr_reader :parser
+
     class << self
       def extensions
         @extensions ||= {}
@@ -33,38 +35,42 @@ module TorqueBox
     end
 
     def initialize(argv)
+      @argv = argv
       require_torquebox_gems
       options = {}
-      extension = TorqueBox::CLI.extensions[argv.first]
-      parser = OptionParser.new
-      if extension
-        setup_extension_parser(extension, argv.shift, parser, options)
+      @extension = TorqueBox::CLI.extensions[argv.first]
+      @parser = OptionParser.new
+      if @extension
+        setup_extension_parser(@extension, argv.shift, @parser, options)
       else
-        setup_usage_parser(parser)
+        setup_usage_parser(@parser)
       end
 
-      setup_common_parser(parser, options)
+      setup_common_parser(@parser, options)
+      @options = options
+    end
+
+    def run
       begin
-        parser.parse!(argv)
+        @parser.parse!(@argv)
       rescue OptionParser::InvalidOption => e
         puts e.message
         puts
-        puts parser
+        puts @parser
         exit 1
       end
 
-
-      if extension
-        log_level = case options.delete(:verbosity)
+      if @extension
+        log_level = case @options.delete(:verbosity)
                     when :quiet then 'ERROR'
                     when :verbose then 'DEBUG'
                     when :really_verbose then 'TRACE'
                     else 'INFO'
                     end
         TorqueBox::Logger.log_level = log_level
-        extension.run(argv, options)
+        @extension.run(@argv, @options)
       else
-        puts parser
+        puts @parser
         exit 1
       end
     end
@@ -104,11 +110,11 @@ module TorqueBox
           options[:verbosity] = :verbose
         end
       end
-      parser.on_tail('-h', '--help', 'Show this message') do
+      parser.on('-h', '--help', 'Show this message') do
         puts parser
         exit 1
       end
-      parser.on_tail('--version', 'Show version') do
+      parser.on('--version', 'Show version') do
         puts "TorqueBox #{TorqueBox::VERSION}"
         exit 1
       end

data/lib/torquebox/cli/archive.rb

@@ -0,0 +1,76 @@
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'optparse'
+
+module TorqueBox
+  class CLI
+    class Archive
+      def initialize(argv)
+        @argv = argv
+        @main = ENV['TORQUEBOX_MAIN']
+        @rackup = ENV['TORQUEBOX_RACKUP']
+
+        if @main
+          @parser = OptionParser.new
+          @parser.on('-h', '--help', 'Show this message') do |arg|
+            puts @parser
+            exit 1
+          end
+        else
+          @cli = TorqueBox::CLI.new(['run'] + @argv)
+          @parser = @cli.parser
+        end
+
+        @parser.separator ""
+        @parser.separator "Archive options:"
+        @parser.on('-S SCRIPT',
+                   'Run a script from inside the archive (rake tasks, etc)') do |arg|
+          # Treat any unprocessed args as belonging to -S so that things like
+          # "java -jar foo.jar -S torquebox help" work without quotes
+          arg = ([arg] + @argv).join(' ')
+          app_jar = java.lang.System.get_property("torquebox.app_jar")
+          load_path = $LOAD_PATH.map { |entry| "-I#{entry}" }.join(' ')
+          jars = Dir.glob("../jars/*.jar").map { |j| "-r#{j}" }.join(' ')
+          # PWD is $tmpdir/app and jruby.jar is $tmpdir/jars/jruby.jar
+          Kernel.exec("java -Dtorquebox.app_jar=#{app_jar} \
+                      -Djava.io.tmpdir=#{java.lang.System.get_property('java.io.tmpdir')} \
+                      -jar ../jars/jruby.jar #{load_path} -r#{app_jar} \
+                      #{jars} -rbundler/setup -rtorquebox/cli/archive_cleaner \
+                      -S #{arg}")
+        end
+      end
+
+      def run
+        @parser.parse!(@argv)
+
+        if @main
+          require @main
+        else
+          require 'torquebox-web'
+          if TorqueBox.in_wildfly?
+            TorqueBox::Web.run(:rackup => @rackup)
+          else
+            @cli.run
+          end
+        end
+      rescue OptionParser::InvalidOption => e
+        puts e.message
+        puts
+        puts @parser
+        exit 1
+      end
+    end
+  end
+end

data/lib/torquebox/cli/archive_cleaner.rb

@@ -0,0 +1,35 @@
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'fileutils'
+
+at_exit do
+  # Clean up any temporary files left around by our jar unpacking
+  # shenanigans. This is only used when executing a script inside
+  # an archive, which ends up calling Kernel.exec and bypassing the
+  # typical temp file cleaning mechanisms.
+  java_tmpdir = File.expand_path(java.lang.System.get_property('java.io.tmpdir'))
+  app_jar = java.lang.System.get_property('torquebox.app_jar')
+  paths = $LOAD_PATH + [app_jar]
+  path_pattern = %r{^(#{java_tmpdir}/wunderboss.+?/).+}
+  paths.each do |path|
+    path = File.expand_path(path)
+    if path =~ path_pattern
+      dir = $1
+      if Dir.exist?(dir)
+        FileUtils.rm_rf(dir)
+      end
+    end
+  end
+end

data/lib/torquebox/cli/jar.rb

@@ -22,17 +22,8 @@ module TorqueBox
   class CLI
     class Jar
 
-      DEFAULT_INIT = "require 'torquebox-web'; \
-if org.projectodd.wunderboss.WunderBoss.options.get('wildfly-service').nil?; \
-  begin; \
-    TorqueBox::CLI.new(ARGV.unshift('run')); \
-  rescue SystemExit => e; \
-    status = e.respond_to?(:status) ? e.status : 0; \
-    java.lang.System.exit(status); \
-  end; \
-else; \
-  TorqueBox::Web.run(:rackup => '$$rackup$$'); \
-end;"
+      DEFAULT_INIT = "require 'torquebox-core'; \
+        TorqueBox::CLI::Archive.new(ARGV).run;"
 
       def initialize
         @logger = org.projectodd.wunderboss.WunderBoss.logger('TorqueBox')
@@ -86,6 +77,12 @@ end;"
            :name => :main,
            :switch => '--main MAIN',
            :description => 'File to require to bootstrap the application (if not given, assumes a web app)'
+         },
+         {
+           :name => :exclude,
+           :switch => '--exclude EXCLUDES',
+           :description => 'File paths to exclude from bundled jar',
+           :type => Array
          }]
       end
 
@@ -109,14 +106,14 @@ end;"
 
       def run(_argv, options)
         options = option_defaults.merge(options)
-        jar_path = File.join(options[:destination], options[:jar_name])
+        jar_path = File.expand_path(File.join(options[:destination], options[:jar_name]))
         @logger.debug("Creating jar with options {}", options.inspect)
 
+        init = DEFAULT_INIT
         if options[:main]
-          init = "require '#{options[:main]}'"
-        else
-          init = DEFAULT_INIT.sub('$$rackup$$', options[:rackup])
+          init = "ENV['TORQUEBOX_MAIN'] = '#{options[:main]}'; #{init}"
         end
+        init = "ENV['TORQUEBOX_RACKUP'] = '#{options[:rackup]}'; #{init}"
 
         jar_builder = org.torquebox.core.JarBuilder.new
         jar_builder.add_manifest_attribute("Main-Class", "org.torquebox.core.TorqueBoxMain")
@@ -128,7 +125,7 @@ end;"
           add_jruby_files(jar_builder)
         end
 
-        add_app_files(jar_builder)
+        add_app_files(jar_builder, options)
 
         if options[:bundle_gems]
           tmpdir = Dir.mktmpdir("tmptorqueboxjar", ".")
@@ -168,13 +165,17 @@ end;"
         add_jar(jar_builder, "#{rb_config['libdir']}/jruby.jar")
       end
 
-      def add_app_files(jar_builder)
+      def add_app_files(jar_builder, options)
         @logger.trace("Adding application files to jar...")
+        exclude = [%r{^/[^/]*\.(jar|war)}]
+        if options[:exclude]
+          exclude += options[:exclude].map { |e| Regexp.new("^#{e}") }
+        end
         add_files(jar_builder,
                   :file_prefix => Dir.pwd,
                   :pattern => "/**/*",
                   :jar_prefix => "app",
-                  :exclude => [%r{^/[^/]*\.(jar|war)}])
+                  :exclude => exclude)
       end
 
       def add_bundler_files(jar_builder, tmpdir, bundle_without)
@@ -207,7 +208,7 @@ end;"
                   :pattern => "/{**/*,.bundle/**/*}",
                   :jar_prefix => "app",
                   :exclude => TorqueBox::Jars.list.map { |j| File.basename(j)  })
-        Gem.default_path.each do |prefix|
+        Gem.path.each do |prefix|
           add_files(jar_builder,
                     :file_prefix => prefix,
                     :pattern => "/**/bundler-#{Bundler::VERSION}{*,/**/*}",
@@ -301,7 +302,11 @@ end;"
       end
 
       def eval_in_new_ruby(script)
-        ruby = org.jruby.Ruby.new_instance
+        # Copy our environment to the new Ruby runtime
+        config = org.jruby.RubyInstanceConfig.new
+        config.environment = ENV
+        config.current_directory = Dir.pwd
+        ruby = org.jruby.Ruby.new_instance(config)
         unless %W(DEBUG TRACE).include?(TorqueBox::Logger.log_level)
           dev_null = PLATFORM =~ /mswin/ ? 'NUL' : '/dev/null'
           ruby.evalScriptlet("$stdout = File.open('#{dev_null}', 'w')")
@@ -311,7 +316,7 @@ end;"
 
       def app_properties(env, init)
         env_str = env.map do |key, value|
-          "ENV['#{key}']||='#{value}';"
+          "ENV['#{key}'] ||= '#{value}';"
         end.join(' ')
         classpath_str = @classpath.join(':')
 

data/lib/torquebox/cli/war.rb

@@ -56,15 +56,12 @@ module TorqueBox
           options[:rackup] = argv.shift
         end
         options = option_defaults.merge(options)
-        if options[:env]
-          options[:envvar]['RACK_ENV'] = options[:env]
-          options[:envvar]['RAILS_ENV'] = options[:env]
-        end
+        process_env(options)
         jar_options = options.dup
         jar_options.delete(:destination)
         jar_path = super(argv, jar_options)
         begin
-          war_path = File.join(options[:destination], options[:war_name])
+          war_path = File.expand_path(File.join(options[:destination], options[:war_name]))
           war_builder = org.torquebox.core.JarBuilder.new
 
           (options[:resource_paths] || []).each do |path|
@@ -74,11 +71,12 @@ module TorqueBox
                       :pattern => "**/*")
           end
 
+          add_main(war_builder)
           add_web_xml(war_builder)
           add_jboss_deployment_structure_xml(war_builder)
           add_jboss_web_xml(war_builder, options)
 
-          war_builder.add_file("WEB-INF/lib/#{File.basename(jar_path)}", jar_path)
+          war_builder.add_file("WEB-INF/lib/app.jar", jar_path)
 
           if File.exist?(war_path)
             @logger.info("Removing {}", war_path)
@@ -94,6 +92,21 @@ module TorqueBox
 
       protected
 
+      def process_env(options)
+        if options[:env]
+          options[:envvar] ||= {}
+          options[:envvar]['RACK_ENV'] = options[:env]
+          options[:envvar]['RAILS_ENV'] = options[:env]
+        end
+      end
+
+      def add_main(war_builder)
+        war_builder.add_manifest_attribute("Main-Class", "org.torquebox.core.TorqueBoxWarMain")
+        main_class = org.torquebox.core.TorqueBoxWarMain.java_class
+        main_path = main_class.name.gsub(".", "/") + ".class"
+        war_builder.add_resource(main_path, main_path)
+      end
+
       def add_web_xml(war_builder)
         unless war_builder.has_entry('WEB-INF/web.xml')
           war_builder.add_string('WEB-INF/web.xml',

data/lib/torquebox/version.rb

@@ -14,7 +14,7 @@
 
 
 module TorqueBox
-  VERSION = '4.0.0.alpha1'
-  WUNDERBOSS_VERSION = '1.x.incremental.174'
+  VERSION = '4.0.0.beta1'
+  WUNDERBOSS_VERSION = '0.8.0'
   WILDFLY_VERSION = '8.2.0.Final'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha1
+  version: 4.0.0.beta1
 platform: java
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbundler
@@ -76,29 +76,31 @@ files:
 - bin/torquebox
 - lib/torquebox-core.jar
 - lib/torquebox-core.rb
-- lib/resources/logback-cli.xml
-- lib/wunderboss-jars/slf4j-api-1.7.5.jar
-- lib/wunderboss-jars/logback-core-1.1.2.jar
-- lib/wunderboss-jars/wunderboss-core-1.x.incremental.174.jar
-- lib/wunderboss-jars/wunderboss-wildfly-1.x.incremental.174.jar
-- lib/wunderboss-jars/logback-classic-1.1.2.jar
-- lib/wunderboss-jars/jboss-logging-3.1.4.GA.jar
-- lib/wunderboss-jars/wunderboss-ruby-1.x.incremental.174.jar
-- lib/torquebox/logger.rb
-- lib/torquebox/option_utils.rb
-- lib/torquebox/cli.rb
-- lib/torquebox/codecs.rb
 - lib/torquebox/version.rb
 - lib/torquebox/spec_helpers.rb
-- lib/torquebox/cli/jar.rb
-- lib/torquebox/cli/war.rb
+- lib/torquebox/codecs.rb
+- lib/torquebox/option_utils.rb
+- lib/torquebox/logger.rb
+- lib/torquebox/cli.rb
+- lib/torquebox/codecs/marshal_smart.rb
 - lib/torquebox/codecs/marshal.rb
 - lib/torquebox/codecs/edn.rb
+- lib/torquebox/codecs/json.rb
 - lib/torquebox/codecs/marshal_base64.rb
-- lib/torquebox/codecs/marshal_smart.rb
 - lib/torquebox/codecs/text.rb
-- lib/torquebox/codecs/json.rb
-homepage: http://torquebox.org/torqbox
+- lib/torquebox/cli/archive_cleaner.rb
+- lib/torquebox/cli/war.rb
+- lib/torquebox/cli/jar.rb
+- lib/torquebox/cli/archive.rb
+- lib/wunderboss-jars/wunderboss-ruby-0.8.0.jar
+- lib/wunderboss-jars/logback-classic-1.1.2.jar
+- lib/wunderboss-jars/logback-core-1.1.2.jar
+- lib/wunderboss-jars/wunderboss-core-0.8.0.jar
+- lib/wunderboss-jars/jboss-logging-3.1.4.GA.jar
+- lib/wunderboss-jars/slf4j-api-1.7.5.jar
+- lib/wunderboss-jars/wunderboss-wildfly-0.8.0.jar
+- lib/resources/logback-cli.xml
+homepage: http://torquebox.org/4x
 licenses:
 - Apache-2.0
 metadata: {}
@@ -117,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements:
-- jar org.projectodd.wunderboss:wunderboss-ruby, 1.x.incremental.174
-- jar org.projectodd.wunderboss:wunderboss-wildfly, 1.x.incremental.174
+- jar org.projectodd.wunderboss:wunderboss-ruby, 0.8.0
+- jar org.projectodd.wunderboss:wunderboss-wildfly, 0.8.0
 rubyforge_project:
 rubygems_version: 2.1.9
 signing_key: