reckon 0.5.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77139229b37c2dcb66ec4f8494fb9d40f036ed267cee0dad067483568b02b948
-  data.tar.gz: 363a124cf17848e855dede2351f06946e799ead31b2440e586d5c01ae45e63f1
+  metadata.gz: 9e7bf4198ae8265e025b20821adea75c3acc7cc9493298ac6e7604b342e04bb1
+  data.tar.gz: 4e7e9be82a15f1aef0ab7667e4a751b7e52472673fe0f57359e5d7c5fdac80f6
 SHA512:
-  metadata.gz: 3473f4f80d659d8369151a4b22310159d8b4231df5a24efefd9fc426fa4d27744f2e62fb2c2d17826b0ce4c9a96ef13176ca9e602a47377b6271da49c1324cae
-  data.tar.gz: 323b5fe3aeafba7f04d93b91458d9982e75704c839bd763bf99371ba8f2b11f74d2b3a82a08bc57a56a1765f7a177955f441af03df63f844f0ae2804f842aacc
+  metadata.gz: eb4ce5f4bcb0b9663b5ab89c5071086bf6b13c157f4d45d1608dc1b530b076b82402b25003b4156882b8c56441f66c1cc97867cd781cb8a6b8386804eddb0673
+  data.tar.gz: ec5941351ad06d6bf029af5b47a9453a611c4a17aa14bddbe8b5b2cf4584bcdceb134a0c9016d32f046832ea507a611807a159a2f85a673374bbf591a063a42a

data/.github/workflows/ruby.yml

@@ -0,0 +1,50 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Build Status
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+          # Current ruby stable version
+          - 3.0
+          # Ubuntu 20.10
+          - 2.7
+          # Ubuntu 19.10
+          - 2.5
+          # Mac v11 Big Sur
+          # - 2.6?
+          # Mac v10.15 Catalina
+          - 2.6
+          # Mac v10.14 Mojave
+          - 2.3.7
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: sudo apt-get -y install ledger hledger
+    - name: Install bundler
+      run: sudo gem install -v 1.17.3 bundler
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
+      # uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake test_all

data/.gitignore

@@ -28,3 +28,6 @@ private_tests
 
 ## Bundler
 vendor
+
+test.log
+test_log.txt

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p648
+3.0.0

data/CHANGELOG.md

@@ -1,12 +1,81 @@
 # Changelog
 
-## [v0.5.3](https://github.com/cantino/reckon/tree/v0.5.3) (2020-05-01)
+## [0.7.0](https://github.com/cantino/reckon/tree/0.7.0) (2021-02-06)
 
-[Full Changelog](https://github.com/cantino/reckon/compare/v0.5.2...v0.5.3)
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.6.2...0.7.0)
 
 **Closed issues:**
 
+- fail on unknown accounts [\#96](https://github.com/cantino/reckon/issues/96)
+
+**Merged pull requests:**
+
+- Fail on unknown account [\#102](https://github.com/cantino/reckon/pull/102) ([benprew](https://github.com/benprew))
+- Joined split sentence to one [\#101](https://github.com/cantino/reckon/pull/101) ([RidaAyed](https://github.com/RidaAyed))
+
+## [v0.6.2](https://github.com/cantino/reckon/tree/v0.6.2) (2021-01-25)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.6.1...v0.6.2)
+
+**Closed issues:**
+
+- spaces in tokens [\#97](https://github.com/cantino/reckon/issues/97)
+- read from stdin [\#95](https://github.com/cantino/reckon/issues/95)
+
+**Merged pull requests:**
+
+- Allow using '-' as filename in -f to read csv from STDIN.  Fixes \#95 [\#98](https://github.com/cantino/reckon/pull/98) ([benprew](https://github.com/benprew))
+
+## [v0.6.1](https://github.com/cantino/reckon/tree/v0.6.1) (2021-01-23)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.6.0...v0.6.1)
+
+**Implemented enhancements:**
+
+- \[Feature Request\] Note flag --add-notes in CLI to allow additional notes for each ledger entry [\#86](https://github.com/cantino/reckon/issues/86)
+
+**Closed issues:**
+
+- Migrate CI system from travis-ci.org [\#93](https://github.com/cantino/reckon/issues/93)
+- \[Feature Request\] Pipe ledger file input to the bayesian predictor \(instead of csv\) [\#91](https://github.com/cantino/reckon/issues/91)
+
+**Merged pull requests:**
+
+- Add github actions [\#100](https://github.com/cantino/reckon/pull/100) ([benprew](https://github.com/benprew))
+- Add documentation for doing a substring match.  Fixes \#97 [\#99](https://github.com/cantino/reckon/pull/99) ([benprew](https://github.com/benprew))
+- Test fixes [\#94](https://github.com/cantino/reckon/pull/94) ([benprew](https://github.com/benprew))
+
+## [v0.6.0](https://github.com/cantino/reckon/tree/v0.6.0) (2020-09-04)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.5.4...v0.6.0)
+
+**Fixed bugs:**
+
+- \[BUG\] Reckon appears not to be parsing ISO standard date yyyy-mm-dd? [\#85](https://github.com/cantino/reckon/issues/85)
+
+**Closed issues:**
+
+- duplicate detection [\#16](https://github.com/cantino/reckon/issues/16)
+
+**Merged pull requests:**
+
+- Add ability to add note to transaction when entering it [\#89](https://github.com/cantino/reckon/pull/89) ([benprew](https://github.com/benprew))
+
+## [v0.5.4](https://github.com/cantino/reckon/tree/v0.5.4) (2020-06-05)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.5.3...v0.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:**
+
 - \[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)
@@ -112,7 +181,6 @@
 **Merged pull requests:**
 
 - Better ISO 8601 dates support [\#49](https://github.com/cantino/reckon/pull/49) ([vzctl](https://github.com/vzctl))
-- Unattended mode and custom tokens support [\#47](https://github.com/cantino/reckon/pull/47) ([vzctl](https://github.com/vzctl))
 - \[RFC\] Implement issue \#40: Tab completion [\#46](https://github.com/cantino/reckon/pull/46) ([BlackEdder](https://github.com/BlackEdder))
 - set readline to allow for backspace in ask dialog [\#44](https://github.com/cantino/reckon/pull/44) ([mrtazz](https://github.com/mrtazz))
 
@@ -136,6 +204,7 @@
 
 **Merged pull requests:**
 
+- Unattended mode and custom tokens support [\#47](https://github.com/cantino/reckon/pull/47) ([vzctl](https://github.com/vzctl))
 - Added spec for csv files from Broker Canada [\#36](https://github.com/cantino/reckon/pull/36) ([BlackEdder](https://github.com/BlackEdder))
 - Date format [\#35](https://github.com/cantino/reckon/pull/35) ([BlackEdder](https://github.com/BlackEdder))
 - Added example from a french bank [\#34](https://github.com/cantino/reckon/pull/34) ([BlackEdder](https://github.com/BlackEdder))
@@ -212,15 +281,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,11 +1,10 @@
 PATH
   remote: .
   specs:
-    reckon (0.5.2)
+    reckon (0.7.0)
       chronic (>= 0.3.0)
       highline (>= 1.5.2)
       rchardet (>= 1.8.0)
-      terminal-table (>= 1.4.2)
 
 GEM
   remote: http://rubygems.org/
@@ -34,9 +33,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,6 @@
 # Reckon
 
-[![Build Status](https://travis-ci.org/cantino/reckon.png?branch=master)](https://travis-ci.org/cantino/reckon)
+![Build Status](https://github.com/cantino/reckon/workflows/Build%20Status/badge.svg)
 
 Reckon automagically converts CSV files for use with the command-line accounting tool [Ledger](http://www.ledger-cli.org/).  It also helps you to select the correct accounts associated with the CSV data using Bayesian machine learning.
 
@@ -34,9 +34,8 @@ Learn more:
 
     Usage: Reckon.rb [options]
 
-
     -f, --file FILE                  The CSV file to parse
-    -a, --account name               The Ledger Account this file is for
+    -a, --account NAME               The Ledger Account this file is for
     -v, --[no-]verbose               Run verbosely
     -i, --inverse                    Use the negative of each amount
     -p, --print-table                Print out the parsed CSV in table form
@@ -44,6 +43,12 @@ Learn more:
     -l, --learn-from FILE            An existing ledger file to learn accounts from
         --ignore-columns 1,2,5
                                      Columns to ignore in the CSV file - the first column is column 1
+        --money-column 2
+                                     Specify the money column instead of letting Reckon guess - the first column is column 1
+        --raw-money
+                                     Don't format money column (for stocks)
+        --date-column 3
+                                     Specify the date column instead of letting Reckon guess - the first column is column 1
         --contains-header [N]
                                      The first row of the CSV is a header and should be skipped. Optionally add the number of rows to skip.
         --csv-separator ','
@@ -57,9 +62,9 @@ Learn more:
                                      Force the date format (see Ruby DateTime strftime)
     -u, --unattended                 Don't ask questions and guess all the accounts automatically. Used with --learn-from or --account-tokens options.
     -t, --account-tokens FILE        YAML file with manually-assigned tokens for each account (see README)
-        --default-into-account name
+        --default-into-account NAME
                                      Default into account
-        --default-outof-account name
+        --default-outof-account NAME
                                      Default 'out of' account
         --suffixed
                                      If --currency should be used as a suffix. Defaults to false.
@@ -77,6 +82,20 @@ To guess the accounts reckon can use an existing ledger file or a token file wit
 
 `reckon --unattended --account-tokens tokens.yaml -f bank.csv -o ledger.dat`
 
+In unattended mode, you can use STDIN to read your csv data, by specifying `-` as the argument to `-f`.
+
+`csv_file_generator | reckon --unattended -l 2010.dat -o ledger.dat -f -`
+
+### Account Tokens
+
+The account tokens file provides a way to teach reckon about what tokens are associated with an account.  As an example, this `tokens.yaml` file:
+
+    Expenses:
+      Bank:
+        - 'ING Direct Deposit'
+
+Would tokenize to 'ING', 'Direct' and 'Deposit'.  The matcher would then suggest matches to transactions that included those tokens. (ex 'Chase Direct Deposit')
+
 Here's an example of `tokens.yaml`:
 
 ```
@@ -96,27 +115,61 @@ Expenses:
   - '4433221100' # Your own account number
 ```
 
-If reckon can not guess the accounts it will use `Income:Unknown` or `Expenses:Unknown` names.
-You can override them with `--default_outof_account` and `--default_into_account` options.
+Reckon will use `Income:Unknown` or `Expenses:Unknown` if it can't match a transaction to an account.
+
+You can override these names with the `--default_outof_account` and `--default_into_account` options.
+
+### Substring Match
+
+If, in the above example, you'd prefer to match any transaction that contains the string 'ING Direct Deposit' you have to use a regex:
+
+    Expenses:
+      Bank:
+        - /ING Direct Deposit/
+
+## Contributing
+
+We encourage you to contribute to Reckon! Here is some information to help you.
 
-## Note on Patches/Pull Requests
+### Patches/Pull Requests Process
 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (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.
+1. Fork the project.
+2. Make your feature addition or bug fix.
+3. Add tests for it. This is important so I don't break it in a future version unintentionally.
+4. Commit, do not mess with rakefile, version, or history.
+   - (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)
+5. Send me a pull request. Bonus points for topic branches.
+
+### Integration Tests
+
+Reckon has integration test located in `spec/integration`.  These are integration and regression tests for reckon.
+
+Run all the tests:
+
+    ./spec/integration/test.sh
+
+Run a single test
+
+    ./spec/integration/test.sh chase/account_tokens_and_regex
+
+#### Add a new integration test
+
+Each test has it's own directory, which you can add any files you want, but the following files are required:
+
+- `test_args` - arguments to add to the reckon command to test against, can specify `--unattended`, `-f input.csv`, etc
+- `output.ledger` - the expected ledger file output
+
+If the result of running reckon with `test_args` does not match `output.ledger`, then the test fails.
+
+Most tests will specify `--unattended`, otherwise reckon prompts for keyboard input.
+
+The convention is to use `input.csv` as the input file, and `tokens.yml` as the tokens file, but it is not required.
 
-## 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.
+Copyright (c) 2013 Andrew Cantino (@cantino). See LICENSE for details.
 
 Thanks to @BlackEdder for many contributions!
+
+Currently maintained by @benprew. Thank you!

data/Rakefile

@@ -1,6 +1,22 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
+require 'English'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
+
+task :test_all do
+  puts "#{`ledger --version |head -n1`}"
+  puts "Running unit tests"
+  Rake::Task["spec"].invoke
+  puts "Running integration tests"
+  Rake::Task["integration_tests"].invoke
+end
+
+task :integration_tests do
+  puts `./spec/integration/test.sh`
+  raise 'Integration tests failed' if $CHILD_STATUS.exitstatus != 0
+end

data/bin/build-new-version.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+VERSION=$1
+
+echo "Install github_changelog_generator"
+gem install --user github_changelog_generator
+
+echo "Update 'lib/reckon/version.rb'"
+echo -e "module Reckon\n  VERSION=\"$VERSION\"\nend" > lib/reckon/version.rb
+echo "Run `bundle install` to build updated Gemfile.lock"
+bundle install
+echo "3. Run changelog generator (requires $TOKEN to be your github token)"
+github_changelog_generator -u cantino -p reckon -t $TOKEN --future-release $VERSION
+echo "4. Commit changes"
+git add CHANGELOG.md lib/reckon/version.rb Gemfile.lock
+git commit -m "Release $VERSION"
+echo "7. Build new gem"
+gem build reckon.gemspec
+echo "5. Tag release"
+git tag v$VERSION
+echo "Push changes and tags"
+echo git push && git push --tags
+echo "Push new gem"
+echo gem push reckon-$VERSION.gem

data/bin/reckon

@@ -3,7 +3,12 @@
 require 'rubygems'
 require 'reckon'
 
-options = Reckon::App.parse_opts
+begin
+  options = Reckon::Options.parse
+rescue RuntimeError => e
+  puts("ERROR: #{e}")
+  exit(1)
+end
 reckon = Reckon::App.new(options)
 
 if options[:print_table]

data/lib/reckon.rb

@@ -4,9 +4,8 @@ require 'rubygems'
 require 'rchardet'
 require 'chronic'
 require 'csv'
-require 'highline/import'
+require 'highline'
 require 'optparse'
-require 'terminal-table'
 require 'time'
 require 'logger'
 
@@ -17,4 +16,5 @@ require_relative 'reckon/date_column'
 require_relative 'reckon/money'
 require_relative 'reckon/ledger_parser'
 require_relative 'reckon/csv_parser'
+require_relative 'reckon/options'
 require_relative 'reckon/app'

data/lib/reckon/app.rb

@@ -1,18 +1,20 @@
 # coding: utf-8
+
 require 'pp'
 require 'yaml'
 
 module Reckon
   class App
     attr_accessor :options, :seen, :csv_parser, :regexps, :matcher
+    @@cli = HighLine.new
 
-    def initialize(options = {})
+    def initialize(opts = {})
+      self.options = opts
       LOGGER.level = Logger::INFO if options[:verbose]
-      self.options = options
+
       self.regexps = {}
-      self.seen = {}
+      self.seen = Set.new
       self.options[:currency] ||= '$'
-      options[:string] = File.read(options[:file]) unless options[:string]
       @csv_parser = CSVParser.new( options )
       @matcher = CosineSimilarity.new(options)
       learn!
@@ -20,22 +22,19 @@ module Reckon
 
     def interactive_output(str)
       return if options[:unattended]
+
       puts str
     end
 
     def learn!
       learn_from_account_tokens(options[:account_tokens_file])
-
-      ledger_file = options[:existing_ledger_file]
-      return unless ledger_file
-      fail "#{ledger_file} doesn't exist!" unless File.exists?(ledger_file)
-      learn_from(File.read(ledger_file))
+      learn_from_ledger_file(options[:existing_ledger_file])
     end
 
     def learn_from_account_tokens(filename)
       return unless filename
 
-      fail "#{filename} doesn't exist!" unless File.exists?(filename)
+      raise "#{filename} doesn't exist!" unless File.exist?(filename)
 
       extract_account_tokens(YAML.load_file(filename)).each do |account, tokens|
         tokens.each do |t|
@@ -48,14 +47,27 @@ module Reckon
       end
     end
 
-    def learn_from(ledger)
+    def learn_from_ledger_file(ledger_file)
+      return unless ledger_file
+
+      raise "#{ledger_file} doesn't exist!" unless File.exist?(ledger_file)
+
+      learn_from_ledger(File.read(ledger_file))
+    end
+
+    def learn_from_ledger(ledger)
+      LOGGER.info "learning from #{ledger}"
       LedgerParser.new(ledger).entries.each do |entry|
         entry[:accounts].each do |account|
           str = [entry[:desc], account[:amount]].join(" ")
-          @matcher.add_document(account[:name], str) unless account[:name] == options[:bank_account]
+          if account[:name] != options[:bank_account]
+            LOGGER.info "adding document #{account[:name]} #{str}"
+            @matcher.add_document(account[:name], str)
+          end
           pretty_date = entry[:date].iso8601
-          seen[pretty_date] ||= {}
-          seen[pretty_date][@csv_parser.pretty_money(account[:amount])] = true
+          if account[:name] == options[:bank_account]
+            seen << seen_key(pretty_date, @csv_parser.pretty_money(account[:amount]))
+          end
         end
       end
     end
@@ -91,9 +103,10 @@ module Reckon
     end
 
     def walk_backwards
+      cmd_options = "[account]/[q]uit/[s]kip/[n]ote/[d]escription"
       seen_anything_new = false
       each_row_backwards do |row|
-        interactive_output Terminal::Table.new(:rows => [ [ row[:pretty_date], row[:pretty_money], row[:description] ] ])
+        print_transaction([row])
 
         if already_seen?(row)
           interactive_output "NOTE: This row is very similar to a previous one!"
@@ -105,50 +118,28 @@ module Reckon
           seen_anything_new = true
         end
 
-        possible_answers = suggest(row)
-
-        ledger = if row[:money] > 0
-          if options[:unattended]
-            out_of_account = possible_answers.first || options[:default_outof_account] || 'Income:Unknown'
-          else
-            out_of_account = ask("Which account provided this income? ([account]/[q]uit/[s]kip) ") { |q|
-              q.completion = possible_answers
-              q.readline = true
-              q.default = possible_answers.first
-            }
-          end
-
-          finish if out_of_account == "quit" || out_of_account == "q"
-          if out_of_account == "skip" || out_of_account == "s"
-            interactive_output "Skipping"
-            next
-          end
-
-          ledger_format( row,
-                         [options[:bank_account], row[:pretty_money]],
-                         [out_of_account, row[:pretty_money_negated]] )
+        if row[:money] > 0
+          # out_of_account
+          answer = ask_account_question("Which account provided this income? (#{cmd_options})", row)
+          line1 = [options[:bank_account], row[:pretty_money]]
+          line2 = [answer, ""]
         else
-          if options[:unattended]
-            into_account = possible_answers.first || options[:default_into_account] || 'Expenses:Unknown'
-          else
-            into_account = ask("To which account did this money go? ([account]/[q]uit/[s]kip) ") { |q|
-              q.completion = possible_answers
-              q.readline = true
-              q.default = possible_answers.first
-            }
-          end
-          finish if into_account == "quit" || into_account == 'q'
-          if into_account == "skip" || into_account == 's'
-            interactive_output "Skipping"
-            next
-          end
+          # into_account
+          answer = ask_account_question("To which account did this money go? (#{cmd_options})", row)
+#          line1 = [answer, row[:pretty_money_negated]]
+          line1 = [answer, ""]
+          line2 = [options[:bank_account], row[:pretty_money]]
+        end
 
-          ledger_format( row,
-                         [into_account, row[:pretty_money_negated]],
-                         [options[:bank_account], row[:pretty_money]] )
+        finish if %w[quit q].include?(answer)
+        if %w[skip s].include?(answer)
+          interactive_output "Skipping"
+          next
         end
 
-        learn_from(ledger) unless options[:account_tokens_file]
+        ledger = ledger_format(row, line1, line2)
+        LOGGER.info "ledger line: #{ledger}"
+        learn_from_ledger(ledger) unless options[:account_tokens_file]
         output(ledger)
       end
     end
@@ -167,16 +158,95 @@ module Reckon
                   :money => @csv_parser.money_for(index),
                   :description => @csv_parser.description_for(index) }
       end
-      rows.sort_by { |n| n[:date] }.each {|row| yield row }
+      rows.sort_by { |n| [n[:date], -n[:money], n[:description]] }.each { |row| yield row }
     end
 
-    def most_specific_regexp_match( row )
+    def print_transaction(rows)
+      str = "\n"
+      header = %w[Date Amount Description Note]
+      maxes = header.map(&:length)
+
+      rows = rows.map { |r| [r[:pretty_date], r[:pretty_money], r[:description], r[:note]] }
+
+      rows.each do |r|
+        r.length.times { |i| l = r[i] ? r[i].length : 0; maxes[i] = l if maxes[i] < l }
+      end
+
+      header.each_with_index do |n, i|
+        str += " #{n.center(maxes[i])} |"
+      end
+      str += "\n"
+
+      rows.each do |row|
+        row.each_with_index do |_, i|
+          just = maxes[i]
+          str += sprintf(" %#{just}s |", row[i])
+        end
+        str += "\n"
+      end
+
+      interactive_output str
+    end
+
+    def ask_account_question(msg, row)
+      possible_answers = suggest(row)
+      LOGGER.info "possible_answers===> #{possible_answers.inspect}"
+
+      if options[:unattended]
+        if options[:fail_on_unknown_account] && possible_answers.empty?
+          raise %(Couldn't find any matches for '#{row[:description]}'
+            Try adding an account token with --account-tokens)
+        end
+
+        default = options[:default_outof_account]
+        default = options[:default_into_account] if row[:pretty_money][0] == '-'
+        return possible_answers[0] || default
+      end
+
+      answer = @@cli.ask(msg) do |q|
+        q.completion = possible_answers
+        q.readline = true
+        q.default = possible_answers.first
+      end
+
+      # if answer isn't n/note/d/description, must be an account name, or skip, or quit
+      return answer unless %w[n note d description].include?(answer)
+
+      add_description(row) if %w[d description].include?(answer)
+      add_note(row) if %w[n note].include?(answer)
+
+      print_transaction([row])
+      # give user a chance to set account name or retry description
+      return ask_account_question(msg, row)
+    end
+
+    def add_description(row)
+      desc_answer = @@cli.ask("Enter a new description for this transaction (empty line aborts)\n") do |q|
+        q.overwrite = true
+        q.readline = true
+        q.default = row[:description]
+      end
+
+      row[:description] = desc_answer unless desc_answer.empty?
+    end
+
+    def add_note(row)
+      desc_answer = @@cli.ask("Enter a new note for this transaction (empty line aborts)\n") do |q|
+        q.overwrite = true
+        q.readline = true
+        q.default = row[:note]
+      end
+
+      row[:note] = desc_answer unless desc_answer.empty?
+    end
+
+    def most_specific_regexp_match(row)
       matches = regexps.map { |regexp, account|
         if match = regexp.match(row[:description])
           [account, match[0]]
         end
       }.compact
-      matches.sort_by! { |account, matched_text| matched_text.length }.map(&:first)
+      matches.sort_by! { |_account, matched_text| matched_text.length }.map(&:first)
     end
 
     def suggest(row)
@@ -185,9 +255,9 @@ module Reckon
     end
 
     def ledger_format(row, line1, line2)
-      out = "#{row[:pretty_date]}\t#{row[:description]}\n"
-      out += "\t#{line1.first}\t\t\t\t\t#{line1.last}\n"
-      out += "\t#{line2.first}\t\t\t\t\t#{line2.last}\n\n"
+      out = "#{row[:pretty_date]}\t#{row[:description]}#{row[:note] ? "\t; " + row[: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
 
@@ -196,8 +266,12 @@ module Reckon
       options[:output_file].flush
     end
 
+    def seen_key(date, amount)
+      return [date, amount].join("|")
+    end
+
     def already_seen?(row)
-      seen[row[:pretty_date]] && seen[row[:pretty_date]][row[:pretty_money]]
+      seen.include?(seen_key(row[:pretty_date], row[:pretty_money]))
     end
 
     def finish
@@ -207,139 +281,11 @@ module Reckon
     end
 
     def output_table
-      output = Terminal::Table.new do |t|
-        t.headings = 'Date', 'Amount', 'Description'
-        each_row_backwards do |row|
-          t << [ row[:pretty_date], row[:pretty_money], row[:description] ]
-        end
-      end
-      interactive_output output
-    end
-
-    def self.parse_opts(args = ARGV)
-      options = { :output_file => STDOUT }
-      parser = OptionParser.new do |opts|
-        opts.banner = "Usage: Reckon.rb [options]"
-        opts.separator ""
-
-        opts.on("-f", "--file FILE", "The CSV file to parse") do |file|
-          options[:file] = file
-        end
-
-        opts.on("-a", "--account NAME", "The Ledger Account this file is for") do |a|
-          options[:bank_account] = a
-        end
-
-        opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-          options[:verbose] = v
-        end
-
-        opts.on("-i", "--inverse", "Use the negative of each amount") do |v|
-          options[:inverse] = v
-        end
-
-        opts.on("-p", "--print-table", "Print out the parsed CSV in table form") do |p|
-          options[:print_table] = p
-        end
-
-        opts.on("-o", "--output-file FILE", "The ledger file to append to") do |o|
-          options[:output_file] = File.open(o, 'a')
-        end
-
-        opts.on("-l", "--learn-from FILE", "An existing ledger file to learn accounts from") do |l|
-          options[:existing_ledger_file] = l
-        end
-
-        opts.on("", "--ignore-columns 1,2,5", "Columns to ignore in the CSV file - the first column is column 1") do |ignore|
-          options[:ignore_columns] = ignore.split(",").map { |i| i.to_i }
-        end
-
-        opts.on("", "--money-column 2", Integer, "Specify the money column instead of letting Reckon guess - the first column is column 1") do |column_number|
-          options[:money_column] = column_number
-        end
-
-        opts.on("", "--date-column 3", Integer, "Specify the date column instead of letting Reckon guess - the first column is column 1") do |column_number|
-          options[:date_column] = column_number
-        end
-
-        opts.on("", "--contains-header [N]", "The first row of the CSV is a header and should be skipped. Optionally add the number of rows to skip.") do |contains_header|
-          options[:contains_header] = 1
-          options[:contains_header] = contains_header.to_i if contains_header
-        end
-
-        opts.on("", "--csv-separator ','", "Separator for parsing the CSV - default is comma.") do |csv_separator|
-          options[:csv_separator] = csv_separator
-        end
-
-        opts.on("", "--comma-separates-cents", "Use comma instead of period to deliminate dollars from cents when parsing ($100,50 instead of $100.50)") do |c|
-          options[:comma_separates_cents] = c
-        end
-
-        opts.on("", "--encoding 'UTF-8'", "Specify an encoding for the CSV file; not usually needed") do |e|
-          options[:encoding] = e
-        end
-
-        opts.on("-c", "--currency '$'", "Currency symbol to use, defaults to $ (£, EUR)") do |e|
-          options[:currency] = e
-        end
-
-        opts.on("", "--date-format '%d/%m/%Y'", "Force the date format (see Ruby DateTime strftime)") do |d|
-          options[:date_format] = d
-        end
-
-        opts.on("-u", "--unattended", "Don't ask questions and guess all the accounts automatically. Used with --learn-from or --account-tokens options.") do |n|
-          options[:unattended] = n
-        end
-
-        opts.on("-t", "--account-tokens FILE", "YAML file with manually-assigned tokens for each account (see README)") do |a|
-          options[:account_tokens_file] = a
-        end
-
-        opts.on("", "--default-into-account NAME", "Default into account") do |a|
-          options[:default_into_account] = a
-        end
-
-        opts.on("", "--default-outof-account NAME", "Default 'out of' account") do |a|
-          options[:default_outof_account] = a
-        end
-
-        opts.on("", "--suffixed", "If --currency should be used as a suffix. Defaults to false.") do |e|
-          options[:suffixed] = e
-        end
-
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
-          exit
-        end
-
-        opts.on_tail("--version", "Show version") do
-          puts VERSION
-          exit
-        end
-
-        opts.parse!(args)
-      end
-
-      unless options[:file]
-        options[:file] = ask("What CSV file should I parse? ")
-        unless options[:file].length > 0
-          puts "\nYou must provide a CSV file to parse.\n"
-          puts parser
-          exit
-        end
-      end
-
-      unless options[:bank_account]
-        fail "Please specify --account for the unattended mode" if options[:unattended]
-
-        options[:bank_account] = ask("What is the account name of this bank account in Ledger? ") do |q|
-          q.readline = true
-          q.validate = /^.{2,}$/
-          q.default = "Assets:Bank:Checking"
-        end
+      rows = []
+      each_row_backwards do |row|
+        rows << row
       end
-
-      options
+      print_transaction(rows)
     end
   end
 end