budgetcrmod 0.0.0 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f6c65051be0ec3e7d8da43ff822486d8af50573
-  data.tar.gz: 75f5c0816e48e18fe9b13076a1af87e16826f959
+  metadata.gz: cd1d0b4f3a58bce91cd2ad56229fed7e745a73fb
+  data.tar.gz: 9e7aa5398882fa4f219eb78fcb6f97e518550b88
 SHA512:
-  metadata.gz: 003fe0aab6ef4f244dc6eb8e21346ddec920274077b6cec71d80f40288cdee4d93e7d7104662a75cbc19d6beeba150dcdb37ab7eb62f3ca579662dd7c8764c7c
-  data.tar.gz: 62b8ccf7c84d2aba282fa22d4711efd7192f5fda2912afdb5172009adef1e186d0ab78f88256cc33294ae62ba834745f0e9b132abb4878acf78c6256125e3047
+  metadata.gz: 13cb28562e021786af1945ad3e050dfdb016d3effd719fab216edb58d0330bb400243abf8b303bc71326ea5dcddd60120e49d2897ef109268b8603a3f3ec5313
+  data.tar.gz: 4fa8496fb757cdffdba9eaf10a480ed2d2942723c82ce6690eb62b676951fa4bb2ac16947611d5815f9c8b032d2a8c4acfc16d3d0fbfaeb3597cff276b4cfa50

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

data/budgetcrmod.gemspec

@@ -0,0 +1,64 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: budgetcrmod 0.1.0 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "budgetcrmod"
+  s.version = "0.1.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-06-02"
+  s.description = "A CodeRunner module to help you do your budget"
+  s.email = "edmundhighcock@users.sourceforge.net"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "budgetcrmod.gemspec",
+    "lib/budgetcrmod.rb",
+    "lib/budgetcrmod/budget.rb",
+    "lib/budgetcrmod/defaults_files/budget_defaults.rb",
+    "test/helper.rb",
+    "test/test_budgetcrmod.rb"
+  ]
+  s.homepage = "http://github.com/edmundhighcock/budgetcrmod"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.2.2"
+  s.summary = "A CodeRunner module to help you do your budget"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<coderunner>, [">= 0.11.0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
+    else
+      s.add_dependency(%q<coderunner>, [">= 0.11.0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["> 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+    end
+  else
+    s.add_dependency(%q<coderunner>, [">= 0.11.0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["> 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+  end
+end
+

data/lib/budgetcrmod/budget.rb

@@ -1,3 +1,4 @@
+require 'date'
 class String
 	def latex_escape
 		self.gsub(/(?<!\\)([%_&^])/, '\\\\\1')
@@ -43,26 +44,48 @@ class CodeRunner
 #		  "11.50",
 #			  "4506.80"]
 #
-		@component_results = [:date, :type, :sc, :ac, :description, :debit, :credit, :balance]	
-		@results = [:data] + @component_results
+		@component_results = [:date, :type, :sc, :ac, :description, :deposit, :withdrawal, :balance]	
+		@results = [:data, :data_line] + @component_results
 		def generate_input_file
 			FileUtils.cp @data_file.sub(/~/, ENV['HOME']), @directory + '/data.cvs'
 		end
+		def debit
+			case @account_type
+			when :Asset, :Expense
+				deposit
+			else
+				withdrawal
+			end
+		end
+		def credit
+			case @account_type
+			when :Asset, :Expense
+				withdrawal
+			else
+				deposit
+			end
+		end
 		DOUBLE_STRING=/"(?:\\\\|\\"|[^"\\]|\\[^"\\])*"/
 		def process_directory_code_specific
 			@status=:Complete
 			data = File.read('data.cvs')
 			data = data.split("\n").map do 	|line| 
-				p matches = line.scan(Regexp.new("((?:#{DOUBLE_STRING}|[^,])*)(?:,|$)"))
+				matches = line.scan(Regexp.new("((?:#{DOUBLE_STRING}|[^,])*)(?:,|$)"))
 				matches.flatten
 			end
-			pp data
+			#pp data
 			@data = data
-			@data.shift
+			@first_line = @data.shift.join(',')
+		end
+		def reversed?
+			#case account_type(@account)
+			#when :Asset
+				@first_line =~ /Debit.*Credit/
+			#end
 		end
 		def print_out_line
 			if @is_component
-				sprintf("%4d. %10s %3s %6s %8s %-60s %8s %8s %8s", id, *rcp.component_results.map{|res| send(res)})
+				sprintf("%4d. %10s %10s %3s  %-30s %8s %8s %8s %8s %8s", id, account, *rcp.component_results.find_all{|r| r!=:ac and r!=:sc}.map{|res| send(res)}, budget, external_account)
 			else
 				#pr = component_runs.sort_by{|r| r.id}
 				"#{sprintf("%3d", @id)}. #{sprintf("%-20s", @account)} Start: #{start_date}   End: #{end_date}   Final Balance: #{final_balance} "
@@ -72,39 +95,50 @@ class CodeRunner
 			@date_sorted_component ||= component_runs.sort_by{|r| r.id}
 		end
 		def end_date
-			date_sorted_component[-1].date
+			date_sorted_component[-1].date rescue nil
 		end
 		def start_date
-			date_sorted_component[0].date
+			date_sorted_component[0].date rescue nil
 		end
 		def final_balance
-			date_sorted_component[-1].balance
+			date_sorted_component[-1].balance rescue nil
 		end
 		def parameter_transition(run)
 		end
 		def parameter_string
 			""
 		end
+
+		#def external_account
+			#(sub_account.to_s + '_' + budget.to_s).to_sum
+		#end
 		
 		def generate_component_runs
 			@runner.cache[:data] ||= []
+			reslts = rcp.component_results
+			if reversed?
+				reslts[5] = :withdrawal
+				reslts[6] = :deposit
+			end
 			@data.each do |dataset|
 				next if @runner.cache[:data].include? dataset and Date.parse(dataset[0]) > Date.parse("1/1/2013")
 				component = create_component
-				rcp.component_results.each_with_index do |res,index|
+				reslts.each_with_index do |res,index|
 					value = dataset[index]
 #					ep value
 					value = Date.parse value if res == :date
-					value = value.to_f if [:credit, :debit, :balance].include? res
+					value = value.to_f if [:deposit, :withdrawal, :balance].include? res
 					component.set(res, value)
+					component.set(:data_line, reslts.map{|r| component.send(r).to_s}.join(','))
 				end
 				@runner.cache[:data].push dataset
 				#component.account = @account
 			end
 		end
-		def days_ago
+		def days_ago(today = Date.today)
+			#ep ['today', today, date]
 #			sprintf("%04d%02d%02d", date.year, date.month, date.day).to_i
-			- ((date.to_datetime.to_time.to_i - Time.now.to_i) / 24 / 3600).to_i
+			- ((date.to_datetime.to_time.to_i - today.to_datetime.to_time.to_i) / 24 / 3600).to_i
 		end
 		def idate
 			date.to_datetime.to_time.to_i
@@ -114,157 +148,157 @@ class CodeRunner
 		end
 
 
-		def self.sum_future(future_items, end_date)
-			sum = future_items.inject(0) do |sum, (name, item)| 
-				item = [item] unless item.kind_of? Array
-				value = item.inject(0) do |value,info|
-					value += info[:size] unless (Date.today > info[:date]) or (info[:date] > end_date) # add unless we have already passed that date
-					value
-				end
-				rcp.excluding.include?(name) ? sum : sum + value
-			end
-			sum
-		end
-
-		def self.budget_expenditure(runner, budget, budget_info, start_date)
-			dates = []
-			expenditures = []
-			budget_items = []
-			date = budget_info[:end]||Date.today
-			start_date = [(budget_info[:start]||start_date), start_date].max
-			expenditure = 0
-			items_temp = []
-			items = runner.component_run_list.values.find_all{|r| r.budget == budget and r.in_date(budget_info)}
-			#ep ['items', items]
-			#ep ['budget', budget]
-			counter = 0
-			if not budget_info[:period]
-				dates.push date
-				budget_items.push items
-				expenditures.push (items.map{|r| r.debit - r.credit}+[0]).sum
-			else
-
-				case budget_info[:period][1]
-				when :month
-					while date > start_date
-						items_temp += items.find_all{|r| r.date == date}
-						if date.mday == (budget_info[:monthday] or 1)
-							counter +=1
-							if counter % budget_info[:period][0] == 0
-								expenditure = (items_temp.map{|r| r.debit - r.credit}+[0]).sum
-								dates.push date
-								expenditures.push expenditure
-								budget_items.push items_temp
-								items_temp = []
-								expenditure = 0
-							end
-						end
-						date-=1
-					end
-				when :day
-					while date > start_date
-						items_temp += items.find_all{|r| r.date == date}
-						#expenditure += (budget_items[-1].map{|r| r.debit}+[0]).sum
-						counter +=1
-						if counter % budget_info[:period][0] == 0
-							expenditure = (items_temp.map{|r| r.debit - r.credit}+[0]).sum
-							dates.push date
-							expenditures.push expenditure
-							budget_items.push items_temp
-							items_temp = []
-							expenditure = 0
-						end
-						date-=1
-					end
-				end
-			end
-
-			[dates, expenditures, budget_items]
-
-		end
-
-		def self.sum_regular(regular_items, end_date)
-			today = Date.today
-			sum = regular_items.inject(0) do |sum, (name, item)|	
-				item = [item] unless item.kind_of? Array
-#			  ep item
-				value = item.inject(0) do |value,info|
-					finish = (info[:end] and info[:end] < end_date) ? info[:end] : end_date
-					#today = (Time.now.to_i / (24.0*3600.0)).round
+		#def self.sum_future(future_items, end_date, options={})
+			#sum = future_items.inject(0) do |sum, (name, item)| 
+				#item = [item] unless item.kind_of? Array
+				#value = item.inject(0) do |value,info|
+					#value += info[:size] unless (options[:today]||Date.today > info[:date]) or (info[:date] > end_date) # add unless we have already passed that date
+					#value
+				#end
+				#rcp.excluding.include?(name) ? sum : sum + value
+			#end
+			#sum
+		#end
+
+		#def self.budget_expenditure(runner, budget, budget_info, start_date, options={})
+			#dates = []
+			#expenditures = []
+			#budget_items = []
+			#date = budget_info[:end]||options[:today]||Date.today
+			#start_date = [(budget_info[:start]||start_date), start_date].max
+			#expenditure = 0
+			#items_temp = []
+			#items = runner.component_run_list.values.find_all{|r| r.budget == budget and r.in_date(budget_info)}
+			##ep ['items', items]
+			##ep ['budget', budget]
+			#counter = 0
+			#if not budget_info[:period]
+				#dates.push date
+				#budget_items.push items
+				#expenditures.push (items.map{|r| r.debit - r.credit}+[0]).sum
+			#else
+
+				#case budget_info[:period][1]
+				#when :month
+					#while date > start_date
+						#items_temp += items.find_all{|r| r.date == date}
+						#if date.mday == (budget_info[:monthday] or 1)
+							#counter +=1
+							#if counter % budget_info[:period][0] == 0
+								#expenditure = (items_temp.map{|r| r.debit - r.credit}+[0]).sum
+								#dates.push date
+								#expenditures.push expenditure
+								#budget_items.push items_temp
+								#items_temp = []
+								#expenditure = 0
+							#end
+						#end
+						#date-=1
+					#end
+				#when :day
+					#while date > start_date
+						#items_temp += items.find_all{|r| r.date == date}
+						##expenditure += (budget_items[-1].map{|r| r.debit}+[0]).sum
+						#counter +=1
+						#if counter % budget_info[:period][0] == 0
+							#expenditure = (items_temp.map{|r| r.debit - r.credit}+[0]).sum
+							#dates.push date
+							#expenditures.push expenditure
+							#budget_items.push items_temp
+							#items_temp = []
+							#expenditure = 0
+						#end
+						#date-=1
+					#end
+				#end
+			#end
+
+			#[dates, expenditures, budget_items]
+
+		#end
+
+		#def self.sum_regular(regular_items, end_date, options={})
+			#today = options[:today]||Date.today
+			#sum = regular_items.inject(0) do |sum, (name, item)|	
+				#item = [item] unless item.kind_of? Array
+##			  ep item
+				#value = item.inject(0) do |value,info|
+					#finish = (info[:end] and info[:end] < end_date) ? info[:end] : end_date
+					##today = (Time.now.to_i / (24.0*3600.0)).round
 					 
-					nunits = 0
-					counter = info[:period][0] == 1 ? 0 : nil
-					unless counter
-					  date = today
-						counter = 0
-						case info[:period][1]
-						when :month
-							while date >= (info[:start] or Date.today)
-								counter +=1 if date.mday == (info[:monthday] or 1)
-								date -= 1
-							end
-						when :year
-							while date >= (info[:start] or Date.today) 
-								counter +=1 if date.yday == (info[:yearday] or 1)
-								date -= 1
-							end
-						when :day
-							while date > (info[:start] or Date.today)
-								counter +=1
-								date -= 1
-							end
-						end
-					end
-					date = today
-					case info[:period][1]
-					when :month
-						#p date, info
-						while date <= finish 
-							if date.mday == (info[:monthday] or 1)
-								nunits += 1 if counter % info[:period][0] == 0
-								counter +=1 
-							end
-							date += 1
-						end
-					when :year
-						while date <= finish
-							if date.yday == (info[:yearday] or 1)
-								nunits += 1 if counter % info[:period][0] == 0
-								counter +=1
-							end
-							date += 1
-						end
-					when :day
-						while date <= finish
-							nunits += 1 if counter % info[:period][0] == 0
-							counter +=1
-							date += 1
-						end
-					end
-
-
-
-
-
-					#nyears = (finish.year - today.year)
-					#nmonths = nyears * 12 + (finish.month - today.month)
-					#(puts "Number of Months: #{nmonths}"; @pnmonths=true) unless @pnmonths
-					#ndays = nyears * 12 + (finish.yday - today.yday)
-					#number = case info[:period][1]
-									 #when :month
-										 #(nmonths / info[:period][0]).ceil
-									 #when :day
-										 #(ndays / info[:period][0]).ceil
-									 #end
-				 	#value + number * info[:size]
-					#eputs "Regular Expenditure Item: #{sprintf("%10s", name)} -- #{nunits} payments, total #{nunits * info[:size]}"
-					value + nunits * info[:size]
-
-				end
-				(rcp.excluding? and rcp.excluding.include?(name)) ? sum : sum + value
-			end
-			sum
-		end
+					#nunits = 0
+					#counter = info[:period][0] == 1 ? 0 : nil
+					#####################unless counter
+					  #####################date = today
+						#####################counter = 0
+						#####################case info[:period][1]
+						#####################when :month
+							#####################while date >= (info[:start] or Date.today)
+								#####################counter +=1 if date.mday == (info[:monthday] or 1)
+								#####################date -= 1
+							#####################end
+						#####################when :year
+							#####################while date >= (info[:start] or Date.today) 
+								#####################counter +=1 if date.yday == (info[:yearday] or 1)
+								#####################date -= 1
+							#####################end
+						#####################when :day
+							#####################while date > (info[:start] or Date.today)
+								#####################counter +=1
+								#####################date -= 1
+							#####################end
+						#####################end
+					#####################end
+					#date = today
+					#########################case info[:period][1]
+					#########################when :month
+						##########################p date, info
+						#########################while date <= finish 
+							#########################if date.mday == (info[:monthday] or 1)
+								#########################nunits += 1 if counter % info[:period][0] == 0
+								#########################counter +=1 
+							#########################end
+							#########################date += 1
+						#########################end
+					#########################when :year
+						#########################while date <= finish
+							#########################if date.yday == (info[:yearday] or 1)
+								#########################nunits += 1 if counter % info[:period][0] == 0
+								#########################counter +=1
+							#########################end
+							#########################date += 1
+						#########################end
+					#########################when :day
+						#########################while date <= finish
+							#########################nunits += 1 if counter % info[:period][0] == 0
+							#########################counter +=1
+							#########################date += 1
+						#########################end
+					#########################end
+
+
+
+
+
+					##nyears = (finish.year - today.year)
+					##nmonths = nyears * 12 + (finish.month - today.month)
+					##(puts "Number of Months: #{nmonths}"; @pnmonths=true) unless @pnmonths
+					##ndays = nyears * 12 + (finish.yday - today.yday)
+					##number = case info[:period][1]
+									 ##when :month
+										 ##(nmonths / info[:period][0]).ceil
+									 ##when :day
+										 ##(ndays / info[:period][0]).ceil
+									 ##end
+				 	##value + number * info[:size]
+					##eputs "Regular Expenditure Item: #{sprintf("%10s", name)} -- #{nunits} payments, total #{nunits * info[:size]}"
+					#value + nunits * info[:size]
+
+				#end
+				#(rcp.excluding? and rcp.excluding.include?(name)) ? sum : sum + value
+			#end
+			#sum
+		#end
 		def self.predictable_component_ids(runner)
 			#runner.instance_variable_set(:@component_run_list, {})
 			#runner.instance_variable_set(:@component_ids, [])
@@ -299,270 +333,275 @@ class CodeRunner
 			puts "Weekly Budget:  #{total / ((end_date.to_datetime.to_time.to_i - Time.now.to_i) / 3600 / 24 /7)}"
 		end
 
-		def self.budgets_with_averages(runner, budgets, start_date)
-		 projected_budgets = budgets.dup
-		 projected_budgets.each{|key,v| projected_budgets[key]=projected_budgets[key].dup}
-		 projected_budgets.each do |budget, budget_info|
-			 #budget_info = budgets[budget]
-			 dates, expenditures, items = budget_expenditure(runner, budget, budget_info, start_date)
-			 budget_info[:size] = expenditures.mean rescue 0.0
-		 end
-		 projected_budgets
-		end
-
-		def self.latex_budget_transfers(runner, budgets, options)
-			numdays = options[:days]
-"#{budgets.map{|budget, budget_info| 
-	dates, expenditures, items = budget_expenditure(runner, budget, budget_info, Date.today - numdays)
-	#ep ['budget', budget, dates, expenditures]
-	kit = GraphKit.quick_create([dates.map{|d| d.to_time.to_i}, expenditures])
-	kit.data.each{|dk| dk.gp.with="boxes"}
-	kit.gp.style = "fill solid"
-	kit.xlabel = nil
-	kit.ylabel = "Expenditure"
-	unless options[:transfers]
-	 kits = budgets_with_averages(runner, {budget => budget_info}, Date.today - numdays).map{|budget, budget_info| 
-		 #ep 'Budget is ', budget
-		 kit2 = GraphKit.quick_create([
-				[dates[0], dates[-1]].map{|d| d.to_time.to_i}, 
-				[budget_info[:size], budget_info[:size]]
-		 ])
-		 kit2.data[0].gp.with = 'lp lw 4'
-		 kit2
-		}
-		#$debug_gnuplot = true
-		#kits.sum.gnuplot
-		kit += kits.sum
-
-	else
-		kit.data[0].y.data.map!{|expen| expen*-1.0}
-	end
-	kit.title = "#{budget} Expenditure with average (Total = #{kit.data[0].y.data.sum})"
-	kit_time_format_x(kit)
-	#kit.gnuplot
-	kit.gnuplot_write("#{budget}.eps")
-	"\\begin{center}\\includegraphics[width=4.0in]{#{budget}.eps}\\vspace{1em}\\end{center}"
-}.join("\n\n")
-}"
-		end
-
-		def self.latex_report(options={})
-			runner = CodeRunner.fetch_runner(Y: Dir.pwd, h: :component)
-			numdays = options[:days]
-			# Delete budgets that contain no items
-			actual_budgets = BUDGETS.dup
-			BUDGETS.keys.each do |budget|
-				actual_budgets.delete(budget) if budget_expenditure(runner, budget, BUDGETS[budget], Date.today - numdays)[0].size == 0
-			end
-			#predictable_component_ids(runner)
-			days_ahead = options[:days_ahead]
-			runs = runner.component_run_list.values
-			indateruns = runs.find_all{|r| r.days_ago < numdays}
-			accounts = runs.map{|r| r.account}.uniq
-			ep 'Accounts', accounts
-		 projected_budgets = Hash[actual_budgets.dup.find_all{|k,v| v[:discretionary]}]
-		 projected_budgets = budgets_with_averages(runner,projected_budgets, Date.today - numdays)
+		#def self.budgets_with_averages(runner, budgets, start_date, options={})
+		 #projected_budgets = budgets.dup
 		 #projected_budgets.each{|key,v| projected_budgets[key]=projected_budgets[key].dup}
 		 #projected_budgets.each do |budget, budget_info|
 			 ##budget_info = budgets[budget]
-			 #dates, expenditures, items = budget_expenditure(runner, budget, budget_info, Date.today - numdays)
-			 #budget_info[:size] = expenditures.mean
+			 #dates, expenditures, items = budget_expenditure(runner, budget, budget_info, start_date, today: options[:today])
+			 #budget_info[:size] = expenditures.mean rescue 0.0
 		 #end
-		 ep 'projected_budgets', projected_budgets
-			File.open('report.tex', 'w') do |file|
-				file.puts <<EOF
-\\documentclass{article}
-\\usepackage[cm]{fullpage}
-\\usepackage{tabulary}
-\\usepackage{graphicx}
-%\\usepackage{hyperlink}
-\\newcommand\\Tstrut{\\rule{0pt}{2.8ex}}
-\\begin{document}
-\\title{#{numdays}-day Budget Report}
-\\maketitle
-\\tableofcontents
-
-\\section{Summary of Accounts}
-#{accounts.map{|acc|
-"\\subsection{#{acc}}
-\\begin{tabulary}{0.8\\textwidth}{ r l}
-Balance & #{runs.find_all{|r| r.account==acc}.sort_by{|r| 
-	r.date
-}[-1].balance} \\\\
-Expenditure & #{runs.find_all{|r| r.account==acc && 
-	r.days_ago < numdays
-}.map{|r| 
-	r.debit
-}.sum} \\\\
-Income & #{runs.find_all{|r| r.account==acc && 
-	r.days_ago < numdays
-}.map{|r| r.credit}.sum} \\\\
-\\end{tabulary}"}.join("\n\n")
-}
-
-\\section{Graphs of Recent Balances}
-#{accounts.map{|acc|
- balance = runs.find_all{|r| r.account==acc}.sort_by{|r| r.date }[-1].balance
- accshort = acc.gsub(/\s/, '')
- kit = runner.graphkit(['date.to_time.to_i', 'balance'], {conditions: "account == #{acc.inspect} and days_ago < #{numdays}", sort: 'date'})
- futuredates = (Date.today..Date.today+days_ahead).to_a
- #p ["Regtrans", REGULAR_TRANSFERS.values_at(*REGULAR_TRANSFERS.keys.find_all{|from,to| to == acc})]
-
- budgets = Hash[projected_budgets.find_all{|k,v| v[:account] == acc}]
- ep ['budgets', budgets]
- projection = futuredates.map{|date| balance - 
-	 sum_regular(REGULAR_EXPENDITURE[acc], date) + 
-	 sum_regular(REGULAR_INCOME[acc], date) -  
-	 sum_regular(budgets, date) -  
-	 sum_future(FUTURE_EXPENDITURE[acc], date) + 
-	 sum_future(FUTURE_INCOME[acc], date) + 
-	 (REGULAR_TRANSFERS.keys.find_all{|from,to| to == acc}.map{|key|
-	 #p [acc, 'to', "key", key]
-	 sum_regular( REGULAR_TRANSFERS[key], date)
- }.sum||0) - 
-	 (REGULAR_TRANSFERS.keys.find_all{|from,to| from == acc}.map{|key|
-	 #p [acc, 'from',"key", key]
-	 sum_regular( REGULAR_TRANSFERS[key], date)
- }.sum||0)  
- }
- kit2 = GraphKit.quick_create([futuredates.map{|d| d.to_time.to_i}, projection])
- kit += kit2
- kit.title = "Balance for #{acc}"
- kit.xlabel = %['Date' offset 0,-2]
- kit.xlabel = nil
- kit.ylabel = "Balance"
-
- kit.data[0].gp.title = 'Previous'
- kit.data[1].gp.title = '0 GBP Discretionary'
- kit.data[1].gp.title = 'Projection'
- kit.data.each{|dk| dk.gp.with = "lp"}
-
- kit_time_format_x(kit)
-
- (kit).gnuplot_write("#{accshort}_balance.eps", size: "4.0in,3.0in")
- "\\begin{center}\\includegraphics[width=4.0in]{#{accshort}_balance.eps}\\end{center}"
-}.join("\n\n")
-}
-
-
-\\section{Budget Expenditure}
-#{latex_budget_transfers(runner,actual_budgets, options)}
-
-\\section{Transfers}
-#{latex_budget_transfers(runner, TRANSFERS, options.dup.absorb({transfers: true}))}
-
-
-
-\\section{Budget Resolutions}
-
-This section sums items from budgets drawn from an alternate account, i.e. it determines how much should be transferred from one account to another as a result of expenditure from a given budget.
-
-#{actual_budgets.map{|budget, budget_info|
-
-"\\subsection{#{budget} }
-		\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{r l}
-			%\\hline
-			Account Owed & Amount  \\\\
-			\\hline
-			\\Tstrut
-  #{budget_items = indateruns.find_all{|r| r.budget == budget}
-    alternate_accounts = budget_items.map{|r| r.account}.uniq - [budget_info[:account]]
-		alternate_accounts.map{|acc|
-			alternate_items = budget_items.find_all{|r| r.account == acc}
-			total = alternate_items.map{|r| r.debit - r.credit}.sum
-			"#{acc} & #{total} \\\\"
-		}.join("\n\n")
-	}
-
-			\\\\
-			\\hline
-			\\end{tabulary}
-			\\normalsize
-			\\vspace{1em}\n\n
-
-#{	alternate_accounts.map{|acc|
-			alternate_items = budget_items.find_all{|r| r.account == acc}
-			alternate_items.pieces((alternate_items.size.to_f/50.to_f).ceil).map{|piece|
-			"\\footnotesize\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 4 + " L " + " r " * 3 }}
-			    #{budget}: & #{budget_info[:account]} & owes & #{acc} &&&&\\\\
-					\\hline
-
-					\\Tstrut
-
-					#{piece.map{|r| 
-					([:id] + rcp.component_results - [:sc]).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")
-					}
-			\\end{tabulary}\\normalsize"}.join("\n\n")
-		}.join("\n\n")}
-"
-}.join("\n\n")
-}
-
-
-
-\\section{Budget and Transfer Breakdown}
-#{(TRANSFERS + actual_budgets).map{|budget, budget_info| 
-	dates, expenditures, budget_items = budget_expenditure(runner, budget, budget_info, Date.today - numdays)
-	pp budget, budget_items.map{|items| items.map{|i| i.date.to_s}}
-	"\\subsection{#{budget}}" + 
-		budget_items.zip(dates, expenditures).map{|items, date, expenditure|
-		if items.size > 0
-			"
-			\\footnotesize
-			\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 4 + " L " + " r " * 2 }}
-			%\\hline
-			& #{date.to_s.latex_escape} & & & Total & #{expenditure} &  \\\\
-			\\hline
-			\\Tstrut
-				#{items.map{|r| 
-						([:id] + rcp.component_results - [:sc, :balance]).map{|res| 
-								r.send(res).to_s.latex_escape
-							}.join(" & ")
-						}.join("\\\\\n")
-					}
-			\\\\
-			\\hline
-			\\end{tabulary}
-			\\normalsize
-			\\vspace{1em}\n\n"
-		else 
-			""
-		end
-	}.join("\n\n")
-}.join("\n\n")
-}
-
-
-
-\\section{Recent Transactions}
-#{accounts.map{|acc| 
-	"\\subsection{#{acc}}
-\\footnotesize
-#{all = runs.find_all{|r|  r.account == acc and r.days_ago < numdays}.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"}}
-		#{piece.map{|r| 
-	  ([:id] + 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")}
-\\end{tabulary}"}.join("\n\n")}"
-}.join("\n\n")}
-\\end{document}
-EOF
-
-
-			end
-			system "latex report.tex && latex report.tex"
-		end
+		 #projected_budgets
+		#end
+
+		#def self.latex_budget_transfers(runner, budgets, options)
+			#numdays = options[:days]
+			#today = options[:today]||Date.today
+#"#{budgets.map{|budget, budget_info| 
+	#dates, expenditures, items = budget_expenditure(runner, budget, budget_info, today - numdays, today: options[:today])
+	##ep ['budget', budget, dates, expenditures]
+	#kit = GraphKit.quick_create([dates.map{|d| d.to_time.to_i}, expenditures])
+	#kit.data.each{|dk| dk.gp.with="boxes"}
+	#kit.gp.style = "fill solid"
+	#kit.xlabel = nil
+	#kit.ylabel = "Expenditure"
+	#unless options[:transfers]
+	 #kits = budgets_with_averages(runner, {budget => budget_info}, today - numdays, today: today).map{|budget, budget_info| 
+		 ##ep 'Budget is ', budget
+		 #kit2 = GraphKit.quick_create([
+				#[dates[0], dates[-1]].map{|d| d.to_time.to_i}, 
+				#[budget_info[:size], budget_info[:size]]
+		 #])
+		 #kit2.data[0].gp.with = 'lp lw 4'
+		 #kit2
+		#}
+		##$debug_gnuplot = true
+		##kits.sum.gnuplot
+		#kit += kits.sum
+
+	#else
+		#kit.data[0].y.data.map!{|expen| expen*-1.0}
+	#end
+	#kit.title = "#{budget} Expenditure with average (Total = #{kit.data[0].y.data.sum})"
+	#kit_time_format_x(kit)
+	##kit.gnuplot
+	#kit.gnuplot_write("#{budget}.eps")
+	#"\\begin{center}\\includegraphics[width=4.0in]{#{budget}.eps}\\vspace{1em}\\end{center}"
+#}.join("\n\n")
+#}"
+		#end
+
+		#def self.latex_report(options={})
+			#runner = CodeRunner.fetch_runner(Y: Dir.pwd, h: :component)
+			#numdays = options[:days]
+			#today = options[:today] || Date.today
+			## Delete budgets that contain no items
+			#actual_budgets = BUDGETS.dup
+			#BUDGETS.keys.each do |budget|
+				#actual_budgets.delete(budget) if budget_expenditure(runner, budget, BUDGETS[budget], today - numdays, today: today)[0].size == 0
+			#end
+			##predictable_component_ids(runner)
+			#days_ahead = options[:days_ahead]
+			#runs = runner.component_run_list.values
+			#indateruns = runs.find_all{|r| r.days_ago < numdays}
+			#accounts = runs.map{|r| r.account}.uniq
+			#ep 'Accounts', accounts
+		 #projected_budgets = Hash[actual_budgets.dup.find_all{|k,v| v[:discretionary]}]
+		 #projected_budgets = budgets_with_averages(runner,projected_budgets, today - numdays, today: today)
+		 ##projected_budgets.each{|key,v| projected_budgets[key]=projected_budgets[key].dup}
+		 ##projected_budgets.each do |budget, budget_info|
+			 ###budget_info = budgets[budget]
+			 ##dates, expenditures, items = budget_expenditure(runner, budget, budget_info, today - numdays)
+			 ##budget_info[:size] = expenditures.mean
+		 ##end
+		 #ep 'projected_budgets', projected_budgets
+			#File.open('report.tex', 'w') do |file|
+				#file.puts <<EOF
+#\\documentclass{article}
+#\\usepackage[cm]{fullpage}
+#\\usepackage{tabulary}
+#\\usepackage{graphicx}
+#%\\usepackage{hyperlink}
+#\\newcommand\\Tstrut{\\rule{0pt}{2.8ex}}
+#\\begin{document}
+#\\title{#{numdays}-day Budget Report}
+#\\maketitle
+#\\tableofcontents
+
+#\\section{Summary of Accounts}
+##{accounts.map{|acc|
+#"\\subsection{#{acc}}
+#\\begin{tabulary}{0.8\\textwidth}{ r l}
+###Balance & #{runs.find_all{|r| r.account==acc}.sort_by{|r| 
+	###r.date
+###}[-1].balance} \\\\
+#####Expenditure & #{runs.find_all{|r| r.account==acc && 
+	#####r.days_ago < numdays
+#####}.map{|r| 
+	#####r.debit
+#####}.sum} \\\\
+###Income & #{runs.find_all{|r| r.account==acc && 
+	###r.days_ago < numdays
+###}.map{|r| r.credit}.sum} \\\\
+#\\end{tabulary}"}.join("\n\n")
+#}
+
+#\\section{Graphs of Recent Balances}
+##{accounts.map{|acc|
+ #balance = runs.find_all{|r| r.account==acc}.sort_by{|r| r.date }[-1].balance
+ #accshort = acc.gsub(/\s/, '')
+ #kit = runner.graphkit(['date.to_time.to_i', 'balance'], {conditions: "account == #{acc.inspect} and days_ago < #{numdays}", sort: 'date'})
+ #futuredates = (today..today+days_ahead).to_a
+ ##p ["Regtrans", REGULAR_TRANSFERS.values_at(*REGULAR_TRANSFERS.keys.find_all{|from,to| to == acc})]
+
+ #budgets = Hash[projected_budgets.find_all{|k,v| v[:account] == acc}]
+ #ep ['budgets', budgets]
+ #projection = futuredates.map{|date| balance - 
+	 #sum_regular(REGULAR_EXPENDITURE[acc], date, today: today) + 
+	 #sum_regular(REGULAR_INCOME[acc], date, today: today) -  
+	 #sum_regular(budgets, date, today: today) -  
+	 #sum_future(FUTURE_EXPENDITURE[acc], date, today: today) + 
+	 #sum_future(FUTURE_INCOME[acc], date, today: today) + 
+	 #(REGULAR_TRANSFERS.keys.find_all{|from,to| to == acc}.map{|key|
+	 ##p [acc, 'to', "key", key]
+	 #sum_regular( REGULAR_TRANSFERS[key], date, today: today)
+ #}.sum||0) - 
+	 #(REGULAR_TRANSFERS.keys.find_all{|from,to| from == acc}.map{|key|
+	 ##p [acc, 'from',"key", key]
+	 #sum_regular( REGULAR_TRANSFERS[key], date, today: today)
+ #}.sum||0)  
+ #}
+ #kit2 = GraphKit.quick_create([futuredates.map{|d| d.to_time.to_i}, projection])
+ #kit += kit2
+ #kit.title = "Balance for #{acc}"
+ #kit.xlabel = %['Date' offset 0,-2]
+ #kit.xlabel = nil
+ #kit.ylabel = "Balance"
+
+ #kit.data[0].gp.title = 'Previous'
+ #kit.data[1].gp.title = '0 GBP Discretionary'
+ #kit.data[1].gp.title = 'Projection'
+ #kit.data.each{|dk| dk.gp.with = "lp"}
+
+ #kit_time_format_x(kit)
+
+ #(kit).gnuplot_write("#{accshort}_balance.eps", size: "4.0in,3.0in")
+ #"\\begin{center}\\includegraphics[width=4.0in]{#{accshort}_balance.eps}\\end{center}"
+#}.join("\n\n")
+#}
+
+
+#\\section{Budget Expenditure}
+##{latex_budget_transfers(runner,actual_budgets, options)}
+
+#\\section{Transfers}
+##{latex_budget_transfers(runner, TRANSFERS, options.dup.absorb({transfers: true}))}
+
+
+
+#\\section{Budget Resolutions}
+
+#This section sums items from budgets drawn from an alternate account, i.e. it determines how much should be transferred from one account to another as a result of expenditure from a given budget.
+
+##{actual_budgets.map{|budget, budget_info|
+
+########################################"\\subsection{#{budget} }
+		########################################\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{r l}
+			########################################%\\hline
+			########################################Account Owed & Amount  \\\\
+			########################################\\hline
+			########################################\\Tstrut
+  #########################################{budget_items = indateruns.find_all{|r| r.budget == budget}
+    ########################################alternate_accounts = budget_items.map{|r| r.account}.uniq - [budget_info[:account]]
+		########################################alternate_accounts.map{|acc|
+			########################################alternate_items = budget_items.find_all{|r| r.account == acc}
+			########################################total = alternate_items.map{|r| r.debit - r.credit}.sum
+			########################################"#{acc} & #{total} \\\\"
+		########################################}.join("\n\n")
+	########################################}
+
+			########################################\\\\
+			########################################\\hline
+			########################################\\end{tabulary}
+			########################################\\normalsize
+			########################################\\vspace{1em}\n\n
+
+#########################################{	alternate_accounts.map{|acc|
+			########################################alternate_items = budget_items.find_all{|r| r.account == acc}
+			########################################alternate_items.pieces((alternate_items.size.to_f/50.to_f).ceil).map{|piece|
+			########################################"\\footnotesize\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 4 + " L " + " r " * 3 }}
+			    #########################################{budget}: & #{budget_info[:account]} & owes & #{acc} &&&&\\\\
+					########################################\\hline
+
+					########################################\\Tstrut
+
+					#########################################{piece.map{|r| 
+					########################################([:id] + rcp.component_results - [:sc]).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")
+					########################################}
+			########################################\\end{tabulary}\\normalsize"}.join("\n\n")
+		########################################}.join("\n\n")}
+########################################"
+#}.join("\n\n")
+#}
+
+
+
+#\\section{Budget and Transfer Breakdown}
+##{(TRANSFERS + actual_budgets).map{|budget, budget_info| 
+	#dates, expenditures, budget_items = budget_expenditure(runner, budget, budget_info, today - numdays, today: today)
+	#pp budget, budget_items.map{|items| items.map{|i| i.date.to_s}}
+	#"\\subsection{#{budget}}" + 
+		########################budget_items.zip(dates, expenditures).map{|items, date, expenditure|
+		########################if items.size > 0
+			########################"
+			########################\\footnotesize
+			########################\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 4 + " L " + " r " * 2 }}
+			########################%\\hline
+			########################& #{date.to_s.latex_escape} & & & Total & #{expenditure} &  \\\\
+			########################\\hline
+			########################\\Tstrut
+				#########################{items.map{|r| 
+						########################([:id] + rcp.component_results - [:sc, :balance]).map{|res| 
+								########################r.send(res).to_s.latex_escape
+							########################}.join(" & ")
+						########################}.join("\\\\\n")
+					########################}
+			########################\\\\
+			########################\\hline
+			########################\\end{tabulary}
+			########################\\normalsize
+			########################\\vspace{1em}\n\n"
+		########################else 
+			########################""
+		########################end
+	########################}.join("\n\n")
+#}.join("\n\n")
+#}
+
+
+
+#\\section{Recent Transactions}
+##{accounts.map{|acc| 
+	#"\\subsection{#{acc}}
+#\\footnotesize
+##{all = runs.find_all{|r|  r.account == acc and r.days_ago < numdays}.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"}}
+		#########{piece.map{|r| 
+	  ########([:id] + 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")}
+########\\end{tabulary}"}.join("\n\n")}"
+#}.join("\n\n")}
+#\\end{document}
+#EOF
+
+
+			#end
+			#system "latex report.tex && latex report.tex"
+		#end
+	#require 'treasurer'
+	#require 'local_customisations.rb'
+	#include Treasurer::LocalCustomisations
 
 	end # class Budget
 end #class CodeRunner
 
 p Dir.pwd
-require Dir.pwd + '/local_customisations.rb'
+#require Dir.pwd + '/local_customisations.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: budgetcrmod
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
@@ -94,6 +94,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- budgetcrmod.gemspec
 - lib/budgetcrmod.rb
 - lib/budgetcrmod/budget.rb
 - lib/budgetcrmod/defaults_files/budget_defaults.rb