golden_brindle 0.0.6 → 0.1

data/README.rdoc

@@ -4,26 +4,34 @@
 
 Tool to help start/stop/restart multiple unicorn servers to use behind a web servers like nginx. This app adds an option to specify a number of Unicorn worker processes to launch, a range of ports, and a configuration file for the cluster. Use "-h" to see command syntax.
 
-Configure cluster and write configuration file:
+Configure cluster and save configuration file to config/brindle.yml:
   golden_brindle brindle::configure
 
-Start cluster:
-  golden_brindle brindle::start
+You must copy this configuration file to the /etc/brindles directory to autostart on system boot.
 
-Restart cluster:
-  golden_brindle brindle::restart
+Start by hand to test proper start:
+  golden_brindle start
 
-Stop cluster:
-  golden_brindle brindle::stop
+Reload source code after deploy or code update:
+  golden_brindle restart
 
+Stop:
+  golden_brindle stop
+
+== Using applications with bundler
+
+Open brindle config file for the application and set bundler option to true:
+  bundler: true
+And update you Gemfile adding this line:
+  gem 'golden_brindle'
 
 == Starting clusters at boot
 
-1. Create golden_brindle conf directory (/etc/brindles).
+1. Create golden_brindle configuration directory (/etc/brindles).
 2. Assign ownership to your Capistrano user.
-3. Copy the init.d script from this gem's resouces directory /etc/init.d.
+3. Copy the init.d script from this gem's resouces directory to /etc/init.d.
 4. chmod +x /etc/init.d/golden_brindles_cluster
-5. Add to init.d startup. On RHEL/CentOS use: /sbin/chkconfig --level 345 golden_brindles_cluster on
+5. Add to init.d startup. On RHEL/CentOS use: /sbin/chkconfig --level 345 golden_brindles on
 
 == Note on Patches/Pull Requests
  
@@ -31,13 +39,13 @@ Stop cluster:
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
+* Commit, do not mess with Rakefile, version, or history.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright
 
-Copyright (c) 2010 Alexander Simonov. See LICENSE for details.
+Copyright (c) 2010-2011 Alexander Simonov. See LICENSE for details.
 
 Copyright (c) 2007 Zed A. Shaw
 

data/Rakefile

@@ -6,12 +6,11 @@ begin
   require File.dirname(__FILE__) + "/lib/golden_brindle/const.rb"
   Jeweler::Tasks.new do |gem|
     gem.name = "golden_brindle"
-    gem.summary = %Q{Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel}
-    gem.description = %Q{Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel}
+    gem.summary = %Q{Unicorn HTTP server multiple application runner tool}
+    gem.description = %Q{Unicorn HTTP server multiple application runner tool}
     gem.email = "alex@simonov.me"
     gem.homepage = "http://github.com/simonoff/golden_brindle"
     gem.authors = ["Alexander Simonov"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.add_dependency "gem_plugin", ">= 0.2.3"
     gem.add_dependency "unicorn", ">= 1.00"
     gem.version = GoldenBrindle::Const::VERSION

data/golden_brindle.gemspec

@@ -1,72 +1,62 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{golden_brindle}
-  s.version = "0.0.6"
+  s.version = "0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Simonov"]
-  s.date = %q{2010-09-05}
+  s.date = %q{2011-05-04}
   s.default_executable = %q{golden_brindle}
-  s.description = %q{Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel}
+  s.description = %q{Unicorn HTTP server multiple application runner tool}
   s.email = %q{alex@simonov.me}
   s.executables = ["golden_brindle"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc",
-     "TODO"
+    "README.rdoc",
+    "TODO"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "COPYING",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "bin/golden_brindle",
-     "golden_brindle.gemspec",
-     "lib/golden_brindle.rb",
-     "lib/golden_brindle/cluster.rb",
-     "lib/golden_brindle/command.rb",
-     "lib/golden_brindle/configure.rb",
-     "lib/golden_brindle/const.rb",
-     "lib/golden_brindle/restart.rb",
-     "lib/golden_brindle/start.rb",
-     "lib/golden_brindle/stop.rb",
-     "resources/golden_brindle_cluster",
-     "test/helper.rb",
-     "test/test_golden_brindle.rb"
+    "COPYING",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "bin/golden_brindle",
+    "golden_brindle.gemspec",
+    "lib/golden_brindle.rb",
+    "lib/golden_brindle/cluster.rb",
+    "lib/golden_brindle/command.rb",
+    "lib/golden_brindle/configure.rb",
+    "lib/golden_brindle/const.rb",
+    "lib/golden_brindle/restart.rb",
+    "lib/golden_brindle/start.rb",
+    "lib/golden_brindle/stop.rb",
+    "resources/golden_brindle",
+    "test/helper.rb",
+    "test/test_golden_brindle.rb"
   ]
   s.homepage = %q{http://github.com/simonoff/golden_brindle}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_golden_brindle.rb"
-  ]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Unicorn HTTP server multiple application runner tool}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     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>, [">= 1.00"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<gem_plugin>, [">= 0.2.3"])
       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>, [">= 1.00"])
   end

data/lib/golden_brindle/command.rb

@@ -68,7 +68,7 @@ module GoldenBrindle
       
       def config_keys
         @config_keys ||=
-          %w(address host port cwd log_file pid_file environment servers daemon debug config_script workers timeout user group prefix preload listen)
+          %w(address host port cwd log_file pid_file environment servers daemon debug config_script workers timeout user group prefix preload listen bundler)
       end
       
       def load_config

data/lib/golden_brindle/configure.rb

@@ -7,6 +7,7 @@ module Brindle
         options [
           ["-e", "--environment ENV", "Rails environment to run as", :@environment, ENV['RAILS_ENV'] || "development"],
           ["-d", "--daemonize", "Run daemonized in the background", :@daemon, false],
+          ["-b", "--bundler", "Use bundler to start unicorn instances", :@bundler, false],
           ['', "--preload", "Preload application", :@preload, false],
           ['-p', '--port PORT', "Which port to bind to (if set numbers of servers - start port number)", :@port, Unicorn::Const::DEFAULT_PORT],
           ['-a', '--address ADDR', "Address to bind to", :@address, Unicorn::Const::DEFAULT_HOST],

data/lib/golden_brindle/const.rb

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

data/lib/golden_brindle/start.rb

@@ -7,6 +7,7 @@ module Brindle
     def configure
       options [
         ["-e", "--environment ENV", "Rails environment to run as", :@environment, ENV['RAILS_ENV'] || "development"],
+        ["-b", "--bundler", "Use bundler to start unicorn instances", :@bundler, false],
         ["-d", "--daemonize", "Run daemonized in the background", :@daemon, false],
         ['', "--preload", "Preload application", :@preload, false],
         ['-p', '--port PORT', "Which port to bind to (if set numbers of servers - start port number)", :@port, Unicorn::Const::DEFAULT_PORT],
@@ -61,8 +62,6 @@ module Brindle
           abort "#$0 must be run inside RAILS_ROOT: #{err.inspect}"
         end
 
-        require 'config/environment'
-
         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
@@ -115,6 +114,12 @@ module Brindle
         valid_exists?(@config_script, "Unicorn-specific config file not there: #@config_script")
         return false unless @valid
       end
+      
+      if @bundler
+        valid_exists?('Gemfile', "Cannot use Bundler - no Gemfile in your application root dir")
+        return false unless @valid
+      end
+      
       @cwd = File.expand_path(@cwd)
       valid_dir? @cwd, "Invalid path to change to during daemon mode: #{@cwd}"
       valid?(@prefix[0] == ?/ && @prefix[-1] != ?/, "Prefix must begin with / and not end in /") if @prefix
@@ -128,6 +133,16 @@ module Brindle
     def run
       # Change there to start, then we'll have to come back after daemonize
       Dir.chdir(@cwd)
+      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)
+      end
       options = { 
         :listeners          => [],
         :pid                => @pid_file,

data/resources/{golden_brindle_cluster → golden_brindle}

@@ -2,10 +2,10 @@
 #
 # Copyright (c) 2010 Alexander Simonov, alex@simonov.me
 #
-# golden_brindle_cluster       Startup script for GoldenBrindle clusters.
+# golden_brindle       Startup script for GoldenBrindle.
 #
 # chkconfig: - 85 15
-# description: golden_brindle_cluster manages multiple Unicorn/GoldenBrindle processes for use \
+# description: golden_brindle manages multiple Unicorn/GoldenBrindle processes for use \
 #              behind a cluster.
 #              
 
@@ -33,7 +33,7 @@ case "$1" in
       RETVAL=$?
   ;;
     *)
-      echo "Usage: golden_brindle_cluster {start|stop|restart|status}"
+      echo "Usage: golden_brindle {start|stop|restart|status}"
       exit 1
   ;;
 esac      

data/test/test_golden_brindle.rb

@@ -2,6 +2,6 @@ require 'helper'
 
 class TestGoldenBrindle < Test::Unit::TestCase
   should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+    #flunk "hey buddy, you should probably rename this file and start testing for real"
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: golden_brindle
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+  prerelease: 
+  version: "0.1"
 platform: ruby
 authors: 
 - Alexander Simonov
@@ -15,55 +10,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 +03:00
+date: 2011-05-04 00:00:00 +03:00
 default_executable: golden_brindle
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: gem_plugin
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 2
-        - 3
         version: 0.2.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: unicorn
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.00"
   type: :runtime
-  version_requirements: *id003
-description: Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel
+  version_requirements: *id002
+description: Unicorn HTTP server multiple application runner tool
 email: alex@simonov.me
 executables: 
 - golden_brindle
@@ -75,7 +47,6 @@ extra_rdoc_files:
 - TODO
 files: 
 - .document
-- .gitignore
 - COPYING
 - LICENSE
 - README.rdoc
@@ -92,7 +63,7 @@ files:
 - lib/golden_brindle/restart.rb
 - lib/golden_brindle/start.rb
 - lib/golden_brindle/stop.rb
-- resources/golden_brindle_cluster
+- resources/golden_brindle
 - test/helper.rb
 - test/test_golden_brindle.rb
 has_rdoc: true
@@ -100,8 +71,8 @@ homepage: http://github.com/simonoff/golden_brindle
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -109,26 +80,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel
-test_files: 
-- test/helper.rb
-- test/test_golden_brindle.rb
+summary: Unicorn HTTP server multiple application runner tool
+test_files: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC