treasurer 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527b7bf070b87e8545bbe39aa6658bfcf0ab6eeb
-  data.tar.gz: 44540e9865df8463262bd9144d3c24a1b272f1f3
+  metadata.gz: a55d811fa5407a680b22be526598e6398fd1a55e
+  data.tar.gz: 64be91516a253dade32ae4391d8fee7c5a183cdc
 SHA512:
-  metadata.gz: ceddf4261e7c3375161643d1536857e1d0d69310c1328796706cbd1d66eafc98f49554fbc19065435c7c57050da33c5d6d8e1b1f97e3d8a678713351244e1ad1
-  data.tar.gz: 1aea117fd0245c4e1bf33a1bcdd4e678d4a284951b4c8b2670cf59b48a648131c19847a7698e0927f24f094d2eda666714b88760b3c68582b3ee9ed2a807bc7b
+  metadata.gz: 7dee8f5e8d9a5ef0a8b572458f2662c27ddcf75b63b86651d160afdf71fac29e7e896cfeef7eb9b788c77c1412530734c0f4b726c16a9759f907c1f65faf6b3b
+  data.tar.gz: d54382492cabf560c32acd50dc0651386e8d7fd92ab0506a05f651e56911e7724d93a1298ad20cfe0ae422998e1a3f9293daa6e4d6806981b1643c49d702cd71

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 gem "activesupport", ">= 5.0.0"
     gem "coderunner", ">= 0.14.16"
-    gem "budgetcrmod", "~> 0.3"
+    gem "budgetcrmod", "~> 0.4"
     gem "command-line-flunky", ">= 1.0.0"
 
 # Add dependencies to develop your gem here.

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/lib/treasurer.rb

@@ -96,8 +96,8 @@ class Treasurer
     # options (copts) hash
     def setup(copts)
       # None neededed
-      copts[:b] = copts[:b].to_i if copts[:b]
-      copts[:a] = copts[:a].to_i if copts[:a]
+      #copts[:b] = copts[:b].to_i if copts[:b]
+      #copts[:a] = copts[:a].to_i if copts[:a]
       copts[:t] = Date.parse(copts[:t]) if copts[:t]
     end
     def verbosity

data/lib/treasurer/accounts.rb

@@ -61,7 +61,7 @@ class Treasurer::Reporter
     def generate_report_account
       p [name_c, @report_runs.class, @runs.class]
       @report_account = ReportAccount.new(@name, @reporter, @runner, nil, @external, {currency: @currency, input_runs: @report_runs})
-      @report_account.instance_variable_set(:@currency, @reporter.report_currency)
+      @report_account.instance_variable_set(:@currency, @reporter.report_currency||currency)
       @report_account.instance_variable_set(:@original_currency, currency)
     end
 
@@ -176,7 +176,7 @@ class Treasurer::Reporter
       @runs.find_all{|r| r.days_ago(today) < days_before and r.date <= today }.map{|r| (@external) ? r.deposit : r.withdrawal }.sum || 0
     end
     def currency
-      @currency || (info[:currencies] && info[:currencies][0])
+      @currency || (info[:currencies] && info[:currencies][0]) || DEFAULT_CURRENCY
     end
     def currency_label
       if currency
@@ -234,8 +234,14 @@ EOF
       #(discretionary ? @reporter.sum_regular({name => info}, date) : 0.0)
     end
     def linked_projected_account_info
-      #Hash[@reporter.projected_accounts_info.find_all{|ext_ac,inf| inf[:linked_accounts] == name and ext_ac.currency == currency}]
-      Hash[@reporter.projected_accounts_info.find_all{|ext_ac,inf| inf[:linked_accounts][original_currency] and inf[:linked_accounts][original_currency] == name and ext_ac.original_currency == original_currency}]
+      #Hash[@reporter.projected_accounts_info.find_all{|ext_ac,inf| inf[:linked_account] == name and ext_ac.currency == currency}]
+      Hash[@reporter.projected_accounts_info.find_all{|ext_ac,inf| 
+        la = inf[:linked_account] and (
+          la == name or
+          (la.kind_of? Hash and la[original_currency] and 
+           la[original_currency] == name and ext_ac.original_currency == original_currency)
+        )
+      }]
     end
     def cache
       @cache ||={}
