reckon 0.5.3 → 0.7.0

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)
@@ -84,12 +89,7 @@ module Reckon
           money_score += Money::likelihood( entry )
           possible_neg_money_count += 1 if entry =~ /^\$?[\-\(]\$?\d+/
           possible_pos_money_count += 1 if entry =~ /^\+?\$?\+?\d+/
-          date_score += 10 if entry =~ /\b(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)/i
-          date_score += 5 if entry =~ /^[\-\/\.\d:\[\]]+$/
-          date_score += entry.gsub(/[^\-\/\.\d:\[\]]/, '').length if entry.gsub(/[^\-\/\.\d:\[\]]/, '').length > 3
-          date_score -= entry.gsub(/[\-\/\.\d:\[\]]/, '').length
-          date_score += 30 if entry =~ /^\d+[:\/\.-]\d+[:\/\.-]\d+([ :]\d+[:\/\.]\d+)?$/
-          date_score += 10 if entry =~ /^\d+\[\d+:GMT\]$/i
+          date_score += DateColumn.likelihood(entry)
 
           # Try to determine if this is a balance column
           entry_as_num = entry.gsub(/[^\-\d\.]/, '').to_f
@@ -163,7 +163,7 @@ module Reckon
       results = evaluate_columns(columns)
 
       if options[:money_column]
-        self.money_column_indices = [ options[:money_column] - 1 ]
+        self.money_column_indices = [options[:money_column] - 1]
       else
         self.money_column_indices = results.select { |n| n[:is_money_column] }.map { |n| n[:index] }
         if self.money_column_indices.length == 1

data/lib/reckon/date_column.rb

@@ -56,5 +56,15 @@ module Reckon
       date.iso8601
     end
 
+    def self.likelihood(entry)
+      date_score = 0
+      date_score += 10 if entry =~ /\b(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)/i
+      date_score += 5 if entry =~ /^[\-\/\.\d:\[\]]+$/
+      date_score += entry.gsub(/[^\-\/\.\d:\[\]]/, '').length if entry.gsub(/[^\-\/\.\d:\[\]]/, '').length > 3
+      date_score -= entry.gsub(/[\-\/\.\d:\[\]]/, '').length
+      date_score += 30 if entry =~ /^\d+[:\/\.-]\d+[:\/\.-]\d+([ :]\d+[:\/\.]\d+)?$/
+      date_score += 10 if entry =~ /^\d+\[\d+:GMT\]$/i
+      return date_score
+    end
   end
 end

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/money.rb

@@ -5,12 +5,13 @@ module Reckon
   class Money
     include Comparable
     attr_accessor :amount, :currency, :suffixed
-    def initialize( amount, options = {} )
-      if options[:inverse]
-        @amount = -1*amount.to_f
-      else
-        @amount = amount.to_f
-      end
+    def initialize(amount, options = {})
+      @options = options
+      @amount_raw = amount
+      @raw = options[:raw]
+
+      @amount = parse(amount, options)
+      @amount = -@amount if options[:inverse]
       @currency = options[:currency] || "$"
       @suffixed = options[:suffixed]
     end
@@ -19,11 +20,19 @@ module Reckon
       return @amount
     end
 
+    def to_s
+      return @options[:raw] ? "#{@amount_raw} | #{@amount}" : @amount
+    end
+
+    # unary minus
+    # ex
+    # m = Money.new
+    # -m
     def -@
-      Money.new( -@amount, :currency => @currency, :suffixed => @suffixed )
+      Money.new(-@amount, :currency => @currency, :suffixed => @suffixed)
     end
 
-    def <=>( mon )
+    def <=>(mon)
       other_amount = mon.to_f
       if @amount < other_amount
         -1
@@ -34,7 +43,13 @@ module Reckon
       end
     end
 
-    def pretty( negate = false )
+    def pretty(negate = false)
+      if @raw
+        return @amount_raw unless negate
+
+        return @amount_raw[0] == '-' ? @amount_raw[1..-1] : "-#{@amount_raw}"
+      end
+
       if @suffixed
         (@amount >= 0 ? " " : "") + sprintf("%0.2f #{@currency}", @amount * (negate ? -1 : 1))
       else
@@ -42,34 +57,20 @@ module Reckon
       end
     end
 
-    def Money::from_s( value, options = {} )
+    def parse(value, options = {})
+      value = value.to_s
       # Empty string is treated as money with value 0
-      return Money.new( 0.00, options ) if value.empty?
-
-      # Remove 1000 separaters and replace , with . if comma_separates_cents
-      # 1.000,00 -> 1000.00
-      value = value.gsub(/\./, '').gsub(/,/, '.') if options[:comma_separates_cents]
-      value = value.gsub(/,/, '')
-
-      money_format_regex = /^(.*?)(\d+\.\d\d)/ # Money has two decimal precision
-      any_number_regex = /^(.*?)([\d\.]+)/
-
-      # Prefer matching the money_format, match any number otherwise
-      m = value.match( money_format_regex ) ||
-        value.match( any_number_regex )
-      if m
-        amount = m[2].to_f
-        # Check whether the money had a - or (, which indicates negative amounts
-        if (m[1].match( /^[\(-]/ ) || m[1].match( /-$/  ))
-          amount *= -1
-        end
-        return Money.new( amount, options )
-      else
-        return nil
-      end
+      return value.to_f if value.to_s.empty?
+
+      invert = value.match(/^\(.*\)$/)
+      value = value.gsub(/[^0-9,.-]/, '')
+      value = value.tr('.', '').tr(',', '.') if options[:comma_separates_cents]
+      value = value.tr(',', '')
+      value = value.to_f
+      return invert ? -value : value
     end
 
-    def Money::likelihood( entry )
+    def Money::likelihood(entry)
       money_score = 0
       # digits separated by , or . with no more than 2 trailing digits
       money_score += 40 if entry.match(/\d+[,.]\d{2}[^\d]*$/)
@@ -83,31 +84,30 @@ module Reckon
   end
 
   class MoneyColumn < Array
-    def initialize( arr = [], options = {} )
-      arr.each { |str| self.push( Money.from_s( str, options ) ) }
+    def initialize(arr = [], options = {})
+      arr.each { |str| push(Money.new(str, options)) }
     end
 
     def positive?
-      self.each do |money|
-        return false if money < 0 if money
+      each do |money|
+        return false if money && money < 0
       end
       true
     end
 
-    def merge!( other_column )
+    def merge!(other_column)
       invert = false
-      invert = true if self.positive? && other_column.positive?
-      self.each_with_index do |mon, i|
+      invert = true if positive? && other_column.positive?
+      each_with_index do |mon, i|
         other = other_column[i]
-        return nil if (!mon || !other)
-        if mon != 0.00 && other == 0.0
-          if invert
-            self[i]= -mon
-          end
-        elsif mon == 0.00 && other != 0.00
+        return nil if !mon || !other
+
+        if mon != 0.0 && other == 0.0
+          self[i] = -mon if invert
+        elsif mon == 0.0 && other != 0.0
           self[i] = other
         else
-          return nil
+          self[i] = Money.new(0)
         end
       end
       self

data/lib/reckon/options.rb

@@ -0,0 +1,147 @@
+module Reckon
+  class Options
+    def self.parse(args = ARGV, stdin = $stdin)
+      options = { output_file: $stdout }
+      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, starts from 1") do |ignore|
+          options[:ignore_columns] = ignore.split(",").map(&:to_i)
+        end
+
+        opts.on("", "--money-column 2", Integer, "Column number of the money column, starts from 1") do |col|
+          options[:money_column] = col
+        end
+
+        opts.on("", "--raw-money", "Don't format money column (for stocks)") do |n|
+          options[:raw] = n
+        end
+
+        opts.on("", "--date-column 3", Integer, "Column number of the date column, starts from 1") do |col|
+          options[:date_column] = col
+        end
+
+        opts.on("", "--contains-header [N]", Integer, "Skip N header rows - default 1") do |hdr|
+          options[:contains_header] = 1
+          options[:contains_header] = hdr.to_i
+        end
+
+        opts.on("", "--csv-separator ','", "CSV separator (default ',')") do |sep|
+          options[:csv_separator] = sep
+        end
+
+        opts.on("", "--comma-separates-cents", "Use comma to separate cents ($100,50 vs. $100.50)") do |c|
+          options[:comma_separates_cents] = c
+        end
+
+        opts.on("", "--encoding 'UTF-8'", "Specify an encoding for the CSV file") do |e|
+          options[:encoding] = e
+        end
+
+        opts.on("-c", "--currency '$'", "Currency symbol to use - default $ (ex £, 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. Use 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
+
+        options[:default_into_account] = 'Expenses:Unknown'
+        opts.on("", "--default-into-account NAME", "Default into account") do |a|
+          options[:default_into_account] = a
+        end
+
+        options[:default_outof_account] = 'Income:Unknown'
+        opts.on("", "--default-outof-account NAME", "Default 'out of' account") do |a|
+          options[:default_outof_account] = a
+        end
+
+        opts.on("", "--fail-on-unknown-account", "Fail on unmatched transactions.") do |n|
+          options[:fail_on_unknown_account] = n
+        end
+
+        opts.on("", "--suffixed", "Append currency symbol as a suffix.") 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
+
+      if options[:file] == '-'
+        unless options[:unattended]
+          raise "--unattended is required to use STDIN as CSV source."
+        end
+
+        options[:string] = stdin.read
+      end
+
+      unless options[:file]
+        options[:file] = @@cli.ask("What CSV file should I parse? ")
+        unless options[:file].empty?
+          puts "\nYou must provide a CSV file to parse.\n"
+          puts parser
+          exit
+        end
+      end
+
+      unless options[:bank_account]
+        raise "Must specify --account in unattended mode" if options[:unattended]
+
+        options[:bank_account] = @@cli.ask("What is this account named in Ledger? ") do |q|
+          q.readline = true
+          q.validate = /^.{2,}$/
+          q.default = "Assets:Bank:Checking"
+        end
+      end
+
+      return options
+    end
+  end
+end

data/lib/reckon/version.rb

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

data/reckon.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rspec", ">= 1.2.9"
@@ -21,6 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rantly", "= 1.2.0"
   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"
   s.add_runtime_dependency "rchardet", ">= 1.8.0"
 end

data/spec/integration/another_bank_example/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/another_bank_example/output.ledger

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

data/spec/integration/another_bank_example/test_args

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