Sutto-perennial 0.2.4.1 → 0.2.4.5

data/lib/perennial.rb

@@ -9,12 +9,12 @@ require 'perennial/exceptions'
 
 module Perennial
   
-  VERSION = "0.2.4.1"
+  VERSION = "0.2.4.5"
   
   has_library :dispatchable, :hookable, :loader, :logger, :nash,
               :loggable, :manifest, :settings, :argument_parser,
               :option_parser, :application, :generator, :daemon,
-              :delegateable
+              :delegateable, :reloading
   
   def self.included(parent)
     parent.extend(Manifest::Mixin)

data/lib/perennial/application.rb

@@ -53,8 +53,8 @@ module Perennial
       @banners         = {}
     end
     
-    def option(name, description = nil)
-      option_parser.add(name, description) { |v| @command_options[name] = v }
+    def option(name, description = nil, opts = {})
+      option_parser.add(name, description, opts) { |v| @command_options[name] = v }
     end
     
     def add_default_options!

data/lib/perennial/dispatchable.rb

@@ -21,6 +21,10 @@ module Perennial
       @@handler_mapping ||= Hash.new { |h,k| h[k] = [] }
     end
     
+    def self.reloading_mapping
+      @@reloading_mapping ||= Hash.new { |h,k| h[k] = [] }
+    end
+    
     def self.included(parent)
       parent.class_eval do
         include InstanceMethods
@@ -125,6 +129,18 @@ module Perennial
         end
       end
       
+      def reloading!
+        handlers = Dispatchable.handler_mapping.delete(self)
+        Dispatchable.reloading_mapping[self.name] = handlers
+      end
+      
+      def reloaded!
+        if Dispatchable.reloading_mapping.has_key?(self.name)
+          handlers = Dispatchable.reloading_mapping.delete(self.name)
+          handlers.each { |h| register_handler(h) }
+        end
+      end
+      
     end
     
   end

data/lib/perennial/loader.rb

@@ -73,6 +73,7 @@ module Perennial
       handler_directory = Settings.root / "handlers"
       if File.directory?(handler_directory)
         Dir[handler_directory / "**" / "*.rb"].each do |handler|
+          Perennial::Reloading.watch(handler, handler_directory)
           require handler
         end
       end

data/lib/perennial/nash.rb

@@ -9,7 +9,7 @@ module Perennial
         contents = YAML.load_file(path)
       end
       if contents.is_a?(Hash)
-        contents.to_hash
+        contents.to_nash
       else
         new(:data => contents).normalized
       end

data/lib/perennial/option_parser.rb

@@ -52,9 +52,9 @@ module Perennial
     def add_defaults!
       return if defined?(@defaults_added) && @defaults_added
       logger_levels = Logger::LEVELS.keys.map { |k| k.to_s }
-      add(:daemon, 'Runs this application as a daemon') { Settings.daemon = true }
-      add(:verbose, 'Runs this application verbosely, writing to STDOUT') { Settings.verbose = true }
-      add(:log_level, "Sets this applications log level, one of: #{logger_levels.join(", ")}") do |level|
+      add(:daemon, 'Runs this application as a daemon', :shortcut => "d") { Settings.daemon = true }
+      add(:verbose, 'Runs this application verbosely, writing to STDOUT', :shortcut => "v") { Settings.verbose = true }
+      add(:log_level, "Sets this applications log level, one of: #{logger_levels.join(", ")}", :shortcut => "l") do |level|
         if logger_levels.include?(level)
           Settings.log_level = level.to_sym
         else

data/lib/perennial/reloading.rb

@@ -0,0 +1,45 @@
+module Perennial
+  class Reloading
+    
+    cattr_accessor :mapping, :mtimes
+    self.mapping = {}
+    self.mtimes = {}
+    
+    def self.watch(file, relative_to = File.dirname(file))
+      file = File.expand_path(file)
+      raise ArgumentError, "You must provide the path to a file" unless File.file?(file)
+      relative = file.gsub(/^#{File.expand_path(relative_to)}\//, '')
+      name = relative.gsub(/\.rb$/, '').split("/").map { |part|part.camelize }.join("::")
+      self.mapping[name] = file
+      self.mtimes[file] = File.mtime(file)
+    end
+    
+    def self.reload!
+      self.mapping.each_pair do |constant, file|
+        next unless File.mtime(file) > self.mtimes[file]
+        begin
+          # Get a relative name and namespace
+          parts = constant.split("::")
+          name = parts.pop
+          ns = parts.inject(Object) { |a, c| a.const_get(c) }
+          # Notify object pre-reload.
+          final = ns.const_get(name)
+          final.reloading! if final.respond_to?(:reloading!)
+          final = nil
+          # Remove the constant
+          ns.send(:remove_const, name)
+          load(file)
+          # Notify the object it was reloaded...
+          final = ns.const_get(name)
+          final.reloaded! if final.respond_to?(:reloaded!)
+          # Finally, update the mtime
+          self.mtimes[file] = File.mtime(file)
+        rescue Exception => e
+          logger.fatal "Exception reloading #{file} (for #{constant})"
+          Perennial::ExceptionTracker.log(e)
+        end
+      end
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Sutto-perennial
 version: !ruby/object:Gem::Version 
-  version: 0.2.4.1
+  version: 0.2.4.5
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: perennial
 dependencies: []
 
@@ -55,6 +55,7 @@ files:
 - lib/perennial/manifest.rb
 - lib/perennial/nash.rb
 - lib/perennial/option_parser.rb
+- lib/perennial/reloading.rb
 - lib/perennial/settings.rb
 - lib/perennial.rb
 - test/delegateable_test.rb
@@ -74,6 +75,7 @@ files:
 - templates/test_helper.erb
 has_rdoc: false
 homepage: http://sutto.net/
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -94,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A simple (generally event-oriented) application library for Ruby