treasurer 0.10.1 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 918eb4cb7a1aa8a9f0c6bac9efa881cdddebc888a61952c81f16f82e2e773a3d
-  data.tar.gz: c0f5775f74249b13fef043752fe92f7186492d3b588b2821e2404f68431ff0eb
+  metadata.gz: b5ac67d0251cca1bbb93ed85a8334a66d0446701d3baa2b73b368df2b9cd93ca
+  data.tar.gz: bc15a7c7e792864a5f7e104d5eb44e9fbc09ee9769977cceba1ffc2c95bb6440
 SHA512:
-  metadata.gz: d1bad563f203927243a5becdf1162e3037faec4a998125325ae0e3a20abe976a82e1b8f3734a534502994d94d27824260e72c99136973192f110e4de14da7c01
-  data.tar.gz: da403469bc36b964d086bd090dd222e40757dc9f2cb837d501cb527829d61d13b06038c72b223ac666e1be537c3a38cc9fb1fde2eeb18d78ed4666254f1f0467
+  metadata.gz: 99de9f6f92158ea3f1a98121c98a831d518f2d3d43515dd6962658880d6c8e53a86b512270955bcb643877142ffd2a1d0914f058dd35f95ba935009e8d7be75b
+  data.tar.gz: 8d9a12e8c6b193554a8dc43b2573236f32baf3c4956037875196929b7dc485f49c85106d1e8fc7ff709f8d151a03efecf28d1137807d361ce4f950de5b221ecf

data/Gemfile

@@ -12,7 +12,7 @@ gem "activesupport", ">= 5.0.0"
 group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
+  gem "bundler", "~> 2.0"
   gem "jeweler", "~> 2.3.1"
   gem "simplecov", ">= 0"
 	gem "ruby-prof", ">= 0.15"

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.10.6

data/lib/treasurer/account_choices.rb

@@ -34,8 +34,10 @@ class CodeRunner::Budget
     end
   end
 
+  DATABASES={}
+
   def self.sqlitedb(folder)
-    SQLite3::Database.new folder + "/treasurer.db"
+    DATABASES[folder] ||= SQLite3::Database.new folder + "/treasurer.db"
   end
 
   def sqlitedb
@@ -142,7 +144,7 @@ class CodeRunner::Budget
       'WHERE signature = ?', 
       signature.inspect
     )
