treasurer 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7093dd3826d606b0ba1f76ae379ea9ff02d74211
-  data.tar.gz: 54f3cde9ccd02559074114f691dc03d48f44d55f
+  metadata.gz: 6aa2a2dc0c5bcd8c4cc5bc4bc905e4c99e317497
+  data.tar.gz: 0208ef5153cfb46947fce5ca8079ead628180fb2
 SHA512:
-  metadata.gz: cbcec24e8990da5ed2131023662c5cfee4d65332f90ca1547f96d648865dbc5051a511dde77c78f27580b56832ff827b3bdc8d483efc65e351673304ccf568da
-  data.tar.gz: d78965e3d3b81edb9fec098aa33a2b58e17a254c71c85e1ad490ed4407434e1279cc9f187d16a6f8cec3539d1758114bb914c3751886ac56c7267bd944c59daf
+  metadata.gz: 891b64d30e9cc11a6fe2793b88751e20bfb84630a14c39370f35bea6d485b47621be03ee06ee9db3d5ab77f159c7bf5458e9dd6af76396e06b4b63d9192cd6cb
+  data.tar.gz: 3694e108f72e3f72b90f2e21660f5939a52b4c931e5b0f4d196f3a2e358ad58e5e5d3b297a4e17dbf1f485e20d211ac66320e5748946f7c0ba63266536b0438f

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/treasurer/commands.rb

@@ -6,7 +6,7 @@ class << self
 		ep 'entries', Dir.entries
 		CodeRunner.submit(p: "{data_file: '#{File.expand_path(file)}', account: :#{account}}")
 	end
-	def add_folder(folder, copts={})
+	def add_folder_of_files(folder, copts={})
 		#Dir.chdir(folder) do
 			files = Dir.entries(folder).grep(/\.csv$/)
 			accounts = files.map{|f| f.sub(/\.csv/, '')}
@@ -18,6 +18,11 @@ class << self
 	def check_is_treasurer_folder
 		raise "This folder has not been set up to use with Treasurer; please initialise a folder with treasurer init" unless FileTest.exist? '.code_runner_script_defaults.rb' and eval(File.read('.code_runner_script_defaults.rb'))[:code] == 'budget'
 	end
+	def create_report(copts = {})
+		load_treasurer_folder
+		reporter = Reporter.new(CodeRunner.fetch_runner(h: :component), days_before: copts[:b]||360, days_ahead: copts[:a]||180, today: copts[:t])
+		reporter.report()
+	end
 	def init_root_folder(folder, copts={})
 		raise "Folder already exists" if FileTest.exist? folder
 		FileUtils.makedirs(folder)
@@ -32,13 +37,8 @@ class << self
 		Treasurer::Reporter.send(:include, Treasurer::LocalCustomisations)
 		Treasurer::Reporter::Account.send(:include, Treasurer::LocalCustomisations)
 		Treasurer::Reporter::Analysis.send(:include, Treasurer::LocalCustomisations)
-		CodeRunner::Budget.send(:include, Treasurer::LocalCustomisations)
 		runner = CodeRunner.fetch_runner
-	end
-	def report(copts = {})
-		load_treasurer_folder
-		reporter = Reporter.new(CodeRunner.fetch_runner(h: :component), days_before: copts[:b]||360, days_ahead: copts[:a]||180, today: copts[:t])
-		reporter.report()
+		CodeRunner::Budget.send(:include, Treasurer::LocalCustomisations)
 	end
 
 	def method_missing(meth, *args)

data/lib/treasurer/local_customisations.rb

@@ -52,6 +52,8 @@ def account_type(account)
 		:Asset
 	when :PersonalLoans
 		:Liability
+	else
+		:Expense
 	end
 end
 

data/lib/treasurer/report.rb

@@ -66,8 +66,9 @@ class Reporter
 	def report
 		get_actual_budgets
 		get_projected_budgets
-	  @accounts = @runs.map{|r| r.account}.uniq.map{|acc| Account.new(acc, self, @runner, @runs, @projected_budgets, false)} + 
-			@runs.map{|r| r.external_account}.uniq.map{|acc| Account.new(acc, self, @runner, @runs, @projected_budgets, true)} 
+	  accounts = @runs.map{|r| r.account}.uniq.map{|acc| Account.new(acc, self, @runner, @runs, @projected_budgets, false)} 
+	  external_accounts = (@runs.map{|r| r.external_account}.uniq - accounts.map{|acc| acc.name}).map{|acc| Account.new(acc, self, @runner, @runs, @projected_budgets, true)} 
+		@accounts = accounts + external_accounts
 		@accounts.unshift (@equity = Equity.new(self, @runner, @accounts))
 		get_in_limit_discretionary_budget_factor
 		get_stable_discretionary_budget_factor
@@ -80,7 +81,7 @@ class Reporter
 		report << expense_account_summary
 		report << budget_expenditure_graphs
 		report << '\end{multicols}'
-		report << budget_resolutions
+		#report << budget_resolutions
 		report << budget_breakdown
 		report << transactions_by_account
 		report << footer
@@ -112,12 +113,17 @@ class Reporter
 			#if !date
 				#@runs.sort_by{|r| r.date}[-1].balance
 			if @external
-				@runs.find_all{|r| r.date < date}.map{|r| (r.deposit - r.withdrawal) * (@external ? -1 : 1)}.sum || 0.0
+				#p ['name is ', name, type]
+				#
+				#@runs.find_all{|r| r.date < date}.map{|r| (r.deposit - r.withdrawal) * (@external ? -1 : 1)}.sum || 0.0
+				# Temporary....
+				0.0
 			else
 				@runs.sort_by{|r| (r.date.to_datetime.to_time.to_i - date.to_datetime.to_time.to_i).to_f.abs}[0].balance
 			end
 		end
 		def expenditure(today, days_before, &block)
+				p ['name22 is ', name, type]
 			@runs.find_all{|r| r.days_ago(today) < days_before and (!block or yield(r)) }.map{|r| @external ? r.withdrawal : r.deposit }.sum || 0
 		end
 		def income(today, days_before)
@@ -143,6 +149,7 @@ EOF
 			end
 		end
 		def projected_balance(date)
+			 return 0.0 if @external # Temporary Hack
 			 non_discretionary_projected_balance(date)  -
 			 @reporter.sum_regular(@projected_budgets, date) 
 		end
@@ -194,7 +201,7 @@ EOF
 			 stable = futuredates.map{|date| projected_balance(date)}
 			 kit5 = GraphKit.quick_create([futuredates.map{|d| d.to_time.to_i}, stable])
 			 #exit
-			 @projected_budget_factor = nil
+			 @reporter.projected_budget_factor = nil
 			 kit += (kit2 + kit4 + kit5)
 			 kit = kit3 + kit
 			 kit.title = "Balance for #{name}"
@@ -287,19 +294,19 @@ EOF
 \\subsection{Equity}
 #{@accounts.find{|acc| acc.type == :Equity }.summary_table(@today, @days_before)}
 \\subsection{Assets}
-#{@accounts.find_all{|acc| account_type(acc.name) == :Asset }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
+#{@accounts.find_all{|acc| acc.type == :Asset }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
 \\subsection{Liabilities}
-#{@accounts.find_all{|acc| account_type(acc.name) == :Liability }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
+#{@accounts.find_all{|acc| acc.type == :Liability }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
 \\subsection{Income}
-#{@accounts.find_all{|acc| account_type(acc.name) == :Income }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
+#{@accounts.find_all{|acc| acc.type == :Income }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
 \\subsection{Expenses}
-#{@accounts.find_all{|acc| account_type(acc.name) == :Expense }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
+#{@accounts.find_all{|acc| acc.type == :Expense }.map{|acc| acc.summary_table(@today, @days_before)}.join("\n\n") }
 EOF
 	end
 	def account_balance_graphs
 		<<EOF
 \\section{Graphs of Recent Balances}
-#{@accounts.find_all{|acc| account_type(acc.name) != :Expense}.map{|acc|
+#{@accounts.find_all{|acc| acc.type != :Expense}.map{|acc|
  acc.write_balance_graph(@today, @days_before, @days_ahead)
  acc.balance_graph_string
 }.join("\n\n")
@@ -326,9 +333,12 @@ EOF
 EOF
 	end
 	def expense_pie_chart(name, &block)
-		expaccs = @accounts.find_all{|acc| account_type(acc.name) == :Expense}
+		expaccs = @accounts.find_all{|acc| acc.type == :Expense}
 		labels = expaccs.map{|acc| acc.name}
 		exps = expaccs.map{|acc| acc.expenditure(@today, 50000, &block)}
+		labels, exps = [labels, exps].transpose.find_all{|l, e| e != 0.0}.transpose
+		return "No expenditure in budget period." if labels == nil
+		ep ['labels22539', labels, exps]
 		kit = GraphKit.quick_create([exps])
 		kit.data[0].gp.with = 'boxes'
 		kit.gp.style = "fill solid"
@@ -500,13 +510,13 @@ EOF
 		if items.size > 0
 			"
 			\\footnotesize
-			\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 4 + " L " + " r " * 2 }}
+			\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 3 + " L " + " r " * 2 + " c " }}
 			%\\hline
-			& #{date.to_s.latex_escape} & & & Total & #{expenditure} &  \\\\
+			#{date.to_s.latex_escape} & & & Total & #{expenditure} &  \\\\
 			\\hline
 			\\Tstrut
 				#{items.map{|r| 
-						([:id] + CodeRunner::Budget.rcp.component_results - [:sc, :balance]).map{|res| 
+						( CodeRunner::Budget.rcp.component_results + [:external_account] -  [:sc, :balance ]).map{|res| 
 								r.send(res).to_s.latex_escape
 							}.join(" & ")
 						}.join("\\\\\n")
@@ -534,9 +544,9 @@ EOF
 #{all = acc.runs.find_all{|r|  r.days_ago(@today) < @days_before}.sort_by{|r| [r.date, r.id]}.reverse
 #ep ['acc', acc, 'ids', all.map{|r| r.id}, 'size', all.size]
 all.pieces((all.size.to_f/50.to_f).ceil).map{|piece|
-"\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 4 + " L " + " r " * 3 + "l"}}
+"\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 3 + " L " + " r " * 3 + "l"}}
 		#{piece.map{|r| 
-	  ([:id] + CodeRunner::Budget.rcp.component_results - [:sc] + [:budget]).map{|res| r.send(res).to_s.latex_escape
+	  (CodeRunner::Budget.rcp.component_results - [:sc] + [:budget]).map{|res| r.send(res).to_s.latex_escape
 	  #rcp.component_results.map{|res| r.send(res).to_s.gsub(/(.{20})/, '\1\\\\\\\\').latex_escape
   }.join(" & ")
 }.join("\\\\\n")}

data/lib/treasurer.rb

@@ -91,6 +91,9 @@ class Treasurer
 		# options (copts) hash
 		def setup(copts)
 			# None neededed
+			copts[:b] = copts[:b].to_i
+			copts[:a] = copts[:a].to_i
+			copts[:t] = Date.parse(copts[:t]) if copts[:t]
 	  end
 		def verbosity
 			2
@@ -100,6 +103,7 @@ class Treasurer
 end
 
 $has_put_startup_message_for_code_runner = true
+require 'date'
 require 'coderunner'
 require 'treasurer/commands.rb'
 require 'treasurer/report.rb'

data/test/test_treasurer.rb

@@ -11,10 +11,10 @@ class TestTreasurer < Test::Unit::TestCase
 			Treasurer.add_file('../bankaccountstatement.csv', 'FirstBank', {})
 			Treasurer.status
 			Treasurer.add_file('../otheraccountstatement.csv', 'SecondBank', {})
-			Treasurer.add_folder('../multiple')
+			Treasurer.add_folder_of_files('../multiple')
 			Treasurer.status h: :component
-			Treasurer.report t: Date.parse('2010-09-07'), b: 40, a: 35
+			Treasurer.create_report t: Date.parse('2010-09-07'), b: 40, a: 35
 		end
-		FileUtils.rm_r(testfolder) if FileTest.exist? testfolder
+		#FileUtils.rm_r(testfolder) if FileTest.exist? testfolder
 	end
 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.1.0 ruby lib
+# stub: treasurer 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treasurer"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock"]
-  s.date = "2014-05-30"
+  s.date = "2014-06-02"
   s.description = "A simple command line tool for managing accounts and finances. Easily import internet banking spreadsheets and generate sophisticated reports and projections."
   s.email = "edmundhighcock@users.sourceforge.net"
   s.executables = ["treasurer"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: treasurer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner