picnic 0.6.3 → 0.6.4

data/CHANGELOG.txt

@@ -1,14 +1,27 @@
-=== 0.6.3 :: 2007-03-14
+=== 0.6.4 :: 2008-05-26
+
+* Patched bundled Camping library to allow setting expiry time on cookies.
+* CLI initializer can now be fed an alternate module name for your application.
+  This will override the module that would have been guessed based on the
+  app's name.
+* Fixed bug where HTTPS operation didn't work under Webrick. You should now
+  again be able to serve over HTTPS when using webrick by supplying the
+  ssl_cert configuration option.
+  See: http://code.google.com/p/rubycas-server/issues/detail?id=45
+* Fixed bug where the log file was being truncuated whenever the server
+  was started in daemon mode.
+
+=== 0.6.3 :: 2008-03-14
 
 * Fixed bug in mongrel postamble that prevented the server from starting when
   the log level was set to DEBUG.
 
-=== 0.6.2 :: 2007-03-06
+=== 0.6.2 :: 2008-03-06
 
 * Fixed some loading problems having to do with the new CAS authenticator
   introduced in 0.6.0.
 
-=== 0.6.1 :: 2007-02-28
+=== 0.6.1 :: 2008-02-28
 
 * Fixed bug introduced in 0.6.0 where webrick and mongrel postambles were
   broken for apps that don't define any public directories.
@@ -16,7 +29,7 @@
   some potential issues with the uri_path config option. Multiple /'s
   in the path are now automatically removed.
 
-=== 0.6.0 :: 2007-02-26
+=== 0.6.0 :: 2008-02-26
 
 * Added support for CAS authentication. See picnic/authentication.rb for 
   details.

data/lib/picnic/cli.rb

@@ -1,5 +1,12 @@
 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.
@@ -41,11 +48,12 @@ module Picnic
     def initialize(app, options = {})
       @app = app
       
-      @options = {}
-      @options[:app_path]  ||= File.expand_path(File.dirname(File.expand_path(__FILE__))+"/../lib/#{app}.rb")
-      @options[:pid_file]  ||= "/etc/#{app}/#{app}.pid"
-      @options[:conf_file] ||= nil
-      @options[:verbose]   ||= false
+      @options = options || {}
+      @options[:app_path]   ||= File.expand_path(File.dirname(File.expand_path(__FILE__))+"/../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
@@ -97,7 +105,8 @@ module Picnic
         
         opts.on_tail("-V", "--version", "Show version number") do
           require "#{path}/lib/#{app}/version"
-          puts "#{app}-#{VERSION::STRING}"
+          app_mod = @options[:app_module].constantize
+          puts "#{app}-#{app_mod::VERSION::STRING}"
           exit
         end
       end.parse!

data/lib/picnic/postambles.rb

@@ -36,12 +36,36 @@ module Picnic
       cert_path = Picnic::Conf.ssl_cert
       key_path = Picnic::Conf.ssl_key || Picnic::Conf.ssl_cert
         # look for the key in the ssl_cert if no ssl_key is specified
+      
+      webrick_options = {
+        :BindAddress => Picnic::Conf.bind_address || "0.0.0.0",
+        :Port => Picnic::Conf.port
+      }
+      
+      unless cert_path.nil? && key_path.nil?
+        raise "The specified certificate file #{cert_path.inspect} does not exist. " +
+          " Your 'ssl_cert' configuration setting must be a path to a valid " +
+          " ssl certificate." unless
+            File.exists? cert_path
+        
+        raise "The specified key file #{key_path.inspect} does not exist. " +
+          " Your 'ssl_key' configuration setting must be a path to a valid " +
+          " ssl private key." unless
+            File.exists? key_path
             
+        require 'openssl'
+        
+        cert = OpenSSL::X509::Certificate.new(File.read(cert_path))
+        key = OpenSSL::PKey::RSA.new(File.read(key_path))
+        
+        webrick_options[:SSLEnable] = true
+        webrick_options[:SSLVerifyClient] = ::OpenSSL::SSL::VERIFY_NONE
+        webrick_options[:SSLCertificate] = cert
+        webrick_options[:SSLPrivateKey] = key
+      end
+      
       begin
-        s = WEBrick::HTTPServer.new(
-          :BindAddress => Picnic::Conf.bind_address || "0.0.0.0",
-          :Port => Picnic::Conf.port
-        )
+        s = WEBrick::HTTPServer.new(webrick_options)
       rescue Errno::EACCES
         puts "\nThe server could not launch. Are you running on a privileged port? (e.g. port 443) If so, you must run the server as root."
         exit 2
@@ -69,9 +93,11 @@ module Picnic
       trap(:TERM) do
         s.shutdown
       end
+      
+      server_url = "http#{webrick_options[:SSLEnable] ? 's' : ''}://#{ENV['HOSTNAME'] || 'localhost'}:#{Picnic::Conf.port}#{Picnic::Conf.uri_path}"
             
       if $DAEMONIZE
-        puts "\n** #{self} will run at http://#{ENV['HOSTNAME'] || 'localhost'}:#{Picnic::Conf.port}#{Picnic::Conf.uri_path} and log to #{Picnic::Conf.log[:file].inspect}. "
+        puts "\n** #{self} will run at #{server_url} and log to #{Picnic::Conf.log[:file].inspect}. "
         puts "** Check the log file for further messages!\n\n"
         
         logdev = $LOG.instance_variable_get(:@logdev).instance_variable_get(:@filename)
@@ -82,6 +108,7 @@ module Picnic
         
         WEBrick::Daemon.start do
           begin
+            #self.init_db_logger
             write_pid_file if $PID_FILE
             $LOG.info "Starting #{self} as a WEBrick daemon with process id #{Process.pid}."
             self.prestart if self.respond_to? :prestart
@@ -94,7 +121,7 @@ module Picnic
           end
         end
       else
-        puts "\n** #{self} is running at http://#{ENV['HOSTNAME'] || 'localhost'}:#{Picnic::Conf.port}#{Picnic::Conf.uri_path} and logging to #{Picnic::Conf.log[:file].inspect}\n\n"
+        puts "\n** #{self} is running at #{server_url} and logging to #{Picnic::Conf.log[:file].inspect}\n\n"
         self.prestart if self.respond_to? :prestart
         s.start
       end
@@ -218,7 +245,7 @@ module Picnic
     def check_log_writable
       log_file = Picnic::Conf.log['file']
       begin
-        f = open(log_file, 'w')
+        f = open(log_file, 'a')
       rescue
         $stderr.puts "Couldn't write to log file at '#{log_file}' (#{$!})."
         exit 1

data/lib/picnic/version.rb

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

data/lib/picnic.rb

@@ -46,12 +46,15 @@ class Module
       
       # Initialize your application's database logger. 
       # If enabled, all SQL queries going through ActiveRecord will be logged here.
+      #
+      # THIS SEEMS TO BE BROKEN RIGHT NOW and I can't really understand why.
       def init_db_logger
         begin
           if self::Conf.db_log
             log_file = self::Conf.db_log[:file] || "#{self.to_s.downcase}_db.log"
-            self::Models::Base.logger = Logger.new(log_file)
-            self::Models::Base.logger.level = "#{self}::Utils::Logger::#{self::Conf.db_log[:level] || 'DEBUG'}".constantize
+            self::Models::Base.logger = Picnic::Utils::Logger.new(log_file)
+            self::Models::Base.logger.level = "Picnic::Utils::Logger::#{self::Conf.db_log[:level] || 'DEBUG'}".constantize
+            $LOG.debug "Logging database queries to #{log_file.inspect}"
           end
         rescue Errno::EACCES => e
           $LOG.warn "Can't write to database log file at '#{log_file}': #{e}"

data/vendor/camping-1.5.180/CHANGELOG

@@ -1,3 +1,15 @@
+= Patches
+=== 31st Mar, 2008
+
+* Can now set expiry time for cookies.
+    
+    @cookies[:foo] = {:value => "bar", :expires => Time.now + 1.hour}
+    
+  The simple method of setting cookies without expiry still works.
+  
+    @cookies[:foo] = "bar"
+    
+
 = 1.5
 === 3rd Oct, 2006
 

data/vendor/camping-1.5.180/lib/camping-unabridged.rb

@@ -434,7 +434,9 @@ module Camping
     # on before and after overrides with Camping.
     def service(*a)
       @body = send(@method, *a) if respond_to? @method
-      @headers['Set-Cookie'] = @cookies.map { |k,v| "#{k}=#{C.escape(v)}; path=#{self/"/"}" if v != @k[k] } - [nil]
+      @headers['Set-Cookie'] = @cookies.map { |k,v| 
+        "#{k}=#{C.escape(v[:value] || v)}; path=#{self/"/"}; expires=#{v[:expires] && v[:expires].strftime('%a, %d-%b-%Y %H:%M:%S %Z') || nil}" if v != @k[k] 
+      } - [nil]
       self
     end
 

data/vendor/camping-1.5.180/lib/camping.rb

@@ -25,8 +25,10 @@ o.binmode;else;fh=""end;while l=@in.read(16384);if l=~b;o<<$`.chomp;@in.seek(-$'
 size,IO::SEEK_CUR);break;end;o<<l;end;C.qsp(fn,'&;',fh,q) if fn;fh[:tempfile].rewind if
 fh.is_a?H;end;elsif@method=="post";q.u C.qsp(@in.read)end;@cookies,@input=
 @k.dup,q.dup end;def service*a;@body=send(@method,*a)if respond_to?@method
-@headers["Set-Cookie"]=@cookies.map{|k,v|"#{k}=#{C.escape(v)}; path=#{self/'/'
-}"if v!=@k[k]}-[nil];self end;def to_s;a=[];@headers.map{|k,v|[*v].map{|x|a<<
+@headers["Set-Cookie"]=@cookies.map{|k,v|"#{k}=#{C.escape(v[:value] || v)
+}; path=#{self/'/'}; expires=#{v[:expires] && 
+v[:expires].strftime('%a, %d-%b-%Y %H:%M:%S %Z') || nil}"if v!=@k[k]}-[nil];
+self end;def to_s;a=[];@headers.map{|k,v|[*v].map{|x|a<<
 "#{k}: #{x}"}};"Status: #{@status}#{Z+a*Z+Z*2+@body}"end;end
 X=module Controllers;@r=[];class<<self;def r;@r;end;def R*u;r=@r;Class.new{
 meta_def(:urls){u};meta_def(:inherited){|x|r<<x}}end;def M;def M;end;constants.map{|c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: picnic
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-14 00:00:00 -04:00
+date: 2008-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency