treasurer 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e0d7fbb9f8e3d3e7257b32b95d02551c86d734
-  data.tar.gz: acfd855c6aba173967f3ac4ad2f5f834f6d72686
+  metadata.gz: 071307e2a3098caafda4366715063128f0cd9a1e
+  data.tar.gz: 72e1762d0c6ef0af5715cfde016a122933bb34a8
 SHA512:
-  metadata.gz: d8bd30fa88d03684297b4cc00432d2ee64efcd130bdd0bc4efcf964275acc1cc6fccef878c7e711f6675bb16253eaa5044f4631a43f1dc0508c1cb682c7a478d
-  data.tar.gz: 65914ce5e0540c566aad1d9b8dab06fd8ce2e672789a8472ac70a9fc5dbd27da54c13b84b5631fc2e75278456e3724fb44e77870bee5bffda7981f4f95a66682
+  metadata.gz: 7bdf9f0d03882d8bcedcd1a77c32547d638393d9e9749aac3b9e23bba0f3f557375f471bed8e20accc7b07f698ff204b5aedd7f47c6874be409f138ed0f7c7d3
+  data.tar.gz: e3d9184ac5afbff5f389e75cf5ece91bd3176ae5634aa843be646216c1245d6bb071428e2253457b826c96ab5fbe81195d7f3d2c9825e2b2181b6c559f0080bd

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/treasurer/accounts.rb

@@ -167,7 +167,7 @@ class Treasurer::Reporter
       balance
     end
     def deposited(today, days_before, &block)
-      p ['name223344 is ', name_c, today, days_before]
+      #p ['name223344 is ', name_c, today, days_before]
       #@runs.find_all{|r| r.days_ago(today) < days_before and (!block or yield(r)) }.map{|r| (@external and not ([:Liability, :Income].include?(type))) ? r.withdrawal : r.deposit }.sum || 0
       @runs.find_all{|r| r.days_ago(today) < days_before and r.date <= today and (!block or yield(r)) }.map{|r| (@external) ? r.withdrawal : r.deposit }.sum || 0
     end

data/lib/treasurer/report.rb

@@ -293,7 +293,7 @@ EOF
               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]
+              #pp ['DATES', start_dates, end_dates, subacc.name]
               return "No expenditure in account period." if end_dates.size==0
               #keylabels = []
               k = (
@@ -314,6 +314,16 @@ EOF
                   kt
                 end
               ).sum
+              subaccount_datagroups = k.data.map{|dk| dk.y.data}.transpose
+              k.gp.label = subaccount_datagroups.size.times.map{|i|
+                "'#{sprintf("%.2f", subaccount_datagroups[i].mean)}' at #{i.to_f + 0.25}, graph 0.99 right rotate by 90 front textcolor rgb 'black' boxed" 
+              }
+              k.gp.label.push(
+                #"'Mean per budget period' at #{subaccount_datagroups.size.to_f}, graph 0.99 right rotate by 90 front textcolor rgb 'black' boxed " 
+                "'Mean expenditure per budget period' at -1.0, graph 0.99 right rotate by 90 front textcolor rgb 'black' boxed " 
+              )
+              k.gp.xrange = "[:#{subaccount_datagroups.size + 1.0}]"
+              k.gp.xrange = "[-1.5:]"
               k
             else
               exps = accounts.map{|acc| acc.type==:Expense ? acc.deposited(@today, 50000, &block) - acc.withdrawn(@today, 50000, &block): acc.withdrawn(@today, 50000, &block) - acc.deposited(@today, 50000, &block)}
@@ -334,10 +344,10 @@ EOF
 
       kit.data.each{|dk| dk.gp.with = 'boxes'}
       kit.gp.boxwidth = "#{0.8/kit.data.size} absolute"
-      kit.gp.style = "fill solid"
+      kit.gp.style = ["fill solid", "textbox opaque noborder fillcolor rgb 'white'"]
       kit.gp.yrange = "[#{[kit.data[0].y.data.min,0].min}:]"
       #kit.gp.xrange = "[-1:#{labels.size+1}]"
-      kit.gp.xrange = "[-1:1]" if labels.size==1
+      kit.gp.xrange = "[-1.5:1]" if labels.size==1
       kit.gp.mytics = "5"
       kit.gp.ytics = "autofreq rotate by 45"
       kit.gp.grid = "ytics mytics lw 2,lw 1"
@@ -347,23 +357,24 @@ EOF
       kit.gp.format = [%["%'.2f"]]
       i = -1
       kit.gp.xtics = "(#{labels.map{|l| %["#{l}" #{i+=1}]}.join(', ')}) rotate by 90 right"
-      pp ['kit222', kit, labels]
+      #pp ['kit222', kit, labels]
       fork do
 
         kit.gp.key = "off"
-        kit.gnuplot_write("#{name}2.eps", size: "#{[[labels.size.to_f/4.5, 4.5].min, 1.0].max}in,4.5in")
+        kit.gnuplot_write("#{name}2.eps", size: "#{[[labels.size.to_f/4.2, 5.0].min, 1.0].max}in,4.5in")
         system %[ps2epsi #{name}2.eps #{name}.eps]
         system %[epstopdf #{name}.eps]
 
       end
       fork do
-        kit.gp.key = "tmargin"
+        kit.gp.key = "tmargin left Left reverse"
         kit.gp.border = "unset"
         kit.gp.xtics = "unset"
         kit.gp.ytics = "unset"
         kit.gp.title = "unset"
         kit.gp.xlabel = "unset"
         kit.gp.ylabel = "unset"
+        kit.gp.label = "unset"
         #kit.gp.xrange = "[-100:-10]"
         kit.gp.boxwidth = "#{0.0/kit.data.size} absolute"
         kit.gp.object = " rect from screen 0, screen 0 to screen 1, graph 1 front fc rgb 'white' fillstyle solid noborder"     
@@ -704,10 +715,12 @@ EOF
 \\newcommand\\myfigurerot[3]{\\vspace*{1em}\\begin{center}
 
 \\begin{minipage}{\\textwidth}
+\\begin{center}
 \\includegraphics[clip,height=0.90\\textwidth,angle=#3]{#1}
 
-\\hfill
+\\vspace*{0.5em}
 \\includegraphics[width=0.5\\textwidth]{#2}
+\\end{center}
 \\end{minipage}
 \\end{center}\\vspace*{0em}
 

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.0 ruby lib
+# stub: treasurer 0.9.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treasurer".freeze
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   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-09"
+  s.date = "2018-04-10"
   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.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport