treasurer 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 249db1dc1774f493ec37945307fa75c56d47977e4e1f6ae6f420b72209bd3736
-  data.tar.gz: eb97e9cb0eb1b45ec0465fa25344a12c7d4c37f368e699d4527139da6031a3bb
+  metadata.gz: 530bccfe411d881237a70e7108ebc999b11401e6961a439b55c5efa8886be585
+  data.tar.gz: e4039efc362d99ba686675a04b7a3fe33e01498f8b3129840f588e2fada30790
 SHA512:
-  metadata.gz: 3a061e81250674481ef0544e4d5a8906e6dcfd6bc40c37210366220e02fc33d1bac19792bab8c046022a354a1326b9b62299982e8d9bc02d7d9df37556dbb131
-  data.tar.gz: 3339deaaf6171c6fb1e71faf3ac51b162f6cea9045685b58e485acbab2d9f9e8e345ada4f6a1506d3166aaac2982b9d8fe4a17e21d05569d8da3258c772ea018
+  metadata.gz: f16b0b2b1be1402f91d5b37bd764f9bd9c8763f3e99933d87bf7baa4decd989abdec961c9abc2c74072ce38fd8b9803ac1c9c0bb4aacfb2b4a93e5c0e33a2acb
+  data.tar.gz: 5a05d1f79c0138cb8f4f289bd8647c0a8c1deb8fa8a56e1c84c6adc0f8752e15daaace29d74fa65192726242ccf32c4f8fdeac64c89a717615439177ee60c372

data/VERSION

@@ -1 +1 @@
-0.10.2
+0.10.3

data/lib/treasurer/account_choices.rb

@@ -161,33 +161,41 @@ class CodeRunner::Budget
     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
-          puts
-          puts "-" * data_line.size
+          print_transactions.call
           #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.map{|k,v| Terminal::LIGHT_GREEN + k + ":" + Terminal.default_colour + v}.join(" ")
+          puts format_choices.call(choices)
           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
@@ -211,6 +219,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
@@ -221,6 +233,9 @@ class CodeRunner::Budget
           #choices_hash[data_line] = {external_account: chosen}
           #end
         end
+        if ext_account and chosen
+            break
+        end
         ext_account = chosen
         next if not chosen
         chosen = false
@@ -229,13 +244,14 @@ class CodeRunner::Budget
           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
@@ -270,9 +286,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

data/lib/treasurer/commands.rb

@@ -32,7 +32,12 @@ 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
+    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)'
     CodeRunner.run_command('external_account', crcopts)
   end
   def status(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

data/treasurer.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: treasurer 0.10.2 ruby lib
+# stub: treasurer 0.10.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treasurer".freeze
-  s.version = "0.10.2"
+  s.version = "0.10.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treasurer
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Edmund Highcock