golden_brindle 0.1 → 0.1.1

data/golden_brindle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{golden_brindle}
-  s.version = "0.1"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Simonov"]
-  s.date = %q{2011-05-04}
+  s.date = %q{2011-09-02}
   s.default_executable = %q{golden_brindle}
   s.description = %q{Unicorn HTTP server multiple application runner tool}
   s.email = %q{alex@simonov.me}

data/lib/golden_brindle/configure.rb

@@ -11,12 +11,12 @@ module Brindle
           ['', "--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, separeted by comma ", :@listen, nil] ,
+          ['-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 TIME', "Time to wait (in seconds) before killing a stalled thread", :@timeout, 60],
+          ['-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"],

data/lib/golden_brindle/const.rb

@@ -3,7 +3,7 @@ module GoldenBrindle
   module Const
     
     # current version
-    VERSION="0.1"
+    VERSION="0.1.1"
     # main banner
     BANNER = "Usage: golden_brindle <command> [options]"
     

data/lib/golden_brindle/start.rb

@@ -12,12 +12,12 @@ module Brindle
         ['', "--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, separeted by comma (default: #{Unicorn::Const::DEFAULT_LISTEN})", :@listen, Unicorn::Const::DEFAULT_LISTEN],
+        ['-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 TIME', "Time to wait (in seconds) before killing a stalled thread", :@timeout, 60],
+        ['-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],
@@ -149,7 +149,7 @@ module Brindle
         :config_file        => @config_script,
         :worker_processes   => @workers.to_i,
         :working_directory  => @cwd,
-        :timeout            => @timeout
+        :timeout            => @timeout.to_i
       }
       # set user via Unicorn options. If we don't set group - then use only user
       options[:user] = @user unless @user.nil? 
@@ -223,7 +223,11 @@ module Brindle
         Unicorn::Launcher.daemonize!(options)
       end
       puts "start Unicorn..."
-      Unicorn.run(app, options)
+      if Unicorn.respond_to?(:run)
+        Unicorn.run(app, options)
+      else
+        Unicorn::HttpServer.new(app, options).start.join
+      end
     end
     
     

metadata

@@ -2,7 +2,7 @@
 name: golden_brindle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Alexander Simonov
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 +03:00
+date: 2011-09-02 00:00:00 +03:00
 default_executable: golden_brindle
 dependencies: 
 - !ruby/object:Gem::Dependency