torquebox 3.0.2 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/bin/torquebox +9 -3
  3. metadata +22 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 42431c4de2602c3ca1ccb6accf1477a7a1b92e60
4
- data.tar.gz: 39bdba3ce60ee76a182601c00375bfd36d3af877
3
+ metadata.gz: 4c903d9f7e1d4ded3e5f1c603744da4347f9a032
4
+ data.tar.gz: a592ae6717daf437e206ae4025f26a073d119557
5
5
  SHA512:
6
- metadata.gz: d4f6a16943923c149fbd94b19dd872918bbcab0b26cfda653e16406dc4f9383207d822188a71feb1098ba7cdcf3afde5b12556bf071350dd1937610cf1947608
7
- data.tar.gz: 7968be58159c33da9c373eef7437dc44a8379109d7591cea1ff807b9cf780681528f1064649573a419ded73b0b7628d83cf045889a044279cf1ece355deab7cf
6
+ metadata.gz: fc26d453f0bf192e1f4331721f293a83ce8c0dfa2110fcc60afdc1f156cdd7e397272a888fee6a8a9f5161f2cf65d108f220a22096ed420ca4411a6f87cb34b9
7
+ data.tar.gz: b749d25dd1a54f57768d61734a9edf0c2bd1302da895159dfa58b5ed06cb08772dc8cf1e6cb31e603f971260a872af0f18a6589a52b3cbefcc8abd5d66b1a67e
data/bin/torquebox CHANGED
@@ -199,13 +199,19 @@ class TorqueBoxCommand < Thor
199
199
 
200
200
  map "exec" => "tb_exec"
201
201
  desc "exec [KNOB_FILE] [COMMAND]", "Execute a command within the context of a TorqueBox application"
202
- method_option :no_bundle, :aliases => '-nb', :type => :boolean, :desc => "Run without `bundle exec`"
202
+ method_option :no_bundle, :aliases => '-n', :type => :boolean, :desc => "Run without `bundle exec`"
203
203
  def tb_exec(knob_file, command)
204
204
  help(__method__) and return if options.help
205
205
  TorqueBox::Server.setup_environment
206
206
  jruby_path = File.join(ENV['JRUBY_HOME'], "bin")
207
207
  knob_path = File.expand_path(knob_file)
208
- bundle_exec = options.no_bundler_exec ? "" : "bundle exec"
208
+ extract_cmd = begin
209
+ `jar > /dev/null 2>&1`
210
+ $?.success? && "jar -xf" || "unzip -q"
211
+ rescue
212
+ "unzip -q"
213
+ end
214
+ bundle_exec = options.no_bundle ? "" : "bundle exec"
209
215
  rb_version = case RUBY_VERSION
210
216
  when /^1\.8\./ then '1.8'
211
217
  when /^1\.9\./ then '1.9'
@@ -213,7 +219,7 @@ class TorqueBoxCommand < Thor
213
219
  end
214
220
  ENV['PATH'] = "#{ENV['PATH']}:#{jruby_path}"
215
221
  Dir.mktmpdir do |tmpdir|
216
- commands = ["cd #{tmpdir}", "jar -xf #{knob_path}"]
222
+ commands = ["cd #{tmpdir}", "#{extract_cmd} #{knob_path}"]
217
223
  commands << "chmod +x vendor/bundle/jruby/#{rb_version}/bin/*"
218
224
  commands << "jruby -S #{bundle_exec} #{command}"
219
225
  exec(commands.join(" && "))
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: torquebox
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.2
4
+ version: 3.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - The TorqueBox Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-30 00:00:00.000000000 Z
11
+ date: 2014-03-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: torquebox-core
@@ -16,12 +16,12 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.0.2
19
+ version: 3.1.0
20
20
  requirement: !ruby/object:Gem::Requirement
21
21
  requirements:
22
22
  - - '='
23
23
  - !ruby/object:Gem::Version
24
- version: 3.0.2
24
+ version: 3.1.0
25
25
  prerelease: false
26
26
  type: :runtime
27
27
  - !ruby/object:Gem::Dependency
@@ -30,12 +30,12 @@ dependencies:
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.0.2
33
+ version: 3.1.0
34
34
  requirement: !ruby/object:Gem::Requirement
35
35
  requirements:
36
36
  - - '='
37
37
  - !ruby/object:Gem::Version
38
- version: 3.0.2
38
+ version: 3.1.0
39
39
  prerelease: false
40
40
  type: :runtime
41
41
  - !ruby/object:Gem::Dependency
@@ -44,12 +44,12 @@ dependencies:
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 3.0.2
47
+ version: 3.1.0
48
48
  requirement: !ruby/object:Gem::Requirement
49
49
  requirements:
50
50
  - - '='
51
51
  - !ruby/object:Gem::Version
52
- version: 3.0.2
52
+ version: 3.1.0
53
53
  prerelease: false
54
54
  type: :runtime
55
55
  - !ruby/object:Gem::Dependency
@@ -58,12 +58,12 @@ dependencies:
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 3.0.2
61
+ version: 3.1.0
62
62
  requirement: !ruby/object:Gem::Requirement
63
63
  requirements:
64
64
  - - '='
65
65
  - !ruby/object:Gem::Version
66
- version: 3.0.2
66
+ version: 3.1.0
67
67
  prerelease: false
68
68
  type: :runtime
69
69
  - !ruby/object:Gem::Dependency
@@ -72,12 +72,12 @@ dependencies:
72
72
  requirements:
73
73
  - - '='
74
74
  - !ruby/object:Gem::Version
75
- version: 3.0.2
75
+ version: 3.1.0
76
76
  requirement: !ruby/object:Gem::Requirement
77
77
  requirements:
78
78
  - - '='
79
79
  - !ruby/object:Gem::Version
80
- version: 3.0.2
80
+ version: 3.1.0
81
81
  prerelease: false
82
82
  type: :runtime
83
83
  - !ruby/object:Gem::Dependency
@@ -86,12 +86,12 @@ dependencies:
86
86
  requirements:
87
87
  - - '='
88
88
  - !ruby/object:Gem::Version
89
- version: 3.0.2
89
+ version: 3.1.0
90
90
  requirement: !ruby/object:Gem::Requirement
91
91
  requirements:
92
92
  - - '='
93
93
  - !ruby/object:Gem::Version
94
- version: 3.0.2
94
+ version: 3.1.0
95
95
  prerelease: false
96
96
  type: :runtime
97
97
  - !ruby/object:Gem::Dependency
@@ -100,12 +100,12 @@ dependencies:
100
100
  requirements:
101
101
  - - '='
102
102
  - !ruby/object:Gem::Version
103
- version: 3.0.2
103
+ version: 3.1.0
104
104
  requirement: !ruby/object:Gem::Requirement
105
105
  requirements:
106
106
  - - '='
107
107
  - !ruby/object:Gem::Version
108
- version: 3.0.2
108
+ version: 3.1.0
109
109
  prerelease: false
110
110
  type: :runtime
111
111
  - !ruby/object:Gem::Dependency
@@ -114,12 +114,12 @@ dependencies:
114
114
  requirements:
115
115
  - - '='
116
116
  - !ruby/object:Gem::Version
117
- version: 3.0.2
117
+ version: 3.1.0
118
118
  requirement: !ruby/object:Gem::Requirement
119
119
  requirements:
120
120
  - - '='
121
121
  - !ruby/object:Gem::Version
122
- version: 3.0.2
122
+ version: 3.1.0
123
123
  prerelease: false
124
124
  type: :runtime
125
125
  - !ruby/object:Gem::Dependency
@@ -128,12 +128,12 @@ dependencies:
128
128
  requirements:
129
129
  - - '='
130
130
  - !ruby/object:Gem::Version
131
- version: 3.0.2
131
+ version: 3.1.0
132
132
  requirement: !ruby/object:Gem::Requirement
133
133
  requirements:
134
134
  - - '='
135
135
  - !ruby/object:Gem::Version
136
- version: 3.0.2
136
+ version: 3.1.0
137
137
  prerelease: false
138
138
  type: :runtime
139
139
  - !ruby/object:Gem::Dependency
@@ -142,12 +142,12 @@ dependencies:
142
142
  requirements:
143
143
  - - '='
144
144
  - !ruby/object:Gem::Version
145
- version: 3.0.2
145
+ version: 3.1.0
146
146
  requirement: !ruby/object:Gem::Requirement
147
147
  requirements:
148
148
  - - '='
149
149
  - !ruby/object:Gem::Version
150
- version: 3.0.2
150
+ version: 3.1.0
151
151
  prerelease: false
152
152
  type: :runtime
153
153
  - !ruby/object:Gem::Dependency