golden_brindle 0.0.4 → 0.0.5

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.authors = ["Alexander Simonov"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.add_dependency "gem_plugin", ">= 0.2.3"
-    gem.add_dependency "unicorn", ">= 0.99"
+    gem.add_dependency "unicorn", ">= 1.00"
     gem.version = GoldenBrindle::Const::VERSION
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/golden_brindle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{golden_brindle}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Simonov"]
-  s.date = %q{2010-06-06}
+  s.date = %q{2010-07-03}
   s.default_executable = %q{golden_brindle}
   s.description = %q{Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel}
   s.email = %q{alex@simonov.me}
@@ -48,8 +48,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel}
   s.test_files = [
-    "test/test_golden_brindle.rb",
-     "test/helper.rb"
+    "test/helper.rb",
+     "test/test_golden_brindle.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -59,16 +59,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<gem_plugin>, [">= 0.2.3"])
-      s.add_runtime_dependency(%q<unicorn>, [">= 0.99"])
+      s.add_runtime_dependency(%q<unicorn>, [">= 1.00"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<gem_plugin>, [">= 0.2.3"])
-      s.add_dependency(%q<unicorn>, [">= 0.99"])
+      s.add_dependency(%q<unicorn>, [">= 1.00"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<gem_plugin>, [">= 0.2.3"])
-    s.add_dependency(%q<unicorn>, [">= 0.99"])
+    s.add_dependency(%q<unicorn>, [">= 1.00"])
   end
 end
 

data/lib/golden_brindle/configure.rb

@@ -59,5 +59,4 @@ module Brindle
     
   end
   
-end
-
+end

data/lib/golden_brindle/const.rb

@@ -3,7 +3,7 @@ module GoldenBrindle
   module Const
     
     # current version
-    VERSION="0.0.4".freeze
+    VERSION="0.0.5".freeze
     # main banner
     BANNER = "Usage: golden_brindle <command> [options]".freeze
     

data/lib/golden_brindle/start.rb

@@ -27,12 +27,36 @@ module Brindle
       ]
     end
     
+    
+    #
+    # Rails 3 dispatcher support
+    # Code from unicorn_rails script
+    #
+    def rails_dispatcher
+      if ::Rails::VERSION::MAJOR >= 3 && ::File.exist?('config/application.rb')
+        if ::File.read('config/application.rb') =~ /^module\s+([\w:]+)\s*$/
+          app_module = Object.const_get($1)
+          begin
+            result = app_module::Application
+          rescue NameError
+          end
+        end
+      end
+
+      if result.nil? && defined?(ActionController::Dispatcher)
+        result = ActionController::Dispatcher.new
+      end
+
+      result || abort("Unable to locate the application dispatcher class")
+    end
+    
     def rails_builder(daemonize)
       # this lambda won't run until after forking if preload_app is false
       lambda do ||
         # Load Rails
         begin
-          require 'config/boot'
+          require ::File.expand_path('config/boot')
+          require ::File.expand_path('config/environment')
         rescue LoadError => err
           abort "#$0 must be run inside RAILS_ROOT: #{err.inspect}"
         end
@@ -42,48 +66,43 @@ module Brindle
         defined?(::Rails::VERSION::STRING) or
           abort "Rails::VERSION::STRING not defined by config/{boot,environment}"
         # it seems Rails >=2.2 support Rack, but only >=2.3 requires it
-        old_rails = case ::Rails::VERSION::MAJOR
-        when 0, 1 then true
-        when 2 then Rails::VERSION::MINOR < 3 ? true : false
-        else
+        old_rails = if ::Rails::VERSION::MAJOR >= 3
           false
-        end
-
-        inner_app = if old_rails
-          require 'unicorn/app/old_rails'
-          Unicorn::App::OldRails.new
         else
-          ActionController::Dispatcher.new
+          return false if ( ::Rails::VERSION::MAJOR == 2 && ::Rails::VERSION::MINOR >= 3 )  
+          true
         end
 
         Rack::Builder.new do
           map_path = ENV['RAILS_RELATIVE_URL_ROOT'] || '/'
-          if inner_app.class.to_s == "Unicorn::App::OldRails"
+          if old_rails
             if map_path != '/'
               # patches + tests welcome, but I really cbf to deal with this
               # since all apps I've ever dealt with just use "/" ...
-              $stderr.puts "relative URL roots may not work for older Rails"
+              warn "relative URL roots may not work for older Rails"
             end
-            $stderr.puts "LogTailer not available for Rails < 2.3" unless daemonize
-            $stderr.puts "Debugger not available" if $DEBUG
+            warn "LogTailer not available for Rails < 2.3" unless daemonize
+            warn "Debugger not available" if $DEBUG
+            require 'unicorn/app/old_rails'
             map(map_path) do
               use Unicorn::App::OldRails::Static
-              run inner_app
+              run Unicorn::App::OldRails.new
             end
           else
             use Rails::Rack::LogTailer unless daemonize
             use Rails::Rack::Debugger if $DEBUG
             map(map_path) do
-              use Rails::Rack::Static
-              run inner_app
+              unless defined?(ActionDispatch::Static)
+                use Rails::Rack::Static
+              end
+              run rails_dispatcher
             end
           end
         end.to_app
       end
     end  
     
-    def validate
-      
+    def validate    
       if @config_file
         valid_exists?(@config_file, "Config file not there: #@config_file")
         return false unless @valid
@@ -112,7 +131,7 @@ module Brindle
       options = { :listeners => []}
       options[:pid] = @pid_file
       options[:config_file] = @config_script
-      options[:worker_processes] = @workers
+      options[:worker_processes] = @workers.to_i
       options[:working_directory] = @cwd
       options[:timeout] = @timeout
       # set user via Unicorn options. If we don't set group - then use only user

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: golden_brindle
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alexander Simonov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 +03:00
+date: 2010-07-03 00:00:00 +03:00
 default_executable: golden_brindle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,11 +56,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 205
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 99
-        version: "0.99"
+        version: "1.00"
   type: :runtime
   version_requirements: *id003
 description: Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel
@@ -130,5 +130,5 @@ signing_key:
 specification_version: 3
 summary: Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel
 test_files: 
-- test/test_golden_brindle.rb
 - test/helper.rb
+- test/test_golden_brindle.rb