@@ -250,7 +256,7 @@ EOF
           transfers.each do |accs, trans|
             next unless accs.include? name
             trans.each do |item, details|
-              if  details[:currency] != currency
+              if details[:currency] and details[:currency] != currency
                 #p ['LAGT(O', details[:currency], currency, details, name_c, item]
                 details[:size] *= EXCHANGE_RATES[[details[:currency], currency]]
               end

data/lib/treasurer/analysis.rb

@@ -58,6 +58,7 @@ module Analysis
 					date-=1
 				end
 			when :day
+        raise "Period of days not implemented yet"
 				while date > @start_date
 					items_temp += items.find_all{|r| r.date == date}
 					#expenditure += (account_items[-1].map{|r| r.debit}+[0]).sum

data/lib/treasurer/commands.rb

@@ -24,7 +24,7 @@ class << self
 	end
 	def fetch_reporter(copts = {})
 		load_treasurer_folder(copts)
-		Reporter.new(CodeRunner.fetch_runner(h: :component, A: true), days_before: copts[:b]||360, days_ahead: copts[:a]||180, today: copts[:t], report_currency: copts[:r])
+		Reporter.new(CodeRunner.fetch_runner(h: :component), days_before: copts[:b]||360, days_ahead: copts[:a]||180, today: copts[:t], report_currency: copts[:r])
 	end
   def status(copts={})
     load_treasurer_folder(copts)

data/lib/treasurer/local_customisations.rb

@@ -30,18 +30,20 @@ FUTURE_TRANSFERS = {
 
 FUTURE_TRANSFERS.default = {}
 
+DEFAULT_CURRENCY = "GBP"
 
 
 ACCOUNT_INFO = {
-	Monthly: {linked_account: :FirstBank, period: [1, :month], monthday: 1, start: nil, end: nil, discretionary: false},
-	MonthlySecondBank: {linked_account: :SecondBank, period: [1, :month], monthday: 1, start: nil, end: nil, discretionary: false},
-	Weekly: {linked_account: :FirstBank, period: [7, :day], monthday: nil, start: nil, end: nil, discretionary: true},
-	WeeklySecondBank: {linked_account: :SecondBank, period: [7, :day], monthday: nil, start: nil, end: nil, discretionary: true},
-	MyHoliday: {linked_account: :SecondBank, period: [1, :day], monthday: nil, start: Date.parse("02/12/2013"), end: Date.parse("2/01/2014"), discretionary: false},
+	MonthlyExpenses: {linked_account: :FirstBank, period: [1, :month], monthday: 1, start: nil, end: nil, discretionary: false},
+	#MonthlySecondBank: {linked_account: :SecondBank, period: [1, :month], monthday: 1, start: nil, end: nil, discretionary: false},
+	DailyExpenses: {linked_account: :FirstBank, period: [1, :month], monthday: 1, start: nil, end: nil, discretionary: true},
+	#WeeklySecondBank: {linked_account: :SecondBank, period: [7, :day], monthday: nil, start: nil, end: nil, discretionary: true},
+	Splurge: {linked_account: :SecondBank, period: [1, :month], monthday: 1, start: Date.parse("02/12/2013"), discretionary: true},
 	PersonalLoans: {type: :Liability},
 	FirstBank: {type: :Asset},
 	SecondBank: {type: :Asset},
-	Pay: {linked_account: :FirstBank, type: :Income},
+	Cash: {type: :Asset},
+	Income: {linked_account: :FirstBank, type: :Income},
 }
 
 def in_date(item)
@@ -72,48 +74,7 @@ def red_line(account, date)
 	end
 end
 
+ASSETS={}
 
-def sub_account
-	case description
-	when /co-op|sainsbury/i 
-		:Food
-	when /insurance/i
-		:Insurance
-	when /Vodafone/i
-		:Phone
-	when /Adams/i
-		:Rent
-	when /Carfax|Lnk/i
-		:Cash
-	when /andalus/i, /angels/i, /maggie arms/i, /barley mow/i
-		:Entertainment
-	when /blackwell/i
-		:Books
-	else
-		:Unknown
-	end
-end
-
-def external_account
-	case description
-	when /Vodafone/i
-		:Monthly
-	when /norries/i
-		:PersonalLoans
-	when /my employer/i
-		:Pay
-	else
-		case sub_account
-		when :Food, :Entertainment
-			:Weekly
-		when :Insurance, :Phone, :Rent
-			:Monthly
-		when :Books, :Cash
-			:WeeklySecondBank
-		else
-			:Unknown
-		end
-	end
-end
-	
+    
 end

data/lib/treasurer/report.rb

@@ -75,21 +75,43 @@ class Treasurer
     attr_reader :stable_discretionary_account_factors
     attr_accessor :projected_account_factor
     attr_reader :accounts
-    attr_reader :equity
+    attr_reader :equities, :equity
     attr_reader :projected_accounts_info
     attr_reader :days_before
     attr_reader :report_currency
     attr_reader :accounts_hash
     def initialize(runner, options)
       @runner = runner
-      @days_ahead = options[:days_ahead]||180
-      @days_before = options[:days_before]||360
+      
       @today = options[:today]||Date.today
+      @days_ahead = case da = options[:days_ahead]
+                      when NilClass, ""
+                        180
+                      when Integer
+                        da
+                      when String
+                        da =~ /^\d+$/ ? da.to_i : Date.parse(da) - @today
+                      else
+                        raise ArgumentError.new("days_ahead")
+                      end
+      @days_before = case da = options[:days_before]
+                      when NilClass, ""
+                        360
+                      when Integer
+                        da
+                      when String
+                        da =~ /^\d+$/ ? da.to_i : @today - Date.parse(da) 
+                      else
+                        raise ArgumentError.new("days_before")
+                      end
+      puts @days_before, options[:days_before]
+      sleep 2
+
       @start_date = @today - @days_before
       @end_date = @today + @days_ahead
       @runs = runner.component_run_list.values
       @currencies = ACCOUNT_INFO.map{|k,v| v[:currencies]}.flatten.uniq
-      @report_currency = options[:report_currency]
+      @report_currency = options[:report_currency] 
 
       if run = @runs.find{|r| not r.external_account}
         raise "External_account not specified for #{run.data_line}"
@@ -128,7 +150,12 @@ class Treasurer
             er = EXCHANGE_RATES[[curr, @report_currency]]
             r.deposit *= er
             r.withdrawal *= er
-            r.balance *= er if r.has_balance?
+            begin
+              r.balance *= er if r.has_balance?
+            rescue => err
+              p [r.account, r.real_id, r.balance, er, r.data_line]
+              raise err
+            end
           end
         end
         ASSETS.each do |name, details|

data/test/account_choices.rb

@@ -0,0 +1,45 @@
+# coding: utf-8
+{"2010-09-03,CPT,000000,99999999,LTSB CARFAX OXFORDCD 03SEP10,0.00,20.00,156.33"=>
+  {:external_account=>:Cash, :sub_account=>:Withdrawal},
+ "2010-09-03,DD,000000,99999999,VODAFONE LIMITED,0.00,28.61,176.33"=>
+  {:external_account=>:MonthlyExpenses, :sub_account=>:Phone},
+ "2010-09-03,DEB,000000,99999999,ENDSLEIGH INSURANCE,0.00,24.63,204.94"=>
+  {:external_account=>:MonthlyExpenses, :sub_account=>:Insurance},
+ "2010-09-02,DEB,000000,99999999,MIDCOUNTIES CO-OP,0.00,32.65,229.57"=>
+  {:external_account=>:DailyExpenses, :sub_account=>:Food},
+ "2010-09-01,FPO,000000,99999999,MISS C ADAMS,0.00,150.00,262.22"=>
+  {:external_account=>:Splurge, :sub_account=>:Gifts},
+ "2010-09-01,DD,000000,99999999,PAYPAL PAYMENT,0.00,5.97,412.22"=>
+  {:external_account=>:Splurge, :sub_account=>:Computers},
+ "2010-09-01,DEB,000000,99999999,S390-BLACKWELLCD ,0.00,15.00,418.19"=>
+  {:external_account=>:Splurge, :sub_account=>:Books},
+ "2010-08-25,DEB,000000,99999999,MIDCOUNTIES CO-OP,0.00,52.65,229.57"=>
+  {:external_account=>:DailyExpenses, :sub_account=>:Food},
+ "2010-08-15,DEB,000000,99999999,MIDCOUNTIES CO-OP,0.00,12.65,229.57"=>
+  {:external_account=>:DailyExpenses, :sub_account=>:Food},
+ "2010-08-07,DEB,000000,99999999,MIDCOUNTIES CO-OP,0.00,32.65,229.57"=>
+  {:external_account=>:DailyExpenses, :sub_account=>:Food},
+ "2010-08-01,DEB,000000,99999999,MISS C ADAMS,0.00,150.00,418.19"=>
+  {:external_account=>:Splurge, :sub_account=>:Gifts},
+ "2010-09-05,CPT,222222,88888888,LNK WINDERMERE,0.00,30.00,860.75"=>
+  {:external_account=>:Cash, :sub_account=>:Withdrawal2},
+ "2010-09-05,FPO,222222,88888888,M H NORRIES,560.00,0.00,890.75"=>
+  {:external_account=>:DailyExpenses, :sub_account=>:Rent},
+ "2010-09-05,DEB,222222,88888888,SAINSBURY'S SMKT,0.00,6.05,1450.75"=>
+  {:external_account=>:DailyExpenses, :sub_account=>:Food},
+ "2010-09-05,DEB,222222,88888888,AL-ANDALUS,0.00,50.00,1456.80"=>
+  {:external_account=>:Splurge, :sub_account=>:EatingOut},
+ "2010-09-05,DEB,222222,88888888,ANGELS,0.00,11.50,1506.80"=>
+  {:external_account=>:Splurge, :sub_account=>:EatingOut},
+ "2010-09-01,DEB,222222,88888888,THE MAGGIE ARMS,0.00,48.00,1518.30"=>
+  {:external_account=>:Splurge, :sub_account=>:EatingOut},
+ "2010-09-01,DEB,222222,88888888,BARLEY MOW,0.00,6.60,1566.30"=>
+  {:external_account=>:Splurge, :sub_account=>:EatingOut},
+ "2010-08-30,DD,222222,88888888,PAYPAL PAYMENT,0.00,11.91,1572.90"=>
+  {:external_account=>:Splurge, :sub_account=>:Computers},
+ "2010-08-30,FPO,222222,88888888,MY EMPLOYER,1000.00,0.00,1560.99"=>
+  {:external_account=>:Income, :sub_account=>:Salary},
+ "2010-09-04,DEB,000000,99999999,MARKS & SPENCER,0.00,35.00,121.33"=>
+  {:external_account=>:Splurge, :sub_account=>:Clothes},
+ "2010-09-06,CPT,222222,88888888,LNK BIRMINGHAM,0.00,40.00,820.75"=>
+  {:external_account=>:Cash, :sub_account=>:Withdrawal2}}

data/test/external_accounts.rb

@@ -0,0 +1,30 @@
+# coding: utf-8
+{:Cash=>
+  {:name=>:Cash,
+   :sym=>"1",
+   :sub_accounts=>
+    {:Withdrawal=>{:name=>:Withdrawal, :sym=>"\e"},
+     :Withdrawal2=>{:name=>:Withdrawal2, :sym=>"1"}}},
+ :MonthlyExpenses=>
+  {:name=>:MonthlyExpenses,
+   :sym=>"3",
+   :sub_accounts=>{:Insurance=>{:name=>:Insurance, :sym=>"1"},
+   :Phone=>{:name=>:Phone, :sym=>"1"}}},
+ :DailyExpenses=>
+  {:name=>:DailyExpenses,
+   :sym=>"4",
+   :sub_accounts=>
+    {:Food=>{:name=>:Food, :sym=>"1"}, :Rent=>{:name=>:Rent, :sym=>"2"}}},
+ :Splurge=>
+  {:name=>:Splurge,
+   :sym=>"5",
+   :sub_accounts=>
+    {:Gifts=>{:name=>:Gifts, :sym=>"1"},
+     :Computers=>{:name=>:Computers, :sym=>"2"},
+     :Books=>{:name=>:Books, :sym=>"3"},
+     :EatingOut=>{:name=>:EatingOut, :sym=>"4"},
+     :Clothes=>{:name=>:Clothes, :sym=>"5"}}},
+ :Income=>
+  {:name=>:Income,
+   :sym=>"6",
+   :sub_accounts=>{:Salary=>{:name=>:Salary, :sym=>"1"}}}}

data/test/helper.rb

@@ -23,12 +23,11 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+require 'minitest'
+require 'minitest/autorun'
 require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'treasurer'
 
-class Test::Unit::TestCase
-end

data/test/test_treasurer.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'ruby-prof'
 #require 'ruby-prof/test'
 
-class TestTreaurer < Test::Unit::TestCase
+class TestTreaurer < MiniTest::Test
 	#include RubyProf::Test
 	#PROFILE_OPTIONS[:
 	def testfolder
@@ -12,6 +12,8 @@ class TestTreaurer < Test::Unit::TestCase
 		FileUtils.rm_r(testfolder) if FileTest.exist? testfolder
 		Treasurer.init_root_folder('test/myaccount', {})
 		Dir.chdir('test/myaccount') do
+      FileUtils.cp('../external_accounts.rb', '.')
+      FileUtils.cp('../account_choices.rb', '.')
 			Treasurer.add_file('../bankaccountstatement.csv', 'FirstBank', {})
 			Treasurer.status
 			Treasurer.add_file('../otheraccountstatement.csv', 'SecondBank', {})
@@ -25,8 +27,8 @@ class TestTreaurer < Test::Unit::TestCase
 			File.open('timing.html', 'w'){|f| printer.print(f, {})}
 			reporter = Treasurer.fetch_reporter(t: Date.parse('2010-09-07'), b: 40, a: 35)
 			reporter.generate_accounts
-			assert_equal(382.08, reporter.equity.balance.round(2))
-			assert_equal(724.33, reporter.equity.projected_balance(Date.parse('2010-10-09')).round(2))
+      assert_equal(1032.08, reporter.equities.values[0].balance.round(2))
+      assert_equal(1825.28, reporter.equities.values[0].projected_balance(Date.parse('2010-10-09')).round(2))
 		end
 		#FileUtils.rm_r(testfolder) if FileTest.exist? testfolder
 	end

data/treasurer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: treasurer 0.9.2 ruby lib
+# stub: treasurer 0.9.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treasurer".freeze
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Edmund Highcock".freeze]
-  s.date = "2018-04-10"
+  s.date = "2018-06-30"
   s.description = "A simple command line tool for managing accounts and finances. Easily import internet banking spreadsheets and generate sophisticated reports and projections.".freeze
   s.email = "edmundhighcock@users.sourceforge.net".freeze
   s.executables = ["treasurer".freeze]
@@ -33,7 +33,9 @@ Gem::Specification.new do |s|
     "lib/treasurer/commands.rb",
     "lib/treasurer/local_customisations.rb",
     "lib/treasurer/report.rb",
+    "test/account_choices.rb",
     "test/bankaccountstatement.csv",
+    "test/external_accounts.rb",
     "test/helper.rb",
     "test/multiple/FirstBank.csv",
     "test/multiple/SecondBank.csv",
@@ -52,7 +54,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>.freeze, [">= 5.0.0"])
       s.add_runtime_dependency(%q<coderunner>.freeze, [">= 0.14.16"])
-      s.add_runtime_dependency(%q<budgetcrmod>.freeze, ["~> 0.3"])
+      s.add_runtime_dependency(%q<budgetcrmod>.freeze, ["~> 0.4"])
       s.add_runtime_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
       s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
       s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
@@ -63,7 +65,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0"])
       s.add_dependency(%q<coderunner>.freeze, [">= 0.14.16"])
-      s.add_dependency(%q<budgetcrmod>.freeze, ["~> 0.3"])
+      s.add_dependency(%q<budgetcrmod>.freeze, ["~> 0.4"])
       s.add_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
       s.add_dependency(%q<shoulda>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
@@ -75,7 +77,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0"])
     s.add_dependency(%q<coderunner>.freeze, [">= 0.14.16"])
-    s.add_dependency(%q<budgetcrmod>.freeze, ["~> 0.3"])
+    s.add_dependency(%q<budgetcrmod>.freeze, ["~> 0.4"])
     s.add_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
     s.add_dependency(%q<shoulda>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: treasurer
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: command-line-flunky
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,9 @@ files:
 - lib/treasurer/commands.rb
 - lib/treasurer/local_customisations.rb
 - lib/treasurer/report.rb
+- test/account_choices.rb
 - test/bankaccountstatement.csv
+- test/external_accounts.rb
 - test/helper.rb
 - test/multiple/FirstBank.csv
 - test/multiple/SecondBank.csv