treasurer 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf846130f8aa5a8fd647db5455494ccb15aa1e25c73577cb977b192d3c1df0d5
-  data.tar.gz: 7b19c82f55fa0d757a5b36a886212edf89eced15b7a4abc79a5327940702e883
+  metadata.gz: b5ac67d0251cca1bbb93ed85a8334a66d0446701d3baa2b73b368df2b9cd93ca
+  data.tar.gz: bc15a7c7e792864a5f7e104d5eb44e9fbc09ee9769977cceba1ffc2c95bb6440
 SHA512:
-  metadata.gz: 1d0b945d48a06f135e6a5ad76e0a0400d8566cb7460e49fd70b30568f04b6fd1bb8c132e24955275d39d5367119dde757c3ff9c78db37a56b9bb29160838b11f
-  data.tar.gz: f031f957e450c3aac58f7d0d59bc93cde6a6f006db1bd132834c67ee8e7f4bd8ae67da2c0995f21e0973ee37089bcc208b5fed7dbe693e35ad328ba3a44fc5f4
+  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.5
+0.10.6

data/lib/treasurer/account_choices.rb

@@ -306,10 +306,11 @@ class CodeRunner::Budget
     end
     if not @external_account
       @external_account = (
-        get_sqlite_choices[:external_account] or
-        get_old_choices[:external_account] or
-        get_new_choices[:external_account]
+        (ch = get_sqlite_choices)[:external_account] or
+        (ch = get_old_choices)[:external_account] or
+        (ch = get_new_choices)[:external_account]
       )
+      @sub_account = ch[:sub_account]
       #if not @external_account
         #raise "No external account for #{data_line}"
       #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/report.rb

@@ -393,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
@@ -577,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.5 ruby lib
+# stub: treasurer 0.10.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treasurer".freeze
-  s.version = "0.10.5"
+  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-10"
+  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.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-10 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.