hledger-forecast 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f769e017bc9ad46ea7d7571f74c64286e9c2415d0696e40f3301438a9038514
-  data.tar.gz: 52f69b30edfbc0c9d5430b88d25687c9c311d6c6aa4b1e5fd3b2815b3602d240
+  metadata.gz: '09b594c8b6cf3c239d070abbb2101cf63a7d2b987f4c2e6680ba02b160c29e24'
+  data.tar.gz: 8df343c7d6baa56d46f053d83fb6152c26ef94308c96a493c4995b78ddfccf80
 SHA512:
-  metadata.gz: 2721eb985469db575b66172a94ee670e96711437da7b94f27da53301beed9f385b46c19121c9d365ce01fb0423ea5ea728ce511296c29adc26fc2051ff33e794
-  data.tar.gz: e41363954be45ca668dd73cc1a816b47a94419be53cde4fccdfc5a88a55601a2166e5f6eeb6532d4673c3bfe204020122165b71fabcca07a9dbf7cf0f1f80271
+  metadata.gz: d395581b614dd9d9931701964959092a6a897ce16daad53b3f1b7b96583e4905962f09bfe3f0cdac1a2583d0e287bb4f602d53c1dc674cd1ecb1dc421c8cafd1
+  data.tar.gz: 241f5d557cc7f777790fe3546a897aa2af73052b35555031bd0d13dcf4d9f65a117002da7c34726334bcec2b76eb3fb6a508dd699dfa7c9306c4980092776a3b

data/hledger-forecast.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version     = HledgerForecast::VERSION
   s.authors     = ['Oli Morris']
   s.summary     = "An extended wrapper around hledger's forecasting functionality"
-  s.description = 'Uses a YAML file to generate forecasts which can be used to extend the default functionality in hledger'
+  s.description = 'Use a CSV or YAML file for improved forecasting with hledger'
   s.email       = 'olimorris@users.noreply.github.com'
   s.homepage    = 'https://github.com/olimorris/hledger-forecast'
   s.license     = 'MIT'

data/lib/hledger_forecast/comparator.rb

@@ -43,7 +43,7 @@ module HledgerForecast
           if header?(i) || j == 0 # Checking for the first column here
             csv2[i][j]
           else
-            difference = parse_money(cell) - parse_money(csv2[i][j])
+            difference = parse_money(csv2[i][j]) - parse_money(cell)
             format_difference(difference, detect_currency(cell))
           end
         end
@@ -51,7 +51,9 @@ module HledgerForecast
     end
 
     def detect_currency(str)
-      # Explicitly check for common currencies first
+      return nil if str == "0"
+
+      # Explicitly check for common currencies
       return "GBP" if str.include?("£")
       return "EUR" if str.include?("€")
       return "USD" if str.include?("$")
@@ -64,13 +66,17 @@ module HledgerForecast
     end
 
     def parse_money(value)
-      # Remove currency symbols and parse the result as a float, then convert to cents
-      cleaned_value = value.gsub(/[^0-9.]/, '').to_f
-      cleaned_value.to_i
+      return 0.0 if value.strip == '0'
+
+      value.gsub(/[^0-9.-]/, '').to_f
     end
 
     def format_difference(amount, currency)
-      formatted_amount = Formatter.format_money(amount, { currency: currency })
+      formatted_amount = if currency.nil?
+                           format("%.2f", amount)
+                         else
+                           Formatter.format_money(amount, { currency: currency })
+                         end
 
       return formatted_amount if amount == 0
 

data/lib/hledger_forecast/version.rb

@@ -1,3 +1,3 @@
 module HledgerForecast
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/spec/cli_spec.rb

@@ -49,7 +49,7 @@ RSpec.describe 'command' do
       +---------+---------+---------+
       | account | 2023-07 | 2023-08 |
       +---------+---------+---------+
-      | total   | £-10.00 | €10.00  |
+      | total   | £10.00  | €-10.00 |
       +---------+---------+---------+
 
     OUTPUT

data/spec/compare_spec.rb

@@ -17,15 +17,15 @@ end
 RSpec.describe HledgerForecast::Comparator do
   let(:file1_content) do
     <<~CSV
-      "account","2023-07","2023-08"
-      "total","£100.00","€200.00"
+      "account","2023-07","2023-08","2023-09"
+      "total","£100.00","€200.00",0
     CSV
   end
 
   let(:file2_content) do
     <<~CSV
-      "account","2023-07","2023-08"
-      "total","£110.00","€190.00"
+      "account","2023-07","2023-08","2023-09"
+      "total","£110.00","-€200.00",£1144.00
     CSV
   end
 
@@ -41,11 +41,11 @@ RSpec.describe HledgerForecast::Comparator do
     comparator = described_class.new
 
     expected_output = strip_ansi_codes(<<~OUTPUT)
-      +---------+---------+---------+
-      | account | 2023-07 | 2023-08 |
-      +---------+---------+---------+
-      | total   | £-10.00 | €10.00  |
-      +---------+---------+---------+
+      +---------+---------+----------+---------+
+      | account | 2023-07 | 2023-08  | 2023-09 |
+      +---------+---------+----------+---------+
+      | total   | £10.00  | €-400.00 | 1144.00 |
+      +---------+---------+----------+---------+
     OUTPUT
 
     actual_output = capture_stdout { comparator.compare('file1.csv', 'file2.csv') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hledger-forecast
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Oli Morris
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -94,8 +94,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
-description: Uses a YAML file to generate forecasts which can be used to extend the
-  default functionality in hledger
+description: Use a CSV or YAML file for improved forecasting with hledger
 email: olimorris@users.noreply.github.com
 executables:
 - hledger-forecast