treasurer 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 530bccfe411d881237a70e7108ebc999b11401e6961a439b55c5efa8886be585
-  data.tar.gz: e4039efc362d99ba686675a04b7a3fe33e01498f8b3129840f588e2fada30790
+  metadata.gz: 48d8bfa323df401bbd38187da11a32d0fc381b88229b1167f6b592e04c5ff2e3
+  data.tar.gz: 001de901ff3f4d1b3dbf5d54edac9bd2c06c6dfc32baef3854e181514723cbe0
 SHA512:
-  metadata.gz: f16b0b2b1be1402f91d5b37bd764f9bd9c8763f3e99933d87bf7baa4decd989abdec961c9abc2c74072ce38fd8b9803ac1c9c0bb4aacfb2b4a93e5c0e33a2acb
-  data.tar.gz: 5a05d1f79c0138cb8f4f289bd8647c0a8c1deb8fa8a56e1c84c6adc0f8752e15daaace29d74fa65192726242ccf32c4f8fdeac64c89a717615439177ee60c372
+  metadata.gz: 04544adc81ae06172f5d399866e29538609991221a062933b481a4916c6dddfd03dbd3ed7708a0f5b39d4de92d661933447741374c9e5a1b22f0c67c8fee47ba
+  data.tar.gz: 25d9236d5a802016688ea7967c7095ffd971fefa50e2176641fd447bd54af2f98e0f8747aa85792a1ad6664c027c8535e9fa762922263c41a56284e8bbc04c71

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.10.4

data/lib/treasurer/account_choices.rb

@@ -233,11 +233,11 @@ class CodeRunner::Budget
           #choices_hash[data_line] = {external_account: chosen}
           #end
         end
+        next if not chosen
         if ext_account and chosen
             break
         end
         ext_account = chosen
-        next if not chosen
         chosen = false
         Hash.phoenix('external_accounts.rb') do |account_hash|
           #choices = account_arr.size.times.map{|i| [i,account_arr[i][:name]]}
@@ -274,6 +274,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"

data/lib/treasurer/commands.rb

@@ -38,7 +38,9 @@ class << self
     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)
+    catch (:quit_data_entry) do
+      CodeRunner.run_command('external_account', crcopts)
+    end
   end
   def status(copts={})
     load_treasurer_folder(copts)

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.3 ruby lib
+# stub: treasurer 0.10.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treasurer".freeze
-  s.version = "0.10.3"
+  s.version = "0.10.4"
 
   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.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Edmund Highcock