-    pp "RRRRROOO", rows
+    #pp "RRRRROOO", rows
     if rows.size == 1
       return {
         external_account: eval(rows[0][0]),
@@ -159,26 +161,43 @@ class CodeRunner::Budget
   def get_new_choices
     ext_account = nil
     chosen = false
+    transactions = runner.component_run_list.values.sort_by{|r| r.date}
+    idx = transactions.index(self)
+    ff = Proc.new{|float| float ? sprintf("%8.2f", float) : " "*8}
+    format = Proc.new{|runs| runs.map{|r| 
+      #begin
+        sprintf("%70s %s %8s %8s %8s %-12s", r.description[0,70], r.date.to_s, ff.call(r.deposit), ff.call(r.withdrawal), ff.call(r.balance), r.account)
+      #rescue
+        #p r
+        #p r.data_line
+        #exit
+      #end
+    }.join("\n")}
+    format_choices = Proc.new{|chs| chs.map{|k,v| Terminal::LIGHT_GREEN + k + ":" + Terminal.default_colour + v}.join(" ")}
     Dir.chdir(@runner.root_folder) do
       sym = nil
+      print_transactions = Proc.new do
+            puts format.call(transactions.slice([idx-30, 0].max, 30))
+            puts Terminal::LIGHT_GREEN + format.call([transactions[idx]]) + "<-----" + Terminal.default_colour
+            sz = transactions.size
+            puts format.call(transactions.slice([idx+1, sz-1].min, 10))
+      end
       while not chosen
         Hash.phoenix('external_accounts.rb') do |account_hash|
           #account_hash.each{|k,v| v[:name] = v[:name].to_sym} #Fixes an earlier bug
           #choices = account_arr.size.times.map{|i| [i,account_arr[i][:name]]}
           choices = account_hash.map{|k,v| [v[:sym], k]}.to_h
+          choices["-"] = "Transfer"
           puts Terminal.default_colour
+          print_transactions.call
+          #format = Proc.new{|runs| runs.map{|r| r.signature.map{|d| d.to_s}.join(",")}.join("\n")}
           puts
-          puts "-" * data_line.size
-          puts signature.inspect
-          puts "-" * data_line.size
-          puts
-          puts "Account: " + account
+          puts format_choices.call(choices)
           puts
-          puts choices.inspect
-          puts
-          puts "Please choose from the above external accounts for this transaction."
-          puts "If you wish to add a new account type 0. To quit type q"
-          puts "To start again for this transaction, type z"
+          puts "Please choose from the above external accounts for this transaction." +
+            "If you wish to add a new account type 0. To quit type q. " +
+                "To start again for this transaction, type z. To mark it as transfer between" +
+                "two non-external accounts, press -."
           while not chosen
             require 'io/console'
             choice = STDIN.getch
@@ -202,6 +221,10 @@ class CodeRunner::Budget
             elsif choice == "z"
               chosen = false
               break
+            elsif choice == "-"
+              ext_account = "Transfer"
+              chosen = "Transfer"
+              break
             elsif not choices.keys.include? choice
               puts "Error: this symbol does not correspond to an account"
             else
@@ -212,21 +235,25 @@ class CodeRunner::Budget
           #choices_hash[data_line] = {external_account: chosen}
           #end
         end
-        ext_account = chosen
         next if not chosen
+        if ext_account and chosen
+            break
+        end
+        ext_account = chosen
         chosen = false
         Hash.phoenix('external_accounts.rb') do |account_hash|
           #choices = account_arr.size.times.map{|i| [i,account_arr[i][:name]]}
           sub_accounts = account_hash[ext_account][:sub_accounts]
           sub_accounts.each{|k,v| v[:name] = v[:name].to_sym} #Fixes an earlier bug
           choices = sub_accounts.map{|k,v| [v[:sym], k]}.to_h
-          puts "-" * data_line.size
+          #puts "-" * data_line.size
+          print_transactions.call
           puts
-          puts choices.inspect
+          puts format_choices.call(choices)
           puts
-          puts "Please choose from the above sub-accounts for this transaction."
-          puts "If you wish to add a new sub account, type 0. To quit, type q"
-          puts "To start again for this transaction, type z"
+          puts "Please choose from the above sub-accounts for this transaction. " + 
+            "If you wish to add a new sub account, type 0. To quit, type q. " +
+            "To start again for this transaction, type z"
           while not chosen
             require 'io/console'
             choice = STDIN.getch
@@ -249,6 +276,7 @@ class CodeRunner::Budget
               chosen = name
             elsif choice == "z"
               chosen = false
+              ext_account = nil
               break
             elsif not choices.keys.include? choice
               puts "Error: this symbol does not correspond to a sub-account"
@@ -261,9 +289,8 @@ class CodeRunner::Budget
         #Hash.phoenix('account_choices.rb') do |choices_hash|
           #choices_hash[signature] = {external_account: ext_account, sub_account: chosen}
         #end
-        add_sqlite_choices({external_account: ext_account, sub_account: chosen})
       end #while not chosen
-
+      add_sqlite_choices({external_account: ext_account, sub_account: chosen})
     end
     {external_account: ext_account, sub_account: chosen}
   end
@@ -279,12 +306,14 @@ class CodeRunner::Budget
     end
     if not @external_account
       @external_account = (
-        get_sqlite_choices[:external_account] or
-        get_old_choices[:external_account]
+        (ch = get_sqlite_choices)[:external_account] or
+        (ch = get_old_choices)[:external_account] or
+        (ch = get_new_choices)[:external_account]
       )
-      if not @external_account
-        raise "No external account for #{data_line}"
-      end
+      @sub_account = ch[:sub_account]
+      #if not @external_account
+        #raise "No external account for #{data_line}"
+      #end
     end
     return @external_account
   end

data/lib/treasurer/accounts.rb

@@ -355,8 +355,11 @@ EOF
              end
 
       fork do
-        (kit).gnuplot_write("#{name_c_file}_balance2.eps", size: size) #, latex: true)
-        system %[ps2epsi #{name_c_file}_balance2.eps #{name_c_file}_balance.eps]
+        #(kit).gnuplot_write("#{name_c_file}_balance2.eps", size: size) #, latex: true)
+        (kit).gnuplot_write("#{name_c_file}_balance.eps", size: size) #, latex: true)
+        # Deprecate ps2epsi
+        # system %[ps2epsi #{name_c_file}_balance2.eps #{name_c_file}_balance.eps]
+        #system %[ps2eps < #{name_c_file}_balance2.eps > #{name_c_file}_balance.eps]
         system %[epstopdf #{name_c_file}_balance.eps]
       end
       #%x[epstopdf #{name}_balance.eps]

data/lib/treasurer/commands.rb

@@ -32,8 +32,15 @@ class << self
   def assign(copts={})
     load_treasurer_folder(copts)
     crcopts = eval(copts[:C]||"{}")
+    #crcopts[:h] = nil
+    #CodeRunner.run_command('generate_component_runs', crcopts)
     crcopts[:h] = :component
-    CodeRunner.run_command('external_account', crcopts)
+    crcopts[:O] = 'date'
+    crcopts[:f] = 'not (component_runs and component_runs.size > 0 and component_runs[0].instance_variable_get(:@external_account))'
+    crcopts[:f] = 'not (@external_account and @sub_account)'
+    catch (:quit_data_entry) do
+      CodeRunner.run_command('external_account', crcopts)
+    end
   end
   def status(copts={})
     load_treasurer_folder(copts)

data/lib/treasurer/report.rb

@@ -124,9 +124,12 @@ class Treasurer
       #p 'accounts256',@runs.size, @runs.map{|r| r.account}.uniq
 
     end
+    # Construct the list of accounts. Because of double entry accounting
+    # # every entry has two accounts. External accounts are abstract accounts
+    # that do not correspond to a real account: e.g. "Food Expenditure"
     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)}
+      external_accounts = (@runs.map{|r| r.external_account}.uniq - accounts.map{|acc| acc.name} - ["Transfer"]).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
@@ -390,8 +393,11 @@ EOF
       fork do
 
         kit.gp.key = "off"
-        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]
+        #kit.gnuplot_write("#{name}2.eps", size: "#{[[labels.size.to_f/4.2, 5.0].min, 1.0].max}in,4.5in")
+        kit.gnuplot_write("#{name}.eps", size: "#{[[labels.size.to_f/4.2, 5.0].min, 1.0].max}in,4.5in")
+        # Deprecate ps2epsi... fails on bounding boxes.
+        #system %[ps2epsi #{name}2.eps #{name}.eps]
+        #system %[ps2eps < #{name}2.eps > #{name}.eps]
         system %[epstopdf #{name}.eps]
 
       end
@@ -574,8 +580,11 @@ EOF
           #kit.gnuplot
           #ep ['kit1122', account, kit]
           fork do
-            kit.gnuplot_write("#{account.name_c_file}2.eps", size: "4.0in,2.0in")
-            system "ps2epsi #{account.name_c_file}2.eps #{account.name_c_file}.eps"
+            #kit.gnuplot_write("#{account.name_c_file}2.eps", size: "4.0in,2.0in")
+            kit.gnuplot_write("#{account.name_c_file}.eps", size: "4.0in,2.0in")
+            #system "ps2epsi #{account.name_c_file}2.eps #{account.name_c_file}.eps"
+            # ps2epsi can break.. we use ps2eps instead!
+            #system "ps2eps < #{account.name_c_file}2.eps > #{account.name_c_file}.eps"
             exec "epstopdf #{account.name_c_file}.eps"
           end
           #%x[ps2eps #{account}.ps]

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.10.1 ruby lib
+# stub: treasurer 0.10.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treasurer".freeze
-  s.version = "0.10.1"
+  s.version = "0.10.6"
 
   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 = "2020-02-08"
+  s.date = "2020-06-27"
   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]
@@ -47,37 +47,25 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/edmundhighcock/treasurer".freeze
   s.licenses = ["GPLv3".freeze]
-  s.rubygems_version = "3.0.6".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "A simple command line tool for managing accounts and finances.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    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.5.0"])
-      s.add_runtime_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<sqlite3>.freeze, ["~> 1.3"])
-      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.1"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_development_dependency(%q<ruby-prof>.freeze, [">= 0.15"])
-    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.5.0"])
-      s.add_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
-      s.add_dependency(%q<sqlite3>.freeze, ["~> 1.3"])
-      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.1"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_dependency(%q<ruby-prof>.freeze, [">= 0.15"])
-    end
+  if s.respond_to? :add_runtime_dependency 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.5.0"])
+    s.add_runtime_dependency(%q<command-line-flunky>.freeze, [">= 1.0.0"])
+    s.add_runtime_dependency(%q<sqlite3>.freeze, ["~> 1.3"])
+    s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.0"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.1"])
+    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_development_dependency(%q<ruby-prof>.freeze, [">= 0.15"])
   else
     s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0"])
     s.add_dependency(%q<coderunner>.freeze, [">= 0.14.16"])
@@ -86,7 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sqlite3>.freeze, ["~> 1.3"])
     s.add_dependency(%q<shoulda>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 2.0"])
     s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.1"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<ruby-prof>.freeze, [">= 0.15"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: treasurer
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.6
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple command line tool for managing accounts and finances.