reckon 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c20b48d4333969c8304a5bb9a3c01fc6053050ab9146329ce14ae6a9886b38
-  data.tar.gz: 27a2ce4e8db5c7818cc4cefb19f180a7c727190f0a990403f565fad503e749a9
+  metadata.gz: 9ddc247a822ee229bd5530bdfd0b4ec72f9022712ac10b15174e30dceb452bef
+  data.tar.gz: '069982cf8f6c5e899c93fe02a746561011beb968e34dcbdde69622143ff272e7'
 SHA512:
-  metadata.gz: 2f569b3d5cf4038714065a6d184d6c07f57d10598e5efc610eeb9919e8b18c65aff5e5329ab89a9ed30f72cabce9d11f5645af4d0df3bda6d05ad9afd988f7e7
-  data.tar.gz: 1783a63ba138c2b87a0756d6b9bcfbce068daf977e582a4c920a37ff50358328f8514f308dbbf932ef5cc4111e9e52dadfaed5876b9d30f4759d4a1eb31299fa
+  metadata.gz: 893a0734cfbfe3cc575f426677ecc5d4f80a08b2e35901962aa64cb4ae7c17e9671e181446647f5c6a97ce4ce8bea9ef11bfda5978e9f051b2442410f449b316
+  data.tar.gz: 2a2993018406fecff07d1b61b1371ea9eea16e816312cbb67f6c2dc097086fef1dd253658249b17f105ef415b9c0744e6ca6ad8f29d3c91456e3cbddd8046508

data/.github/workflows/ruby.yml

@@ -9,13 +9,10 @@ name: Build Status
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -26,17 +23,18 @@ jobs:
           - 3.0
           # Ubuntu 20.04
           - 2.7
+          # For date_column errors
+          - 2.6
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Update package
       run: sudo apt-get update
     - name: Install packages
       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):
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+      # use ruby/setup-ruby@v1 (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

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v0.9.2](https://github.com/cantino/reckon/tree/v0.9.2) (2023-04-14)
+
+[Full Changelog](https://github.com/cantino/reckon/compare/v0.9.1...v0.9.2)
+
+**Closed issues:**
+
+- reckon fails any csv with Date::Error [\#121](https://github.com/cantino/reckon/issues/121)
+- \[FEATURE REQUEST\] Use ledger files as input source in addition to csv's [\#92](https://github.com/cantino/reckon/issues/92)
+
+**Merged pull requests:**
+
+- 121 require date [\#122](https://github.com/cantino/reckon/pull/122) ([benprew](https://github.com/benprew))
+
 ## [v0.9.1](https://github.com/cantino/reckon/tree/v0.9.1) (2023-03-19)
 
 [Full Changelog](https://github.com/cantino/reckon/compare/v0.9.0...v0.9.1)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reckon (0.9.1)
+    reckon (0.9.2)
       chronic (>= 0.3.0)
       highline (>= 1.5.2)
       matrix (>= 0.4.2)

data/bin/build-new-version.sh

@@ -1,9 +1,14 @@
 #!/bin/bash
 
-set -xe
+set -e
 
 VERSION=$1
 
+if [ -z "$TOKEN" ]; then
+    echo "\$TOKEN var must be your github api token"
+    exit 1
+fi
+
 echo "Install github_changelog_generator"
 gem install --user github_changelog_generator
 
@@ -12,16 +17,16 @@ echo -e "module Reckon\n  VERSION = \"$VERSION\"\nend" > lib/reckon/version.rb
 echo "Run `bundle install` to build updated Gemfile.lock"
 bundle install
 echo "Run changelog generator (requires $TOKEN to be your github token)"
-github_changelog_generator -u cantino -p reckon -t $TOKEN --future-release v$VERSION
+github_changelog_generator -u cantino -p reckon -t "$TOKEN" --future-release "v$VERSION"
 echo "Commit changes"
 git add CHANGELOG.md lib/reckon/version.rb Gemfile.lock
 git commit -m "Release $VERSION"
 echo "Tag release"
-git tag v$VERSION
+git tag "v$VERSION"
 echo "Build new gem"
 gem build reckon.gemspec
 echo "Push changes and tags"
 echo "git push && git push --tags"
 echo "Push new gem"
 echo "gem push reckon-$VERSION.gem"
-gh release create v$VERSION reckon-$VERSION.gem --draft --generate-notes
+gh release create "v$VERSION" "reckon-$VERSION.gem" --draft --generate-notes

data/lib/reckon/date_column.rb

@@ -1,7 +1,13 @@
+# frozen_string_literal: true
+
+require 'date'
+
 module Reckon
+  # Handle date columns in csv
   class DateColumn < Array
     attr_accessor :endian_precedence
-    def initialize( arr = [], options = {} )
+
+    def initialize(arr = [], options = {})
       # output date format
       @ledger_date_format = options[:ledger_date_format]
 
@@ -11,7 +17,9 @@ module Reckon
         if date_format
           begin
             value = Date.strptime(value, date_format)
-          rescue
+          # ruby 2.6.0 doesn't have Date::Error, but Date::Error is a subclass of
+          # ArgumentError
+          rescue ArgumentError
             puts "I'm having trouble parsing '#{value}' with the desired format: #{date_format}"
             exit 1
           end
@@ -22,12 +30,11 @@ module Reckon
           value = [$1, $2, $3].join("/") if value =~ /^(\d{4})\-(\d{2})\-(\d{2})$/            # yyyy-mm-dd format
           value = [$1, $2, $3].join("/") if value =~ /^(\d{4})(\d{2})(\d{2})/                 # yyyymmdd format
 
-
           unless @endian_precedence # Try to detect endian_precedence
-            reg_match = value.match( /^(\d\d)\/(\d\d)\/\d\d\d?\d?/ )
+            reg_match = value.match(%r{^(\d\d)/(\d\d)/\d\d\d?\d?})
             # If first one is not \d\d/\d\d/\d\d\d?\d set it to default
             if !reg_match
-              @endian_precedence = [:middle, :little]
+              @endian_precedence = %i[middle little]
             elsif reg_match[1].to_i > 12
               @endian_precedence = [:little]
             elsif reg_match[2].to_i > 12
@@ -35,23 +42,24 @@ module Reckon
             end
           end
         end
-        self.push( value )
+        push(value)
       end
+
       # if endian_precedence still nil, raise error
-      unless @endian_precedence || date_format
-        raise( "Unable to determine date format. Please specify using --date-format" )
-      end
+      return if @endian_precedence || date_format
+
+      raise("Unable to determine date format. Please specify using --date-format")
     end
 
-    def for( index )
-      value = self.at( index )
-      guess = Chronic.parse(value, :context => :past,
-                            :endian_precedence => @endian_precedence )
-      if guess.to_i < 953236800 && value =~ /\//
-        guess = Chronic.parse((value.split("/")[0...-1] + [(2000 + value.split("/").last.to_i).to_s]).join("/"), :context => :past,
-                              :endian_precedence => @endian_precedence)
+    def for(index)
+      value = at(index)
+      guess = Chronic.parse(value, contex: :past,
+                                   endian_precedence: @endian_precedence)
+      if guess.to_i < 953_236_800 && value =~ %r{/}
+        guess = Chronic.parse((value.split("/")[0...-1] + [(2000 + value.split("/").last.to_i).to_s]).join("/"), context: :past,
+                                                                                                                 endian_precedence: @endian_precedence)
       end
-      guess && guess.to_date
+      guess&.to_date
     end
 
     def pretty_for(index)
@@ -65,7 +73,10 @@ module Reckon
       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
+      # add points for columns that start with date-like characters -/.\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
@@ -73,7 +84,11 @@ module Reckon
       begin
         DateTime.parse(entry)
         date_score += 20
-      rescue Date::Error, ArgumentError
+      # ruby 2.6.0 doesn't have Date::Error, but Date::Error is a subclass of
+      # ArgumentError
+      rescue ArgumentError
+        # we don't need do anything here since the column didn't parse as a date
+        nil
       end
 
       date_score

data/lib/reckon/version.rb

@@ -1,3 +1,3 @@
 module Reckon
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reckon
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Andrew Cantino
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-19 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec