ledger_web 1.4.6 → 1.4.7

data/bin/ledger_web

@@ -13,6 +13,8 @@ rescue LoadError => e
   require 'ledger_web'
 end
 
+user_dir = "#{ENV['HOME']}/.ledger_web"
+
 OptionParser.new do |opts|
   opts.banner = "Usage: ledger_web [options]"
 
@@ -27,8 +29,14 @@ OptionParser.new do |opts|
   opts.on("-d", "--database-url URL", String, "Database URL to load into") do |d|
     LedgerWeb::Config.instance.set :database_url, d
   end
+
+  opts.on("-U", "--user-dir DIR", String, "Directory containing reports and config") do |d|
+    user_dir = d
+  end
 end.parse!
 
+LedgerWeb::Config.instance.load_user_config(user_dir)
+
 LedgerWeb::Database.connect
 
 LedgerWeb::Watcher.run!

data/lib/ledger_web/config.rb

@@ -61,13 +61,26 @@ module LedgerWeb
       end
     end
 
+    def load_user_config(user_dir)
+      if LedgerWeb::Config.should_load_user_config && File.directory?(user_dir)
+        if File.directory? "#{user_dir}/reports"
+          dirs = self.get(:report_directories)
+          dirs.unshift "#{user_dir}/reports"
+          self.set :report_directories, dirs
+        end
+
+        if File.exists? "#{user_dir}/config.rb"
+          self.override_with(LedgerWeb::Config.from_file("#{user_dir}/config.rb"))
+        end
+      end
+    end
+
     def self.from_file(filename)
       File.open(filename) do |file|
         return eval(file.read, nil, filename)
       end
     end
 
-
     def self.instance
       @@instance ||= LedgerWeb::Config.new do |config|
         config.set :database_url,       "postgres://localhost/ledger"
@@ -79,29 +92,16 @@ module LedgerWeb
         config.set :watch_interval,     5
         config.set :watch_stable_count, 3
         config.set :ledger_bin_path,    "ledger"
-      
+
         config.set :ledger_format, "%(quoted(xact.beg_line)),%(quoted(date)),%(quoted(payee)),%(quoted(account)),%(quoted(commodity)),%(quoted(quantity(scrub(display_amount)))),%(quoted(cleared)),%(quoted(virtual)),%(quoted(join(note | xact.note))),%(quoted(cost))\n"
-      
+
         config.set :price_lookup_skip_symbols, ['$']
-      
+
         func = Proc.new do |symbol, min_date, max_date|
           LedgerWeb::YahooPriceLookup.new(symbol, min_date, max_date).lookup
         end
         config.set :price_function, func
-      
-        ledger_web_dir = "#{ENV['HOME']}/.ledger_web"
-      
-        if LedgerWeb::Config.should_load_user_config && File.directory?(ledger_web_dir)
-          if File.directory? "#{ledger_web_dir}/reports"
-            dirs = config.get(:report_directories)
-            dirs.unshift "#{ledger_web_dir}/reports"
-            config.set :report_directories, dirs
-          end
-          
-          if File.exists? "#{ledger_web_dir}/config.rb"
-            config.override_with(LedgerWeb::Config.from_file("#{ledger_web_dir}/config.rb"))
-          end
-        end
+
       end
     end
   end

data/lib/ledger_web/version.rb

@@ -1,3 +1,3 @@
 module LedgerWeb
-  VERSION = '1.4.6'
+  VERSION = '1.4.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ledger_web
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000Z
+date: 2012-05-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg