unicorn-rails 1.1.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6f3d9bfccaf76671ebab836a7856d87426f58887
+  data.tar.gz: 73c3af6bbc6b9acd6d4c2ff15c602143b6806da0
+SHA512:
+  metadata.gz: bb518ae26fe4b55096e071aa7f0aba781735a99137ce7ed57c987a8d1e6db0e493e76e473c606e1dbdf45c599da3b89048f99d067a303e7e9d6eba6d499b4efc
+  data.tar.gz: 7ffbd0033b7c1ae8e6c021b77b056455a9d8fd3a31f12d41316cde51757a028af2584171932570f2be1e824d66b9224cdc29638bf79dd695272ba3372f48a13e

data/lib/unicorn/rails.rb

@@ -12,12 +12,15 @@ module Rack
       class << self
         def run(app, options = {})
           unicorn_options = {}
-          unicorn_options[:listeners] = ["#{options[:Host]}:#{options[:Port]}"]
-          unicorn_options[:worker_processes] = (ENV["UNICORN_WORKERS"] || "1").to_i
-          unicorn_options[:timeout] = 31 * 24 * 60 * 60
 
           if ::File.exist?("config/unicorn/#{environment}.rb")
             unicorn_options[:config_file] = "config/unicorn/#{environment}.rb"
+          elsif ::File.exist?("config/unicorn.rb")
+            unicorn_options[:config_file] = "config/unicorn.rb"
+          else
+            unicorn_options[:listeners] = ["#{options[:Host]}:#{options[:Port]}"]
+            unicorn_options[:timeout] = 31 * 24 * 60 * 60
+            unicorn_options[:worker_processes] = (ENV["UNICORN_WORKERS"] || "1").to_i
           end
 
           ::Unicorn::Launcher.daemonize!(unicorn_options) if options[:daemonize]
@@ -25,7 +28,7 @@ module Rack
         end
 
         def environment
-          ENV['RACK_ENV'] || ENV['RAILS_ENV']
+          ENV["RACK_ENV"] || ENV["RAILS_ENV"]
         end
       end
     end

data/lib/unicorn/rails/version.rb

@@ -1,5 +1,5 @@
 module Unicorn
   module Rails
-    VERSION = "1.1.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Samuel Kadolph
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: unicorn-rails overrides the Rack::Handler.default method to return Rack::Handler::Unicorn
@@ -51,32 +46,31 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/unicorn/rails/version.rb
-- lib/unicorn/rails.rb
 - lib/unicorn-rails.rb
+- lib/unicorn/rails.rb
+- lib/unicorn/rails/version.rb
 homepage: https://github.com/samuelkadolph/unicorn-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: unicorn-rails is a simple gem that sets the default server for rack (and
   rails) to unicorn.
 test_files: []