golden_brindle 0.0.3 → 0.0.4

data/TODO

@@ -1 +1 @@
-
+Hack Unicorn to improve application gems checking

data/golden_brindle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{golden_brindle}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Simonov"]
-  s.date = %q{2010-05-27}
+  s.date = %q{2010-06-06}
   s.default_executable = %q{golden_brindle}
   s.description = %q{Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel}
   s.email = %q{alex@simonov.me}
@@ -45,18 +45,18 @@ Gem::Specification.new do |s|
   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.5}
+  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"
+    "test/test_golden_brindle.rb",
+     "test/helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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>, [">= 0.99"])

data/lib/golden_brindle.rb

@@ -1,5 +1,6 @@
 require 'gem_plugin'
 require 'optparse'
+require 'yaml'
 require 'unicorn'
 require 'unicorn/launcher'
 require 'golden_brindle/const'

data/lib/golden_brindle/cluster.rb

@@ -11,8 +11,16 @@ module Cluster
       ]
     end
     
+    def validate
+      @cwd = File.expand_path(@cwd)
+      valid_dir? @cwd, "Invalid path to golden_brindle configuration files: #@cwd"
+      return @valid
+    end
+
     def run
       command = self.class.to_s.downcase.split('::')[1]
+      counter = 0
+      errors = 0
       Dir.chdir @cwd do
         confs =  Dir.glob("*.yml")
         confs += Dir.glob("*.conf")
@@ -22,9 +30,13 @@ module Cluster
           puts cmd if @verbose 
           output = `#{cmd}`
           puts output if @verbose
-          puts "golden_brindle #{command} returned an error." unless $?.success?     
+          status = $?.success?
+          puts "golden_brindle #{command} returned an error." unless status
+          counter += 1 if status
+          errors += 1 unless status
         end
       end
+      puts "Success:#{counter}; Errors: #{errors}"
     end
     
   end
@@ -42,4 +54,4 @@ module Cluster
     include Cluster::Base
   end
   
-end
+end

data/lib/golden_brindle/configure.rb

@@ -59,4 +59,5 @@ module Brindle
     
   end
   
-end
+end
+

data/lib/golden_brindle/const.rb

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

data/lib/golden_brindle/restart.rb

@@ -22,22 +22,19 @@ module Brindle
       end
       
       @cwd = File.expand_path(@cwd)
-      valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
-      return false unless @valid
-      Dir.chdir @cwd
-
-      valid_exists? @pid_file, "PID file #@pid_file does not exist.  Not running?"
+      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
     end
 
     def run
       if @soft
-        GoldenBrindle::send_signal("HUP", @pid_file)
+        GoldenBrindle::send_signal("HUP", File.join(@cwd,@pid_file))
       else
-        GoldenBrindle::send_signal("USR2", @pid_file)
+        GoldenBrindle::send_signal("USR2", File.join(@cwd,@pid_file))
       end
     end
     
   end
   
-end
+end

data/lib/golden_brindle/start.rb

@@ -97,20 +97,18 @@ module Brindle
         return false unless @valid
       end
       @cwd = File.expand_path(@cwd)
-      valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
-      return false unless @valid
-      # Change there to start, then we'll have to come back after daemonize
-      Dir.chdir(@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(@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_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
       return @valid
     end
     
     def run
+      # Change there to start, then we'll have to come back after daemonize
+      Dir.chdir(@cwd)
       options = { :listeners => []}
       options[:pid] = @pid_file
       options[:config_file] = @config_script
@@ -181,9 +179,10 @@ module Brindle
       if @daemon
         Unicorn::Launcher.daemonize!(options)
       end
+      puts "start Unicorn..."
       Unicorn.run(app, options)
     end
     
     
   end
-end
+end

data/lib/golden_brindle/stop.rb

@@ -16,22 +16,19 @@ module Brindle
     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
+        return @valid
       end
       
       @cwd = File.expand_path(@cwd)
       valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
-      return false unless @valid
-      Dir.chdir @cwd
-
-      valid_exists? @pid_file, "PID file #@pid_file does not exist.  Not running?"
+      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
@@ -45,4 +42,4 @@ module Brindle
     
   end
   
-end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: golden_brindle
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Alexander Simonov
@@ -9,39 +15,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 +03:00
+date: 2010-06-06 00:00:00 +03:00
 default_executable: golden_brindle
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: gem_plugin
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 2
+        - 3
         version: 0.2.3
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: unicorn
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 205
+        segments: 
+        - 0
+        - 99
         version: "0.99"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Unicorn HTTP server clustering tool like mongrel_cluster for Mongrel
 email: alex@simonov.me
 executables: 
@@ -84,24 +105,30 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 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
+- test/helper.rb