climax 0.0.4 → 0.0.5

data/README.markdown

@@ -127,9 +127,9 @@ your `main` method completes, any existing events in the queue are processed.  Y
 then called again.  This process goes on until the `main` method returns a value other than nil or
 an `:exit` or `:quit` event is placed in the event queue.
 
-Your application can send events to the climax event queue with the `send_event` method.  You must
-pass `send_event` the event type (e.g., `:exit` or `:start_remote_debugger`) and you may also
-optionally pass a payload (i.e., extra data) as a second parameter.
+Your application can send events to the climax event queue with the `climax_send_event` method.  You
+must pass `climax_send_event` the event type (e.g., `:exit` or `:start_remote_debugger`) and you may
+also optionally pass a payload (i.e., extra data) as a second parameter.
 
 For example, if you wish for your application to exit in an orderly fashion **after** the current
 iteration of `main` has had a chance to finish, you can accomplish this by placing an `:exit` event
@@ -143,7 +143,7 @@ off of the queue it will call your `post_main` method and perform other cleanup
       include Climax::Application
       
       def main
-        send_event(:exit) if about_to_meet_work_quota?
+        climax_send_event(:exit) if about_to_meet_work_quota?
         work = get_some_work
         do_work(work)
         return nil
@@ -163,6 +163,9 @@ This is excellent for stopping a long running process without interrupting its w
 :exit or :quit event, whether through the Control DRb or from your application itself, your
 application will be allowed to finish processing its current unit of work before exiting.
 
+For your convenience there is also a 'climax_has_event?' method that returns true only if there are
+events waiting on the event queue.
+
 Generating a New Application
 ============================
 

data/lib/climax/application.rb

@@ -32,7 +32,7 @@ module Climax
 
     def _post_main
       log.debug "Stopping Control DRb"
-      @control_drb.stop_service
+      DRb.stop_service
     end
 
     def _parse_options
@@ -169,7 +169,7 @@ module Climax
           unless event.nil?
             case event.type
             when :set_log_level then log_level = event.payload
-            when :stop_control_drb then @control_drb && @control_drb.stop_service
+            when :stop_control_drb then DRb.stop_service
             when :start_remote_debugger then binding.remote_pry rescue nil
             when :quit, :exit then return 0
             end
@@ -181,12 +181,18 @@ module Climax
       end
     end
 
-    def send_event (type, payload=nil)
+    def climax_send_event (type, payload=nil)
       _events_mutex.synchronize {
         _events.unshift OpenStruct.new(:type => type, :payload => payload)
       }
     end
 
+    def climax_has_event?
+      _events_mutex.synchronize {
+        _events.count > 1
+      }
+    end
+
     def _events
       @_events ||= []
     end

data/lib/climax/control_drb.rb

@@ -11,11 +11,11 @@ module Climax
     end
 
     def log_level= (level)
-      @app.send_event(:set_log_level, level)
+      @app.climax_send_event(:set_log_level, level)
     end
 
     def start_debugger
-      @app.send_event(:start_remote_debugger)
+      @app.climax_send_event(:start_remote_debugger)
     end
   end
 

data/lib/climax/version.rb

@@ -1,3 +1,3 @@
 module Climax
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/templates/bin/application.rb.erb

@@ -3,4 +3,16 @@
 $:.unshift File.expand_path("../../lib", __FILE__)
 require "rubygems" rescue nil
 require "<%= name %>"
-<%= module_string %>::Application.new(ARGV).run
+app = <%= module_string %>::Application.new(ARGV)
+received_ctrlc = false
+trap("INT") do
+  if received_ctrlc == false
+    app.log.info "Received Interrupt.  Attempting to exit safely.  Send Interrupt again to quit abruptly."
+    app.climax_send_event(:quit)
+    received_ctrlc = true
+  else
+    app.log.fatal "Aborting!"
+    exit 1
+  end
+end
+app.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: climax
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry