picnic 0.6.5 → 0.7.0

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.7 :: In progress...
+
+* Can now configure the CLI aspect of an app to respond to additional command-
+  line flags. This is done by passing a block of OptionParser calls as
+  an :extra_cli_options parameter to the Cli initializer.
+* activerecord is no longer a requirement. However you should make sure that
+  you take care of loading activerecord in your app if you intend to use
+  Camping's database functionality.
+  
 === 0.6.5 :: 2008-09-18
 
 * Fixed compatibility with ActiveSupport 2.1.

data/Rakefile

@@ -57,6 +57,6 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   # note that camping-1.5.0.180 is now bundled with picnic in the vendor directory. 
   p.extra_deps = [
     'markaby',
-    ['activesupport', '>=2.0.2']
+    'activesupport'
   ]
 end

data/lib/picnic/cli.rb

@@ -1,12 +1,5 @@
 require 'optparse'
 
-begin
-  require 'active_support'
-rescue LoadError
-  require 'rubygems'
-  require 'active_support'
-end
-
 module Picnic
   # Provides a command-line interface for your app. 
   # This is useful for creating a 'bin' file for launching your application.
@@ -22,7 +15,7 @@ module Picnic
   #
   #   cli = Picnic::Cli.new(
   #     'foo',
-  #     :app_path => File.expand_path(File.dirname(File.expand_path(__FILE__)))
+  #     :app_path => "/path/to/foo.br"
   #   )
   #
   #   cli.handle_cli_input   
@@ -38,7 +31,7 @@ module Picnic
     #         binary, which by default is expected to be in the same directory
     #         as the service control script.
     # +options+:: A hash overriding default options. The options are:
-    #             +app_path+:: The path to your application's main Ruby file.
+    #             +app_file+:: The path to your application's main Ruby file.
     #                          By default this is expected to be <tt>../lib/<app>.rb</tt>
     #             +pid_file+:: Where the app's PID file (containing the app's
     #                          process ID) should be placed. By default this is
@@ -49,28 +42,33 @@ module Picnic
       @app = app
       
       @options = options || {}
-      @options[:app_path]   ||= File.expand_path(File.dirname(File.expand_path(__FILE__))+"/../lib/#{app}.rb")
+      @options[:app_file]   ||= File.expand_path(File.dirname(File.expand_path($0))+"/../lib/#{app}.rb")
       @options[:app_module] ||= app.capitalize
       @options[:pid_file]   ||= "/etc/#{app}/#{app}.pid"
       @options[:conf_file]  ||= nil
       @options[:verbose]    ||= false
-      
-      @options = options
     end
     
     # Parses command line options given to the script.
     def handle_cli_input
-      if File.exists? options[:app_path]
+      if File.exists? options[:app_file]
         # try to use given app base path
-        $: << File.dirname(options[:app_path])
-        path = File.dirname(options[:app_path])+"/"
+        $APP_PATH = File.dirname(options[:app_file]).gsub(/\/lib\/?$/, '')
       else
-        # fall back to using gem installation
-        path = ""
         require 'rubygems'
+        
+        # fall back to using gem installation
+        matches = Gem::source_index.find_name(app)
+        raise LoadError, "#{app} gem doesn't appear to be installed!" if matches.empty?
+        
+        gem_spec = matches.last
+        $APP_PATH = gem_spec.full_gem_path
+        
         gem(app)
       end
       
+      $: <<  $APP_PATH+"/lib"
+      
       $PID_FILE = "/etc/#{app}/#{app}.pid" 
       
       OptionParser.new do |opts|
@@ -97,23 +95,26 @@ module Picnic
             puts "Not running as daemon.  Ignoring pid option"
           end
         end
-      
+ 
+        # :extra_cli_options should be a block with additonal app-specific opts.on() calls
+        if @options[:extra_cli_options]
+          @options[:extra_cli_options].call(opts)
+        end     
+
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit
         end
         
         opts.on_tail("-V", "--version", "Show version number") do
-          require "#{path}/lib/#{app}/version"
-          app_mod = @options[:app_module].constantize
+          require "#{$APP_PATH}/lib/#{app}/version.rb"
+          app_mod = Object.const_get(@options[:app_module])
           puts "#{app}-#{app_mod::VERSION::STRING}"
           exit
         end
       end.parse!
       
-      $APP_PATH = options[:app_path]
-      
-      load "#{path}/lib/#{app}.rb"
+      require "#{$APP_PATH}/lib/#{app}.rb"
     end
   end
 end

data/lib/picnic/postambles.rb

@@ -169,58 +169,67 @@ module Picnic
         :cwd => $APP_PATH
       }
       
-      # need to close all IOs before daemonizing
-      $LOG.close if $DAEMONIZE
-      
-      public_dirs = Picnic::Conf.public_dirs || Picnic::Conf.public_dir
-      public_dirs = [public_dirs] unless 
-        public_dirs.kind_of? Array || public_dirs.nil?
-      
       begin
-        app_mod = self
-        mongrel = Mongrel::Configurator.new settings  do
-          daemonize :log_file => Picnic::Conf.log[:file], :cwd => $APP_PATH if $DAEMONIZE
-          app_mod.init_logger
-          #app_mod.init_db_logger
-          listener :port => Picnic::Conf.port do
-            uri Picnic::Conf.uri_path, :handler => Mongrel::Camping::CampingHandler.new(app_mod)
-
-            if public_dirs
-              public_dirs.each do |d|
-                dir = d[:dir]
-                path = "#{Picnic::Conf.uri_path}/#{d[:path]}".gsub(/\/\/+/,'/')
-                $LOG.debug("Mounting public directory #{dir.inspect} to path #{path.inspect}.")
-                uri(path, :handler => Mongrel::DirHandler.new(dir))
+        # need to close all IOs before daemonizing
+        $LOG.close if $DAEMONIZE
+        
+        public_dirs = Picnic::Conf.public_dirs || Picnic::Conf.public_dir
+        public_dirs = [public_dirs] unless 
+          public_dirs.kind_of? Array || public_dirs.nil?
+        
+        begin
+          app_mod = self
+          mongrel = Mongrel::Configurator.new settings  do
+            daemonize :log_file => Picnic::Conf.log[:file], :cwd => $APP_PATH if $DAEMONIZE
+            app_mod.init_logger
+            #app_mod.init_db_logger
+            listener :port => Picnic::Conf.port do
+              uri Picnic::Conf.uri_path, :handler => Mongrel::Camping::CampingHandler.new(app_mod)
+  
+              if public_dirs
+                public_dirs.each do |d|
+                  dir = d[:dir]
+                  path = "#{Picnic::Conf.uri_path}/#{d[:path]}".gsub(/\/\/+/,'/')
+                  $LOG.debug("Mounting public directory #{dir.inspect} to path #{path.inspect}.")
+                  uri(path, :handler => Mongrel::DirHandler.new(dir))
+                end
               end
+              
+              setup_signals
             end
-            
-            setup_signals
           end
-        end
-      rescue Errno::EADDRINUSE
-        exit 1
-      end
-      
-      mongrel.run
-            
-      
-      if $DAEMONIZE && $PID_FILE
-        write_pid_file
-        unless File.exists? $PID_FILE
-          $LOG.error "#{self} could not start because pid file #{$PID_FILE.inspect} could not be created."
+        rescue Errno::EADDRINUSE
           exit 1
         end
-      end
-      
-      puts "\n** #{self} is running at http://#{ENV['HOSTNAME'] || 'localhost'}:#{Picnic::Conf.port}#{Picnic::Conf.uri_path} and logging to '#{Picnic::Conf.log[:file]}'"
       
       
-      self.prestart if self.respond_to? :prestart
-      mongrel.join
-
-      clear_pid_file
-
-      puts "\n** #{self} is stopped (#{Time.now})"
+        mongrel.run
+        
+        if $DAEMONIZE && $PID_FILE
+          write_pid_file
+          unless File.exists? $PID_FILE
+            $LOG.error "#{self} could not start because pid file #{$PID_FILE.inspect} could not be created."
+            exit 1
+          end
+        end
+        
+        puts "\n** #{self} is running at http://#{ENV['HOSTNAME'] || 'localhost'}:#{Picnic::Conf.port}#{Picnic::Conf.uri_path} and logging to '#{Picnic::Conf.log[:file]}'"
+        
+        
+        self.prestart if self.respond_to? :prestart
+        mongrel.join
+  
+        clear_pid_file
+        
+        if mongrel.needs_restart
+          $LOG.info "#{self} is restarting..."
+          puts "\n** #{self} is restarting..."
+        else
+          $LOG.info "#{self} is stopped."
+          puts "\n** #{self} is stopped (#{Time.now})"
+        end
+        
+      end while mongrel.needs_restart
     end
     
     # Theoretically this should launch your Picnic app as a FastCGI process.

data/lib/picnic/service_control.rb

@@ -247,6 +247,11 @@ module Picnic
     end
     
     def get_state
+      # FIXME: This is a poor attempt at trying to fix a problem where occassionally 
+      #        an empty pid_file is read, probably because it has not yet been
+      #        fully written.  
+      sleep 0.5
+      
       if File.exists? @options[:pid_file]
         pid = File.read(@options[:pid_file]).strip
         

data/lib/picnic/version.rb

@@ -1,8 +1,8 @@
 module Picnic #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 6
-    TINY  = 5
+    MINOR = 7
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/picnic.rb

@@ -1,22 +1,13 @@
-$: << File.dirname(File.expand_path(__FILE__))
-$: << File.dirname(File.expand_path(__FILE__))+"/../vendor/camping-1.5.180/lib"
+require 'rubygems'
+#require 'active_support'
 
-unless Object.const_defined?(:ActiveSupport)
-  begin
-    require 'active_support'
-  rescue LoadError
-    require 'rubygems'
-    gem 'activesupport', '>=2.0.2'
-    gem 'activerecord', '>=2.0.2'
-    require 'active_support'
-  end
-end
+$: << File.dirname(File.expand_path(__FILE__))+"/../vendor/camping-1.5.180/lib" 
+require "camping"
 
-require 'camping'
-
-require 'picnic/utils'
-require 'picnic/conf'
-require 'picnic/postambles'
+$: << File.dirname(File.expand_path(__FILE__))
+require "picnic/utils.rb"
+require "picnic/conf.rb"
+require "picnic/postambles.rb"
 
 
 class Module
@@ -84,7 +75,7 @@ class Module
       # your app's conf file.
       #
       def authenticate_using(mod)
-        require 'picnic/authentication'
+        load "picnic/authentication.rb"
         mod = self::Authentication.const_get(mod.to_s.camelize) unless mod.kind_of? Module
         
         $LOG.info("Enabling authentication for all requests using #{mod.inspect}.")
@@ -98,7 +89,7 @@ class Module
       # Launches the web server to run your Picnic app.
       # This method will continue to run as long as your server is running.
       def start_picnic
-          require 'picnic/postambles'
+          require "#{File.dirname(File.expand_path(__FILE__))}/picnic/postambles.rb"
           self.extend self::Postambles
           
           if $PID_FILE && !(self::Conf.server.to_s == 'mongrel' || self::Conf.server.to_s == 'webrick')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: picnic
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-26 00:00:00 -04:00
+date: 2008-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe