reckon 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5984a4f8cd36d4e14f013c14bb111725f8681b90768b6710679820d1325a02e5
-  data.tar.gz: b392d89078a7679f01a344799512ec0467cfe8cad101374a5b8fd198c7e39480
+  metadata.gz: fbf144e0683d1b618fbc046ade5af1c9fd37a69c2a62ee393301ce26f9b9a475
+  data.tar.gz: 32fc57d45adec068894497619c357a36482ede4e547a3169a4c8faf95e731a2c
 SHA512:
-  metadata.gz: ae9b8348e93294d45354f1b96045305dd480b23cd34dcaca3f958fcbc866582000faa1711ea6cbb552578ffe98f126943221b98af298757b86e6dfa54c623f9d
-  data.tar.gz: f43e7128e198c9b73fc40b148cbe281d0bc02aeec90d576615e24fe98789a1846553121319152bffb3a9ca966fd26e1b3916da90480979c5d55106e06dbfe7f2
+  metadata.gz: a5cdf653ec68d8360526c131335249fce69c9b51b12824023263621fb743c4c769cf9e9a44aa37108d8d1ef3ad51bba9b9268e36259c7d4597dddf20abf3c368
+  data.tar.gz: 0af870f477d800fb76edf3d7a4e31ef1120d40817b55d8e8da7175bad0e6daa2a981186e5bfc258a46703dd81cb1c07ed805a0260e9472264a5817fd207a9649

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [v0.8.0](https://github.com/cantino/reckon/tree/v0.8.0) (2021-08-08)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.7.2...v0.8.0)
+
+**Closed issues:**
+
+- --date-format '%d/%m/%Y' not working [\#113](https://github.com/cantino/reckon/issues/113)
+- Reckon behaviour does not match what is explained on README.md [\#112](https://github.com/cantino/reckon/issues/112)
+- --date-format '%d/%m/%Y' not working [\#111](https://github.com/cantino/reckon/issues/111)
+- --date-format '%d/ [\#110](https://github.com/cantino/reckon/issues/110)
+
+**Merged pull requests:**
+
+- Add ledger-date-format option to specify ledger file date format [\#114](https://github.com/cantino/reckon/pull/114) ([benprew](https://github.com/benprew))
+
 ## [v0.7.2](https://github.com/cantino/reckon/tree/v0.7.2) (2021-04-22)
 
 [Full Changelog](https://github.com/cantino/reckon/compare/v0.7.1...v0.7.2)
@@ -150,6 +165,7 @@
 - Fix bugs in ledger file parsing.  Fixes \#56. [\#81](https://github.com/cantino/reckon/pull/81) ([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))
 - convert default date format to iso8601 [\#77](https://github.com/cantino/reckon/pull/77) ([benprew](https://github.com/benprew))
 - Fix rspec failure for ruby 2.3 and 2.4 [\#69](https://github.com/cantino/reckon/pull/69) ([BlackEdder](https://github.com/BlackEdder))
 - Allow setting of money and date columns by index [\#67](https://github.com/cantino/reckon/pull/67) ([cantino](https://github.com/cantino))
@@ -202,11 +218,11 @@
 
 **Merged pull requests:**
 
-- bug: invalid header lines should be ignored, not parsed. [\#78](https://github.com/cantino/reckon/pull/78) ([benprew](https://github.com/benprew))
 - 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))
+- Fix --encoding option [\#41](https://github.com/cantino/reckon/pull/41) ([mamciek](https://github.com/mamciek))
 
 ## [v0.3.10](https://github.com/cantino/reckon/tree/v0.3.10) (2014-08-16)
 
@@ -214,9 +230,7 @@
 
 **Merged pull requests:**
 
-- Fix --encoding option [\#41](https://github.com/cantino/reckon/pull/41) ([mamciek](https://github.com/mamciek))
 - Bumped version number [\#37](https://github.com/cantino/reckon/pull/37) ([BlackEdder](https://github.com/BlackEdder))
-- Ing csv [\#30](https://github.com/cantino/reckon/pull/30) ([BlackEdder](https://github.com/BlackEdder))
 
 ## [v0.3.9](https://github.com/cantino/reckon/tree/v0.3.9) (2014-02-20)
 
@@ -233,12 +247,15 @@
 - 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))
 - Austrian example [\#33](https://github.com/cantino/reckon/pull/33) ([BlackEdder](https://github.com/BlackEdder))
+- Ing csv [\#30](https://github.com/cantino/reckon/pull/30) ([BlackEdder](https://github.com/BlackEdder))
 - Further improvements in nationwide csv handling [\#29](https://github.com/cantino/reckon/pull/29) ([BlackEdder](https://github.com/BlackEdder))
 - Refactor: Add money class [\#28](https://github.com/cantino/reckon/pull/28) ([BlackEdder](https://github.com/BlackEdder))
 - Initial split of CSVparser from class App [\#27](https://github.com/cantino/reckon/pull/27) ([BlackEdder](https://github.com/BlackEdder))
 - Updated version of pull request 24: Allow for other currency symbols while calculating money\_score [\#26](https://github.com/cantino/reckon/pull/26) ([BlackEdder](https://github.com/BlackEdder))
 - Change double column detection [\#23](https://github.com/cantino/reckon/pull/23) ([BlackEdder](https://github.com/BlackEdder))
+- Added optional argument to contains\_header to skip multiple header lines [\#22](https://github.com/cantino/reckon/pull/22) ([BlackEdder](https://github.com/BlackEdder))
 - Add a Bitdeli Badge to README [\#20](https://github.com/cantino/reckon/pull/20) ([bitdeli-chef](https://github.com/bitdeli-chef))
+- Update README to show latest usage info [\#19](https://github.com/cantino/reckon/pull/19) ([purcell](https://github.com/purcell))
 
 ## [v0.3.8](https://github.com/cantino/reckon/tree/v0.3.8) (2013-07-03)
 
@@ -255,7 +272,6 @@
 
 **Merged pull requests:**
 
-- Update README to show latest usage info [\#19](https://github.com/cantino/reckon/pull/19) ([purcell](https://github.com/purcell))
 - add support for spanish dates dd/mm/yyyy closes \#13 [\#14](https://github.com/cantino/reckon/pull/14) ([mauromorales](https://github.com/mauromorales))
 - fix issue showing true when parsing the currency option related to \#7 [\#12](https://github.com/cantino/reckon/pull/12) ([mauromorales](https://github.com/mauromorales))
 
@@ -265,7 +281,6 @@
 
 **Merged pull requests:**
 
-- Added optional argument to contains\_header to skip multiple header lines [\#22](https://github.com/cantino/reckon/pull/22) ([BlackEdder](https://github.com/BlackEdder))
 - Updated the sources to allow for custom curreny [\#11](https://github.com/cantino/reckon/pull/11) ([ghost](https://github.com/ghost))
 - Add --account option on the commandline [\#10](https://github.com/cantino/reckon/pull/10) ([copiousfreetime](https://github.com/copiousfreetime))
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reckon (0.7.2)
+    reckon (0.8.0)
       chronic (>= 0.3.0)
       highline (>= 1.5.2)
       rchardet (>= 1.8.0)

data/README.md

@@ -58,10 +58,13 @@ Learn more:
         --encoding 'UTF-8'
                                      Specify an encoding for the CSV file
     -c, --currency '$'               Currency symbol to use - default $ (ex £, EUR)
-        --date-format '%d/%m/%Y'
-                                     Force the date format (see Ruby DateTime strftime)
+        --date-format FORMAT
+                                     CSV file date format (see `date` for format)
+        --ledger-date-format FORMAT
+                                     Ledger date format (see `date` for format)
     -u, --unattended                 Don't ask questions and guess all the accounts automatically. Use with --learn-from or --account-tokens options.
     -t, --account-tokens FILE        YAML file with manually-assigned tokens for each account (see README)
+        --table-output-file FILE
         --default-into-account NAME
                                      Default into account
         --default-outof-account NAME
@@ -80,13 +83,13 @@ If you find CSV files that it can't parse, send me examples or pull requests!
 You can run reckon in a non-interactive mode.
 To guess the accounts reckon can use an existing ledger file or a token file with keywords.
 
-`reckon --unattended -l 2010.dat -f bank.csv -o ledger.dat`
+`reckon --unattended -a Checking -l 2010.dat -f bank.csv -o ledger.dat`
 
-`reckon --unattended --account-tokens tokens.yaml -f bank.csv -o ledger.dat`
+`reckon --unattended -a Checking --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 -`
+`csv_file_generator | reckon --unattended -a Checking -l 2010.dat -o ledger.dat -f -`
 
 ### Account Tokens
 

data/lib/reckon/date_column.rb

@@ -2,12 +2,13 @@ module Reckon
   class DateColumn < Array
     attr_accessor :endian_precedence
     def initialize( arr = [], options = {} )
+      @options = options
       arr.each do |value|
         if options[:date_format]
           begin
             value = Date.strptime(value, options[:date_format])
           rescue
-            puts "I'm having trouble parsing #{value} with the desired format: #{options[:date_format]}"
+            puts "I'm having trouble parsing '#{value}' with the desired format: #{options[:date_format]}"
             exit 1
           end
         else
@@ -53,7 +54,7 @@ module Reckon
       date = self.for(index)
       return "" if date.nil?
 
-      date.iso8601
+      date.strftime(@options[:ledger_date_format] || '%Y-%m-%d')
     end
 
     def self.likelihood(entry)

data/lib/reckon/ledger_parser.rb

@@ -114,7 +114,7 @@ module Reckon
 
     def initialize(ledger, options = {})
       @options = options
-      @date_format = options[:date_format] || '%Y-%m-%d'
+      @date_format = options[:ledger_date_format] || options[:date_format] || '%Y-%m-%d'
       parse(ledger)
     end
 

data/lib/reckon/options.rb

@@ -73,10 +73,14 @@ module Reckon
           options[:currency] = e
         end
 
-        opts.on("", "--date-format '%d/%m/%Y'", "Force the date format (see Ruby DateTime strftime)") do |d|
+        opts.on("", "--date-format FORMAT", "CSV file date format (see `date` for format)") do |d|
           options[:date_format] = d
         end
 
+        opts.on("", "--ledger-date-format FORMAT", "Ledger date format (see `date` for format)") do |d|
+          options[:ledger_date_format] = d
+        end
+
         opts.on("-u", "--unattended", "Don't ask questions and guess all the accounts automatically. Use with --learn-from or --account-tokens options.") do |n|
           options[:unattended] = n
         end

data/lib/reckon/version.rb

@@ -1,3 +1,3 @@
 module Reckon
-  VERSION="0.7.2"
+  VERSION="0.8.0"
 end

data/spec/integration/ledger_date_format/compare_cmds

@@ -0,0 +1 @@
+ledger --input-date-format '%d/%m/%Y'

data/spec/integration/ledger_date_format/input.csv

@@ -0,0 +1,3 @@
+02/12/2009,Check - 0000000122,122,-$76.00,"","$1,750.06"
+02/12/2009,BLARG    R SH 456930,"","",+$327.49,"$1,826.06"
+02/12/2009,Check - 0000000112,112,-$800.00,"","$1,498.57"

data/spec/integration/ledger_date_format/output.ledger

@@ -0,0 +1,12 @@
+02/12/2009	BLARG R SH 456930; $1,826.06
+	Assets:Bank:Checking			 $327.49
+	Income:Unknown			
+
+02/12/2009	Check - 0000000122; 122; $1,750.06
+	Income:Unknown			
+	Assets:Bank:Checking			-$76.00
+
+02/12/2009	Check - 0000000112; 112; $1,498.57
+	Income:Unknown			
+	Assets:Bank:Checking			-$800.00
+

data/spec/integration/ledger_date_format/test_args

@@ -0,0 +1 @@
+-f input.csv --unattended --account Assets:Bank:Checking --date-format '%d/%m/%Y' --ledger-date-format '%d/%m/%Y'

data/spec/integration/test.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# set -x
-
 set -Euo pipefail
 
 
@@ -23,7 +21,7 @@ main () {
 
     echo > test.log
 
-    NUM_TESTS=$(echo "$TESTS" |wc -l)
+    NUM_TESTS=$(echo "$TESTS" |wc -l |awk '{print $1}')
 
     echo "1..$NUM_TESTS"
 
@@ -31,17 +29,19 @@ main () {
 
     for t in $TESTS; do
         TEST_DIR=$(dirname "$t")
+        TEST_LOG=$(mktemp)
         pushd "$TEST_DIR" >/dev/null || exit 1
         if [[ -e "cli_input.exp" ]]; then
-            cli_test
+            cli_test >$TEST_LOG 2>&1
         else
-            unattended_test
+            unattended_test >$TEST_LOG 2>&1
         fi
 
         popd >/dev/null || exit 1
         # have to save output after popd
         echo -e "\n\n======>$TEST_DIR" >> test.log
-        echo -e "TEST_CMD\n$TEST_LOG" >> test.log
+        echo -e "TEST_CMD: $TEST_CMD" >> test.log
+        cat $TEST_LOG >> test.log
 
         if [[ $ERROR -ne 0 ]]; then
             echo -e "not ok $I - $TEST_DIR"
@@ -56,11 +56,11 @@ main () {
 
 cli_test () {
     OUTPUT_FILE=$(mktemp)
-    TEST_CMD="$RECKON_CMD --table-output-file $OUTPUT_FILE $(cat test_args)"
-    TEST_CMD="expect -d -c 'spawn $TEST_CMD' cli_input.exp"
-    TEST_LOG=$(eval "$TEST_CMD" 2>&1)
+    CLI_CMD="$RECKON_CMD --table-output-file $OUTPUT_FILE $(cat test_args)"
+    TEST_CMD="expect -d -c 'spawn $CLI_CMD' cli_input.exp"
+    eval $TEST_CMD 2>&1
     ERROR=0
-    TEST_DIFF=$(diff -u "$OUTPUT_FILE" "expected_output")
+    TEST_DIFF=$(diff -u "$OUTPUT_FILE" expected_output)
 
     # ${#} is character length, test that there was no output from diff
     if [ ${#TEST_DIFF} -eq 0 ]; then
@@ -73,7 +73,7 @@ cli_test () {
 unattended_test() {
     OUTPUT_FILE=$(mktemp)
     TEST_CMD="$RECKON_CMD -o $OUTPUT_FILE $(cat test_args)"
-    TEST_LOG=$(eval "$TEST_CMD" 2>&1)
+    eval $TEST_CMD 2>&1
     ERROR=0
 
     compare_output "$OUTPUT_FILE"
@@ -87,6 +87,26 @@ test_fail () {
     fi
 }
 
+compare_output () {
+    OUTPUT_FILE=$1
+    pwd
+    if [[ -e compare_cmds ]]; then
+        COMPARE_CMDS=$(cat compare_cmds)
+    else
+        COMPARE_CMDS=$'ledger\nhledger'
+    fi
+
+    ERROR=1
+    while IFS= read -r n; do
+        if compare_output_for "$OUTPUT_FILE" "$n"; then
+            ERROR=0
+        else
+            ERROR=1
+            break
+        fi
+    done <<< "$COMPARE_CMDS"
+}
+
 compare_output_for () {
     OUTPUT_FILE=$1
     LEDGER=$2
@@ -94,8 +114,11 @@ compare_output_for () {
     EXPECTED_FILE=$(mktemp)
     ACTUAL_FILE=$(mktemp)
 
-    $LEDGER -f output.ledger r >"$EXPECTED_FILE" 2>&1 || return 1
-    $LEDGER -f output.ledger r >"$ACTUAL_FILE" 2>&1 || return 1
+    echo $LEDGER -f output.ledger r "$EXPECTED_FILE"
+    eval $LEDGER -f output.ledger r >"$EXPECTED_FILE"  || return 1
+
+    echo $LEDGER -f output.ledger r "$ACTUAL_FILE"
+    eval $LEDGER -f output.ledger r >"$ACTUAL_FILE"  || return 1
 
     TEST_DIFF=$(diff -u "$EXPECTED_FILE" "$ACTUAL_FILE")
 
@@ -107,17 +130,4 @@ compare_output_for () {
     fi
 }
 
-compare_output () {
-    OUTPUT_FILE=$1
-
-    for n in {ledger,hledger}; do
-        if compare_output_for "$OUTPUT_FILE" "$n"; then
-            ERROR=0
-        else
-            ERROR=1
-            return 0
-        fi
-    done
-}
-
 main "$@"

data/spec/reckon/date_column_spec.rb

@@ -38,4 +38,16 @@ describe Reckon::DateColumn do
         .to eq(Date.new(2013, 2, 1))
     end
   end
+
+  describe "#pretty_for" do
+    it 'should use ledger_date_format' do
+      expect(Reckon::DateColumn.new(%w[13/02/2013], {ledger_date_format: '%d/%m/%Y'}).pretty_for(0))
+               .to eq('13/02/2013')
+    end
+
+    it 'should default to is' do
+      expect(Reckon::DateColumn.new(%w[13/12/2013]).pretty_for(0))
+        .to eq('2013-12-13')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrew Cantino
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -217,6 +217,10 @@ files:
 - spec/integration/inversed_credit_card/input.csv
 - spec/integration/inversed_credit_card/output.ledger
 - spec/integration/inversed_credit_card/test_args
+- spec/integration/ledger_date_format/compare_cmds
+- spec/integration/ledger_date_format/input.csv
+- spec/integration/ledger_date_format/output.ledger
+- spec/integration/ledger_date_format/test_args
 - spec/integration/nationwide/input.csv
 - spec/integration/nationwide/output.ledger
 - spec/integration/nationwide/test_args