golden_brindle 0.2 → 0.3

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,11 @@
+# A sample Gemfile
+source "http://rubygems.org"
+gem "unicorn"
+
+group :development do
+  gem "rspec"
+  gem "yard"
+  gem "bundler"
+  gem "jeweler"
+  gem "rcov", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,38 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    kgio (2.6.0)
+    rack (1.3.2)
+    raindrops (0.7.0)
+    rake (0.9.2)
+    rcov (0.9.10)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    unicorn (4.1.1)
+      kgio (~> 2.4)
+      rack
+      raindrops (~> 0.6)
+    yard (0.7.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  jeweler
+  rcov
+  rspec
+  unicorn
+  yard

data/Rakefile

@@ -1,55 +1,42 @@
-require 'rubygems'
-require 'rake'
+# encoding: utf-8
 
+require 'rubygems'
+require 'bundler'
 begin
-  require 'jeweler'
-  require File.dirname(__FILE__) + "/lib/golden_brindle/const.rb"
-  Jeweler::Tasks.new do |gem|
-    gem.name = "golden_brindle"
-    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_dependency "gem_plugin", ">= 0.2.3"
-    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
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'rake'
+$LOAD_PATH.unshift('lib')
+require 'jeweler'
+require 'golden_brindle'
+Jeweler::Tasks.new do |gem|
+  gem.name = "golden_brindle"
+  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.version = GoldenBrindle::Const::VERSION
+  gem.license = "GPL2"
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :test => :check_dependencies
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
 
-task :default => :test
+task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "golden_brindle #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/bin/golden_brindle

@@ -1,12 +1,9 @@
 #!usr/bin/env ruby
 require 'rubygems'
-require 'gem_plugin'
 
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'golden_brindle'
 
-GemPlugin::Manager.instance.load "golden_brindle" => GemPlugin::INCLUDE
-
-if not GoldenBrindle::Command::Registry.instance.run ARGV
+if not GoldenBrindle::Registry.run ARGV
   exit 1
 end

data/golden_brindle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{golden_brindle}
-  s.version = "0.2"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Simonov"]
-  s.date = %q{2011-09-03}
+  s.date = %q{2011-09-14}
   s.default_executable = %q{golden_brindle}
   s.description = %q{Unicorn HTTP server multiple application runner tool}
   s.email = %q{alex@simonov.me}
@@ -21,7 +21,10 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
     "COPYING",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -30,20 +33,23 @@ Gem::Specification.new do |s|
     "bin/golden_brindle",
     "golden_brindle.gemspec",
     "lib/golden_brindle.rb",
-    "lib/golden_brindle/cluster.rb",
+    "lib/golden_brindle/actions/cluster.rb",
+    "lib/golden_brindle/actions/configure.rb",
+    "lib/golden_brindle/actions/restart.rb",
+    "lib/golden_brindle/actions/start.rb",
+    "lib/golden_brindle/actions/stop.rb",
+    "lib/golden_brindle/base.rb",
     "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",
+    "lib/golden_brindle/validations.rb",
     "resources/golden_brindle",
-    "test/helper.rb",
-    "test/test_golden_brindle.rb"
+    "spec/golden_brindle_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/simonoff/golden_brindle}
+  s.licenses = ["GPL2"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Unicorn HTTP server multiple application runner tool}
@@ -52,15 +58,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gem_plugin>, [">= 0.2.3"])
-      s.add_runtime_dependency(%q<unicorn>, [">= 1.00"])
+      s.add_runtime_dependency(%q<unicorn>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<gem_plugin>, [">= 0.2.3"])
-      s.add_dependency(%q<unicorn>, [">= 1.00"])
+      s.add_dependency(%q<unicorn>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<gem_plugin>, [">= 0.2.3"])
-    s.add_dependency(%q<unicorn>, [">= 1.00"])
+    s.add_dependency(%q<unicorn>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/lib/golden_brindle/actions/cluster.rb

@@ -0,0 +1,50 @@
+module GoldenBrindle
+
+  module Cluster
+    class Base < ::GoldenBrindle::Base
+      def configure
+        options [
+          ["-c", "--conf_path PATH", "Path to golden_brindle configuration files", :@cwd, "."],
+          ["-V", "", "Verbose output", :@verbose, false]
+        ]
+      end
+
+      def validate
+        @cwd = File.expand_path(@cwd)
+        valid_dir? @cwd, "Invalid path to golden_brindle configuration files: #{@cwd}"
+        @valid
+      end
+
+      def run
+        command = self.class.to_s.downcase.split('::')[1]
+        counter = 0
+        errors = 0
+        Dir.chdir @cwd do
+          Dir.glob("**/*.{yml,conf}").each do |conf|
+            cmd = "golden_brindle #{command} -C #{File.join(@cwd,conf)}"
+            cmd += " -d" if command == "start" #daemonize only when start
+            puts cmd if @verbose
+            output = `#{cmd}`
+            puts output if @verbose
+            status = $?.success?
+            puts "golden_brindle #{command} returned an error." unless status
+            status ? counter += 1 : errors += 1
+          end
+        end
+        puts "Success:#{counter}; Errors: #{errors}"
+      end
+    end
+  end
+
+  module Actions
+    module Cluster
+
+      class Start < ::GoldenBrindle::Cluster::Base; end
+
+      class Stop < ::GoldenBrindle::Cluster::Base; end
+
+      class Restart < ::GoldenBrindle::Cluster::Base; end
+
+    end
+  end
+end

data/lib/golden_brindle/actions/configure.rb

@@ -0,0 +1,63 @@
+module GoldenBrindle
+  module Actions
+  
+    class Configure < ::GoldenBrindle::Base
+
+      def configure
+          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],
+            ['-o', '--listen {HOST:PORT|PATH}',"listen on HOST:PORT or PATH, separated by comma ", :@listen, nil] ,
+            ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/unicorn.log"],
+            ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "tmp/pids/unicorn.pid"],
+            ['-n', '--num-workers INT', "Number of Unicorn workers", :@workers, 4],
+            ['-N', '--num-servers INT', "Number of Unicorn listen records", :@servers, 1],
+            ['-t', '--timeout INT', "Time to wait (in seconds) before killing a stalled thread", :@timeout, 60],
+            ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
+            ['-D', '--debug', "Enable debugging mode", :@debug, false],
+            ['-C', '--config PATH', "Path to brindle configuration file", :@config_file, "config/brindle.yml"],
+            ['-S', '--script PATH', "Load the Unicorn-specific config file", :@config_script, nil],
+            ['', '--user USER', "User to run as", :@user, nil],
+            ['', '--group GROUP', "Group to run as", :@group, nil],
+            ['', '--prefix PATH', "URL prefix for Rails app", :@prefix, nil]
+          ]
+      end
+
+      def validate
+
+        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}")
+          return false unless @valid
+        end
+
+        valid?(@prefix[0] == ?/ && @prefix[-1] != ?/, "Prefix must begin with / and not end in /") if @prefix
+        valid_dir? File.dirname(@log_file), "Path to log file not valid: #@log_file"
+        valid_dir? File.dirname(@pid_file), "Path to pid file not valid: #@pid_file"
+        valid_user? @user if @user
+        valid_group? @group if @group
+        @valid
+      end
+
+      def run
+
+        file_options = {}
+
+        self.config_keys.each do |key|
+          key_val = self.instance_variable_get "@#{key}"
+          file_options[key] = key_val unless key_val.nil?
+        end
+
+        $stdout.puts "Writing configuration file to #{@config_file}."
+        File.open(@config_file,"w") {|f| f.write(file_options.to_yaml)}
+
+      end
+
+    end
+  end
+end

data/lib/golden_brindle/actions/restart.rb

@@ -0,0 +1,40 @@
+module GoldenBrindle
+  module Actions
+  
+    class Restart < ::GoldenBrindle::Base
+
+      def configure
+        options [
+          ['-c', '--chdir PATH', "Change to dir before starting (will be expanded).", :@cwd, "."],
+          ['-C', '--config PATH', "Use a mongrel based config file", :@config_file, nil],
+          ['-s', '--soft', "Do a soft restart rather than a process exit restart", :@soft, false],
+          ['-P', '--pid FILE', "Where the PID file is located.", :@pid_file, "tmp/pids/unicorn.pid"]
+        ]
+      end
+
+      def validate
+        if @config_file
+          valid_exists?(@config_file, "Config file not there: #{@config_file}")
+          return false unless @valid
+          @config_file = File.expand_path(@config_file)
+          load_config
+          return false unless @valid
+        end
+
+        @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?"
+        @valid
+      end
+
+      def run
+        if @soft
+          GoldenBrindle::send_signal("HUP", File.join(@cwd,@pid_file))
+        else
+          GoldenBrindle::send_signal("USR2", File.join(@cwd,@pid_file))
+        end
+      end
+
+    end
+  end
+end

data/lib/golden_brindle/actions/start.rb

@@ -0,0 +1,131 @@
+module GoldenBrindle
+
+  module Actions
+  
+    class Start < ::GoldenBrindle::Base
+      include ::GoldenBrindle::Hooks
+
+      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],
+          ['-a', '--address ADDR', "Address to bind to", :@address, Unicorn::Const::DEFAULT_HOST],
+          ['-o', '--listen {HOST:PORT|PATH}',"listen on HOST:PORT or PATH, separated by comma (default: #{Unicorn::Const::DEFAULT_LISTEN})", :@listen, Unicorn::Const::DEFAULT_LISTEN],
+          ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/unicorn.log"],
+          ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "tmp/pids/unicorn.pid"],
+          ['-n', '--num-workers INT', "Number of Unicorn workers", :@workers, 4],
+          ['-N', '--num-servers INT', "Number of Unicorn listen records", :@servers, 1],
+          ['-t', '--timeout INT', "Time to wait (in seconds) before killing a stalled thread", :@timeout, 60],
+          ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
+          ['-D', '--debug', "Enable debugging mode", :@debug, false],
+          ['-C', '--config PATH', "Use a mongrel based config file", :@config_file, nil],
+          ['-S', '--script PATH', "Load the Unicorn-specific config file", :@config_script, nil],
+          ['', '--user USER', "User to run as", :@user, nil],
+          ['', '--group GROUP', "Group to run as", :@group, nil],
+          ['', '--prefix PATH', "URL prefix for Rails app", :@prefix, nil]
+        ]
+      end
+
+      def validate
+        if @config_file
+          valid_exists?(@config_file, "Config file not there: #@config_file")
+          return false unless @valid
+          @config_file = File.expand_path(@config_file)
+          load_config
+          return false unless @valid
+        end
+
+        if @config_script
+          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
+        valid_dir? File.dirname(File.join(@cwd,@log_file)), "Path to log file not valid: #{@log_file}"
+        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
+        @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
+        # 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"
+          exec(bundler_cmd)
+        end
+        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
+        options[:preload_app] = @preload
+        options.merge!(collect_hooks)
+        ENV['RAILS_ENV'] = @environment
+        ENV['RAILS_RELATIVE_URL_ROOT'] = @prefix
+        [collect_listeners, parse_listen_option].each do |listeners|
+          options[:listeners] += listeners if listeners
+        end
+        app = ::GoldenBrindle::RailsSupport.rails_builder(@daemon)
+        if @daemon
+          Unicorn::Launcher.daemonize!(options)
+        end
+        puts "start Unicorn v#{Unicorn::Const::UNICORN_VERSION}..."
+        if Unicorn.respond_to?(:run)
+          Unicorn.run(app, options)
+        else
+          Unicorn::HttpServer.new(app, options).start.join
+        end
+      end
+    end
+
+  end
+end