unicorn-rails 1.1.0 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 6f3d9bfccaf76671ebab836a7856d87426f58887
4
+ data.tar.gz: 73c3af6bbc6b9acd6d4c2ff15c602143b6806da0
5
+ SHA512:
6
+ metadata.gz: bb518ae26fe4b55096e071aa7f0aba781735a99137ce7ed57c987a8d1e6db0e493e76e473c606e1dbdf45c599da3b89048f99d067a303e7e9d6eba6d499b4efc
7
+ data.tar.gz: 7ffbd0033b7c1ae8e6c021b77b056455a9d8fd3a31f12d41316cde51757a028af2584171932570f2be1e824d66b9224cdc29638bf79dd695272ba3372f48a13e
data/lib/unicorn/rails.rb CHANGED
@@ -12,12 +12,15 @@ module Rack
12
12
  class << self
13
13
  def run(app, options = {})
14
14
  unicorn_options = {}
15
- unicorn_options[:listeners] = ["#{options[:Host]}:#{options[:Port]}"]
16
- unicorn_options[:worker_processes] = (ENV["UNICORN_WORKERS"] || "1").to_i
17
- unicorn_options[:timeout] = 31 * 24 * 60 * 60
18
15
 
19
16
  if ::File.exist?("config/unicorn/#{environment}.rb")
20
17
  unicorn_options[:config_file] = "config/unicorn/#{environment}.rb"
18
+ elsif ::File.exist?("config/unicorn.rb")
19
+ unicorn_options[:config_file] = "config/unicorn.rb"
20
+ else
21
+ unicorn_options[:listeners] = ["#{options[:Host]}:#{options[:Port]}"]
22
+ unicorn_options[:timeout] = 31 * 24 * 60 * 60
23
+ unicorn_options[:worker_processes] = (ENV["UNICORN_WORKERS"] || "1").to_i
21
24
  end
22
25
 
23
26
  ::Unicorn::Launcher.daemonize!(unicorn_options) if options[:daemonize]
@@ -25,7 +28,7 @@ module Rack
25
28
  end
26
29
 
27
30
  def environment
28
- ENV['RACK_ENV'] || ENV['RAILS_ENV']
31
+ ENV["RACK_ENV"] || ENV["RAILS_ENV"]
29
32
  end
30
33
  end
31
34
  end
@@ -1,5 +1,5 @@
1
1
  module Unicorn
2
2
  module Rails
3
- VERSION = "1.1.0"
3
+ VERSION = "2.0.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,46 +1,41 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: unicorn-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
5
- prerelease:
4
+ version: 2.0.0
6
5
  platform: ruby
7
6
  authors:
8
7
  - Samuel Kadolph
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-06-27 00:00:00.000000000 Z
11
+ date: 2014-04-17 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rack
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
- - - ! '>='
17
+ - - ">="
20
18
  - !ruby/object:Gem::Version
21
19
  version: '0'
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
- - - ! '>='
24
+ - - ">="
28
25
  - !ruby/object:Gem::Version
29
26
  version: '0'
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: unicorn
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - ">="
36
32
  - !ruby/object:Gem::Version
37
33
  version: '0'
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - ">="
44
39
  - !ruby/object:Gem::Version
45
40
  version: '0'
46
41
  description: unicorn-rails overrides the Rack::Handler.default method to return Rack::Handler::Unicorn
@@ -51,32 +46,31 @@ executables: []
51
46
  extensions: []
52
47
  extra_rdoc_files: []
53
48
  files:
54
- - lib/unicorn/rails/version.rb
55
- - lib/unicorn/rails.rb
56
49
  - lib/unicorn-rails.rb
50
+ - lib/unicorn/rails.rb
51
+ - lib/unicorn/rails/version.rb
57
52
  homepage: https://github.com/samuelkadolph/unicorn-rails
58
53
  licenses: []
54
+ metadata: {}
59
55
  post_install_message:
60
56
  rdoc_options: []
61
57
  require_paths:
62
58
  - lib
63
59
  required_ruby_version: !ruby/object:Gem::Requirement
64
- none: false
65
60
  requirements:
66
- - - ! '>='
61
+ - - ">="
67
62
  - !ruby/object:Gem::Version
68
63
  version: 1.8.7
69
64
  required_rubygems_version: !ruby/object:Gem::Requirement
70
- none: false
71
65
  requirements:
72
- - - ! '>='
66
+ - - ">="
73
67
  - !ruby/object:Gem::Version
74
68
  version: '0'
75
69
  requirements: []
76
70
  rubyforge_project:
77
- rubygems_version: 1.8.25
71
+ rubygems_version: 2.2.2
78
72
  signing_key:
79
- specification_version: 3
73
+ specification_version: 4
80
74
  summary: unicorn-rails is a simple gem that sets the default server for rack (and
81
75
  rails) to unicorn.
82
76
  test_files: []