torquebox 2.1.1 → 2.1.2

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 (2) hide show
  1. data/bin/torquebox +2 -34
  2. metadata +13 -13
data/bin/torquebox CHANGED
@@ -18,7 +18,6 @@
18
18
  # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
19
19
 
20
20
  require 'rubygems'
21
- gem 'thor', '0.14.6'
22
21
 
23
22
  require 'thor'
24
23
  require 'torquebox-rake-support'
@@ -27,8 +26,6 @@ require 'torquebox/rails'
27
26
 
28
27
  class TorqueBoxCommand < Thor
29
28
 
30
- TASK_ORDER = %w(deploy undeploy start rails archive cli env help)
31
-
32
29
  map "run" => "start"
33
30
  desc "run", "Run TorqueBox (binds to localhost, use -b to override)"
34
31
  method_option :clustered, :type => :boolean, :desc => "Run TorqueBox in clustered mode"
@@ -55,10 +52,10 @@ class TorqueBoxCommand < Thor
55
52
  def rails(root = ".")
56
53
  ARGV.shift
57
54
  TorqueBox::Server.setup_environment
58
- if File.exist?( root )
55
+ if File.exist?( File.join(root, 'config', 'environment.rb') )
59
56
  TorqueBox::Rails.apply_template( root )
60
57
  else
61
- TorqueBox::Rails.new_app
58
+ TorqueBox::Rails.new_app( root )
62
59
  end
63
60
  end
64
61
 
@@ -163,35 +160,6 @@ class TorqueBoxCommand < Thor
163
160
  end
164
161
  end
165
162
 
166
- no_tasks {
167
- class << self
168
- # Override all_tasks and help methods in Thor to print options
169
- # out in the order we prefer
170
- alias_method :all_tasks_from_super, :all_tasks
171
-
172
- def all_tasks
173
- super_tasks = all_tasks_from_super
174
- tasks = Thor::CoreExt::OrderedHash.new
175
- TASK_ORDER.each do |task|
176
- tasks[task] = super_tasks[task] unless super_tasks[task].nil?
177
- end
178
- tasks.merge(super_tasks)
179
- end
180
-
181
- def help(shell, subcommand = false)
182
- list = printable_tasks(true, subcommand)
183
- Thor::Util.thor_classes_in(self).each do |klass|
184
- list += klass.printable_tasks(false)
185
- end
186
-
187
- shell.say "Tasks:"
188
- shell.print_table(list, :ident => 2, :truncate => true)
189
- shell.say
190
- class_options_help(shell)
191
- end
192
- end
193
- }
194
-
195
163
  end
196
164
 
197
165
  TorqueBoxCommand.start
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: torquebox
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 2.1.1
5
+ version: 2.1.2
6
6
  platform: ruby
7
7
  authors:
8
8
  - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2012-08-27 00:00:00 Z
13
+ date: 2012-09-24 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: torquebox-core
@@ -20,7 +20,7 @@ dependencies:
20
20
  requirements:
21
21
  - - "="
22
22
  - !ruby/object:Gem::Version
23
- version: 2.1.1
23
+ version: 2.1.2
24
24
  type: :runtime
25
25
  version_requirements: *id001
26
26
  - !ruby/object:Gem::Dependency
@@ -31,7 +31,7 @@ dependencies:
31
31
  requirements:
32
32
  - - "="
33
33
  - !ruby/object:Gem::Version
34
- version: 2.1.1
34
+ version: 2.1.2
35
35
  type: :runtime
36
36
  version_requirements: *id002
37
37
  - !ruby/object:Gem::Dependency
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - "="
44
44
  - !ruby/object:Gem::Version
45
- version: 2.1.1
45
+ version: 2.1.2
46
46
  type: :runtime
47
47
  version_requirements: *id003
48
48
  - !ruby/object:Gem::Dependency
@@ -53,7 +53,7 @@ dependencies:
53
53
  requirements:
54
54
  - - "="
55
55
  - !ruby/object:Gem::Version
56
- version: 2.1.1
56
+ version: 2.1.2
57
57
  type: :runtime
58
58
  version_requirements: *id004
59
59
  - !ruby/object:Gem::Dependency
@@ -64,7 +64,7 @@ dependencies:
64
64
  requirements:
65
65
  - - "="
66
66
  - !ruby/object:Gem::Version
67
- version: 2.1.1
67
+ version: 2.1.2
68
68
  type: :runtime
69
69
  version_requirements: *id005
70
70
  - !ruby/object:Gem::Dependency
@@ -75,7 +75,7 @@ dependencies:
75
75
  requirements:
76
76
  - - "="
77
77
  - !ruby/object:Gem::Version
78
- version: 2.1.1
78
+ version: 2.1.2
79
79
  type: :runtime
80
80
  version_requirements: *id006
81
81
  - !ruby/object:Gem::Dependency
@@ -86,7 +86,7 @@ dependencies:
86
86
  requirements:
87
87
  - - "="
88
88
  - !ruby/object:Gem::Version
89
- version: 2.1.1
89
+ version: 2.1.2
90
90
  type: :runtime
91
91
  version_requirements: *id007
92
92
  - !ruby/object:Gem::Dependency
@@ -97,7 +97,7 @@ dependencies:
97
97
  requirements:
98
98
  - - "="
99
99
  - !ruby/object:Gem::Version
100
- version: 2.1.1
100
+ version: 2.1.2
101
101
  type: :runtime
102
102
  version_requirements: *id008
103
103
  - !ruby/object:Gem::Dependency
@@ -108,7 +108,7 @@ dependencies:
108
108
  requirements:
109
109
  - - "="
110
110
  - !ruby/object:Gem::Version
111
- version: 2.1.1
111
+ version: 2.1.2
112
112
  type: :runtime
113
113
  version_requirements: *id009
114
114
  - !ruby/object:Gem::Dependency
@@ -119,7 +119,7 @@ dependencies:
119
119
  requirements:
120
120
  - - "="
121
121
  - !ruby/object:Gem::Version
122
- version: 2.1.1
122
+ version: 2.1.2
123
123
  type: :runtime
124
124
  version_requirements: *id010
125
125
  - !ruby/object:Gem::Dependency
@@ -128,7 +128,7 @@ dependencies:
128
128
  requirement: &id011 !ruby/object:Gem::Requirement
129
129
  none: false
130
130
  requirements:
131
- - - "="
131
+ - - ">="
132
132
  - !ruby/object:Gem::Version
133
133
  version: 0.14.6
134
134
  type: :runtime