reckon 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbf144e0683d1b618fbc046ade5af1c9fd37a69c2a62ee393301ce26f9b9a475
-  data.tar.gz: 32fc57d45adec068894497619c357a36482ede4e547a3169a4c8faf95e731a2c
+  metadata.gz: 26126e1e4ead4fcd93a94093f8e4a4fd557a9c46ccc6983198d4bdd516e639ee
+  data.tar.gz: f196a86ca58ebaeee4f27030bb21af9fd3c3001d20d06b74f2063ea42d96cfcc
 SHA512:
-  metadata.gz: a5cdf653ec68d8360526c131335249fce69c9b51b12824023263621fb743c4c769cf9e9a44aa37108d8d1ef3ad51bba9b9268e36259c7d4597dddf20abf3c368
-  data.tar.gz: 0af870f477d800fb76edf3d7a4e31ef1120d40817b55d8e8da7175bad0e6daa2a981186e5bfc258a46703dd81cb1c07ed805a0260e9472264a5817fd207a9649
+  metadata.gz: 02ad471caf5a5b6b69d98cde9cfa5e0579bbe680f50bb7fa8c1f5b3a7908018a48075531674a27d23139913be9156f889cac8010e06de87439c0665b064d7171
+  data.tar.gz: a8abf375fab7ba91d31a0d05ee372a5fc788feca0fe6a61859cb4ed6c72a3387238a4df2d2dac2ce300fe4f047142ea18bbe03a364e008e2b9588143f0223852

data/.github/workflows/ruby.yml

@@ -9,9 +9,7 @@ name: Build Status
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 jobs:
   test:
@@ -21,23 +19,17 @@ jobs:
       matrix:
         ruby-version:
           # Current ruby stable version
+          - 3.1.2
+          # Ubuntu 22.04
           - 3.0
-          # Ubuntu 20.10
+          # Ubuntu 20.04
           - 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: Update package
       run: sudo apt-get update
     - name: Install packages
-      run: sudo apt-get -y install ledger hledger expect
+      run: sudo apt-get -y install ledger hledger
     - 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):

data/.gitignore

@@ -28,6 +28,14 @@ private_tests
 
 ## Bundler
 vendor
+.bundle
+# binstubs
+exec/
+
+# Don't commit gem files
+*.gem
 
 test.log
 test_log.txt
+
+.byebug_history

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [v0.9.0](https://github.com/cantino/reckon/tree/v0.9.0) (2023-02-23)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.9.0-beta...v0.9.0)
+
+**Merged pull requests:**
+
+- Add support for multiple money columns [\#118](https://github.com/cantino/reckon/pull/118) ([oskarth](https://github.com/oskarth))
+
+## [v0.9.0-beta](https://github.com/cantino/reckon/tree/v0.9.0-beta) (2023-02-21)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.8.1...v0.9.0-beta)
+
+## [v0.8.1](https://github.com/cantino/reckon/tree/v0.8.1) (2022-07-02)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.8.0...v0.8.1)
+
+**Closed issues:**
+
+- Reckon files every transaction \(incoming and outgoing\) as Income:Unknown [\#116](https://github.com/cantino/reckon/issues/116)
+
+**Merged pull requests:**
+
+- fix bugs with test.sh [\#117](https://github.com/cantino/reckon/pull/117) ([benprew](https://github.com/benprew))
+
 ## [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)
@@ -222,7 +246,6 @@
 - 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)
 
@@ -230,6 +253,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))
 
 ## [v0.3.9](https://github.com/cantino/reckon/tree/v0.3.9) (2014-02-20)

data/Gemfile.lock

@@ -1,38 +1,40 @@
 PATH
   remote: .
   specs:
-    reckon (0.8.0)
+    reckon (0.9.0)
       chronic (>= 0.3.0)
       highline (>= 1.5.2)
+      matrix (>= 0.4.2)
       rchardet (>= 1.8.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     chronic (0.10.2)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    highline (2.0.3)
-    method_source (0.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (12.3.3)
+    coderay (1.1.3)
+    diff-lcs (1.5.0)
+    highline (2.1.0)
+    matrix (0.4.2)
+    method_source (1.0.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.6)
     rantly (1.2.0)
     rchardet (1.8.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
 
 PLATFORMS
   ruby
@@ -45,4 +47,4 @@ DEPENDENCIES
   rspec (>= 1.2.9)
 
 BUNDLED WITH
-   1.17.3
+   2.3.5

data/README.md

@@ -45,6 +45,8 @@ Learn more:
                                      Columns to ignore, starts from 1
         --money-column 2
                                      Column number of the money column, starts from 1
+        --money-columns 2,3
+                                     Column number of the money columns, starts from 1 (1 or 2 columns)
         --raw-money
                                      Don't format money column (for stocks)
         --date-column 3

data/bin/build-new-version.sh

@@ -5,7 +5,7 @@ set -e
 VERSION=$1
 
 echo "Install github_changelog_generator"
-# gem install --user 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

data/lib/reckon/csv_parser.rb

@@ -126,13 +126,6 @@ module Reckon
       return results.sort_by { |n| n[:index] }
     end
 
-    def found_double_money_column(id1, id2)
-      self.money_column_indices = [id1, id2]
-      puts "It looks like this CSV has two seperate columns for money, one of which shows positive"
-      puts "changes and one of which shows negative changes.  If this is true, great.  Otherwise,"
-      puts "please report this issue to us so we can take a look!\n"
-    end
-
     # Some csv files negative/positive amounts are indicated in separate account
     def detect_sign_column
       return if columns[0].length <= 2 # This test needs requires more than two rows otherwise will lead to false positives
@@ -162,14 +155,30 @@ module Reckon
     def detect_columns
       results = evaluate_columns(columns)
 
+      # We keep money_column options for backwards compatibility reasons, while
+      # adding option to specify multiple money_columns
       if options[:money_column]
         self.money_column_indices = [options[:money_column] - 1]
+
+      # One or two columns can be specified as money_columns
+      elsif options[:money_columns]
+        if options[:money_columns].length == 1
+          self.money_column_indices = [options[:money_column] - 1]
+        elsif options[:money_columns].length == 2
+          in_col, out_col = options[:money_columns]
+          self.money_column_indices = [in_col -1, out_col -1]
+        else
+          puts "Unable to determine money columns, use --money-columns to specify the 1 or 2 column(s) reckon should use."
+        end
+
+      # If no money_column(s) argument is supplied, try to automatically infer money_column(s)
       else
         self.money_column_indices = results.select { |n| n[:is_money_column] }.map { |n| n[:index] }
         if self.money_column_indices.length == 1
           puts "Using column #{money_column_indices.first + 1} as the money column.  Use --money-colum to specify a different one."
         elsif self.money_column_indices.length == 2
-          found_double_money_column(*self.money_column_indices)
+          puts "Using columns #{money_column_indices[0] + 1} and #{money_column_indices[1] + 1} as money column. Use --money-columns to specify different ones."
+          self.money_column_indices = self.money_column_indices[0..1]
         else
           puts "Unable to determine a money column, use --money-column to specify the column reckon should use."
         end

data/lib/reckon/options.rb

@@ -44,6 +44,10 @@ module Reckon
           options[:money_column] = col
         end
 
+        opts.on("", "--money-columns 2,3", "Column number of the money columns, starts from 1 (1 or 2 columns)") do |ignore|
+          options[:money_columns] = ignore.split(",").map(&:to_i)
+        end
+
         opts.on("", "--raw-money", "Don't format money column (for stocks)") do |n|
           options[:raw] = n
         end

data/lib/reckon/version.rb

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

data/reckon.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "chronic", ">= 0.3.0"
   s.add_runtime_dependency "highline", ">= 1.5.2"
   s.add_runtime_dependency "rchardet", ">= 1.8.0"
+  s.add_runtime_dependency "matrix", ">= 0.4.2"
 end

data/spec/integration/ask_for_account/cli_input.txt

@@ -0,0 +1 @@
+Test::Bank

data/spec/integration/test.sh

@@ -31,7 +31,7 @@ main () {
         TEST_DIR=$(dirname "$t")
         TEST_LOG=$(mktemp)
         pushd "$TEST_DIR" >/dev/null || exit 1
-        if [[ -e "cli_input.exp" ]]; then
+        if [[ -e "cli_input.txt" ]]; then
             cli_test >$TEST_LOG 2>&1
         else
             unattended_test >$TEST_LOG 2>&1
@@ -56,10 +56,8 @@ main () {
 
 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_CMD="$RECKON_CMD --table-output-file $OUTPUT_FILE $(cat test_args)"
+    cat cli_input.txt | $TEST_CMD
     TEST_DIFF=$(diff -u "$OUTPUT_FILE" expected_output)
 
     # ${#} is character length, test that there was no output from diff
@@ -73,7 +71,7 @@ cli_test () {
 unattended_test() {
     OUTPUT_FILE=$(mktemp)
     TEST_CMD="$RECKON_CMD -o $OUTPUT_FILE $(cat test_args)"
-    eval $TEST_CMD 2>&1
+    eval "$TEST_CMD" 2>&1
     ERROR=0
 
     compare_output "$OUTPUT_FILE"
@@ -114,11 +112,13 @@ compare_output_for () {
     EXPECTED_FILE=$(mktemp)
     ACTUAL_FILE=$(mktemp)
 
-    echo $LEDGER -f output.ledger r "$EXPECTED_FILE"
-    eval $LEDGER -f output.ledger r >"$EXPECTED_FILE"  || return 1
+    EXPECTED_CMD="$LEDGER -f output.ledger r >$EXPECTED_FILE"
+    echo "$EXPECTED_CMD"
+    eval "$EXPECTED_CMD" || return 1
 
-    echo $LEDGER -f output.ledger r "$ACTUAL_FILE"
-    eval $LEDGER -f output.ledger r >"$ACTUAL_FILE"  || return 1
+    ACTUAL_CMD="$LEDGER -f \"$OUTPUT_FILE\" r"
+    echo "running $ACTUAL_CMD"
+    eval $ACTUAL_CMD >$ACTUAL_FILE || return 1
 
     TEST_DIFF=$(diff -u "$EXPECTED_FILE" "$ACTUAL_FILE")
 

data/spec/integration/two_money_columns_manual/input.csv

@@ -0,0 +1,5 @@
+Date,Summary,Withdrawal,Deposit,Ending balance,Remarks,In/outward transfer account,Notes
+2021/07/02,Expense,200,,999,,,
+2021/07/02,Expense,100,,999,,,
+2021/07/08,Transfer,,200,999,,,In1
+2021/07/08,Transfer,500,,999,,,Out1

data/spec/integration/two_money_columns_manual/output.ledger

@@ -0,0 +1,16 @@
+2021-07-02	Expense; 999
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$100.00
+
+2021-07-02	Expense; 999
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$200.00
+
+2021-07-08	Transfer; 999; In1
+	Assets:Bank:Checking			 $200.00
+	Expenses:Unknown			
+
+2021-07-08	Transfer; 999; Out1
+	Expenses:Unknown			
+	Assets:Bank:Checking			-$500.00
+

data/spec/integration/two_money_columns_manual/test_args

@@ -0,0 +1 @@
+-f input.csv --unattended --account Assets:Bank:Checking --money-columns 3,4

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Andrew Cantino
 - BlackEdder
 - Ben Prew
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-08 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -96,6 +96,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 description: Reckon automagically converts CSV files for use with the command-line
   accounting tool Ledger.  It also helps you to select the correct accounts associated
   with the CSV data using Bayesian machine learning.
@@ -163,7 +177,7 @@ files:
 - spec/integration/another_bank_example/input.csv
 - spec/integration/another_bank_example/output.ledger
 - spec/integration/another_bank_example/test_args
-- spec/integration/ask_for_account/cli_input.exp
+- spec/integration/ask_for_account/cli_input.txt
 - spec/integration/ask_for_account/expected_output
 - spec/integration/ask_for_account/input.csv
 - spec/integration/ask_for_account/test_args
@@ -251,6 +265,9 @@ files:
 - spec/integration/two_money_columns/input.csv
 - spec/integration/two_money_columns/output.ledger
 - spec/integration/two_money_columns/test_args
+- spec/integration/two_money_columns_manual/input.csv
+- spec/integration/two_money_columns_manual/output.ledger
+- spec/integration/two_money_columns_manual/test_args
 - spec/integration/yyyymmdd_date_example/input.csv
 - spec/integration/yyyymmdd_date_example/output.ledger
 - spec/integration/yyyymmdd_date_example/test_args
@@ -267,7 +284,7 @@ homepage: https://github.com/cantino/reckon
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -282,8 +299,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 4
 summary: Utility for interactively converting and labeling CSV files for the Ledger
   accounting tool.

data/spec/integration/ask_for_account/cli_input.exp

@@ -1,33 +0,0 @@
-#!/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