ledger_web 1.4.7 → 1.4.8

data/README.md

@@ -67,7 +67,7 @@ This says that every value in the `Account` column will be surrounded with an `<
 
 #### Customizing
 
-Any ruby files in `~/.ledger_web/lib` will be loaded at startup so you can define your own classes, modules, whatever you want. In addition, you can put [Sequel migrations](http://sequel.rubyforge.org/rdoc/files/doc/migration_rdoc.html) in `~/.ledger_web/migrate` and they'll get applied as necessary at startup.
+You can put [Sequel migrations](http://sequel.rubyforge.org/rdoc/files/doc/migration_rdoc.html) in `~/.ledger_web/migrate` and they'll get applied as necessary at startup.
 
 #### Hooks
 

data/lib/ledger_web.rb

@@ -8,14 +8,3 @@ require 'ledger_web/report'
 require 'ledger_web/watcher'
 require 'ledger_web/helpers'
 require 'ledger_web/app'
-
-
-ledger_web_dir = "#{ENV['HOME']}/.ledger_web"
-
-if File.directory? ledger_web_dir
-  if File.directory? File.join(ledger_web_dir, "lib")
-    Dir.glob(File.join(ledger_web_dir, "lib", "*.rb")).each do |f|
-      require f
-    end
-  end
-end

data/lib/ledger_web/config.rb

@@ -69,6 +69,14 @@ module LedgerWeb
           self.set :report_directories, dirs
         end
 
+        if File.directory? "#{user_dir}/migrate"
+          self.set :user_migrate_dir, "#{user_dir}/migrate"
+        end
+
+        if File.directory? "#{user_dir}/reports"
+          self.set :user_reports_dir, "#{user_dir}/reports"
+        end
+
         if File.exists? "#{user_dir}/config.rb"
           self.override_with(LedgerWeb::Config.from_file("#{user_dir}/config.rb"))
         end

data/lib/ledger_web/db.rb

@@ -22,9 +22,9 @@ module LedgerWeb
     def self.run_migrations
       Sequel::Migrator.apply(@@db, File.join(File.dirname(__FILE__), "db/migrate"))
 
-      home_migrations = File.join(ENV['HOME'], '.ledger_web', 'migrate')
-      if LedgerWeb::Config.should_load_user_config && File.directory?(home_migrations)
-        Sequel::Migrator.run(@@db, home_migrations, :table => "user_schema_changes")
+      user_migrations = LedgerWeb::Config.instance.get :user_migrate_directory
+      if not user_migrations.nil?
+        Sequel::Migrator.run(@@db, user_migrations, :table => "user_schema_changes")
       end
     end
 

data/lib/ledger_web/report.rb

@@ -174,7 +174,7 @@ end
 def find_all_reports
   directories = [
     File.join(File.dirname(__FILE__), "reports"),
-    File.join(ENV['HOME'], ".ledger_web", "reports")
+    LedgerWeb::Config.instance.get :user_report_dir
   ]
 
   reports = {}

data/lib/ledger_web/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ledger_web
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
   prerelease: 
 platform: ruby
 authors: