conveyor 0.1.2 → 0.1.3

data/Rakefile

@@ -11,6 +11,7 @@ Hoe.new('conveyor', Conveyor::VERSION) do |p|
   p.remote_rdoc_dir = ''
   p.extra_deps << ['mongrel']
   p.extra_deps << ['json']
+  p.extra_deps << ['daemons']
 end
 
 # vim: syntax=Ruby

data/bin/conveyor

@@ -25,7 +25,7 @@ opts = OptionParser.new do |opts|
 end
 
 opts.parse!
-p options
+
 unless ARGV.length == 1
   puts opts.help
   exit
@@ -39,4 +39,10 @@ if options[:daemonize]
   Daemonize.daemonize
 end
 
-Conveyor::Server.new('0.0.0.0', options[:port], ARGV[0], options[:log_directory]).run.join
+server = Conveyor::Server.new('0.0.0.0', options[:port], ARGV[0], options[:log_directory])
+
+Signal.trap 'INT' do
+  server.stop
+end
+
+server.run.join

data/lib/conveyor.rb

@@ -1,4 +1,4 @@
 module Conveyor
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   QUALITY = 'alpha'
 end

data/lib/conveyor/base_channel.rb

@@ -9,7 +9,7 @@ module Conveyor
   # Base implementation for channels. Not useful to instantiate directly.
   class BaseChannel
 
-    NAME_PATTERN = %r{\A[a-zA-Z\-0-9]+\Z}
+    NAME_PATTERN = %r{\A[a-zA-Z\-0-9\_]+\Z}
     BUCKET_SIZE = 100_000
 
     def initialize directory

data/test/test_channel.rb

@@ -173,5 +173,11 @@ class TestConveyorChannel < Test::Unit::TestCase
     assert_equal 'foo', d.get_next_by_group('bar')[1]
   end
   
-  
+  def test_valid_name
+    assert BaseChannel.valid_channel_name?(('a'..'z').to_a.join)
+    assert BaseChannel.valid_channel_name?(('A'..'Z').to_a.join)
+    assert BaseChannel.valid_channel_name?(('0'..'9').to_a.join)
+    assert BaseChannel.valid_channel_name?('-')
+    assert BaseChannel.valid_channel_name?('_')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: conveyor
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ryan King
@@ -30,7 +30,7 @@ cert_chain:
   Zls3y84CmyAEGg==
   -----END CERTIFICATE-----
 
-date: 2008-02-05 00:00:00 -08:00
+date: 2008-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: