reckon 0.6.2 → 0.8.0

data/spec/integration/another_bank_example/output.ledger

@@ -1,5 +1,5 @@
 2003-12-24	CREDIT; Some Company vendorpymt PPD ID: 5KL3832735
-	Assets:Bank:Checking			 $2105.00
+	Assets:Bank:Checking			 $2,105.00
 	Income:Unknown			
 
 2004-12-24	CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL
@@ -15,11 +15,11 @@
 	Expenses:Unknown			
 
 2007-12-24	CREDIT; Blarg BLARG REVENUE PPD ID: 00jah78563
-	Assets:Bank:Checking			 $1558.52
+	Assets:Bank:Checking			 $1,558.52
 	Income:Unknown			
 
 2008-12-24	CREDIT; Some Company vendorpymt PPD ID: 59728JSL20
-	Assets:Bank:Checking			 $3520.00
+	Assets:Bank:Checking			 $3,520.00
 	Income:Unknown			
 
 2009-12-24	DEBIT; GITHUB 041287430274 CA 12/22GITHUB 04

data/spec/integration/ask_for_account/cli_input.exp

@@ -0,0 +1,33 @@
+#!/usr/bin/expect -f
+
+
+set timeout 7
+match_max 100000
+expect "What is this account named in Ledger  |Assets:Bank:Checking|?\r
+\[1G▽\[6n"
+send -- "\[45;2R"
+expect -exact "\[1G\[K\[6n"
+send -- "\[45;1R"
+expect  "\[1G\[K\[1G\[1G"
+send -- "T"
+expect  "\[1GT\[K\[1G\[2G"
+send -- "e"
+expect "\[1GTe\[K\[1G\[3G"
+send -- "s"
+expect "\[1GTes\[K\[1G\[4G"
+send -- "t"
+expect "\[1GTest\[K\[1G\[5G"
+send -- ":"
+expect "\[1GTest:\[K\[1G\[6G"
+send -- ":"
+expect "\[1GTest::\[K\[1G\[7G"
+send -- "B"
+expect "\[1GTest::B\[K\[1G\[8G"
+send -- "a"
+expect "\[1GTest::Ba\[K\[1G\[9G"
+send -- "n"
+expect "\[1GTest::Ban\[K\[1G\[10G"
+send -- "k"
+expect "\[1GTest::Bank\[K\[1G\[11G"
+send -- "\r"
+expect eof

data/spec/integration/ask_for_account/expected_output

@@ -0,0 +1,11 @@
+
+    Date    |   Amount   |                    Description                     | Note |
+ 2003-12-24 |  $2,105.00 | CREDIT; Some Company vendorpymt PPD ID: 5KL3832735 |      |
+ 2004-12-24 |   -$116.22 |         CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL |      |
+ 2005-12-24 |     -$0.96 | DEBIT; WEBSITE-BALANCE-10DEC09 12 12/10WEBSITE-BAL |      |
+ 2006-12-24 |      $0.23 | DEBIT; WEBSITE-BALANCE-17DEC09 12 12/17WEBSITE-BAL |      |
+ 2007-12-24 |  $1,558.52 |     CREDIT; Blarg BLARG REVENUE PPD ID: 00jah78563 |      |
+ 2008-12-24 |  $3,520.00 | CREDIT; Some Company vendorpymt PPD ID: 59728JSL20 |      |
+ 2009-12-24 |     -$7.00 |       DEBIT; GITHUB 041287430274 CA 12/22GITHUB 04 |      |
+ 2010-12-24 |    -$20.00 |                                  CHECK; CHECK 2656 |      |
+ 2011-12-24 |    -$85.00 |         DEBIT; HOST 037196321563 MO 12/22SLICEHOST |      |

data/spec/integration/ask_for_account/input.csv

@@ -0,0 +1,9 @@
+DEBIT,2011/12/24,"HOST 037196321563 MO        12/22SLICEHOST",($85.00)
+CHECK,2010/12/24,"CHECK 2656",($20.00)
+DEBIT,2009/12/24,"GITHUB 041287430274 CA           12/22GITHUB 04",($7.00)
+CREDIT,2008/12/24,"Some Company vendorpymt                 PPD ID: 59728JSL20",$3520.00
+CREDIT,2007/12/24,"Blarg BLARG REVENUE                  PPD ID: 00jah78563",$1558.52
+DEBIT,2006/12/24,"WEBSITE-BALANCE-17DEC09 12        12/17WEBSITE-BAL",$.23
+DEBIT,2005/12/24,"WEBSITE-BALANCE-10DEC09 12        12/10WEBSITE-BAL",($0.96)
+CREDIT,2004/12/24,"PAYPAL           TRANSFER                   PPD ID: PAYPALSDSL",($116.22)
+CREDIT,2003/12/24,"Some Company vendorpymt                 PPD ID: 5KL3832735",$2105.00

data/spec/integration/ask_for_account/test_args

@@ -0,0 +1 @@
+-f input.csv -p

data/spec/integration/broker_canada_example/output.ledger

@@ -8,7 +8,7 @@
 
 2013-06-19	2013-06-24; Buy; ISHARES S&P/TSX CAPPED REIT IN; XRE; 300; 15.90; CDN; CAD
 	Income:Unknown			
-	Assets:Bank:Checking			-$4779.95
+	Assets:Bank:Checking			-$4,779.95
 
 2013-06-27	2013-06-27; Dividend; ICICI BK SPONSORED ADR; IBN; 100; USD
 	Assets:Bank:Checking			 $66.70
@@ -19,7 +19,7 @@
 	Income:Unknown			
 
 2014-01-07	2014-01-10; Sell; BMO NASDAQ 100 EQTY HEDGED TO; ZQQ; -300; 27.44; CDN; CAD
-	Assets:Bank:Checking			 $8222.05
+	Assets:Bank:Checking			 $8,222.05
 	Income:Unknown			
 
 2014-01-07	2014-01-07; Interest; BMO S&P/TSX EQUAL WEIGHT BKS I; ZEB; 250; CAD

data/spec/integration/chase/account_tokens_and_regex/output.ledger

@@ -1,5 +1,5 @@
 2009-12-10	CREDIT; Some Company vendorpymt PPD ID: 5KL3832735
-	Assets:Bank:Checking			 $2105.00
+	Assets:Bank:Checking			 $2,105.00
 	Income:Unknown			
 
 2009-12-11	CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL
@@ -15,11 +15,11 @@
 	Assets:Bank:Checking			-$12.23
 
 2009-12-23	CREDIT; Some Company vendorpymt PPD ID: 59728JSL20
-	Assets:Bank:Checking			 $3520.00
+	Assets:Bank:Checking			 $3,520.00
 	Income:Unknown			
 
 2009-12-23	CREDIT; Blarg BLARG REVENUE PPD ID: 00jah78563
-	Assets:Bank:Checking			 $1558.52
+	Assets:Bank:Checking			 $1,558.52
 	Income:Unknown			
 
 2009-12-24	DEBIT; GITHUB 041287430274 CA 12/22GITHUB 04

data/spec/integration/chase/default_account_names/output.ledger

@@ -1,5 +1,5 @@
 2009-12-10	CREDIT; Some Company vendorpymt PPD ID: 5KL3832735
-	Assets:Bank:Checking			 $2105.00
+	Assets:Bank:Checking			 $2,105.00
 	Income:Default			
 
 2009-12-11	CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL
@@ -15,11 +15,11 @@
 	Assets:Bank:Checking			-$12.23
 
 2009-12-23	CREDIT; Some Company vendorpymt PPD ID: 59728JSL20
-	Assets:Bank:Checking			 $3520.00
+	Assets:Bank:Checking			 $3,520.00
 	Income:Default			
 
 2009-12-23	CREDIT; Blarg BLARG REVENUE PPD ID: 00jah78563
-	Assets:Bank:Checking			 $1558.52
+	Assets:Bank:Checking			 $1,558.52
 	Income:Default			
 
 2009-12-24	DEBIT; GITHUB 041287430274 CA 12/22GITHUB 04

data/spec/integration/chase/learn_from_existing/output.ledger

@@ -1,5 +1,5 @@
 2009-12-10	CREDIT; Some Company vendorpymt PPD ID: 5KL3832735
-	Assets:Bank:Checking			 $2105.00
+	Assets:Bank:Checking			 $2,105.00
 	Income:Unknown			
 
 2009-12-11	CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL
@@ -15,11 +15,11 @@
 	Assets:Bank:Checking			-$12.23
 
 2009-12-23	CREDIT; Some Company vendorpymt PPD ID: 59728JSL20
-	Assets:Bank:Checking			 $3520.00
+	Assets:Bank:Checking			 $3,520.00
 	Income:Unknown			
 
 2009-12-23	CREDIT; Blarg BLARG REVENUE PPD ID: 00jah78563
-	Assets:Bank:Checking			 $1558.52
+	Assets:Bank:Checking			 $1,558.52
 	Income:Unknown			
 
 2009-12-24	DEBIT; GITHUB 041287430274 CA 12/22GITHUB 04

data/spec/integration/chase/simple/output.ledger

@@ -1,5 +1,5 @@
 2009-12-10	CREDIT; Some Company vendorpymt PPD ID: 5KL3832735
-	Assets:Bank:Checking			 $2105.00
+	Assets:Bank:Checking			 $2,105.00
 	Income:Unknown			
 
 2009-12-11	CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL
@@ -15,11 +15,11 @@
 	Assets:Bank:Checking			-$12.23
 
 2009-12-23	CREDIT; Some Company vendorpymt PPD ID: 59728JSL20
-	Assets:Bank:Checking			 $3520.00
+	Assets:Bank:Checking			 $3,520.00
 	Income:Unknown			
 
 2009-12-23	CREDIT; Blarg BLARG REVENUE PPD ID: 00jah78563
-	Assets:Bank:Checking			 $1558.52
+	Assets:Bank:Checking			 $1,558.52
 	Income:Unknown			
 
 2009-12-24	DEBIT; GITHUB 041287430274 CA 12/22GITHUB 04

data/spec/integration/danish_kroner_nordea_example/output.ledger

@@ -4,7 +4,7 @@
 
 2012-09-12	Dankort-nota B.J. TRADING E 14660; 12-09-2012; 26164,80
 	Expenses:Unknown			
-	Assets:Bank:Checking			-$3452.90
+	Assets:Bank:Checking			-$3,452.90
 
 2012-10-12	Visa kob DKK 995,00 WWW.ASOS.COM 00000; 12-10-2012; 27939,54
 	Expenses:Unknown			

data/spec/integration/extratofake/output.ledger

@@ -3,7 +3,7 @@
 	Income:Unknown			
 
 2012-11-01	Proventos; 496774
-	Assets:Bank:Checking			 $1000.00
+	Assets:Bank:Checking			 $1,000.00
 	Income:Unknown			
 
 2012-11-01	0000-9; Transferência on line - 01/11 4885 256620-6 XXXXXXXXXXXXX; 224885000256620

data/spec/integration/harder_date_example/output.ledger

@@ -1,5 +1,5 @@
 2009-11-04	TRANSFER CREDIT INTERNET TRANSFER; INTERNET TRANSFER; 1234.00
-	Assets:Bank:Checking			 $1234.00
+	Assets:Bank:Checking			 $1,234.00
 	Income:Unknown			
 
 2009-11-10	TRANSFER DEBIT INTERNET TRANSFER; INTERNET TRANSFER MORTGAGE; 0.00
@@ -16,5 +16,5 @@
 
 2011-11-04	TRANSFER DEBIT INTERNET TRANSFER; INTERNET TRANSFER SAV TO MECU; 0.00
 	Income:Unknown			
-	Assets:Bank:Checking			-$1234.00
+	Assets:Bank:Checking			-$1,234.00
 

data/spec/integration/invalid_header_example/test_args

@@ -1 +1 @@
--f input.csv --unattended --account Assets:Bank:Checking --contains-header 4o
+-f input.csv --unattended --account Assets:Bank:Checking --contains-header 4

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,13 +1,14 @@
 #!/bin/bash
 
-# set -x
-
 set -Euo pipefail
 
+
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 TEST_DIFF=""
 OUTPUT=""
-RECKON_CMD="env RUBYLIB=$SCRIPT_DIR/../../lib:$RUBYLIB reckon -v"
+RECKON_CMD="reckon -v"
+export RUBYLIB=$SCRIPT_DIR/../../lib:${RUBYLIB:-}
+export PATH="$SCRIPT_DIR/../../bin:$PATH"
 
 main () {
     trap test_fail EXIT
@@ -20,28 +21,64 @@ main () {
 
     echo > test.log
 
+    NUM_TESTS=$(echo "$TESTS" |wc -l |awk '{print $1}')
+
+    echo "1..$NUM_TESTS"
+
+    I=1
+
     for t in $TESTS; do
-        OUTPUT_FILE=$(mktemp)
         TEST_DIR=$(dirname "$t")
+        TEST_LOG=$(mktemp)
         pushd "$TEST_DIR" >/dev/null || exit 1
-        echo "$TEST_DIR Running..."
-        TEST_CMD="$RECKON_CMD -o $OUTPUT_FILE $(cat test_args)"
-        TEST_LOG=$(eval "$TEST_CMD" 2>&1)
-        ERROR=0
-
-        compare_output "$OUTPUT_FILE"
+        if [[ -e "cli_input.exp" ]]; then
+            cli_test >$TEST_LOG 2>&1
+        else
+            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"
+            tail -n25 test.log
             exit 1
+        else
+            echo -e "ok $I - $TEST_DIR"
         fi
+        I=$(($I + 1))
     done
 }
 
+cli_test () {
+    OUTPUT_FILE=$(mktemp)
+    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)
+
+    # ${#} is character length, test that there was no output from diff
+    if [ ${#TEST_DIFF} -eq 0 ]; then
+        ERROR=0
+    else
+        ERROR=1
+    fi
+}
+
+unattended_test() {
+    OUTPUT_FILE=$(mktemp)
+    TEST_CMD="$RECKON_CMD -o $OUTPUT_FILE $(cat test_args)"
+    eval $TEST_CMD 2>&1
+    ERROR=0
+
+    compare_output "$OUTPUT_FILE"
+}
+
 test_fail () {
     STATUS=$?
     if [[ $STATUS -ne 0 ]]; then
@@ -50,11 +87,40 @@ 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
 
-    TEST_DIFF=$(diff -u <($LEDGER -f output.ledger r --date-format %F 2>&1) <($LEDGER -f "$OUTPUT_FILE" r --date-format %F 2>&1) )
+    EXPECTED_FILE=$(mktemp)
+    ACTUAL_FILE=$(mktemp)
+
+    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")
 
     # ${#} is character length, test that there was no output from diff
     if [ ${#TEST_DIFF} -eq 0 ]; then
@@ -64,19 +130,4 @@ compare_output_for () {
     fi
 }
 
-compare_output () {
-    OUTPUT_FILE=$1
-
-    for n in {ledger,hledger}; do
-        echo -n "  - $n..."
-        if compare_output_for "$OUTPUT_FILE" "$n"; then
-            echo "SUCCESS!"
-        else
-            echo "FAILED!"
-            ERROR=1
-            return 0
-        fi
-    done
-}
-
 main "$@"

data/spec/reckon/app_spec.rb

@@ -16,10 +16,10 @@ describe Reckon::App do
     describe "each_row_backwards" do
       it "should return rows with hashes" do
         @rows[0][:pretty_date].should == "2009-12-10"
-        @rows[0][:pretty_money].should == " $2105.00"
+        @rows[0][:pretty_money].should == " $2,105.00"
         @rows[0][:description].should == "CREDIT; Some Company vendorpymt PPD ID: 5KL3832735"
         @rows[1][:pretty_date].should == "2009-12-11"
-        @rows[1][:pretty_money].should == "-$116.22"
+        @rows[1][:pretty_money].should == " $116.22"
         @rows[1][:description].should == "CREDIT; PAYPAL TRANSFER PPD ID: PAYPALSDSL"
       end
     end
@@ -37,14 +37,16 @@ describe Reckon::App do
 
   context 'unattended mode with chase csv input' do
     let(:output_file) { StringIO.new }
-    let(:chase) {
+    let(:chase) do
       Reckon::App.new(
         string: BANK_CSV,
         unattended: true,
         output_file: output_file,
-        bank_account: 'Assets:Bank:Checking'
+        bank_account: 'Assets:Bank:Checking',
+        default_into_account: 'Expenses:Unknown',
+        default_outof_account: 'Income:Unknown',
       )
-    }
+    end
 
     describe 'walk backwards' do
       it 'should assign Income:Unknown and Expenses:Unknown by default' do
@@ -87,20 +89,20 @@ describe Reckon::App do
       end
     end
 
-    describe 'csv from STDIN' do
-      it 'should assign to :string option' do
-        options = Reckon::App.parse_opts(
-          %w[-f - --unattended --account bank],
-          StringIO.new('foo,bar,baz')
-        )
-        expect(options[:string]).to eq('foo,bar,baz')
-      end
+    it 'should fail-on-unknown-account' do
+      chase = Reckon::App.new(
+        string: BANK_CSV,
+        unattended: true,
+        output_file: output_file,
+        bank_account: 'Assets:Bank:Checking',
+        default_into_account: 'Expenses:Unknown',
+        default_outof_account: 'Income:Unknown',
+        fail_on_unknown_account: true
+      )
 
-      it 'should require --unattended flag' do
-        expect {Reckon::App.parse_opts(%w[-f - --account bank])}.to(
-          raise_error(RuntimeError, "--unattended is required to use STDIN as CSV source.")
-        )
-      end
+      expect { chase.walk_backwards }.to(
+        raise_error(RuntimeError, /Couldn't find any matches/)
+      )
     end
   end
 
@@ -162,7 +164,7 @@ describe Reckon::App do
     CREDIT,20091223120000[0:GMT],"Blarg BLARG REVENUE                  PPD ID: 00jah78563",1558.52
     DEBIT,20091221120000[0:GMT],"WEBSITE-BALANCE-17DEC09 12        12/17WEBSITE-BAL",-12.23
     DEBIT,20091214120000[0:GMT],"WEBSITE-BALANCE-10DEC09 12        12/10WEBSITE-BAL",-20.96
-    CREDIT,20091211120000[0:GMT],"PAYPAL           TRANSFER                   PPD ID: PAYPALSDSL",-116.22
+    CREDIT,20091211120000[0:GMT],"PAYPAL           TRANSFER                   PPD ID: PAYPALSDSL",116.22
     CREDIT,20091210120000[0:GMT],"Some Company vendorpymt                 PPD ID: 5KL3832735",2105.00
   CSV