reckon 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77139229b37c2dcb66ec4f8494fb9d40f036ed267cee0dad067483568b02b948
-  data.tar.gz: 363a124cf17848e855dede2351f06946e799ead31b2440e586d5c01ae45e63f1
+  metadata.gz: 52cfe9cf67708213b2650008196a5177e9732285e320e7024d92cab9155aab5b
+  data.tar.gz: 82197ab9f98b310892471cc1cbe5b7d924b8fa57ca2b2cf3b4dbd2abc428f654
 SHA512:
-  metadata.gz: 3473f4f80d659d8369151a4b22310159d8b4231df5a24efefd9fc426fa4d27744f2e62fb2c2d17826b0ce4c9a96ef13176ca9e602a47377b6271da49c1324cae
-  data.tar.gz: 323b5fe3aeafba7f04d93b91458d9982e75704c839bd763bf99371ba8f2b11f74d2b3a82a08bc57a56a1765f7a177955f441af03df63f844f0ae2804f842aacc
+  metadata.gz: 5601c43ce038078a9ce825a05b7cd09f57953632e7abc9882f7025806a7c5a6d89f350c41b0b4964e9a3302090e07839064597f343c348e00ad514e8796852bd
+  data.tar.gz: 3de71c2b8ab50d203ceb9fe888d13c7bf68785f428322a7a865a21315aa781a809639d95cab5c0eeb96c678e871f83505b61bf0860b08ff0387d772e836a8488

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p648
+2.7

data/CHANGELOG.md

@@ -1,12 +1,20 @@
 # Changelog
 
-## [v0.5.3](https://github.com/cantino/reckon/tree/v0.5.3) (2020-05-01)
+## [0.5.4](https://github.com/cantino/reckon/tree/0.5.4) (2020-06-04)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.5.3...0.5.4)
+
+**Fixed bugs:**
+
+- order of transactions [\#88](https://github.com/cantino/reckon/issues/88)
+- Is reckon failing to handle comments when learning? [\#87](https://github.com/cantino/reckon/issues/87)
+
+## [v0.5.3](https://github.com/cantino/reckon/tree/v0.5.3) (2020-05-02)
 
 [Full Changelog](https://github.com/cantino/reckon/compare/v0.5.2...v0.5.3)
 
 **Closed issues:**
 
-- Is reckon failing to handle comments when learning? [\#87](https://github.com/cantino/reckon/issues/87)
 - \[FEATURE REQUEST\] Ask for currency of Account and output in output file in standard format of xxxx TLA for currency [\#84](https://github.com/cantino/reckon/issues/84)
 
 ## [v0.5.2](https://github.com/cantino/reckon/tree/v0.5.2) (2020-03-07)
@@ -28,7 +36,7 @@
 
 **Merged pull requests:**
 
-- guard against rows that don't parse dates [\#82](https://github.com/cantino/reckon/pull/82) ([benprew](https://github.com/benprew))
+- Fix bugs in ledger file parsing.  Fixes \#56. [\#81](https://github.com/cantino/reckon/pull/81) ([benprew](https://github.com/benprew))
 
 ## [v0.5.0](https://github.com/cantino/reckon/tree/v0.5.0) (2020-02-19)
 
@@ -55,7 +63,7 @@
 
 **Merged pull requests:**
 
-- Fix bugs in ledger file parsing.  Fixes \#56. [\#81](https://github.com/cantino/reckon/pull/81) ([benprew](https://github.com/benprew))
+- guard against rows that don't parse dates [\#82](https://github.com/cantino/reckon/pull/82) ([benprew](https://github.com/benprew))
 - Better file encoding suggestions [\#80](https://github.com/cantino/reckon/pull/80) ([benprew](https://github.com/benprew))
 - :bug: fix matching algorithm, add logging and a spec helper.  Fixes \#73 [\#79](https://github.com/cantino/reckon/pull/79) ([benprew](https://github.com/benprew))
 - bug: invalid header lines should be ignored, not parsed. [\#78](https://github.com/cantino/reckon/pull/78) ([benprew](https://github.com/benprew))
@@ -212,15 +220,15 @@
 
 ## [v0.3.3](https://github.com/cantino/reckon/tree/v0.3.3) (2013-01-13)
 
-[Full Changelog](https://github.com/cantino/reckon/compare/v0.3.2...v0.3.3)
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.3.1...v0.3.3)
 
-## [v0.3.2](https://github.com/cantino/reckon/tree/v0.3.2) (2012-07-30)
+## [v0.3.1](https://github.com/cantino/reckon/tree/v0.3.1) (2012-07-30)
 
-[Full Changelog](https://github.com/cantino/reckon/compare/v0.3.1...v0.3.2)
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.3.2...v0.3.1)
 
-## [v0.3.1](https://github.com/cantino/reckon/tree/v0.3.1) (2012-07-30)
+## [v0.3.2](https://github.com/cantino/reckon/tree/v0.3.2) (2012-07-30)
 
-[Full Changelog](https://github.com/cantino/reckon/compare/5c07bea3fe63f9b909b4b76bd49f22fd8faf7a29...v0.3.1)
+[Full Changelog](https://github.com/cantino/reckon/compare/5c07bea3fe63f9b909b4b76bd49f22fd8faf7a29...v0.3.2)
 
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reckon (0.5.2)
+    reckon (0.5.4)
       chronic (>= 0.3.0)
       highline (>= 1.5.2)
       rchardet (>= 1.8.0)
@@ -10,17 +10,49 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (6.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     chronic (0.10.2)
     coderay (1.1.2)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    github_changelog_generator (1.15.2)
+      activesupport
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.2.1)
+      rake (>= 10.0)
+      retriable (~> 3.0)
     highline (2.0.3)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
     method_source (0.9.2)
+    minitest (5.14.1)
+    multi_json (1.14.1)
+    multipart-post (2.1.1)
+    octokit (4.18.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    public_suffix (4.0.5)
+    rainbow (3.0.0)
     rake (12.3.3)
     rantly (1.2.0)
     rchardet (1.8.0)
+    retriable (3.1.2)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -34,14 +66,22 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.6.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  github_changelog_generator
   pry (>= 0.12.2)
   rake
   rantly (= 1.2.0)

data/README.md

@@ -109,14 +109,18 @@ You can override them with `--default_outof_account` and `--default_into_account
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-## Making a release
-* Update lib/reckon/version.rb
-* Run `github_changelog_generator --future-release v$(egrep '"[^"]+"' -o lib/reckon/version.rb |sed -e 's/"//g') --user cantino --project reckon -t $(cat ~/.github_token)`
-* Commit
-* Tag the commit same as in version.rb vX.XX.XX (ex v0.5.2)
-
 ## Copyright
 
 Copyright (c) 2013 Andrew Cantino. See LICENSE for details.
 
 Thanks to @BlackEdder for many contributions!
+
+## Building a new version of reckon
+1. Update reckon/version.rb
+2. Run `bundle install` to build updated Gemfile.lock
+3. Run `bundle exec github_changelog_generator -u cantino -p reckon -t $TOKEN --future-release $VERSION`
+3. Commit changes with: 'Release $VERSION'
+4. Tag release `git tag v$VERSION`
+5. `git push && git push --tags`
+6. Build new gem `gem build reckon.gemspec`
+7. Push new gem `gem push <gemname>`

data/lib/reckon/csv_parser.rb

@@ -53,7 +53,12 @@ module Reckon
     end
 
     def description_for(index)
-      description_column_indices.map { |i| columns[i][index] }.reject(&:empty?).join("; ").squeeze(" ").gsub(/(;\s+){2,}/, '').strip
+      description_column_indices.map { |i| columns[i][index].to_s.strip }
+        .reject(&:empty?)
+        .join("; ")
+        .squeeze(" ")
+        .gsub(/(;\s+){2,}/, '')
+        .strip
     end
 
     def row(index)

data/lib/reckon/ledger_parser.rb

@@ -122,12 +122,13 @@ module Reckon
       @entries = []
       new_entry = {}
       in_comment = false
+      comment_chars = ';#%*|'
       ledger.strip.split("\n").each do |entry|
         # strip comment lines
         in_comment = true if entry == 'comment'
         in_comment = false if entry == 'end comment'
         next if in_comment
-        next if entry =~ /^\s*$/ || entry =~ /^[;#%|*]/
+        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*(.*)$}))
@@ -139,6 +140,9 @@ module Reckon
             desc: m[4].strip,
             accounts: []
           }
+        elsif entry =~ /^\s*$/ && new_entry[:date]
+          add_entry(new_entry)
+          new_entry = {}
         elsif new_entry[:date] && entry =~ /^\s+/
           LOGGER.info("Adding new account #{entry}")
           new_entry[:accounts] << parse_account_line(entry)

data/lib/reckon/version.rb

@@ -1,3 +1,3 @@
 module Reckon
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/reckon.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", ">= 1.2.9"
   s.add_development_dependency "pry", ">= 0.12.2"
   s.add_development_dependency "rantly", "= 1.2.0"
+  s.add_development_dependency "github_changelog_generator"
   s.add_runtime_dependency "chronic", ">= 0.3.0"
   s.add_runtime_dependency "highline", ">= 1.5.2"
   s.add_runtime_dependency "terminal-table", ">= 1.4.2"

data/spec/reckon/csv_parser_spec.rb

@@ -232,6 +232,11 @@ describe Reckon::CSVParser do
       parser = Reckon::CSVParser.new(:string => '01/09/2015,05354 SUBWAY,8.19,,',:date_format => '%d/%m/%Y')
       parser.description_for(0).should == '05354 SUBWAY'
     end
+
+    it "should handle nil description" do
+      parser = Reckon::CSVParser.new(string: '2015-09-01,test,3.99')
+      expect(parser.description_for(1)).to eq("")
+    end
   end
 
   describe "pretty_money_for" do

data/spec/reckon/ledger_parser_spec.rb

@@ -20,12 +20,13 @@ describe Reckon::LedgerParser do
       formats = ["%Y/%m/%d", "%Y-%m-%d"]
       types = [' ! ', ' * ', ' ']
       delimiters = ["  ", "\t", "\t\t"]
+      comment_chars = ';#%*|'
       currency_delimiters = delimiters + ['']
       currencies = ['', '$', '£']
       property_of do
         Rantly do
           description = Proc.new do
-            sized(15){string}.tr(%q{'`:*\\},'').gsub(/\s+/, ' ').gsub(/^[!;<\[( ]+/, '')
+            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)}" }
@@ -56,11 +57,12 @@ describe Reckon::LedgerParser do
         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)
-        ledger_csv = `echo #{safe_s} | ledger csv --date-format '%Y-%m-%d' -f - `
-        ledger_parser_csv = Reckon::LedgerParser.new(s, date_format: '%Y/%m/%d').to_csv.join("\n")
 
+        lp_csv = Reckon::LedgerParser.new(s, date_format: '%Y-%m-%d').to_csv.join("\n")
+        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)
-        actual = CSV.parse(ledger_parser_csv, headers: headers).map(&filter_format)
         expected.length.times do |i|
           expect(actual[i]).to eq(expected[i])
         end
@@ -87,6 +89,19 @@ HERE
 
     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
+      l = Reckon::LedgerParser.new(ledger)
+      expect(l.entries.first[:accounts].map { |n| n[:name] }).to eq(['Expenses:Household', 'Liabilities:ChaseSapphire'])
+      expect(l.entries.first[:accounts].size).to eq(2)
+      expect(l.entries.length).to eq(1)
+    end
+
     it "should ignore non-standard entries" do
       @ledger.entries.length.should == 7
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Andrew Cantino
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -54,6 +54,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -197,46 +211,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Utility for interactively converting and labeling CSV files for the Ledger
   accounting tool.
-test_files:
-- spec/data_fixtures/51-sample.csv
-- spec/data_fixtures/51-tokens.yml
-- spec/data_fixtures/73-sample.csv
-- spec/data_fixtures/73-tokens.yml
-- spec/data_fixtures/73-transactions.ledger
-- spec/data_fixtures/85-date-example.csv
-- spec/data_fixtures/austrian_example.csv
-- spec/data_fixtures/bom_utf8_file.csv
-- spec/data_fixtures/broker_canada_example.csv
-- spec/data_fixtures/chase.csv
-- spec/data_fixtures/danish_kroner_nordea_example.csv
-- spec/data_fixtures/english_date_example.csv
-- spec/data_fixtures/extratofake.csv
-- spec/data_fixtures/french_example.csv
-- spec/data_fixtures/german_date_example.csv
-- spec/data_fixtures/harder_date_example.csv
-- spec/data_fixtures/ing.csv
-- spec/data_fixtures/intuit_mint_example.csv
-- spec/data_fixtures/invalid_header_example.csv
-- spec/data_fixtures/inversed_credit_card.csv
-- spec/data_fixtures/nationwide.csv
-- spec/data_fixtures/simple.csv
-- spec/data_fixtures/some_other.csv
-- spec/data_fixtures/spanish_date_example.csv
-- spec/data_fixtures/suntrust.csv
-- spec/data_fixtures/test_money_column.csv
-- spec/data_fixtures/tokens.yaml
-- spec/data_fixtures/two_money_columns.csv
-- spec/data_fixtures/yyyymmdd_date_example.csv
-- spec/reckon/app_spec.rb
-- spec/reckon/csv_parser_spec.rb
-- spec/reckon/date_column_spec.rb
-- spec/reckon/ledger_parser_spec.rb
-- spec/reckon/money_column_spec.rb
-- spec/reckon/money_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+test_files: []