camper_van 0.0.9 → 0.0.10

data/bin/camper_van

@@ -36,11 +36,16 @@ Options:
   stop_on "proxy"
 
   opt :log_level, "Log level", :default => "info"
-  opt :log_file, "Log file", :short => "f", :type => :string
+  opt :log_file, "Log file (required when running as a daemon)", :short => "f", :type => :string
   opt :ssl, "Enable SSL for IRC client connections"
   opt :ssl_private_key, "Path to SSL private key file for IRC client connections, defaults to self-signed", :type => :string
   opt :ssl_cert, "Path to SSL cert file for IRC client connections, defaults to self-signed", :type => :string
   opt :ssl_verify_peer, "Verify peers for IRC client connections"
+
+  opt :daemon, 'Daemonizes the process'
+
+  opt :pid, 'Path of the PID file', :type => :string,
+    :default => '/var/run/camper_van.pid'
 end
 
 opts = Trollop.with_standard_exception_handling parser do
@@ -50,6 +55,10 @@ opts = Trollop.with_standard_exception_handling parser do
     raise Trollop::HelpNeeded
   end
 
+  if o[:daemon] and !o[:log_file]
+    raise Trollop::HelpNeeded
+  end
+
   o
 end
 
@@ -69,7 +78,9 @@ else
     :ssl => opts[:ssl],
     :ssl_private_key => opts[:ssl_private_key],
     :ssl_cert => opts[:ssl_cert],
-    :ssl_verify_peer => opts[:ssl_verify_peer]
+    :ssl_verify_peer => opts[:ssl_verify_peer],
+    :daemon => opts[:daemon],
+    :pid => opts[:pid]
   )
 
 end

data/lib/camper_van/channel.rb

@@ -43,11 +43,11 @@ module CamperVan
     #   false if the room was full or locked.
     def join
       if room.locked?
-        numeric_reply :err_inviteonlychan, "Cannot join #{channel} (locked)"
+        client.numeric_reply :err_inviteonlychan, "Cannot join #{channel} (locked)"
         return false
 
       elsif room.full?
-        numeric_reply :err_channelisfull, "Cannot join #{channel} (full)"
+        client.numeric_reply :err_channelisfull, "Cannot join #{channel} (full)"
         return false
 
       else

data/lib/camper_van/server.rb

@@ -14,6 +14,8 @@ module CamperVan
     #                :ssl_private_key - if using ssl, private key file to use, defaults to self-signed
     #                :ssl_cert - if using ssl, cert file to use, defaults to self-signed
     #                :ssl_verify_peer - if using ssl, verify client certificates, defaults to false
+    #                :daemon - if camper_van should daemonize itself
+    #                :pid - the path of the PID file to use.
     def self.run(bind_address="localhost", port=6667, options={})
 
       initialize_logging options
@@ -22,6 +24,11 @@ module CamperVan
         logger = Logging.logger[self.name]
         logger.info "starting server on #{bind_address}:#{port}"
         EM.start_server bind_address, port, self, options
+
+        if options[:daemon]
+          daemonize(logger, options[:pid])
+        end
+
         trap("INT") do
           logger.info "SIGINT, shutting down"
           EM.stop
@@ -29,6 +36,28 @@ module CamperVan
       end
     end
 
+    # Turns the current process into a daemon.
+    #
+    # logger - The logger to use
+    # pid - The path to the PID file
+    #
+    def self.daemonize(logger, pid)
+      if !File.writable?(pid)
+        logger.error "The PID file #{pid} is not writable"
+        abort
+      end
+
+      logger.info "Daemonizing camper_van using PID #{pid}"
+
+      Process.daemon
+
+      File.open(pid, 'w') do |handle|
+        handle.write(Process.pid.to_s)
+      end
+
+      Logging.reopen
+    end
+
     # Initialize the logging system
     #
     # opts - Hash of logging options

data/lib/camper_van/version.rb

@@ -1,3 +1,3 @@
 module CamperVan
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/camper_van/channel_spec.rb

@@ -123,6 +123,18 @@ describe CamperVan::Channel do
       @channel.join
       @room.stream_count.must_equal 1
     end
+
+    it "returns an error if the room is locked" do
+      @room.locked = true
+      @channel.join
+      @client.sent.last.must_match /Cannot join #test.*locked/
+    end
+
+    it "returns an error if the room is full" do
+      @room.full = true
+      @channel.join
+      @client.sent.last.must_match /Cannot join #test.*full/
+    end
   end
 
   describe "#part" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camper_van
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -102,7 +102,6 @@ files:
 - .gitignore
 - .rvmrc
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - Procfile
@@ -150,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1820978099192572136
+      hash: -1732883802111020027
 requirements: []
 rubyforge_project: camper_van
 rubygems_version: 1.8.23

data/Gemfile.lock

@@ -1,48 +0,0 @@
-PATH
-  remote: .
-  specs:
-    camper_van (0.0.9)
-      eventmachine (~> 0.12.10)
-      firering (~> 1.2.0)
-      logging (~> 1.5.1)
-      trollop (~> 1.16.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.7)
-    em-http-request (0.3.0)
-      addressable (>= 2.0.0)
-      escape_utils
-      eventmachine (>= 0.12.9)
-    escape_utils (0.2.4)
-    eventmachine (0.12.10)
-    ffi (1.0.11)
-    firering (1.2.2)
-      em-http-request (~> 0.3.0)
-      eventmachine (~> 0.12.10)
-      yajl-ruby (~> 0.7.6)
-    growl (1.0.3)
-    guard (1.0.1)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-minitest (0.5.0)
-      guard (>= 0.4)
-    little-plugger (1.1.3)
-    logging (1.5.2)
-      little-plugger (>= 1.1.2)
-    rake (0.9.2.2)
-    rb-fsevent (0.9.0)
-    thor (0.14.6)
-    trollop (1.16.2)
-    yajl-ruby (0.7.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  camper_van!
-  growl
-  guard-minitest
-  rake
-  rb-fsevent