treasurer 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 918eb4cb7a1aa8a9f0c6bac9efa881cdddebc888a61952c81f16f82e2e773a3d
-  data.tar.gz: c0f5775f74249b13fef043752fe92f7186492d3b588b2821e2404f68431ff0eb
+  metadata.gz: 249db1dc1774f493ec37945307fa75c56d47977e4e1f6ae6f420b72209bd3736
+  data.tar.gz: eb97e9cb0eb1b45ec0465fa25344a12c7d4c37f368e699d4527139da6031a3bb
 SHA512:
-  metadata.gz: d1bad563f203927243a5becdf1162e3037faec4a998125325ae0e3a20abe976a82e1b8f3734a534502994d94d27824260e72c99136973192f110e4de14da7c01
-  data.tar.gz: da403469bc36b964d086bd090dd222e40757dc9f2cb837d501cb527829d61d13b06038c72b223ac666e1be537c3a38cc9fb1fde2eeb18d78ed4666254f1f0467
+  metadata.gz: 3a061e81250674481ef0544e4d5a8906e6dcfd6bc40c37210366220e02fc33d1bac19792bab8c046022a354a1326b9b62299982e8d9bc02d7d9df37556dbb131
+  data.tar.gz: 3339deaaf6171c6fb1e71faf3ac51b162f6cea9045685b58e485acbab2d9f9e8e345ada4f6a1506d3166aaac2982b9d8fe4a17e21d05569d8da3258c772ea018

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.10.2

data/lib/treasurer/account_choices.rb

@@ -159,6 +159,8 @@ 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)
     Dir.chdir(@runner.root_folder) do
       sym = nil
       while not chosen
@@ -169,12 +171,19 @@ class CodeRunner::Budget
           puts Terminal.default_colour
           puts
           puts "-" * data_line.size
-          puts signature.inspect
+          #format = Proc.new{|runs| runs.map{|r| r.signature.map{|d| d.to_s}.join(",")}.join("\n")}
+          format = Proc.new{|runs| runs.map{|r| 
+            sprintf("%-40s %5.2f %5.2f %5.2f %12s", r.description, r.deposit, r.withdrawal, r.balance, r.account)
+          }.join("\n")}
+          puts format.call(transactions.slice([idx-10, 0].max, idx-1))
+          puts Terminal::LIGHT_GREEN + format.call([transactions[idx]]) + "<-----" + Terminal.default_colour
+          sz = transactions.size
+          puts format.call(transactions.slice([idx+1, sz].min, [idx+10,sz].min))
           puts "-" * data_line.size
           puts
           puts "Account: " + account
           puts
-          puts choices.inspect
+          puts choices.map{|k,v| Terminal::LIGHT_GREEN + k + ":" + Terminal.default_colour + v}.join(" ")
           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"
@@ -280,11 +289,12 @@ class CodeRunner::Budget
     if not @external_account
       @external_account = (
         get_sqlite_choices[:external_account] or
-        get_old_choices[:external_account]
+        get_old_choices[:external_account] or
+        get_new_choices[:external_account]
       )
-      if not @external_account
-        raise "No external account for #{data_line}"
-      end
+      #if not @external_account
+        #raise "No external account for #{data_line}"
+      #end
     end
     return @external_account
   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.10.1 ruby lib
+# stub: treasurer 0.10.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treasurer".freeze
-  s.version = "0.10.1"
+  s.version = "0.10.2"
 
   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-02-09"
   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.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport