golden_brindle 0.2 → 0.3

data/lib/golden_brindle/actions/stop.rb

@@ -0,0 +1,45 @@
+module GoldenBrindle
+  module Actions
+  
+    class Stop < ::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],
+          ['-f', '--force', "Force the shutdown (kill -9).", :@force, false],
+          ['-w', '--wait SECONDS', "Wait SECONDS before forcing shutdown", :@wait, "0"],
+          ['-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")
+          @config_file = File.expand_path(@config_file)
+          load_config
+          return @valid
+        end
+
+        @cwd = File.expand_path(@cwd)
+        valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
+        valid_exists? File.join(@cwd,@pid_file), "PID file #@pid_file does not exist.  Not running?"
+        return @valid
+      end
+
+      def run
+        @pid_file = File.join(@cwd,@pid_file)
+        if @force
+          @wait.to_i.times do |waiting|
+            exit(0) if not File.exist? @pid_file
+            sleep 1
+          end
+          GoldenBrindle::send_signal("KILL", @pid_file) if File.exist? @pid_file
+        else
+          GoldenBrindle::send_signal("TERM", @pid_file)
+        end
+      end
+
+    end
+  end
+end

data/lib/golden_brindle/base.rb

@@ -0,0 +1,89 @@
+module GoldenBrindle
+  class Base
+    include Validations
+    attr_reader :valid, :done_validating, :original_args
+
+    # 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(argv)
+      @opt = ::OptionParser.new
+      @opt.banner = GoldenBrindle::Const::BANNER
+      @valid = true
+      # 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
+        puts @opt
+      end
+      # I need to add my own -v definition to prevent the -v from exiting by default as well.
+      @opt.on_tail("--version", "Show version") do
+        @done_validating = true
+        if VERSION
+          puts "Version #{GoldenBrindle::Const::VERSION}"
+        end
+      end
+      @opt.parse! argv
+    end
+
+    # Called by the implemented command to set the options for that command.
+    # Every option has a short and long version, a description, a variable to
+    # set, and a default value.  No exceptions.
+    def options(opts)
+      # process the given options array
+      opts.each do |short, long, help, variable, default|
+        self.instance_variable_set(variable, default)
+        @opt.on(short, long, help) do |arg|
+          self.instance_variable_set(variable, arg)
+        end
+      end
+    end
+
+    def configure
+      options []
+    end
+
+    def config_keys
+      GoldenBrindle::Const::CONFIG_KEYS
+    end
+
+    def load_config
+      settings = {}
+      begin
+        settings = ::YAML.load_file(@config_file)
+      ensure
+        STDERR.puts "** Loading settings from #{@config_file} (they override command line)." unless @daemon || settings[:daemon]
+      end
+
+      # Config file settings will override command line settings
+      settings.each do |key, value|
+        key = key.to_s
+        if config_keys.include?(key)
+          key = 'address' if key == 'host'
+          self.instance_variable_set("@#{key}", value)
+        else
+          failure "Unknown configuration setting: #{key}"
+          @valid = false
+        end
+      end
+    end
+
+    # Returns true/false depending on whether the command is configured properly.
+    def validate
+      @valid
+    end
+
+    # Returns a help message.  Defaults to OptionParser#help which should be good.
+    def help
+      @opt.help
+    end
+
+    # Runs the command doing it's job.  You should implement this otherwise it will
+    # throw a NotImplementedError as a reminder.
+    def run
+      raise NotImplementedError
+    end
+  end
+end

data/lib/golden_brindle/command.rb

@@ -1,194 +1,60 @@
 module GoldenBrindle
-  
-  
-  def GoldenBrindle::send_signal(signal, pid_file)
-    pid = open(pid_file).read.to_i
-    print "Sending #{signal} to Unicorn at PID #{pid}..."
-    begin
-      Process.kill(signal, pid)
-    rescue Errno::ESRCH
-      puts "Process does not exist. Not running."
+
+  class << self
+    def send_signal(signal, pid_file)
+      pid = open(pid_file).read.to_i
+      print "Sending #{signal} to Unicorn at PID #{pid}..."
+      begin
+        Process.kill(signal, pid)
+      rescue Errno::ESRCH
+        puts "Process does not exist. Not running."
+      end
+      puts "Done."
     end
-    puts "Done."
   end
-  
-  module Command
-    
-    module Base
-      
-      attr_reader :valid, :done_validating, :original_args
 
-      # Called by the implemented command to set the options for that command.
-      # Every option has a short and long version, a description, a variable to
-      # set, and a default value.  No exceptions.
-      def options(opts)
-        # process the given options array
-        opts.each do |short, long, help, variable, default|
-          self.instance_variable_set(variable, default)
-          @opt.on(short, long, help) do |arg|
-            self.instance_variable_set(variable, arg)
-          end
-        end
-      end
+  # A Singleton class that manages all of the available commands
+  # and handles running them.
+  class Registry
 
-      # 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={})
-        argv = options[:argv] || []
-        @opt = OptionParser.new
-        @opt.banner = GoldenBrindle::Const::BANNER
-        @valid = true
-        # 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
-          puts @opt
-        end
+    class << self
 
-        # I need to add my own -v definition to prevent the -v from exiting by default as well.
-        @opt.on_tail("--version", "Show version") do
-          @done_validating = true
-          if VERSION
-            puts "Version #{GoldenBrindle::Const::VERSION}"
-          end
+      def constantize(camel_cased_word)
+        names = camel_cased_word.split('::')
+        names.shift if names.empty? || names.first.empty?
+        constant = Object
+        names.each do |name|
+          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
         end
-        @opt.parse! argv
+        constant
       end
 
-      def configure
-        options []
-      end
-      
-      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 bundler)
-      end
-      
-      def load_config
-        settings = {}
-        begin
-          settings = YAML.load_file(@config_file)
-        ensure
-          STDERR.puts "** Loading settings from #{@config_file} (they override command line)." unless @daemon || settings[:daemon] 
-        end
-
-        # Config file settings will override command line settings
-        settings.each do |key, value|
-          key = key.to_s
-          if config_keys.include?(key)
-            key = 'address' if key == 'host'
-            self.instance_variable_set("@#{key}", value)
+      # Builds a list of possible commands from the Command derivates list
+      def commands
+        GoldenBrindle::Actions.constants.inject([]) do |memo, action|
+          constants = constantize("GoldenBrindle::Actions::#{action.to_s}").constants
+          if constants.empty?
+            memo << action.to_s.downcase
           else
-            failure "Unknown configuration setting: #{key}"  
-            @valid = false
+            constants.each do |subaction|
+              memo << "#{action.to_s}::#{subaction.to_s}".downcase
+            end
           end
+          memo
         end
       end
 
-      # Returns true/false depending on whether the command is configured properly.
-      def validate
-        @valid
-      end
-
-      # Returns a help message.  Defaults to OptionParser#help which should be good.
-      def help
-        @opt.help
-      end
-
-      # Runs the command doing it's job.  You should implement this otherwise it will
-      # throw a NotImplementedError as a reminder.
-      def run
-        raise NotImplementedError
-      end
-
-      # Validates the given expression is true and prints the message if not, exiting.
-      def valid?(exp, message)
-        if !@done_validating && !exp
-          failure message
-          @valid = false
-          @done_validating = true
-        end
-      end
-
-      # Validates that a file exists and if not displays the message
-      def valid_exists?(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.file?(file), message)
-      end
-
-      # Validates that the given directory exists
-      def valid_dir?(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")
-      end
-
-      def valid_user?(user)
-        valid?(@group, "You must also specify a group.")
-        can_change_user?
-        begin
-          Etc.getpwnam(user)
-        rescue
-          failure "User does not exist: #{user}"
-          @valid = false
-        end
-      end
-
-      def valid_group?(group)
-        valid?(@user, "You must also specify a user.")
-        begin
-          Etc.getgrnam(group)
-        rescue
-          failure "Group does not exist: #{group}"
-          @valid = false
-        end
-      end
-
-      # Just a simple method to display failure until something better is developed.
-      def failure(message)
-        STDERR.puts "!!! #{message}"
-      end
-      
-    end
-    
-    # A Singleton class that manages all of the available commands
-    # and handles running them.
-    class Registry
-      include Singleton
-
-      # Builds a list of possible commands from the Command derivates list
-      def commands
-        pmgr = GemPlugin::Manager.instance
-        list = pmgr.plugins["/commands"].keys
-        list.sort
-      end
-
       # Prints a list of available commands.
       def print_command_list
         puts "#{GoldenBrindle::Const::BANNER}\nAvailable commands are:\n\n"
-
-        self.commands.each do |name|
-          if /brindle::/ =~ name
-            name = name[9 .. -1]
-          end
-
-          puts " - #{name[1 .. -1]}\n"
+        commands.each do |name|
+          puts " - #{name}\n"
         end
 
         puts "\nEach command takes -h as an option to get help."
 
       end
 
-
       # Runs the args against the first argument as the command name.
       # If it has any errors it returns a false, otherwise it return true.
       def run(args)
@@ -204,10 +70,9 @@ module GoldenBrindle
         end
 
         begin
-          if ["start", "stop", "restart", "configure", "reload"].include? cmd_name
-            cmd_name = "brindle::" + cmd_name
-          end
-          command = GemPlugin::Manager.instance.create("/commands/#{cmd_name}", :argv => args)
+          cmd_name = cmd_name.split("::").map{|x| x.capitalize}.join("::")
+          constant = constantize("GoldenBrindle::Actions::#{cmd_name}")
+          command = constant.new(args)
         rescue OptionParser::InvalidOption
           STDERR.puts "#$! for command '#{cmd_name}'"
           STDERR.puts "Try #{cmd_name} -h to get help."
@@ -233,7 +98,7 @@ module GoldenBrindle
         true
       end
     end
-    
+
   end
-  
+    
 end

data/lib/golden_brindle/const.rb

@@ -1,12 +1,12 @@
 module GoldenBrindle
-
   module Const
-    
     # current version
-    VERSION="0.2"
+    VERSION="0.3"
     # main banner
     BANNER = "Usage: golden_brindle <command> [options]"
-    
+    # config options names
+    CONFIG_KEYS = %w(address host port cwd log_file pid_file environment servers daemon debug config_script workers timeout user group prefix preload listen bundler)
+    ANSI_RED    = "\033[0;31m"
+    ANSI_RESET  = "\033[0m"
   end
-
 end

data/lib/golden_brindle/hooks.rb

@@ -1,5 +1,6 @@
-module Brindle
+module GoldenBrindle
   module Hooks
+
     def collect_hooks
       [:after_fork, :after_reload, :before_fork, :before_exec].inject({}) do |memo, sym|
         memo[sym] = send(sym)

data/lib/golden_brindle/rails_support.rb

@@ -1,4 +1,4 @@
-module Brindle
+module GoldenBrindle
   class RailsSupport
     class << self
 
@@ -68,7 +68,7 @@ module Brindle
                 unless defined?(ActionDispatch::Static)
                   use Rails::Rack::Static
                 end
-                run Brindle::RailsSupport.rails_dispatcher
+                run ::GoldenBrindle::RailsSupport.rails_dispatcher
               end
             end
           end.to_app

data/lib/golden_brindle/validations.rb

@@ -0,0 +1,56 @@
+module GoldenBrindle
+  module Validations
+
+    # Validates the given expression is true and prints the message if not, exiting.
+    def valid?(exp, message)
+      if !exp
+        failure message
+        @valid = false
+      end
+    end
+
+    # Validates that a file exists and if not displays the message
+    def valid_exists?(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.file?(file), message)
+    end
+
+    # Validates that the given directory exists
+    def valid_dir?(file, message)
+      valid?(::File.directory?(file), message)
+    end
+
+    def can_change_user?
+      valid?(::Process.euid.zero?, "if you want to change workers UID/GID you must run programm from root")
+    end
+
+    def valid_user?(user)
+      return unless can_change_user?
+      begin
+        ::Etc.getpwnam(user)
+      rescue
+        failure "User does not exist: #{user}"
+        @valid = false
+      end
+    end
+
+    def valid_group?(group)
+      begin
+        ::Etc.getgrnam(group)
+      rescue
+        failure "Group does not exist: #{group}"
+        @valid = false
+      end
+    end
+
+    # Just a simple method to display failure until something better is developed.
+    def failure(message)
+      STDERR.puts "#{::GoldenBrindle::Const::ANSI_RED}!!! * #{message}#{::GoldenBrindle::Const::ANSI_RESET}"
+    end
+
+  end
+end