reckon 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 648b51c8481100983f8d8eff4d9b86ea2ad1962e0908268a6450f618d90f3267
-  data.tar.gz: fb19e70b53da00299caa495e24d8fa01ac20686306e383f598a8888f5118dae3
+  metadata.gz: 2f1e02a1c5dde18325b138afa66518fc2516ea30e8c39eae5cdff2808f5f8bb4
+  data.tar.gz: 3d70362d3b8c8a3e6e147f4ca3466e35db7905e2bfe60571de9d219c330e23db
 SHA512:
-  metadata.gz: 56a4558fe3aadfbf9a0a9f4399f8e70b549b90a08057235fafe5839203390c462b502511fc60b748490398c75f46b5a4d8ccbb4ac9b07b4e6058d72bf615f4ac
-  data.tar.gz: dc3acb9fdae98efc8cd4a8891037cc5bfff716b2c5db74f8b1f86edaa2da0e60843ffbcb0eeeef49358738e0a63bded19e2fa3f9955cce40566a3241cbc86aff
+  metadata.gz: 707f23ee5da2df3837f0ae5c520e8b62d802d812dd9ab3acef72853c5e7d27d51b7aeaa269f89c66de1b73ab0e6891fb9ced9d3f59fb11c49d7679fa84c0e4f5
+  data.tar.gz: 73bbdf6dec9a09c23735695d8c192fde6b94df1d4931e7e79a256bed20a736e46d1503985dc29689f7f4fbaefd5c11413f4a41eb58516691b77daef99c2c8c75

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [v0.9.5](https://github.com/cantino/reckon/tree/v0.9.5) (2024-01-08)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.9.4...v0.9.5)
+
+**Closed issues:**
+
+- Ruby Readline error [\#127](https://github.com/cantino/reckon/issues/127)
+- Date formats [\#126](https://github.com/cantino/reckon/issues/126)
+
+**Merged pull requests:**
+
+- Pin highline to 2.x branch. Fixes \#127 [\#128](https://github.com/cantino/reckon/pull/128) ([benprew](https://github.com/benprew))
+
+## [v0.9.4](https://github.com/cantino/reckon/tree/v0.9.4) (2023-11-24)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.9.3...v0.9.4)
+
 ## [v0.9.3](https://github.com/cantino/reckon/tree/v0.9.3) (2023-08-25)
 
 [Full Changelog](https://github.com/cantino/reckon/compare/v0.9.2...v0.9.3)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    reckon (0.9.4)
+    reckon (0.9.6)
       chronic (>= 0.3.0)
-      highline (>= 1.5.2)
+      highline (~> 2.0)
       matrix (>= 0.4.2)
       rchardet (>= 1.8.0)
 

data/Rakefile

@@ -8,6 +8,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
 
+desc "Run specs and integration tests"
 task :test_all do
   puts "#{`ledger --version |head -n1`}"
   puts "Running unit tests"
@@ -16,6 +17,7 @@ task :test_all do
   Rake::Task["test_integration"].invoke
 end
 
+desc "Run integration tests"
 task :test_integration do
   cmd = 'prove -v ./spec/integration/test.sh'
   raise 'Integration tests failed' unless system(cmd)

data/bin/build-new-version.sh

@@ -28,5 +28,6 @@ gem build reckon.gemspec
 echo "Push changes and tags"
 echo "git push && git push --tags"
 echo "Push new gem"
-echo "gem push reckon-$VERSION.gem"
+echo "gem push reckon-$VERSION.gem --otp (ykman oath accounts code -s rubygems.org)"
+echo "Publish draft github release"
 gh release create "v$VERSION" "reckon-$VERSION.gem" --draft --generate-notes

data/lib/reckon/ledger_parser.rb

@@ -107,8 +107,8 @@
 require 'rubygems'
 
 module Reckon
+  # Parses ledger files
   class LedgerParser
-
     # ledger is an object that response to #each_line,
     # (i.e. a StringIO or an IO object)
     def initialize(options = {})
@@ -130,7 +130,7 @@ module Reckon
         next if entry =~ /^\s*[#{comment_chars}]/
 
         # (date, type, code, description), type and code are optional
-        if (m = entry.match(%r{^(\d+[\d/-]+)\s+([*!])?\s*(\([^)]+\))?\s*(.*)$}))
+        if (m = entry.match(%r{^(\d+[^\s]+)\s+([*!])?\s*(\([^)]+\))?\s*(.*)$}))
           add_entry(entries, new_entry)
           new_entry = {
             date: try_parse_date(m[1]),
@@ -140,7 +140,7 @@ module Reckon
             accounts: []
           }
         elsif entry =~ /^\s*$/ && new_entry[:date]
-          add_entry(entries,new_entry)
+          add_entry(entries, new_entry)
           new_entry = {}
         elsif new_entry[:date] && entry =~ /^\s+/
           LOGGER.info("Adding new account #{entry}")
@@ -175,13 +175,13 @@ module Reckon
     end
 
     def format_row(row, line1, line2)
-      out = "#{row[:pretty_date]}\t#{row[:description]}#{row[:note] ? "\t; " + row[:note]: ""}\n"
+      note = row[:note] ? "\t; row[:note]" : ""
+      out = "#{row[:pretty_date]}\t#{row[:description]}#{note}\n"
       out += "\t#{line1.first}\t\t\t#{line1.last}\n"
       out += "\t#{line2.first}\t\t\t#{line2.last}\n\n"
       out
     end
 
-
     private
 
     def add_entry(entries, entry)

data/lib/reckon/version.rb

@@ -1,3 +1,3 @@
 module Reckon
-  VERSION = "0.9.4"
+  VERSION = "0.9.6"
 end

data/reckon.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry", ">= 0.12.2"
   s.add_development_dependency "rantly", "= 1.2.0"
   s.add_runtime_dependency "chronic", ">= 0.3.0"
-  s.add_runtime_dependency "highline", ">= 1.5.2"
+  s.add_runtime_dependency "highline", "~> 2.0"  # 3.0 replaces readline with reline and breaks reckon
   s.add_runtime_dependency "rchardet", ">= 1.8.0"
   s.add_runtime_dependency "matrix", ">= 0.4.2"
 end

data/spec/reckon/ledger_parser_spec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-#encoding: utf-8
+# encoding: utf-8
 
 require_relative "../spec_helper"
 require 'rubygems'
@@ -28,27 +28,31 @@ describe Reckon::LedgerParser do
       property_of do
         Rantly do
           description = Proc.new do
-            sized(15){string}.tr(%q{'`:*\\},'').gsub(/\s+/, ' ').gsub(/^[!;<\[( #{comment_chars}]+/, '')
+            sized(15) {
+              string
+            }.tr(%q{'`:*\\}, '').gsub(/\s+/, ' ').gsub(/^[!;<\[( #{comment_chars}]+/, '')
           end
           currency = choose(*currencies) # to be consistent within the transaction
-          single_line_comments = ";#|%*".split('').map { |n| "#{n} #{call(description)}" }
+          single_line_comments = ";#|%*".split('').map { |n|
+            "#{n} #{call(description)}"
+          }
           comments = ['', ';   ', "\t;#{call(description)}", "  ; #{call(description)}"]
           date = Time.at(range(0, 1_581_389_644)).strftime(choose(*formats))
           codes = [' ', " (#{string(:alnum).tr('()', '')}) "]
           account = Proc.new { choose(*delimiters) + call(description) }
           account_money = Proc.new do
-              sprintf("%.02f", (float * range(5,10) + 1) * choose(1, -1))
+            sprintf("%.02f", (float * range(5, 10) + 1) * choose(1, -1))
           end
           account_line = Proc.new do
             call(account) + \
-            choose(*delimiters) + \
-            currency + \
-            choose(*currency_delimiters) + \
-            call(account_money) + \
-            choose(*comments)
+              choose(*delimiters) + \
+              currency + \
+              choose(*currency_delimiters) + \
+              call(account_money) + \
+              choose(*comments)
           end
           ledger = "#{date}#{choose(*types)}#{choose(*codes)}#{call(description)}\n"
-          range(1,5).times do
+          range(1, 5).times do
             ledger += "#{call(account_line)}\n"
           end
           ledger += "#{call(account)}\n"
@@ -56,7 +60,10 @@ describe Reckon::LedgerParser do
           ledger
         end
       end.check(1000) do |s|
-        filter_format = lambda { |n| [n['date'], n['desc'], n['name'], sprintf("%.02f", n['amount'])] }
+        filter_format = lambda { |n|
+          [n['date'], n['desc'], n['name'],
+           sprintf("%.02f", n['amount'])]
+        }
         headers = %w[date code desc name currency amount type commend]
         safe_s = Shellwords.escape(s)
 
@@ -64,7 +71,8 @@ describe Reckon::LedgerParser do
         actual = CSV.parse(lp_csv, headers: headers).map(&filter_format)
 
         ledger_csv = `echo #{safe_s} | ledger csv --date-format '%Y/%m/%d' -f - `
-        expected = CSV.parse(ledger_csv.gsub('\"', '""'), headers: headers).map(&filter_format)
+        expected = CSV.parse(ledger_csv.gsub('\"', '""'),
+                             headers: headers).map(&filter_format)
         expected.length.times do |i|
           expect(actual[i]).to eq(expected[i])
         end
@@ -72,34 +80,35 @@ describe Reckon::LedgerParser do
     end
 
     it 'should filter block comments' do
-      ledger = <<HERE
-1970/11/01 Dinner should show up
-  Assets:Checking  -123.00
-  Expenses:Restaurants
+      ledger = <<~HERE
+        1970/11/01 Dinner should show up
+          Assets:Checking  -123.00
+          Expenses:Restaurants
 
-comment
+        comment
 
-1970/11/01 Lunch should NOT show up
-  Assets:Checking  -12.00
-  Expenses:Restaurants
+        1970/11/01 Lunch should NOT show up
+          Assets:Checking  -12.00
+          Expenses:Restaurants
 
-end comment
-HERE
+        end comment
+      HERE
       entries = Reckon::LedgerParser.new.parse(StringIO.new(ledger))
       expect(entries.length).to eq(1)
       expect(entries.first[:desc]).to eq('Dinner should show up')
-
     end
 
     it 'should transaction comments' do
-      ledger = <<HERE
-2020-03-27      AMZN Mktp USX999H3203; Shopping; Sale
-    Expenses:Household                                      $82.77
-    Liabilities:ChaseSapphire                                       -$81.77
-    # END FINANCE SCRIPT OUTPUT Thu 02 Apr 2020 12:05:54 PM EDT
-HERE
+      ledger = <<~HERE
+        2020-03-27      AMZN Mktp USX999H3203; Shopping; Sale
+            Expenses:Household                                      $82.77
+            Liabilities:ChaseSapphire                                       -$81.77
+            # END FINANCE SCRIPT OUTPUT Thu 02 Apr 2020 12:05:54 PM EDT
+      HERE
       entries = Reckon::LedgerParser.new.parse(StringIO.new(ledger))
-      expect(entries.first[:accounts].map { |n| n[:name] }).to eq(['Expenses:Household', 'Liabilities:ChaseSapphire'])
+      expect(entries.first[:accounts].map { |n|
+               n[:name]
+             }).to eq(['Expenses:Household', 'Liabilities:ChaseSapphire'])
       expect(entries.first[:accounts].size).to eq(2)
       expect(entries.length).to eq(1)
     end
@@ -123,80 +132,99 @@ HERE
       @entries.last[:accounts].last[:name].should == "Assets:Bank:Checking"
       @entries.last[:accounts].last[:amount].should == -20.24
     end
+
+    it "should parse dot-separated dates" do
+      ledger = <<~HERE
+        2024.03.12	groceries; 11223344556; 32095205940
+        	assets:bank:spending			 530.00 NOK
+        	assets:bank:co:groceries
+
+        2024.03.13	autosave; 11223344555; 11223344556
+        	assets:bank:savings
+        	assets:bank:spending			-10.00 NOK
+      HERE
+      options = { ledger_date_format: '%Y.%m.%d' }
+      entries = Reckon::LedgerParser.new(options).parse(StringIO.new(ledger))
+      expect(entries.first[:date]).to eq(Date.new(2024, 3, 12))
+      expect(entries.last[:date]).to eq(Date.new(2024, 3, 13))
+      expect(entries.length).to eq(2)
+    end
   end
 
   describe "balance" do
     it "it should balance out missing account values" do
       @ledger.send(:balance, [
-          { :name => "Account1", :amount => 1000 },
-          { :name => "Account2", :amount => nil }
-      ]).should == [ { :name => "Account1", :amount => 1000 }, { :name => "Account2", :amount => -1000 } ]
+                     { :name => "Account1", :amount => 1000 },
+                     { :name => "Account2", :amount => nil }
+                   ]).should == [{ :name => "Account1", :amount => 1000 },
+                                 { :name => "Account2", :amount => -1000 }]
     end
 
     it "it should balance out missing account values" do
       @ledger.send(:balance, [
-          { :name => "Account1", :amount => 1000 },
-          { :name => "Account2", :amount => 100 },
-          { :name => "Account3", :amount => -200 },
-          { :name => "Account4", :amount => nil }
-      ]).should == [
-          { :name => "Account1", :amount => 1000 },
-          { :name => "Account2", :amount => 100 },
-          { :name => "Account3", :amount => -200 },
-          { :name => "Account4", :amount => -900 }
-      ]
+                     { :name => "Account1", :amount => 1000 },
+                     { :name => "Account2", :amount => 100 },
+                     { :name => "Account3", :amount => -200 },
+                     { :name => "Account4", :amount => nil }
+                   ]).should == [
+                     { :name => "Account1", :amount => 1000 },
+                     { :name => "Account2", :amount => 100 },
+                     { :name => "Account3", :amount => -200 },
+                     { :name => "Account4", :amount => -900 }
+                   ]
     end
 
     it "it should work on normal values too" do
       @ledger.send(:balance, [
-          { :name => "Account1", :amount => 1000 },
-          { :name => "Account2", :amount => -1000 }
-      ]).should == [ { :name => "Account1", :amount => 1000 }, { :name => "Account2", :amount => -1000 } ]
+                     { :name => "Account1", :amount => 1000 },
+                     { :name => "Account2", :amount => -1000 }
+                   ]).should == [{ :name => "Account1", :amount => 1000 },
+                                 { :name => "Account2", :amount => -1000 }]
     end
   end
 
   # Data
 
-  EXAMPLE_LEDGER = (<<-LEDGER).strip
-= /^Expenses:Books/
-  (Liabilities:Taxes)             -0.10
+  EXAMPLE_LEDGER = (<<~LEDGER).strip
+    = /^Expenses:Books/
+      (Liabilities:Taxes)             -0.10
 
-~ Monthly
-  Assets:Bank:Checking          $500.00
-  Income:Salary
+    ~ Monthly
+      Assets:Bank:Checking          $500.00
+      Income:Salary
 
-2004-05-01 * Checking balance
-  Assets:Bank:Checking        $1,000.00
-  Equity:Opening Balances
+    2004-05-01 * Checking balance
+      Assets:Bank:Checking        $1,000.00
+      Equity:Opening Balances
 
-2004-05-01 * Checking balance
-  Assets:Bank:Checking        €1,000.00
-  Equity:Opening Balances
+    2004-05-01 * Checking balance
+      Assets:Bank:Checking        €1,000.00
+      Equity:Opening Balances
 
-2004-05-01 * Checking balance
-  Assets:Bank:Checking        1,000.00 SEK
-  Equity:Opening Balances
+    2004-05-01 * Checking balance
+      Assets:Bank:Checking        1,000.00 SEK
+      Equity:Opening Balances
 
-2004/05/01 * Investment balance
-  Assets:Brokerage              50 AAPL @ $30.00
-  Equity:Opening Balances
+    2004/05/01 * Investment balance
+      Assets:Brokerage              50 AAPL @ $30.00
+      Equity:Opening Balances
 
-; blah
-!account blah
+    ; blah
+    !account blah
 
-!end
+    !end
 
-D $1,000
+    D $1,000
 
-2004/05/14 * Pay day
-  Assets:Bank:Checking          $500.00
-  Income:Salary
+    2004/05/14 * Pay day
+      Assets:Bank:Checking          $500.00
+      Income:Salary
 
-2004/05/27 Book Store
-  Expenses:Books                 $20.00
-  Liabilities:MasterCard
-2004/05/27 (100) Credit card company
-  Liabilities:MasterCard         $20.24
-  Assets:Bank:Checking
+    2004/05/27 Book Store
+      Expenses:Books                 $20.00
+      Liabilities:MasterCard
+    2004/05/27 (100) Credit card company
+      Liabilities:MasterCard         $20.24
+      Assets:Bank:Checking
   LEDGER
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - Andrew Cantino
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -72,16 +72,16 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rchardet
   requirement: !ruby/object:Gem::Requirement