torquebox 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42431c4de2602c3ca1ccb6accf1477a7a1b92e60
-  data.tar.gz: 39bdba3ce60ee76a182601c00375bfd36d3af877
+  metadata.gz: 4c903d9f7e1d4ded3e5f1c603744da4347f9a032
+  data.tar.gz: a592ae6717daf437e206ae4025f26a073d119557
 SHA512:
-  metadata.gz: d4f6a16943923c149fbd94b19dd872918bbcab0b26cfda653e16406dc4f9383207d822188a71feb1098ba7cdcf3afde5b12556bf071350dd1937610cf1947608
-  data.tar.gz: 7968be58159c33da9c373eef7437dc44a8379109d7591cea1ff807b9cf780681528f1064649573a419ded73b0b7628d83cf045889a044279cf1ece355deab7cf
+  metadata.gz: fc26d453f0bf192e1f4331721f293a83ce8c0dfa2110fcc60afdc1f156cdd7e397272a888fee6a8a9f5161f2cf65d108f220a22096ed420ca4411a6f87cb34b9
+  data.tar.gz: b749d25dd1a54f57768d61734a9edf0c2bd1302da895159dfa58b5ed06cb08772dc8cf1e6cb31e603f971260a872af0f18a6589a52b3cbefcc8abd5d66b1a67e

data/bin/torquebox

@@ -199,13 +199,19 @@ class TorqueBoxCommand < Thor
 
   map "exec" => "tb_exec"
   desc "exec [KNOB_FILE] [COMMAND]", "Execute a command within the context of a TorqueBox application"
-  method_option :no_bundle, :aliases => '-nb', :type => :boolean, :desc => "Run without `bundle exec`"
+  method_option :no_bundle, :aliases => '-n', :type => :boolean, :desc => "Run without `bundle exec`"
   def tb_exec(knob_file, command)
     help(__method__) and return if options.help
     TorqueBox::Server.setup_environment
     jruby_path = File.join(ENV['JRUBY_HOME'], "bin")
     knob_path = File.expand_path(knob_file)
-    bundle_exec = options.no_bundler_exec ? "" : "bundle exec"
+    extract_cmd = begin
+                    `jar > /dev/null 2>&1`
+                    $?.success? && "jar -xf" || "unzip -q"
+                  rescue
+                    "unzip -q"
+                  end
+    bundle_exec = options.no_bundle ? "" : "bundle exec"
     rb_version = case RUBY_VERSION
                  when /^1\.8\./ then '1.8'
                  when /^1\.9\./ then '1.9'
@@ -213,7 +219,7 @@ class TorqueBoxCommand < Thor
                  end
     ENV['PATH'] = "#{ENV['PATH']}:#{jruby_path}"
     Dir.mktmpdir do |tmpdir|
-      commands = ["cd #{tmpdir}", "jar -xf #{knob_path}"]
+      commands = ["cd #{tmpdir}", "#{extract_cmd} #{knob_path}"]
       commands << "chmod +x vendor/bundle/jruby/#{rb_version}/bin/*"
       commands << "jruby -S #{bundle_exec} #{command}"
       exec(commands.join(" && "))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torquebox
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: torquebox-core
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -30,12 +30,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -44,12 +44,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -58,12 +58,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -72,12 +72,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -86,12 +86,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -100,12 +100,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -114,12 +114,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -128,12 +128,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -142,12 +142,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency