mercury_banking 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d958cfcc9d23e6dada51282855c5ee4a3bdee31c75ec8651d0f91abc1de1d52
-  data.tar.gz: 7e4da144d5e945c181bdd523956907ed52ec4cb4e58956b3d8dfc959abbf4b7b
+  metadata.gz: 5c388af3fd079eacd9a2ba3fbc78a137ecb57352bd7deda55bcebbb372149126
+  data.tar.gz: 5665853a81cb64eb76128d70a60a3d830b732fa9ae9096ab2f6bae2d5ea858fd
 SHA512:
-  metadata.gz: aeb81d99cda287f2c8fc890604338af74a5b2ea9077ba0a73909fdc0284aa6a2b84d2b19f2d07e7aea76c8f2c5914c221aa438697b7fabe3d96cb806468b2ad5
-  data.tar.gz: 9bbd04395ed06195a618ed0e33b7899d3c56ce1a4fcac1e1c013673120e2900382ca4e800f20b4382092d0fb65fb556b564e1ba8e99aae19aff129e4f96837a8
+  metadata.gz: 8161c1c7afb40e33bb6dd29dbd843d01b969616be1ef4ed45983c2ea65dc2047344ca204e3043085351f8da86822e11ab015d56c4fa077400dd0982047186f75
+  data.tar.gz: 97f6fa41b322f94b53a4b69ee9255ceeb9083f3ec5934f35fc1b3952166aa9b0e16767a6460c688d0d7e4cd9aa6f43d65b1eeb3bac0eedb9f519c6679c11aab9

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.7.0] - 2025-03-11
+### Changed
+- Simplified gem functionality to focus on core features
+- Removed balance sheet generation and only kept balance checking functionality
+- Removed all reconciliation functionality (reconcile, reconcile_all, reconciliation_status, unreconcile)
+- Added new `balancecheck` command that checks ledger balances against Mercury account balances
+- Reduced dependencies by removing unnecessary modules and imports
+
+## [0.6.0] - 2025-03-10
+### Changed
+- Major code refactoring to improve code quality and maintainability
+- Extracted helper methods into separate modules
+- Reduced method complexity and size
+- Fixed various RuboCop issues
+- Improved code organization by separating concerns
+
 ## [0.5.34] - 2025-03-10
 ### Fixed
 - Added missing `thor` gem dependency to fix LoadError when running CLI commands

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mercury_banking (0.6.0)
+    mercury_banking (0.7.0)
       activesupport (~> 7.0.0)
       dotenv (~> 2.8)
       fiddle (~> 1.1)

data/lib/mercury_banking/cli/base.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+require 'logger'
+require 'symmetric-encryption'
+require 'json'
+require 'base64'
+require 'fileutils'
+
 module MercuryBanking
   module CLI
     # Base module for CLI functionality
@@ -20,7 +26,38 @@ module MercuryBanking
         exit 1
       end
 
-      # Get the API key from the configuration file
+      # Get API key by decrypting the stored encrypted key
+      def get_api_key
+        config_dir = File.join(Dir.home, '.mercury-banking')
+        key_config_path = File.join(config_dir, 'key_config.json')
+        api_key_path = File.join(config_dir, 'api_key.enc')
+
+        unless File.exist?(key_config_path) && File.exist?(api_key_path)
+          return nil
+        end
+
+        # Load the cipher configuration
+        cipher_config = JSON.parse(File.read(key_config_path))
+        
+        # Recreate the cipher
+        cipher = SymmetricEncryption::Cipher.new(
+          key: Base64.strict_decode64(cipher_config['key']),
+          iv: Base64.strict_decode64(cipher_config['iv']),
+          cipher_name: cipher_config['cipher_name']
+        )
+
+        # Set the cipher as the primary one
+        SymmetricEncryption.cipher = cipher
+        
+        # Load and decrypt the API key
+        encrypted_key = File.read(api_key_path)
+        cipher.decrypt(encrypted_key)
+      rescue StandardError => e
+        puts "Error decrypting API key: #{e.message}" unless options[:json]
+        nil
+      end
+
+      # Get the API key from the configuration file (legacy method)
       def api_key
         config_path = File.join(Dir.home, '.mercury', 'config')
         key_path = File.join(Dir.home, '.mercury', 'key')

data/lib/mercury_banking/cli/financials.rb

@@ -2,278 +2,28 @@
 
 require 'mercury_banking/cli/base'
 require 'mercury_banking/formatters/export_formatter'
-require 'mercury_banking/reports/balance_sheet'
 
 module MercuryBanking
   module CLI
-    # Module for financial report commands
-    module Financials
-      # Define the financials command class
-      class FinancialsCommand < Thor
-        include MercuryBanking::CLI::Base
-        include MercuryBanking::Formatters::ExportFormatter
-        include MercuryBanking::Reports::BalanceSheet
-        # BalanceSheetHelper will be included after it's defined
-
-        desc "balancesheet", "Generate a balance sheet report and cross-check with Mercury account balances"
-        method_option :format, type: :string, default: 'ledger', desc: 'Accounting format to use (ledger or beancount)'
-        method_option :start, type: :string, default: '2020-01-01', desc: 'Start date for transactions (YYYY-MM-DD)'
-        method_option :end, type: :string, desc: 'End date for transactions (YYYY-MM-DD)'
-        method_option :save_report, type: :string, desc: 'Save report output to specified file'
-        method_option :verbose, type: :boolean, default: false, desc: 'Show detailed debug information'
-        method_option :ledger_file, type: :string,
-                                    desc: 'Use an existing ledger file instead of fetching transactions from Mercury'
-        def balancesheet
-          # Call the balance_sheet method directly
-          balance_sheet
-        end
-
-        # Methods that should not be exposed as commands
-        no_commands do
-          # Implementation of the balance sheet functionality
-          def balance_sheet
-            client = MercuryBanking::Client.new
-            accounts = client.get_accounts
-
-            if options[:ledger_file] && File.exist?(options[:ledger_file])
-              process_existing_ledger_file(options[:ledger_file], options[:format], options[:save_report], options[:verbose])
-              return
-            end
-
-            # Fetch all transactions from all accounts
-            transactions = fetch_all_transactions(client, accounts, options[:end])
-            puts "Found #{transactions.length} transactions across #{accounts.length} accounts."
-
-            # Get current balances for all Mercury accounts
-            mercury_balances = get_mercury_balances(accounts)
-
-            # Create a temporary file for exporting transactions
-            temp_file, output_file = create_temp_file(options[:format])
-
-            # Export transactions and generate balance sheet
-            balance_sheet_output = export_and_generate_balance_sheet(
-              transactions,
-              output_file,
-              options[:format],
-              options[:end],
-              options[:verbose]
-            )
-
-            # If balance sheet generation failed, exit
-            unless balance_sheet_output
-              temp_file.close
-              temp_file.unlink
-              return
-            end
-
-            # Parse the balance sheet output to get account balances
-            ledger_balances = {}
-            balance_sheet_output.each_line do |line|
-              next unless line.strip.start_with?('Assets:')
-
-              parts = line.strip.split(/\s+/)
-              account = parts.first
-              amount = parts.last.gsub(/[$,]/, '').to_f
-              ledger_balances[account] = amount
-            end
-
-            # Display cross-check between Mercury and ledger balances
-            display_balance_cross_check(mercury_balances, ledger_balances, options[:verbose])
-
-            # Save full report to file if requested
-            save_full_report(balance_sheet_output, mercury_balances, ledger_balances, options[:save_report]) if options[:save_report]
-
-            # Clean up temporary file
-            temp_file.close
-            temp_file.unlink
-          end
-
-          # Process an existing ledger file
-          def process_existing_ledger_file(ledger_file, format, save_path, _verbose)
-            puts "Using existing ledger file: #{ledger_file}"
-
-            # Determine the format based on file extension if not specified
-            unless format
-              format = File.extname(ledger_file).delete('.').downcase
-              puts "Detected format: #{format}"
-            end
-
-            # Generate balance sheet based on format
-            balance_sheet_output = process_ledger_format(ledger_file, format)
-
-            # If balance sheet generation failed, exit
-            return unless balance_sheet_output
-
-            # Save report to file if requested
-            return unless save_path
-
-            File.write(save_path, balance_sheet_output)
-            puts "\nReport saved to #{save_path}"
-          end
-
-          # Process ledger format file
-          def process_ledger_format(ledger_file, format)
-            case format
-            when 'ledger'
-              generate_ledger_balance_sheet(ledger_file)
-            when 'beancount'
-              generate_beancount_balance_sheet(ledger_file)
-            else
-              puts "Unsupported format: #{format}. Please use 'ledger' or 'beancount'."
-              nil
-            end
-          end
-
-          # Helper method to save a report to a file
-          def save_report_to_file(content, file_path)
-            File.write(file_path, content)
-            puts "\nReport saved to #{file_path}"
-          end
-        end
-
-        desc "incomestatement", "Generate an income statement report"
-        method_option :format, type: :string, default: 'ledger', desc: 'Accounting format to use (ledger or beancount)'
-        method_option :start, type: :string, default: '2020-01-01', desc: 'Start date for transactions (YYYY-MM-DD)'
-        method_option :end, type: :string, desc: 'End date for transactions (YYYY-MM-DD)'
-        method_option :save_report, type: :string, desc: 'Save report output to specified file'
-        method_option :verbose, type: :boolean, default: false, desc: 'Show detailed debug information'
-        def incomestatement
-          # Access the parent class to call with_api_client
-          parent_class = self.class.parent_class
-          parent_instance = parent_class.new
-
-          parent_instance.with_api_client do |client|
-            # Get all transactions for the income statement
-            start_date = options[:start]
-            end_date = options[:end]
-            format = options[:format]
-            verbose = options[:verbose]
-
-            date_range = "since #{start_date}"
-            date_range += " until #{end_date}" if end_date
-
-            puts "Fetching transactions for all accounts #{date_range}..."
-
-            transactions = client.get_all_transactions(start_date)
-
-            # Filter by end date if specified
-            if end_date
-              end_date_obj = Date.parse(end_date)
-              transactions = transactions.select do |t|
-                transaction_date = Date.parse(t["postedAt"] || t["createdAt"])
-                transaction_date <= end_date_obj
-              end
-            end
-
-            # Create a temporary file
-            require 'tempfile'
-            temp_file = Tempfile.new(['mercury_transactions', ".#{format}"])
-            output_file = temp_file.path
-
-            # Export transactions in the specified format
-            case format
-            when 'ledger'
-              parent_instance.export_to_ledger(transactions, output_file, [], verbose)
-              income_statement_output = parent_instance.generate_ledger_reports(output_file, 'income', nil, end_date)
-            when 'beancount'
-              parent_instance.export_to_beancount(transactions, output_file, [], verbose)
-              income_statement_output = parent_instance.generate_beancount_reports(output_file, 'income', nil, end_date)
-            else
-              puts "Unsupported format: #{format}. Please use 'ledger' or 'beancount'."
-              temp_file.unlink
-              income_statement_output = nil
-              break # Use break instead of return to exit the loop
-            end
-
-            # Display the income statement if it exists
-            puts income_statement_output if income_statement_output
-
-            # Save the report to a file if requested
-            if options[:save_report]
-              File.open(options[:save_report], 'w') do |file|
-                file.puts income_statement_output
-              end
-              puts "\nReport saved to #{options[:save_report]}"
-            end
-
-            # Clean up the temporary file
-            temp_file.unlink
-          end
-        end
-
-        # Store reference to parent class
-        class << self
-          attr_accessor :parent_class
-        end
-      end
-
-      # Add financial report commands to the CLI class
-      def self.included(base)
-        base.class_eval do
-          # Register the financials command
-          desc "financials SUBCOMMAND", "Financial reporting commands"
-          subcommand "financials", FinancialsCommand
-
-          # Set the parent class for the subcommand
-          FinancialsCommand.parent_class = base
-
-          # Remove the old methods with underscores if they exist
-          remove_method :financials_balancesheet if method_defined?(:financials_balancesheet)
-          remove_method :financials_incomestatement if method_defined?(:financials_incomestatement)
-        end
-      end
-    end
-
-    # Module for balance sheet related functionality
+    # Module for balance check related functionality
     module BalanceSheetHelper
-      # Fetch all transactions from all accounts
-      def fetch_all_transactions(client, accounts, end_date)
-        transactions = []
-        accounts.each do |account|
-          account_id = account['id']
-          account_transactions = client.get_transactions(account_id)
-
-          # Filter by end date if provided
-          if end_date
-            account_transactions = account_transactions.select do |t|
-              t['postedAt'] && Date.parse(t['postedAt']) <= Date.parse(end_date)
-            end
-          end
-
-          transactions.concat(account_transactions)
-        end
-        transactions
-      end
-
       # Get current balances for all Mercury accounts
       def get_mercury_balances(accounts)
         mercury_balances = {}
         accounts.each do |account|
-          mercury_balances[account['name']] = account['currentBalance']
+          # Use the simplified account name for easier matching with ledger accounts
+          account_name = account['name'].gsub(/•+\d+/, '').strip
+          mercury_balances[account_name] = account['currentBalance'].to_f
         end
-        mercury_balances
-      end
-
-      # Create a temporary file for exporting transactions
-      def create_temp_file(format)
-        require 'tempfile'
-        temp_file = Tempfile.new(['mercury_transactions', ".#{format}"])
-        [temp_file, temp_file.path]
-      end
-
-      # Export transactions and generate balance sheet
-      def export_and_generate_balance_sheet(transactions, output_file, format, end_date, verbose)
-        case format
-        when 'ledger'
-          export_to_ledger(transactions, output_file, [], verbose)
-          generate_ledger_balance_sheet(output_file, end_date)
-        when 'beancount'
-          export_to_beancount(transactions, output_file, [], verbose)
-          generate_beancount_balance_sheet(output_file, end_date)
-        else
-          puts "Unsupported format: #{format}. Please use 'ledger' or 'beancount'."
-          nil
+        
+        if options[:verbose]
+          puts "\nMercury account balances:"
+          mercury_balances.each do |name, balance|
+            puts "  #{name}: $#{format('%.2f', balance)}"
+          end
         end
+        
+        mercury_balances
       end
 
       # Display cross-check between Mercury and ledger balances
@@ -283,19 +33,45 @@ module MercuryBanking
         puts "-" * 75
 
         total_diff = 0
+        
+        if verbose
+          puts "\nMatching accounts:"
+          puts "Mercury accounts: #{mercury_balances.keys.join(', ')}"
+          puts "Ledger accounts: #{ledger_balances.keys.join(', ')}"
+        end
+        
         mercury_balances.each do |account_name, mercury_balance|
-          # Find the corresponding ledger account (might be prefixed with Assets:)
-          ledger_account_key = ledger_balances.keys.find { |k| k.include?(account_name) }
-
+          # Find the corresponding ledger account 
+          ledger_account_key = nil
+          ledger_balance = 0
+          
+          # Try different matching strategies
+          if ledger_balances.key?("Assets:Mercury:#{account_name.split.first}")
+            # Direct match with first word (e.g., "Checking" or "Savings")
+            ledger_account_key = "Assets:Mercury:#{account_name.split.first}"
+            ledger_balance = ledger_balances[ledger_account_key]
+          elsif account_name.include?("Checking") && ledger_balances.keys.any? { |k| k.include?("Checking") }
+            # Match by account type
+            ledger_account_key = ledger_balances.keys.find { |k| k.include?("Checking") }
+            ledger_balance = ledger_balances[ledger_account_key]
+          elsif account_name.include?("Savings") && ledger_balances.keys.any? { |k| k.include?("Savings") }
+            # Match by account type
+            ledger_account_key = ledger_balances.keys.find { |k| k.include?("Savings") }
+            ledger_balance = ledger_balances[ledger_account_key]
+          end
+          
           # Debug information
           if verbose
-            puts "Looking for Mercury account '#{account_name}' in ledger accounts:"
-            ledger_balances.each_key do |k|
-              puts "  - #{k} (match: #{k.include?(account_name) ? 'Yes' : 'No'})"
-            end
+            puts "\nMatching for Mercury account '#{account_name}':"
+            puts "  Found match: #{ledger_account_key || 'None'}"
+            puts "  Mercury balance: $#{format('%.2f', mercury_balance)}"
+            puts "  Ledger balance: $#{format('%.2f', ledger_balance)}"
+          end
+          
+          # Skip zero-balance accounts unless in verbose mode
+          if mercury_balance == 0 && ledger_balance == 0
+            next unless verbose
           end
-
-          ledger_balance = ledger_account_key ? ledger_balances[ledger_account_key] : 0
 
           # Calculate difference
           diff = mercury_balance - ledger_balance
@@ -325,30 +101,127 @@ module MercuryBanking
           puts "\n✓ Balance sheet matches Mercury account balances."
         end
       end
+    end
 
-      # Save full report to file
-      def save_full_report(balance_sheet_output, mercury_balances, ledger_balances, save_path)
-        full_report = "#{balance_sheet_output}\n\n=== Balance Sheet Cross-Check ===\n"
-        mercury_balances.each do |account_name, mercury_balance|
-          ledger_account_key = ledger_balances.keys.find { |k| k.include?(account_name) }
-          ledger_balance = ledger_account_key ? ledger_balances[ledger_account_key] : 0
-          diff = mercury_balance - ledger_balance
+    # Module for financial report commands
+    module Financials
+      # Define the financials command class
+      class FinancialsCommand < Thor
+        include MercuryBanking::CLI::Base
+        include MercuryBanking::Formatters::ExportFormatter
+        include MercuryBanking::CLI::BalanceSheetHelper
 
-          # Format the report line with proper line breaks
-          report_line = "#{account_name}: "
-          report_line += "Mercury $#{format('%.2f', mercury_balance)} "
-          report_line += "vs Ledger $#{format('%.2f', ledger_balance)} "
-          report_line += "(Diff: $#{format('%.2f', diff)})\n"
+        desc "balancecheck", "Check that transactions match the bank balance shown in Mercury"
+        method_option :format, type: :string, default: 'ledger', desc: 'Accounting format to use (ledger or beancount)'
+        method_option :ledger_file, type: :string, desc: 'Ledger file to check against Mercury balances'
+        method_option :verbose, type: :boolean, default: false, desc: 'Show detailed debug information'
+        def balancecheck
+          with_api_client do |client|
+            accounts = client.accounts
 
-          full_report += report_line
+            unless options[:ledger_file] && File.exist?(options[:ledger_file])
+              puts "Error: You must provide a valid ledger file to check. Use --ledger-file option."
+              return
+            end
+
+            # Get balances from the ledger file
+            ledger_file = options[:ledger_file]
+            format = options[:format] || File.extname(ledger_file).delete('.').downcase
+            
+            # Get ledger balances
+            ledger_balances = get_ledger_balances(ledger_file, format)
+            
+            if ledger_balances.empty?
+              puts "No account balances found in the ledger file."
+              return
+            end
+
+            # Get current balances for all Mercury accounts
+            mercury_balances = get_mercury_balances(accounts)
+
+            # Display cross-check between Mercury and ledger balances
+            display_balance_cross_check(mercury_balances, ledger_balances, options[:verbose])
+          end
+        end
+
+        # Methods that should not be exposed as commands
+        no_commands do
+          # Get balances from ledger file
+          def get_ledger_balances(ledger_file, format)
+            ledger_balances = {}
+            
+            # Get balance sheet output from the ledger file
+            balance_sheet_output = case format
+                                   when 'ledger'
+                                     `ledger -f #{ledger_file} balance Assets:Mercury`
+                                   when 'beancount'
+                                     `bean-report #{ledger_file} balances`
+                                   else
+                                     puts "Unsupported format: #{format}. Please use 'ledger' or 'beancount'."
+                                     return {}
+                                   end
+            
+            puts "Raw ledger output:" if options[:verbose]
+            puts balance_sheet_output if options[:verbose]
+            
+            # Directly parse the specific format we know ledger outputs
+            balance_sheet_output.each_line do |line|
+              line = line.strip
+              # Skip empty lines
+              next if line.empty?
+              
+              # Split the line on whitespace but preserve the account path
+              parts = line.split(/\s+/, 2) # Split on first whitespace
+              if parts.length == 2
+                amount_part = parts[0]
+                account_part = parts[1]
+                
+                # Parse amount - remove $ and , characters
+                amount = amount_part.gsub(/[$,]/, '').to_f
+                
+                # Store in the hash
+                ledger_balances[account_part] = amount
+                
+                puts "Matched: #{account_part} = $#{amount}" if options[:verbose]
+              end
+            end
+            
+            if options[:verbose]
+              puts "Parsed ledger balances:"
+              if ledger_balances.empty?
+                puts "  No account balances found in the ledger file."
+              else
+                ledger_balances.each do |account, amount|
+                  puts "  #{account}: $#{format('%.2f', amount)}"
+                end
+              end
+            end
+            
+            ledger_balances
+          end
         end
 
-        File.write(save_path, full_report)
-        puts "\nReport saved to #{save_path}"
+        # Store reference to parent class
+        class << self
+          attr_accessor :parent_class
+        end
+      end
+
+      # Add financial report commands to the CLI class
+      def self.included(base)
+        base.class_eval do
+          # Register the financials command
+          desc "financials SUBCOMMAND", "Financial reporting commands"
+          subcommand "financials", FinancialsCommand
+
+          # Set the parent class for the subcommand
+          FinancialsCommand.parent_class = base
+
+          # Remove the old methods with underscores if they exist
+          remove_method :financials_balancesheet if method_defined?(:financials_balancesheet)
+          remove_method :financials_incomestatement if method_defined?(:financials_incomestatement)
+        end
       end
     end
   end
 end
-
-# Include the BalanceSheetHelper module in the FinancialsCommand class
-MercuryBanking::CLI::Financials::FinancialsCommand.include(MercuryBanking::CLI::BalanceSheetHelper)

data/lib/mercury_banking/cli.rb

@@ -7,7 +7,11 @@ require 'mercury_banking/cli/transactions'
 require 'mercury_banking/cli/financials'
 require 'mercury_banking/formatters/table_formatter'
 require 'mercury_banking/formatters/export_formatter'
-require 'mercury_banking/reports/balance_sheet'
+require 'symmetric-encryption'
+require 'json'
+require 'base64'
+require 'fileutils'
+require 'securerandom'
 
 module MercuryBanking
   # CLI module for Mercury Banking
@@ -21,7 +25,6 @@ module MercuryBanking
       include MercuryBanking::CLI::Financials
       include MercuryBanking::Formatters::TableFormatter
       include MercuryBanking::Formatters::ExportFormatter
-      include MercuryBanking::Reports::BalanceSheet
 
       # Add global option for JSON output
       class_option :json, type: :boolean, default: false, desc: 'Output in JSON format'

data/lib/mercury_banking/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MercuryBanking
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/mercury_banking.rb

@@ -11,10 +11,7 @@ require 'csv'
 require 'mercury_banking/api'
 require 'mercury_banking/recipient'
 require 'mercury_banking/multi'
-require 'mercury_banking/reconciliation'
 require 'mercury_banking/utils/command_utils'
-require 'mercury_banking/reports/balance_sheet'
-require 'mercury_banking/reports/reconciliation'
 
 module MercuryBanking
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercury_banking
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jonathan Siegel
 - Yusuke Ishida
 bindir: bin
 cert_chain: []
-date: 2025-03-10 00:00:00.000000000 Z
+date: 2025-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry