picnic 0.7.0 → 0.7.1

data/History.txt

@@ -1,4 +1,10 @@
-=== 0.7 :: In progress...
+=== 0.7.1 :: 2008-11-10
+
+* Fixed config file loading problems rooted in $APP_PATH inconsistencies.
+  $APP_PATH is now set to the root of the application installation, rather than
+  the bin or lib subdirectory.
+
+=== 0.7.0 :: 2008-10-28
 
 * 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
@@ -59,4 +65,4 @@
 
 === 0.5.0 :: 2007-12-20
 
-* First public release.
+* First public release.

data/lib/picnic/cli.rb

@@ -53,7 +53,7 @@ module Picnic
     def handle_cli_input
       if File.exists? options[:app_file]
         # try to use given app base path
-        $APP_PATH = File.dirname(options[:app_file]).gsub(/\/lib\/?$/, '')
+        $APP_PATH = File.dirname(options[:app_file]).gsub(/\/(lib|bin)\/?$/, '')
       else
         require 'rubygems'
         

data/lib/picnic/conf.rb

@@ -48,7 +48,7 @@ module Picnic
         caller.last =~ /^(.*?):\d+$/
         app_path = File.dirname(File.expand_path($1))
       end
-      app_path+'/../config.example.yml'
+      app_path+'/config.example.yml'
     end
     
     # Copies the example config file into the appropriate

data/lib/picnic/service_control.rb

@@ -94,9 +94,9 @@ module Picnic
     #                          everything that it's doing to STDOUT.  
     def initialize(app, options = {})
       @app = app
-      
+
       @options = options
-      @options[:bin_file]  ||= File.expand_path(File.dirname(File.expand_path(__FILE__)))+"/#{app}"
+      @options[:bin_file]  ||= "bin/#{app}"
       @options[:pid_file]  ||= "/etc/#{app}/#{app}.pid"
       @options[:conf_file] ||= nil
       @options[:verbose]   ||= false
@@ -155,7 +155,7 @@ module Picnic
     def start
       # use local app bin if it exists and is executable -- makes debugging easier
       bin = options[:bin_file]
-      
+
       if File.exists?(bin)
         exec = "ruby #{bin}"
       else
@@ -271,4 +271,4 @@ module Picnic
       end
     end
   end
-end
+end

data/lib/picnic/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: picnic
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-28 00:00:00 -04:00
+date: 2008-11-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: picnic
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Camping for sissies