treasurer 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92a0a6c8e0a23eecc1d69c1dd14ff399b8b227c4
-  data.tar.gz: 66e9cab23527f7dd3f843e2601a8d2904dbe6301
+  metadata.gz: d2048cb90864a5b22bc6bb26e1d226040caeb731
+  data.tar.gz: 340e5a5daf1026576358fc596ce9894566fac808
 SHA512:
-  metadata.gz: 9bc7d55859630ea044d03356f113a20edc1a33dbe357d06b3055c7c922b285944b13acce16f7e4c2a825b10baf83f9eeff182f69863387009fc730e223088973
-  data.tar.gz: 8c5e101af682d340a99b283f0801ed7afd776e4df1185fa90e3921f4003877c489116b450e3fd951d48c5f27b3a6c7eef99981aa2ea302dff47065a8b11ff5b9
+  metadata.gz: c0ac2576887308f53d2e3f72f3e73ece698785c4798d0ae2d8a14a1f114670eb7b44f18462742cab5b7b97c634a20ce71a7cc600d4f816d47d75859e44c1b511
+  data.tar.gz: cc2da7e7611fc6cf38502565a2b3721e64c45084627e2adb6bb7df043060af09f377a314e24683591284820aaac63eef9d611f018a676c4006db755d927f608f

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/treasurer/accounts.rb

@@ -13,6 +13,8 @@ class Treasurer::Reporter
       #ep ['sub_accounts333', name, @runs.size, runs.size]
     end
   end
+  class ReportAccount < Account
+  end
   class Account
     attr_reader :name, :external, :runs, :currency
     attr_accessor :projection, :average, :original_currency
@@ -23,21 +25,66 @@ class Treasurer::Reporter
       @currency = options[:currency]
       #@projected_accounts_info =Hash[projected_accounts_info.find_all{|k,v| v[:account] == name}]
       @external = external
-      @runs = runs.find_all do |r| 
-        #p ['checking11', name, @currency, ACCOUNT_INFO[r.account]] if name == r.external_account and @currency and @external
-        #@external ? r.external_account : r.account) == name}
-        if not @external
-          r.account == name
-        elsif @currency and info and cur = info[:currencies] and cur.size > 1
-          #p ['checking11', name, @currency, ACCOUNT_INFO[r.account]] if name == r.external_account and @currency
-          r.external_account == name and acinfo = ACCOUNT_INFO[r.account] and acinfo[:currencies] == [@currency]
-        else 
-          r.external_account == name
+      unless @runs = options[:input_runs] 
+        @runs = runs.find_all do |r| 
+          #p ['checking11', name, @currency, ACCOUNT_INFO[r.account]] if name == r.external_account and @currency and @external
+          #@external ? r.external_account : r.account) == name}
+          if not @external
+            r.account == name
+          elsif @currency and info and cur = info[:currencies] and cur.size > 1
+            #p ['checking11', name, @currency, ACCOUNT_INFO[r.account]] if name == r.external_account and @currency
+            r.external_account == name and acinfo = ACCOUNT_INFO[r.account] and acinfo[:currencies] == [@currency]
+          else 
+            r.external_account == name
+          end
         end
+
+        if should_report?
+          if @external
+            @report_runs = runs.find_all do |r|
+              r.external_account == name
+            end
+          else
+            @report_runs = @runs
+          end
+        end
+      else
+        @report_runs = []
       end
       #p ['Accountinf', name, @currency, @runs.size, runs.size]
       info[:external] = external if info
     end
+
+    # Make the account object that does the reporting. This only
+    # gets called if we are doing a currency conversion and
+    # this account is in the reeport currency.
+    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(:@original_currency, currency)
+    end
+
+    # The object that actually does the reporting. If there is no
+    # currency conversion this is just self.
+    # A separate report object is needed as just lumping all the 
+    # different currencies together across the board results
+    # in double counting.
+    #
+    # The report account is used for reporting information
+    # regarding a particular account. The main accoun is
+    # used for calculations e.g. Equity
+    def report_account
+      @report_account || self
+    end
+
+    # Should I report? If there is no currency conversion
+    # all accounts report. If there is currency conversion
+    # only non-external accounts and accounts in the 
+    # right currency report.
+    def should_report?
+      !@reporter.report_currency or !@external or (@original_currency||currency) == @reporter.report_currency
+    end
     def sub_accounts
       @sub_accounts ||= @runs.map{|r| r.sub_account}.uniq.compact.map{|acc| SubAccount.new(acc, @reporter, @runner, @runs, @external, currency: @currency)}
     end
@@ -137,7 +184,7 @@ EOF
     def summary_line(today, days_before)
 
       <<EOF
-      #{name_c} & #{balance} & #{deposited(today, days_before)} & #{withdrawn(today, days_before)} 
+      #{name_c} & #{balance.to_tex} & #{deposited(today, days_before).to_tex} & #{withdrawn(today, days_before).to_tex} 
 EOF
     end
     def money_in_sign
@@ -237,13 +284,15 @@ EOF
       #exit
       @reporter.projected_account_factor = nil
       kit += ( kit4 + kit5 + kit2)
-      kit.yrange = [kit.data.map{|dk| dk.y.data.min}.min, kit.data.map{|dk| dk.y.data.max}.max]
+      kit.yrange = [(m = kit.data.map{|dk| dk.y.data.min}.min; m-m.abs*0.1), (m=kit.data.map{|dk| dk.y.data.max}.max; m+m.abs*0.1)]
       #kit += (kit2)
       kit = kit3 + kit
       kit.title = "Balance for #{name_c}"
       kit.xlabel = %['Date' offset 0,-2]
       kit.xlabel = nil
       kit.ylabel = "Balance"
+      kit.gp.mytics= "5"
+      kit.gp.grid = "ytics mytics lw 2,lw 1"
 
 
       kit.data[0].gp.title = 'Limit'
@@ -255,14 +304,20 @@ EOF
       kit.data.each{|dk| dk.gp.with = "l lw 5"}
       kit.data[4].gp.with = "l lw 5 dt 2 lc rgb 'black' "
       kit.gp.key = ' bottom left '
-      kit.gp.key = ' rmargin '
+      kit.gp.key = ' rmargin samplen 2'
 
       #(p kit; STDIN.gets) if name == :LloydsCreditCard
       CodeRunner::Budget.kit_time_format_x(kit)
+      size = case type
+             when :Equity
+               "4.0in,4.0in"
+             else
+               "4.0in,2.5in"
+             end
 
       fork do
-        (kit).gnuplot_write("#{name_c_file}_balance.eps", size: "4.0in,1.5in") #, latex: true)
-        %x[epspdf #{name_c_file}_balance.eps]
+        (kit).gnuplot_write("#{name_c_file}_balance.eps", size: size) #, latex: true)
+        %x[epspdf -b #{name_c_file}_balance.eps]
       end
       #%x[epspdf #{name}_balance.eps]
     end
@@ -281,6 +336,9 @@ EOF
       @accounts = accounts #.find_all{|acc| not acc.external}
       @currency = options[:currency]
     end
+    def should_report?
+      true
+    end
     def type
       :Equity
     end
@@ -336,7 +394,7 @@ Balance & #{balance} \\\\
 EOF
     end
     def summary_line(today, days_before)
-      "#{name_c} & #{balance(today)} &  & "
+      "#{name_c} & #{balance(today).to_tex} &  & "
     end
   end
 end

data/lib/treasurer/analysis.rb

@@ -22,7 +22,8 @@ module Analysis
 		#start_date = [(account.info[:start]||@start_date), @start_date].max
 		expenditure = 0
 		items_temp = []
-    items = @runner.component_run_list.values.find_all{|r| r.external_account == account.name and r.in_date(account.info) and @accounts_hash[r.account].original_currency == account.original_currency}
+    #items = @runner.component_run_list.values.find_all{|r| r.external_account == account.name and r.in_date(account.info) and @accounts_hash[r.account].original_currency == account.original_currency}
+    items = account.runs.find_all{|r| r.in_date(account.info)}
     #ep ['items', items.map{|i| i.date}]
     #ep ['account', account.name_c]
 		counter = 0
@@ -142,7 +143,7 @@ module Analysis
 		sum_out = regular_items.inject(0) do |sum, (account, item)|	
 			item = [item] unless item.kind_of? Array
 #			  ep item
-			value = item.inject(0) do |value,info|
+			value_out = 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
 				 
@@ -212,7 +213,7 @@ module Analysis
         value + nunits * (info[:size]||account.projection*(@projected_account_factor||1.0))
 
 			end
-			sum + value
+			sum + value_out
 			#(rcp.excluding? and rcp.excluding.include?(name)) ? sum : sum + value
 		end
 		sum_out

data/lib/treasurer/report.rb

@@ -11,39 +11,44 @@ class Float
     sprintf("%.2f", self)
   end
 end
+class Numeric
+  def to_tex
+    sprintf("%.2f", self).reverse.gsub(/(\d{3})(?=\d)/){"#$1,\\"}.reverse
+  end
+end
 class Date
   def inspect
     "Date.parse('#{to_s}')"
   end
 end
-# Some thoughts on double entry accounting: 
+# Some thoughts on double entry accounting:
 #
 # assets - liabilities = equity
 # where equity = equity_at_start + income - expenses
 #
-# so 
+# so
 #
 # assets - liabilities = equity_at_start + income - expenses
 #
-# or alternatively 
+# or alternatively
 #
 # assets + expenses = equity_at_start + income + liabilities (1)
 #
 # Good things:
 # 	Positive equity_at_start, positive assets, positive income, negative liabilities, negative expenses
 #
-# A debit on the left of (1) must be matched by a credit on the right of (1) and 
-# vice versa. 
+# A debit on the left of (1) must be matched by a credit on the right of (1) and
+# vice versa.
 #
 #
 # A debit to an asset account increases the value of the asset. This means buying some land
-# or supplies or depositing some cash in a bank account. You can think of it as a debit because 
+# or supplies or depositing some cash in a bank account. You can think of it as a debit because
 # you are locking up your equity in a way that may not be realisable. A credit to the asset account
 # means drawing down on the asset, for example selling a bit of land or taking money out of a
 # bank account.
 #
 # Similarly, a debit to an expense account, effectively, spending money on that expense,
-# increases the value of that account. Debits here are clearly negative things from 
+# increases the value of that account. Debits here are clearly negative things from
 # the point of view of your wealth! (Credits to expense accounts would be something like
 # travel reimbursements).
 #
@@ -52,16 +57,16 @@ end
 # example a bank account, i.e. you must effectively spend it by buying an asset: remember
 # a bank may fail... a bank account is an asset with risk just as much as a painting).
 #
-# A credit to liabilities increases the value of the liability, for example taking out a 
+# A credit to liabilities increases the value of the liability, for example taking out a
 # loan. Once you credit a liability you have to either buy (debit) an asset, or buy (debit)
 # an expense directly (for example a loan to pay some fees).
-# 
+#
 # In any accounting period, the sum of all debits and credits should be 0. Also, at the end
 # of the accounting period,
 #
 # equity_at_end = assets - liabilities = equity_at_start + income - expenses
 #
-# This seems obvious to me!!  
+# This seems obvious to me!!
 class Treasurer
   class Reporter
     #include LocalCustomisations
@@ -72,7 +77,7 @@ class Treasurer
     attr_reader :accounts
     attr_reader :equity
     attr_reader :projected_accounts_info
-    attr_reader :days_before 
+    attr_reader :days_before
     attr_reader :report_currency
     attr_reader :accounts_hash
     def initialize(runner, options)
@@ -87,30 +92,30 @@ class Treasurer
       @report_currency = options[:report_currency]
 
       if run = @runs.find{|r| not r.external_account}
-        raise "External_account not specified for #{run.data_line}" 
+        raise "External_account not specified for #{run.data_line}"
       end
       @indateruns = @runs.find_all{|r| r.days_ago(@today) < @days_before}
       @stable_discretionary_account_factors = {}
       @in_limit_discretionary_account_factors = {}
-      #p 'accounts256',@runs.size, @runs.map{|r| r.account}.uniq 
+      #p 'accounts256',@runs.size, @runs.map{|r| r.account}.uniq
 
     end
     def generate_accounts
-      accounts = @runs.map{|r| r.account}.uniq.map{|acc| Account.new(acc, self, @runner, @runs, false)} 
-      external_accounts = (@runs.map{|r| r.external_account}.uniq - accounts.map{|acc| acc.name}).map{|acc| Account.new(acc, self, @runner, @runs, true)} 
+      accounts = @runs.map{|r| r.account}.uniq.map{|acc| Account.new(acc, self, @runner, @runs, false)}
+      external_accounts = (@runs.map{|r| r.external_account}.uniq - accounts.map{|acc| acc.name}).map{|acc| Account.new(acc, self, @runner, @runs, true)}
       #if not @report_currency
-        external_accounts = external_accounts.map do |acc|
-          if acc_inf = ACCOUNT_INFO[acc.name] and currencies = acc_inf[:currencies] and currencies.size > 1
-            raise "Only expense accounts can have multiple currencies: #{acc.name} has type #{acc.type}" unless acc.type == :Expense
-            new_accounts = currencies.map do |curr|
-              Account.new(acc.name, self, @runner, @runs, true, currency: curr)
-            end
-            new_accounts.delete_if{|a| a.runs.size == 0}
-            new_accounts
-          else
-            acc
+      external_accounts = external_accounts.map do |acc|
+        if acc_inf = ACCOUNT_INFO[acc.name] and currencies = acc_inf[:currencies] and currencies.size > 1
+          raise "Only expense accounts can have multiple currencies: #{acc.name} has type #{acc.type}" unless acc.type == :Expense
+          new_accounts = currencies.map do |curr|
+            Account.new(acc.name, self, @runner, @runs, true, currency: curr)
           end
+          new_accounts.delete_if{|a| a.runs.size == 0}
+          new_accounts
+        else
+          acc
         end
+      end
       #end
       external_accounts = external_accounts.flatten
       @accounts = accounts + external_accounts
@@ -148,6 +153,10 @@ class Treasurer
               acc.info[:opening_balance] *= EXCHANGE_RATES[[acc.currency, @report_currency]]
             end
           end
+          if acc.should_report?
+            #p acc.name_c
+            acc.generate_report_account
+          end
           acc.instance_variable_set(:@original_currency, acc.currency)
           acc.instance_variable_set(:@currency, @report_currency)
           acc.info[:currencies] = [@report_currency]
@@ -164,7 +173,7 @@ class Treasurer
       end
       @equities = @equities.to_h
     end
-     
+
     def report
       generate_accounts
       #get_actual_accounts
@@ -199,18 +208,18 @@ class Treasurer
       <<EOF
 \\section{Summary of Accounts}
       #{[:Equity, :Asset, :Liability, :Income, :Expense].map{|type|
-      accs = @accounts.find_all{|acc| acc.type == type }
+      accs = @accounts.find_all{|acc| acc.type == type and acc.should_report?}
       "\\subsection{#{type}}
-    \\begin{tabulary}{0.9\\textwidth}{ R | c | c | c}
+    \\begin{tabulary}{0.9\\textwidth}{ R | r | r | r}
     Account & Balance & Deposited & Withdrawn \\\\
     \\hline
     \\Tstrut
-      #{(accs.map{|acc| acc.summary_line(@today, @days_before)} + 
-      (type == :Asset ? ASSETS.map{|n,details| "#{n} (#{details[:currency]}) & #{details[:size]} & & "} : [])).join("\\\\\n")}
+      #{(accs.map{|acc| acc.report_account.summary_line(@today, @days_before)} +
+      (type == :Asset ? ASSETS.map{|n,details| "#{n} (#{details[:currency]}) & #{details[:size].to_tex} & & "} : [])).join("\\\\\n")}
       #{type!=:Equity&&false ? "
       \\\\ \\hline
       \\Tstrut
-      Totals & #{accs.map{|a| a.balance}.sum} & #{accs.map{|a| a.deposited(@today, @days_before)}.sum} & #{accs.map{|a| a.withdrawn(@today, @days_before)}.sum} \\\\ " : "\\\\"}
+      Totals & #{accs.map{|a| a.balance}.sum.to_tex} & #{accs.map{|a| a.deposited(@today, @days_before)}.sum.to_tex} & #{accs.map{|a| a.withdrawn(@today, @days_before)}.sum.to_tex} \\\\ " : "\\\\"}
     \\end{tabulary}"
       }.join("\n\n")}
 EOF
@@ -219,7 +228,7 @@ EOF
       <<EOF
 \\section{Graphs of Recent Balances}
       #{[:Equity, :Asset, :Liability].map{|typ|
-      "\\subsection{#{typ}}\\vspace{3em}" + 
+      "\\subsection{#{typ}}\\vspace{3em}" +
         @accounts.find_all{|acc| acc.type == typ}.map{|acc|
         acc.write_balance_graph(@today, @days_before, @days_ahead)
         acc.balance_graph_string
@@ -234,9 +243,10 @@ EOF
 \\subsection{Totals for #@days_before-day Budget Period}
       #{expense_pie_charts_by_currency('accountperiod', @expense_accounts){|r| r.days_ago(@today) < @days_before}}
 \\subsection{Expense Account Breakdown}
-      #{@expense_accounts.map{|account|
-      #ep ['sub_accounts2124', account.sub_accounts.map{|sa| sa.name}]
-      "\\subsection{#{account.name_c}} 
+      #{@expense_accounts.find_all{|exaccount| exaccount.should_report?}.map{|exaccount|
+          account = exaccount.report_account
+          "
+\\subsection{#{account.name_c}}
       #{expense_pie_chart(account.name_c_file + 'breakdown', account.sub_accounts, account){|r|r.days_ago(@today) < @days_before }}"
       }.join("\n\n")}
 EOF
@@ -258,7 +268,7 @@ EOF
         currencies.map do |curr|
           str = ""
           str << "\\subsubsection{#{curr}}\n" if curr
-          str << expense_pie_chart(name + curr.to_s, accounts.find_all{|acc| acc.currency == curr}, &block)
+          str << expense_pie_chart(name + curr.to_s, accounts.find_all{|acc| acc.currency == curr and acc.should_report?}.map{|acc| acc.report_account}, &block)
           str
         end
       ).join("\n\n")
@@ -269,27 +279,27 @@ EOF
       #ep ['labels22539', name, labels, exps]
 
       kit = if subacc
-        start_dates, end_dates, _exps, _items = account_expenditure(subacc)
-        end_dates = end_dates.reverse #Now from earliest to latest
-        start_dates = start_dates.reverse
-        pp ['DATES', start_dates, end_dates, subacc.name]
-        return "No expenditure in account period." if end_dates.size==0
-        k = (
-          end_dates.size.times.map do |i|
-            exps = accounts.map{|acc| acc.deposited(end_dates[i], end_dates[i] - start_dates[i], &block)}
-            kt = GraphKit.quick_create([labels.size.times.to_a.map{|l| l.to_f + i.to_f/end_dates.size.to_f}, exps])
-            kt.data[0].gp.title = "Ending #{end_dates[i].strftime("#{end_dates[i].mday.ordinalize} %B")}; total = #{exps.sum}"
-            kt.gp.key = "tmargin"
-            kt
-          end
-        ).sum
-        k
-      else
-        exps = accounts.map{|acc| acc.deposited(@today, 50000, &block)}
-        labels, exps = [labels, exps].transpose.find_all{|l, e| e != 0.0}.transpose
-        return "No expenditure in account period." if not labels #<F8> labels.size==0
-        GraphKit.quick_create([labels.size.times.to_a, exps])
-      end
+              start_dates, end_dates, _exps, _items = account_expenditure(subacc)
+              end_dates = end_dates.reverse #Now from earliest to latest
+              start_dates = start_dates.reverse
+              pp ['DATES', start_dates, end_dates, subacc.name]
+              return "No expenditure in account period." if end_dates.size==0
+              k = (
+                end_dates.size.times.map do |i|
+                  exps = accounts.map{|acc| acc.deposited(end_dates[i], end_dates[i] - start_dates[i], &block)}
+                  kt = GraphKit.quick_create([labels.size.times.to_a.map{|l| l.to_f + i.to_f/end_dates.size.to_f}, exps])
+                  kt.data[0].gp.title = "Ending #{end_dates[i].strftime("#{end_dates[i].mday.ordinalize} %B")}; total = #{exps.sum}"
+                  kt.gp.key = "tmargin"
+                  kt
+                end
+              ).sum
+              k
+            else
+              exps = accounts.map{|acc| acc.deposited(@today, 50000, &block)}
+              labels, exps = [labels, exps].transpose.find_all{|l, e| e != 0.0}.transpose
+              return "No expenditure in account period." if not labels #<F8> labels.size==0
+              GraphKit.quick_create([labels.size.times.to_a, exps])
+            end
 
 
       #sum = exps.sum
