golden_brindle 0.2 → 0.3

data/lib/golden_brindle.rb

@@ -1,14 +1,13 @@
-require 'gem_plugin'
 require 'optparse'
 require 'yaml'
 require 'unicorn'
 require 'unicorn/launcher'
 require 'golden_brindle/const'
-require 'golden_brindle/command'
-require 'golden_brindle/configure'
+require 'golden_brindle/validations'
+require 'golden_brindle/base'
 require 'golden_brindle/rails_support'
 require 'golden_brindle/hooks'
-require 'golden_brindle/start'
-require 'golden_brindle/stop'
-require 'golden_brindle/restart'
-require 'golden_brindle/cluster'
+Dir.glob(File.join(File.dirname(__FILE__),'golden_brindle/actions/', '*.rb')) do |action|
+  require action
+end
+require 'golden_brindle/command'

data/spec/golden_brindle_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
+  describe GoldenBrindle::Registry do
+
+    let(:commands) do
+      ["start", "stop", "restart", "configure", "cluster::start", "cluster::stop", "cluster::restart"]
+    end
+
+    it "constantize should return proper constant" do
+      GoldenBrindle::Registry.constantize("GoldenBrindle::Registry").should eql GoldenBrindle::Registry
+    end
+
+    it "constantize should raise on broken constant" do
+      expect { GoldenBrindle::Registry.constantize("GoldenBrindle::Registry123")}.to raise_error
+    end
+
+    it "commands should return correct commands" do
+      GoldenBrindle::Registry.commands.should =~ commands
+    end
+
+
+  end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'golden_brindle'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  
+end

metadata

@@ -2,7 +2,7 @@
 name: golden_brindle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Alexander Simonov
@@ -10,31 +10,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-03 00:00:00 +03:00
+date: 2011-09-14 00:00:00 +03:00
 default_executable: golden_brindle
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: gem_plugin
-  prerelease: false
+  name: unicorn
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.3
+        version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: unicorn
-  prerelease: false
+  name: rspec
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.00"
-  type: :runtime
+        version: "0"
+  type: :development
+  prerelease: false
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: Unicorn HTTP server multiple application runner tool
 email: alex@simonov.me
 executables: 
@@ -47,7 +91,10 @@ extra_rdoc_files:
 - TODO
 files: 
 - .document
+- .rspec
 - COPYING
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -56,22 +103,24 @@ files:
 - 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
 has_rdoc: true
 homepage: http://github.com/simonoff/golden_brindle
-licenses: []
-
+licenses: 
+- GPL2
 post_install_message: 
 rdoc_options: []
 
@@ -82,6 +131,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -123107741511934714
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false

data/lib/golden_brindle/cluster.rb

@@ -1,53 +0,0 @@
-
-module Cluster
-  
-  module Base
-    include GoldenBrindle::Command::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 #{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
-  
-  class Start < GemPlugin::Plugin "/commands"
-    include Cluster::Base
-  end
-  
-  class Stop < GemPlugin::Plugin "/commands"
-    include Cluster::Base
-  end
-  
-  class Restart < GemPlugin::Plugin "/commands"
-    include Cluster::Base
-  end
-  
-end

data/lib/golden_brindle/configure.rb

@@ -1,63 +0,0 @@
-module Brindle
-  
-  class Configure < GemPlugin::Plugin "/commands"
-    include GoldenBrindle::Command::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

data/lib/golden_brindle/restart.rb

@@ -1,40 +0,0 @@
-module Brindle
-  
-  class Restart < GemPlugin::Plugin "/commands"
-    include GoldenBrindle::Command::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

data/lib/golden_brindle/start.rb

@@ -1,130 +0,0 @@
-module Brindle
-  
-  class Start < GemPlugin::Plugin "/commands"
-    include GoldenBrindle::Command::Base
-    include 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 = 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