ruby-style 1.0.1 → 1.0.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Jeremy Evans <code@jeremyevans.net>
+Copyright (c) 2007-2008 Jeremy Evans <code@jeremyevans.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/RailsMongrelStyle.rb

@@ -12,12 +12,15 @@ module Mongrel
     
     # Keep the interface the same, but ignore the host and port and don't
     # create a socket (one will be provided later)
-    def initialize(host, port, num_processors=2**30-1, timeout=0)
+    def initialize(host, port, num_processors=950, throttle=0, timeout=60)
+      tries = 0
       @classifier = URIClassifier.new
+      @host = host
+      @port = port
       @workers = ThreadGroup.new
-      @timeout = timeout
+      @throttle = throttle
       @num_processors = num_processors
-      @death_time = 60
+      @timeout = timeout
     end
   end
 end

data/lib/style.rb

@@ -27,27 +27,25 @@ class Style
                :logfile=>'log/style.log', :children=>{},:sockets=>{},
                :style_config=>{}, :directory=>'.'}
     @mutex = Mutex.new
-    parse_options
+    begin
+      parse_options
+    rescue GetoptLong::InvalidOption
+      exit_with_error($!)
+    end
   end
   
   # Check that the directory of the given filename exists and is a directory, exit otherwise 
   def check_dir(filename)
     filename = File.expand_path(filename)
     dirname = File.dirname(filename)
-    unless File.directory?(dirname)
-      puts "Invalid directory: #{dirname}"
-      exit(1)
-    end
+    exit_with_error("Invalid directory: #{dirname}") unless File.directory?(dirname)
     filename
   end
   
   # Check that the filename given exists and is a file, exit otherwise 
   def check_file(filename)
     filename = File.expand_path(filename)
-    unless File.file?(filename)
-      puts "Invalid file: #{filename}"
-      exit(1)
-    end
+    exit_with_error("Invalid file: #{filename}") unless File.file?(filename)
     filename
   end
 
@@ -140,7 +138,7 @@ class Style
     end
     
     config[:directory] = File.expand_path(config[:directory])
-    Dir.chdir(config[:directory]) rescue (puts "Invalid directory: #{arg}"; exit(1))
+    Dir.chdir(config[:directory]) rescue (exit_with_error("Invalid directory: #{config[:directory]}"))
     
     cliconfig[:config] = File.expand_path(check_file(cliconfig[:config])) if cliconfig[:config]
     config[:config] = File.expand_path(config[:config])
@@ -151,10 +149,14 @@ class Style
       config[opt] = File.expand_path(config[opt])
       config[opt] = check_dir(config[opt])
     end
-    unless VALID_STYLE_RE.match(config[:style])
-      puts "#{config[:style]} is not a valid style!"
-      exit(1)
-    end
+    exit_with_error("#{config[:style]} is not a valid style!") unless VALID_STYLE_RE.match(config[:style])
+  end
+  
+  # Print the error message and the usage, then exit
+  def exit_with_error(error_message)
+    puts error_message
+    puts usage
+    exit(1)
   end
 
   # Process the command given 
@@ -179,8 +181,7 @@ class Style
       when 'stop'
         signal_supervisor(:INT)
       else
-        puts usage
-        exit(1)
+        exit_with_error("Not a valid command: #{command}")
     end
   end
 
@@ -199,8 +200,7 @@ class Style
       when 'stop'
         stop
       else
-        puts usage
-        exit(1)
+        exit_with_error("Not a valid command: #{command}")
     end
   end
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-style
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2007-12-08 00:00:00 -08:00
+  version: 1.0.2
+date: 2008-01-06 00:00:00 -08:00
 summary: Supervised TCPServer, Yielding Listeners Easily
 require_paths: 
 - lib