@@ -311,7 +321,7 @@ EOF
       i = -1
       kit.gp.xtics = "(#{labels.map{|l| %["#{l}" #{i+=1}]}.join(', ')}) rotate by 315"
       pp ['kit222', kit, labels]
-      fork do 
+      fork do
         kit.gnuplot_write("#{name}.eps", size: "4.0in,2.0in")
         %x[epspdf #{name}.eps]
       end
@@ -362,16 +372,18 @@ EOF
       #exit
     end
     def discretionary_account_table(currency)
-      discretionary_accounts = accounts_with_averages(@projected_accounts_info.find_all{|acc,inf| acc.currency == currency}.to_h)
+      discretionary_accounts = accounts_with_averages(
+        @projected_accounts_info.find_all{|acc,inf| acc.currency == currency and acc.should_report?}.map{|acc,inf| [acc.report_account,inf]}.to_h)
+      accounts_with_projections(discretionary_accounts.keys)
 
       <<EOF
 \\section{Discretionary Budget Summary (#{currency})}
-\\begin{tabulary}{0.9\\textwidth}{ R | c  c  c c  }
+\\begin{tabulary}{0.9\\textwidth}{ R | r  r  r r  }
 Budget & Average & Projection & Limit & Stable \\\\
       #{discretionary_accounts.map{|account, info|
       #ep info
       "#{account.name_c} & #{account.average} & #{account.projection} & #{
-        (account.projection * @in_limit_discretionary_account_factors[currency]).round(2)} & 
+        (account.projection * @in_limit_discretionary_account_factors[currency]).round(2)} &
       #{(account.projection * @stable_discretionary_account_factors[currency]).round(2)}  \\\\"
       }.join("\n\n")
       }
@@ -381,15 +393,15 @@ EOF
     def account_expenditure_graphs
       <<EOF
 \\section{Expenditure by Account Period}
-      #{currency_list.map{|curr| 
-        account_and_transfer_graphs(@expense_accounts.find_all{|acc| 
-          acc.info and acc.info[:period] and acc.currency == curr
-        })
+      #{currency_list.map{|curr|
+      account_and_transfer_graphs(@expense_accounts.find_all{|acc|
+        acc.info and acc.info[:period] and acc.currency == curr and acc.should_report?
+      }.map{|acc| acc.report_account})
       }.join("\n")}
 EOF
     end
     def account_and_transfer_graphs(accounts, options={})
-      "#{accounts.map{|account| 
+      "#{accounts.map{|account|
         account_info = account.info
         #ep ['accountbadf', account, account_info]
         start_dates, dates, expenditures, _items = account_expenditure(account)
@@ -416,11 +428,11 @@ EOF
           kit.xlabel = nil
           kit.ylabel = nil
           unless options[:transfers]
-            kits = accounts_with_averages({account => account_info}).map{|account, account_info| 
+            kits = accounts_with_averages({account => account_info}).map{|acco, acco_info|
               #ep 'Budget is ', account
               kit2 = GraphKit.quick_create([
-                [dates[0], dates[-1]].map{|d| d.to_time.to_i - barsize}, 
-                [account.average, account.average]
+                [dates[0], dates[-1]].map{|d| d.to_time.to_i - barsize},
+                [acco.average, acco.average]
               ])
               kit2.data[0].gp.with = 'l lw 5'
               kit2
@@ -436,7 +448,7 @@ EOF
           CodeRunner::Budget.kit_time_format_x(kit)
           #kit.gnuplot
           #ep ['kit1122', account, kit]
-          fork do 
+          fork do
             kit.gnuplot_write("#{account.name_c_file}.eps", size: "4.0in,2.0in")
             exec "epspdf #{account.name_c_file}.eps"
           end
@@ -487,8 +499,8 @@ This section sums items from accounts drawn from an alternate account, i.e. it d
 
           \\Tstrut
 
-      #{piece.map{|r| 
-      ([:id] + CodeRunner::Budget.rcp.component_results - [:sc]).map{|res| 
+      #{piece.map{|r|
+      ([:id] + CodeRunner::Budget.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(" & ")
@@ -517,12 +529,12 @@ EOF
     def account_breakdown
       <<EOF
 \\section{SubAccount Breakdown}
-      #{(@actual_accounts).map{|account, account_info| 
+      #{(@actual_accounts).map{|account, account_info|
       _start_dates, dates, expenditures, account_items = account_expenditure(account, account_info)
       #pp account, account_items.map{|items| items.map{|i| i.date.to_s}}
-      "\\subsection{#{account}}" + 
+      "\\subsection{#{account}}" +
         account_items.zip(dates, expenditures).map{|items, date, expenditure|
-        if items.size > 0
+          if items.size > 0
           "
       \\small
       \\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 3 + " L " + " r " * 2 + " c " }}
@@ -530,8 +542,8 @@ EOF
           #{date.to_s.latex_escape} & & & Total & #{expenditure} &  \\\\
       \\hline
       \\Tstrut
-          #{items.map{|r| 
-          ( CodeRunner::Budget.rcp.component_results + [:external_account] -  [:sc, :balance ]).map{|res| 
+          #{items.map{|r|
+          ( CodeRunner::Budget.rcp.component_results + [:external_account] -  [:sc, :balance ]).map{|res|
             r.send(res).to_s.latex_escape
           }.join(" & ")
           }.join("\\\\\n")
@@ -541,7 +553,7 @@ EOF
       \\end{tabulary}
       \\normalsize
       \\vspace{1em}\n\n"
-        else 
+          else
           ""
           end
       }.join("\n\n")
@@ -553,7 +565,7 @@ EOF
     def transactions_by_account
       <<EOF
 \\section{Recent Transactions}
-      #{@accounts.find_all{|acc| not acc.type == :Equity}.sort_by{|acc| acc.external ? 0 : 1}.map{|acc| 
+      #{@accounts.find_all{|acc| not acc.type == :Equity}.sort_by{|acc| acc.external ? 0 : 1}.map{|acc|
       "\\subsection{#{acc.name_c}}
 \\tiny
       #{all = acc.runs.find_all{|r|  r.days_ago(@today) < @days_before}
@@ -566,10 +578,10 @@ EOF
       #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 " * 3 + " l " + " r " * 3 + "l"}}
-  #{piece.map{|r| 
-  (CodeRunner::Budget.rcp.component_results - [:sc] + [:sub_account]).map{|res| 
+  #{piece.map{|r|
+  (CodeRunner::Budget.rcp.component_results - [:sc] + [:sub_account]).map{|res|
     entry = r.send(res).to_s.latex_escape
-    #if 
+    #if
     entry = entry[0...25] if entry.length > 25
     #if entry.length > 40
     #entry = entry.split(/.{40}/).join(" \\newline ")
@@ -596,9 +608,9 @@ EOF
 \\usepackage{libertine}
 \\usepackage{xcolor,listings}
 \\newcommand\\Tstrut{\\rule{0pt}{2.8ex}}
-\\newcommand\\myfigure[1]{\\vspace*{0em}\\begin{center}
+\\newcommand\\myfigure[1]{\\vspace*{1em}\\begin{center}
 
-\\includegraphics[width=0.9\\textwidth]{#1}
+\\includegraphics[width=0.99\\textwidth]{#1}
 
 \\end{center}\\vspace*{0em}
 
@@ -636,10 +648,10 @@ EOF
   end
 end
 #\\subsection{Last Week}
-      ##{expense_pie_charts_by_currency('lastweekexpenses', @expense_accounts){|r| 
-      ##p ['r.daysago', r.days_ago(@today)]; 
-      #r.days_ago(@today) < 7}}
+##{expense_pie_charts_by_currency('lastweekexpenses', @expense_accounts){|r|
+##p ['r.daysago', r.days_ago(@today)];
+#r.days_ago(@today) < 7}}
 #\\subsection{Last Month}
-      ##{expense_pie_charts_by_currency('lastmonthexpenses', @expense_accounts){|r| r.days_ago(@today) < 30}}
+##{expense_pie_charts_by_currency('lastmonthexpenses', @expense_accounts){|r| r.days_ago(@today) < 30}}
 #\\subsection{Last Year}
-      ##{expense_pie_charts_by_currency('lastyearexpenses', @expense_accounts){|r| r.days_ago(@today) < 365}}
+##{expense_pie_charts_by_currency('lastyearexpenses', @expense_accounts){|r| r.days_ago(@today) < 365}}

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.6.0 ruby lib
+# stub: treasurer 0.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treasurer".freeze
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   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-05"
+  s.date = "2018-04-06"
   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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: treasurer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport