golden_brindle 0.1.1 → 0.2

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.2

data/golden_brindle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{golden_brindle}
-  s.version = "0.1.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Simonov"]
-  s.date = %q{2011-09-02}
+  s.date = %q{2011-09-03}
   s.default_executable = %q{golden_brindle}
   s.description = %q{Unicorn HTTP server multiple application runner tool}
   s.email = %q{alex@simonov.me}
@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
     "lib/golden_brindle/command.rb",
     "lib/golden_brindle/configure.rb",
     "lib/golden_brindle/const.rb",
+    "lib/golden_brindle/hooks.rb",
+    "lib/golden_brindle/rails_support.rb",
     "lib/golden_brindle/restart.rb",
     "lib/golden_brindle/start.rb",
     "lib/golden_brindle/stop.rb",

data/lib/golden_brindle/cluster.rb

@@ -13,8 +13,8 @@ module Cluster
     
     def validate
       @cwd = File.expand_path(@cwd)
-      valid_dir? @cwd, "Invalid path to golden_brindle configuration files: #@cwd"
-      return @valid
+      valid_dir? @cwd, "Invalid path to golden_brindle configuration files: #{@cwd}"
+      @valid
     end
 
     def run
@@ -22,9 +22,7 @@ module Cluster
       counter = 0
       errors = 0
       Dir.chdir @cwd do
-        confs =  Dir.glob("*.yml")
-        confs += Dir.glob("*.conf")
-        confs.each do |conf|
+        Dir.glob("**/*.{yml,conf}").each do |conf|
           cmd = "golden_brindle #{command} -C #{conf}"
           cmd += " -d" if command == "start" #daemonize only when start
           puts cmd if @verbose 
@@ -32,8 +30,7 @@ module Cluster
           puts output if @verbose
           status = $?.success?
           puts "golden_brindle #{command} returned an error." unless status
-          counter += 1 if status
-          errors += 1 unless status
+          status ? counter += 1 : errors += 1
         end
       end
       puts "Success:#{counter}; Errors: #{errors}"
@@ -43,7 +40,6 @@ module Cluster
   
   class Start < GemPlugin::Plugin "/commands"
     include Cluster::Base
-    
   end
   
   class Stop < GemPlugin::Plugin "/commands"

data/lib/golden_brindle/command.rb

@@ -7,7 +7,7 @@ module GoldenBrindle
     begin
       Process.kill(signal, pid)
     rescue Errno::ESRCH
-      puts "Process does not exist.  Not running."
+      puts "Process does not exist. Not running."
     end
     puts "Done."
   end
@@ -30,8 +30,7 @@ module GoldenBrindle
           end
         end
       end
-      
-      
+
       # Called by the subclass to setup the command and parse the argv arguments.
       # The call is destructive on argv since it uses the OptionParser#parse! function.
       def initialize(options={})
@@ -42,9 +41,7 @@ module GoldenBrindle
         # this is retarded, but it has to be done this way because -h and -v exit
         @done_validating = false
         @original_args = argv.dup
-
         configure
-
         # I need to add my own -h definition to prevent the -h by default from exiting.
         @opt.on_tail("-h", "--help", "Show this message") do
           @done_validating = true
@@ -58,7 +55,6 @@ module GoldenBrindle
             puts "Version #{GoldenBrindle::Const::VERSION}"
           end
         end
-
         @opt.parse! argv
       end
 
@@ -94,7 +90,7 @@ module GoldenBrindle
 
       # Returns true/false depending on whether the command is configured properly.
       def validate
-        return @valid
+        @valid
       end
 
       # Returns a help message.  Defaults to OptionParser#help which should be good.
@@ -108,10 +104,9 @@ module GoldenBrindle
         raise NotImplementedError
       end
 
-
       # Validates the given expression is true and prints the message if not, exiting.
       def valid?(exp, message)
-        if not @done_validating and (not exp)
+        if !@done_validating && !exp
           failure message
           @valid = false
           @done_validating = true
@@ -120,22 +115,21 @@ module GoldenBrindle
 
       # Validates that a file exists and if not displays the message
       def valid_exists?(file, message)
-        valid?(file != nil && File.exist?(file), message)
+        valid?(File.exist?(file), message)
       end
 
-
       # Validates that the file is a file and not a directory or something else.
       def valid_file?(file, message)
-        valid?(file != nil && File.file?(file), message)
+        valid?(File.file?(file), message)
       end
 
       # Validates that the given directory exists
       def valid_dir?(file, message)
-        valid?(file != nil && File.directory?(file), message)
+        valid?(File.directory?(file), message)
       end
       
       def can_change_user?
-          valid?(Process.euid.to_i == 0,"if you want to change workers UID/GID you must run script from root")
+        valid?(Process.euid.to_i == 0, "if you want to change workers UID/GID you must run script from root")
       end
 
       def valid_user?(user)
@@ -175,7 +169,7 @@ module GoldenBrindle
       def commands
         pmgr = GemPlugin::Manager.instance
         list = pmgr.plugins["/commands"].keys
-        return list.sort
+        list.sort
       end
 
       # Prints a list of available commands.
@@ -227,16 +221,16 @@ module GoldenBrindle
         # Normally the command is NOT valid right after being created
         # but sometimes (like with -h or -v) there's no further processing
         # needed so the command is already valid so we can skip it.
-        if not command.done_validating
-          if not command.validate
-            STDERR.puts "#{cmd_name} reported an error. Use goldent_brindle #{cmd_name} -h to get help."
+        if !command.done_validating
+          if !command.validate
+            STDERR.puts "#{cmd_name} reported an error. Use golden_brindle #{cmd_name} -h to get help."
             return false
           else
             command.run
           end
         end
 
-        return true
+        true
       end
     end
     

data/lib/golden_brindle/configure.rb

@@ -32,7 +32,7 @@ module Brindle
       valid_dir? File.dirname(@config_file), "Path to config file not valid: #{@config_file}"
       
       if @config_script
-        valid_exists?(@config_script, "Unicorn-specific config file not there: #@config_script")
+        valid_exists?(@config_script, "Unicorn-specific config file not there: #{@config_script}")
         return false unless @valid
       end
 
@@ -41,7 +41,7 @@ module Brindle
       valid_dir? File.dirname(@pid_file), "Path to pid file not valid: #@pid_file"
       valid_user? @user if @user
       valid_group? @group if @group
-      return @valid
+      @valid
     end
     
     def run

data/lib/golden_brindle/const.rb

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

data/lib/golden_brindle/hooks.rb

@@ -0,0 +1,70 @@
+module Brindle
+  module Hooks
+    def collect_hooks
+      [:after_fork, :after_reload, :before_fork, :before_exec].inject({}) do |memo, sym|
+        memo[sym] = send(sym)
+        memo
+      end
+    end
+
+    def after_fork
+      lambda do |server, worker|
+        defined?(ActiveRecord::Base) and
+          ActiveRecord::Base.establish_connection
+          # trying to change user and group
+        begin
+          # check if something not set in config or cli
+          unless @user.nil? || @group.nil?
+            uid, gid = Process.euid, Process.egid
+            user, group = @user, @group
+            target_uid = Etc.getpwnam(user).uid
+            target_gid = Etc.getgrnam(group).gid
+            worker.tmp.chown(target_uid, target_gid)
+            if uid != target_uid || gid != target_gid
+              Process.initgroups(user, target_gid)
+              Process::GID.change_privilege(target_gid)
+              Process::UID.change_privilege(target_uid)
+            end
+          end
+        rescue => e
+          if ENV['RAILS_ENV'] == 'development'
+            STDERR.puts "couldn't change user, oh well"
+          else
+            raise e
+          end
+        end
+      end
+    end
+
+    def before_fork
+      lambda do |server, worker|
+        defined?(ActiveRecord::Base) and
+          ActiveRecord::Base.connection.disconnect!
+        # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
+        if GC.respond_to?(:copy_on_write_friendly=)
+            GC.copy_on_write_friendly = true
+        end
+        old_pid = "#{server.config[:pid]}.oldbin"
+        if File.exists?(old_pid) && server.pid != old_pid
+          begin
+            Process.kill("QUIT", File.read(old_pid).to_i)
+          rescue Errno::ENOENT, Errno::ESRCH
+          end
+        end
+      end
+    end
+
+    def after_reload
+      lambda do
+        ::FileUtils.mkdir_p(%w(cache pids sessions sockets).map! { |d| "tmp/#{d}" })
+      end
+    end
+
+    def before_exec
+      lambda do |server|
+        ENV["BUNDLE_GEMFILE"] = "#{@cwd}/Gemfile" if @bundler
+      end
+    end
+
+  end
+end

data/lib/golden_brindle/rails_support.rb

@@ -0,0 +1,80 @@
+module Brindle
+  class RailsSupport
+    class << self
+
+      def rails3?
+        ::Rails::VERSION::MAJOR == 3
+      end
+
+      def rails2?
+        ::Rails::VERSION::MAJOR == 2
+      end
+
+      def support_rack?
+        return true if rails3?
+        return true if rails2? && ::Rails::VERSION::MINOR >= 3
+        false
+      end
+
+      def rails3_application
+        return unless rails3? || ::File.exist?('config/application.rb')
+        return Object.const_get($1)::Application if \
+           ::File.read('config/application.rb') =~ /^module\s+([\w:]+)\s*$/
+      rescue NameError
+        nil
+      end
+
+      def rails_dispatcher
+        result = rails3_application
+        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 ::File.expand_path('config/boot')
+            require ::File.expand_path('config/environment')
+          rescue LoadError => e
+            abort "#{$0} must be run inside RAILS_ROOT: #{e.inspect}"
+          end
+
+          defined?(::Rails::VERSION::STRING) or
+            abort "Rails::VERSION::STRING not defined by config/{boot,environment}"
+
+          old_rails = !support_rack?
+
+          ::Rack::Builder.new do
+            map_path = ENV['RAILS_RELATIVE_URL_ROOT'] || '/'
+            if old_rails
+              if map_path != '/'
+                warn "relative URL roots may not work for older Rails"
+              end
+              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 Unicorn::App::OldRails.new
+              end
+            else
+              use Rails::Rack::LogTailer unless daemonize
+              use Rails::Rack::Debugger if $DEBUG
+              map(map_path) do
+                unless defined?(ActionDispatch::Static)
+                  use Rails::Rack::Static
+                end
+                run Brindle::RailsSupport.rails_dispatcher
+              end
+            end
+          end.to_app
+        end
+      end
+
+    end
+  end
+end

data/lib/golden_brindle/restart.rb

@@ -24,7 +24,7 @@ module Brindle
       @cwd = File.expand_path(@cwd)
       valid_dir? @cwd, "Invalid path to application dir: #@cwd"
       valid_exists? File.join(@cwd,@pid_file), "PID file #@pid_file does not exist.  Not running?"
-      return @valid
+      @valid
     end
 
     def run

data/lib/golden_brindle/start.rb

@@ -1,8 +1,8 @@
-
 module Brindle
   
   class Start < GemPlugin::Plugin "/commands"
     include GoldenBrindle::Command::Base
+    include Hooks
     
     def configure
       options [
@@ -28,80 +28,7 @@ module Brindle
       ]
     end
     
-    
-    #
-    # Rails 3 dispatcher support
-    # Code from unicorn_rails script
-    #
-    def self.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 ::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
-
-        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
-          false
-        end
-
-        Rack::Builder.new do
-          map_path = ENV['RAILS_RELATIVE_URL_ROOT'] || '/'
-          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 "/" ...
-              warn "relative URL roots may not work for older Rails"
-            end
-            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 Unicorn::App::OldRails.new
-            end
-          else
-            use Rails::Rack::LogTailer unless daemonize
-            use Rails::Rack::Debugger if $DEBUG
-            map(map_path) do
-              unless defined?(ActionDispatch::Static)
-                use Rails::Rack::Static
-              end
-              run Brindle::Start.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
@@ -127,7 +54,44 @@ module Brindle
       valid_dir? File.dirname(File.join(@cwd,@pid_file)), "Path to pid file not valid: #{@pid_file}"
       valid_user? @user if @user
       valid_group? @group if @group
-      return @valid
+      @valid
+    end
+
+    def default_options
+      {
+        :listeners          => [],
+        :pid                => @pid_file,
+        :config_file        => @config_script,
+        :worker_processes   => @workers.to_i,
+        :working_directory  => @cwd,
+        :timeout            => @timeout.to_i
+      }
+    end
+
+    def bundler_cmd
+      cmd = "bundle exec #{@opt.program_name}"
+      @original_args.each_slice(2) do |arg_key,value|
+        cmd << " #{arg_key} #{value}" if arg_key != "-b"
+      end
+      cmd
+    end
+
+    def collect_listeners
+      return if @port.nil?
+      start_port = end_port = nil
+      start_port ||=  @port.to_i
+      end_port ||=  start_port + @servers.to_i - 1
+      (start_port..end_port).map do |port|
+        "#{@address}:#{port}"
+      end
+    end
+
+    def parse_listen_option
+      return if @listen.nil? || @listen.empty?
+      @listen.split(',').map do |listen|
+        listen = File.join(@cwd,listen) if listen[0..0] != "/" && !listen.match(/\w+\:\w+/)
+        "#{listen}"
+      end
     end
     
     def run
@@ -136,93 +100,24 @@ module Brindle
       if @bundler
         puts "Using Bundler"
         puts "reexec via bundle exec"
-        require 'pp'
-        cmd_for_exec = "bundle exec #{@opt.program_name}"
-        @original_args.each_slice(2) do |arg_key,value|
-          cmd_for_exec << " #{arg_key} #{value}" if arg_key != "-b"
-        end
-        exec(cmd_for_exec)
+        exec(bundler_cmd)
       end
-      options = { 
-        :listeners          => [],
-        :pid                => @pid_file,
-        :config_file        => @config_script,
-        :worker_processes   => @workers.to_i,
-        :working_directory  => @cwd,
-        :timeout            => @timeout.to_i
-      }
+      options = default_options
       # set user via Unicorn options. If we don't set group - then use only user
       options[:user] = @user unless @user.nil? 
       options[:stderr_path] = options[:stdout_path] = @log_file if @daemon
-      # ensure Rails standard tmp paths exist
-      options[:after_reload] = lambda do
-        FileUtils.mkdir_p(%w(cache pids sessions sockets).map! { |d| "tmp/#{d}" })
-      end
-        
       options[:preload_app] = @preload
-      # do base steps for Rails
-      options[:after_fork] = lambda do |server, worker|
-        defined?(ActiveRecord::Base) and
-          ActiveRecord::Base.establish_connection
-          # trying to change user and group
-        begin
-          # check if something not set in config or cli
-          unless @user.nil? || @group.nil?
-            uid, gid = Process.euid, Process.egid
-            user, group = @user, @group
-            target_uid = Etc.getpwnam(user).uid
-            target_gid = Etc.getgrnam(group).gid
-            worker.tmp.chown(target_uid, target_gid)
-            if uid != target_uid || gid != target_gid
-              Process.initgroups(user, target_gid)
-              Process::GID.change_privilege(target_gid)
-              Process::UID.change_privilege(target_uid)
-            end
-          end
-         rescue => e
-           if ENV['RAILS_ENV'] == 'development'
-             STDERR.puts "couldn't change user, oh well"
-           else
-             raise e
-           end
-         end
-      end   
-      options[:before_fork] = lambda do |server, worker| 
-        defined?(ActiveRecord::Base) and
-          ActiveRecord::Base.connection.disconnect!
-        # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
-        if GC.respond_to?(:copy_on_write_friendly=)
-            GC.copy_on_write_friendly = true
-        end
-        old_pid = "#{server.config[:pid]}.oldbin"
-        if File.exists?(old_pid) && server.pid != old_pid
-          begin
-            Process.kill("QUIT", File.read(old_pid).to_i)
-          rescue Errno::ENOENT, Errno::ESRCH
-          end
-        end
-      end
+      options.merge!(collect_hooks)
       ENV['RAILS_ENV'] = @environment
       ENV['RAILS_RELATIVE_URL_ROOT'] = @prefix
-      unless @port.nil?
-        start_port = end_port = nil
-        start_port ||=  @port.to_i
-        end_port ||=  start_port + @servers.to_i - 1
-        (start_port..end_port).each do |port|
-          options[:listeners] << "#{@address}:#{port}"
-        end
-      end
-      unless @listen.nil? || @listen.empty?
-        @listen.split(',').each do |listen|
-          listen = File.join(@cwd,listen) if listen[0..0] != "/" && !listen.match(/\w+\:\w+/)
-          options[:listeners] << "#{listen}"
-        end
+      [collect_listeners, parse_listen_option].each do |listeners|
+        options[:listeners] += listeners if listeners
       end
-      app = rails_builder(@daemon)
+      app = RailsSupport.rails_builder(@daemon)
       if @daemon
         Unicorn::Launcher.daemonize!(options)
       end
-      puts "start Unicorn..."
+      puts "start Unicorn v#{Unicorn::Const::UNICORN_VERSION}..."
       if Unicorn.respond_to?(:run)
         Unicorn.run(app, options)
       else

data/lib/golden_brindle.rb

@@ -6,6 +6,8 @@ require 'unicorn/launcher'
 require 'golden_brindle/const'
 require 'golden_brindle/command'
 require 'golden_brindle/configure'
+require 'golden_brindle/rails_support'
+require 'golden_brindle/hooks'
 require 'golden_brindle/start'
 require 'golden_brindle/stop'
 require 'golden_brindle/restart'

metadata

@@ -2,7 +2,7 @@
 name: golden_brindle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: "0.2"
 platform: ruby
 authors: 
 - Alexander Simonov
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 +03:00
+date: 2011-09-03 00:00:00 +03:00
 default_executable: golden_brindle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,8 @@ files:
 - lib/golden_brindle/command.rb
 - lib/golden_brindle/configure.rb
 - lib/golden_brindle/const.rb
+- lib/golden_brindle/hooks.rb
+- lib/golden_brindle/rails_support.rb
 - lib/golden_brindle/restart.rb
 - lib/golden_brindle/start.rb
 - lib/golden_brindle/stop.rb