thefox-wallet 0.17.1 → 0.18.0

data/lib/wallet/command_add.rb

@@ -2,117 +2,117 @@
 require 'date'
 
 module TheFox::Wallet
-	
-	# Add a new Entry.
-	class AddCommand < Command
-		
-		NAME = 'add'
-		
-		def run
-			if @options[:entry_category].nil?
-				@options[:entry_category] = 'default'
-			end
-			
-			if @options[:is_interactively]
-				# Interactive User Input
-				
-				print "title: [#{@options[:entry_title]}] "
-				title_t = STDIN.gets.strip
-				if title_t.length > 0
-					# Search for '%d' in title.
-					if @options[:entry_title] =~ /%d/
-						# Like sprintf.
-						@options[:entry_title] = @options[:entry_title] % title_t.split(',').map{ |s| s.strip }
-					else
-						@options[:entry_title] = title_t
-					end
-				end
-				
-				print "date: [#{@options[:entry_date]}] "
-				date_t = STDIN.gets.strip
-				if date_t.length > 0
-					@options[:entry_date] = date_t
-				end
-				
-				print "revenue: [#{@options[:entry_revenue]}] "
-				revenue_t = revenue(STDIN.gets.strip)
-				if !revenue_t.nil?
-					@options[:entry_revenue] = revenue_t
-				end
-				
-				print "expense: [#{@options[:entry_expense]}] "
-				expense_t = expense(STDIN.gets.strip)
-				if !expense_t.nil?
-					@options[:entry_expense] = expense_t
-				end
-				
-				print "category: [#{@options[:entry_category]}] "
-				category_t = STDIN.gets.strip
-				if category_t.length > 0
-					@options[:entry_category] = category_t
-				end
-				
-				print "comment: [#{@options[:entry_comment]}] "
-				comment_t = STDIN.gets.strip
-				if comment_t.length > 0
-					@options[:entry_comment] = comment_t
-				end
-				
-				puts '-' * 20
-			end
-			
-			if @options[:entry_title].nil?
-				raise "Option --title is required for command '#{NAME}'"
-			end
-			
-			# --force option
-			# --id    option
-			is_unique = !@options[:force] && @options[:entry_id]
-			
-			puts "id:       '#{@options[:entry_id]}'"
-			puts "title:    '#{@options[:entry_title]}'"
-			puts "date:      " << Date.parse(@options[:entry_date]).to_s
-			puts "revenue:   " << NUMBER_FORMAT % @options[:entry_revenue]
-			puts "expense:   " << NUMBER_FORMAT % @options[:entry_expense]
-			puts "balance:   " << NUMBER_FORMAT % [@options[:entry_revenue] + @options[:entry_expense]]
-			puts "category:  #{@options[:entry_category]}"
-			puts "comment:  '#{@options[:entry_comment]}'"
-			puts "force:    #{@options[:force] ? 'YES' : 'NO'}"
-			puts "unique:   #{is_unique ? 'YES' : 'NO'} (#{is_unique})"
-			
-			# Create new Entry.
-			entry = Entry.new(@options[:entry_id], @options[:entry_title], @options[:entry_date], @options[:entry_revenue], @options[:entry_expense], @options[:entry_category], @options[:entry_comment])
-			
-			# Initialize Wallet.
-			wallet = Wallet.new(@options[:wallet_path])
-			
-			# Add Entry to Wallet.
-			added = wallet.add(entry, is_unique)
-			
-			puts "added:    #{added ? 'YES' : 'NO'}"
-			
-			added
-		end
-		
-		# @TODO replace with Wumber.
-		def revenue(revenue_s)
-			if !revenue_s.nil? && revenue_s.length > 0
-				# Replace , with . in numbers. '1,23' means '1.23'.
-				# eval the revenue so calculations are solved.
-				eval(revenue_s.to_s.gsub(/,/, '.')).to_f.round(NUMBER_ROUND).abs
-			end
-		end
-		
-		# @TODO replace with Wumber.
-		def expense(expense_s)
-			if !expense_s.nil? && expense_s.length > 0
-				# Replace , with . in numbers. '1,23' means '1.23'.
-				# eval the revenue so calculations are solved.
-				# Expenses are always minus.
-				-eval(expense_s.to_s.gsub(/,/, '.')).to_f.round(NUMBER_ROUND).abs
-			end
-		end
-		
-	end
-	
+  
+  # Add a new Entry.
+  class AddCommand < Command
+    
+    NAME = 'add'
+    
+    def run
+      if @options[:entry_category].nil?
+        @options[:entry_category] = 'default'
+      end
+      
+      if @options[:is_interactively]
+        # Interactive User Input
+        
+        print "title: [#{@options[:entry_title]}] "
+        title_t = STDIN.gets.strip
+        if title_t.length > 0
+          # Search for '%d' in title.
+          if @options[:entry_title] =~ /%d/
+            # Like sprintf.
+            @options[:entry_title] = @options[:entry_title] % title_t.split(',').map{ |s| s.strip }
+          else
+            @options[:entry_title] = title_t
+          end
+        end
+        
+        print "date: [#{@options[:entry_date]}] "
+        date_t = STDIN.gets.strip
+        if date_t.length > 0
+          @options[:entry_date] = date_t
+        end
+        
+        print "revenue: [#{@options[:entry_revenue]}] "
+        revenue_t = revenue(STDIN.gets.strip)
+        if !revenue_t.nil?
+          @options[:entry_revenue] = revenue_t
+        end
+        
+        print "expense: [#{@options[:entry_expense]}] "
+        expense_t = expense(STDIN.gets.strip)
+        if !expense_t.nil?
+          @options[:entry_expense] = expense_t
+        end
+        
+        print "category: [#{@options[:entry_category]}] "
+        category_t = STDIN.gets.strip
+        if category_t.length > 0
+          @options[:entry_category] = category_t
+        end
+        
+        print "comment: [#{@options[:entry_comment]}] "
+        comment_t = STDIN.gets.strip
+        if comment_t.length > 0
+          @options[:entry_comment] = comment_t
+        end
+        
+        puts '-' * 20
+      end
+      
+      if @options[:entry_title].nil?
+        raise "Option --title is required for command '#{NAME}'"
+      end
+      
+      # --force option
+      # --id    option
+      is_unique = !@options[:force] && @options[:entry_id]
+      
+      puts "id:       '#{@options[:entry_id]}'"
+      puts "title:    '#{@options[:entry_title]}'"
+      puts "date:      " << Date.parse(@options[:entry_date]).to_s
+      puts "revenue:   " << NUMBER_FORMAT % @options[:entry_revenue]
+      puts "expense:   " << NUMBER_FORMAT % @options[:entry_expense]
+      puts "balance:   " << NUMBER_FORMAT % [@options[:entry_revenue] + @options[:entry_expense]]
+      puts "category:  #{@options[:entry_category]}"
+      puts "comment:  '#{@options[:entry_comment]}'"
+      puts "force:    #{@options[:force] ? 'YES' : 'NO'}"
+      puts "unique:   #{is_unique ? 'YES' : 'NO'} (#{is_unique})"
+      
+      # Create new Entry.
+      entry = Entry.new(@options[:entry_id], @options[:entry_title], @options[:entry_date], @options[:entry_revenue], @options[:entry_expense], @options[:entry_category], @options[:entry_comment])
+      
+      # Initialize Wallet.
+      wallet = Wallet.new(@options[:wallet_path])
+      
+      # Add Entry to Wallet.
+      added = wallet.add(entry, is_unique)
+      
+      puts "added:    #{added ? 'YES' : 'NO'}"
+      
+      added
+    end
+    
+    # @TODO replace with Wumber.
+    def revenue(revenue_s)
+      if !revenue_s.nil? && revenue_s.length > 0
+        # Replace , with . in numbers. '1,23' means '1.23'.
+        # eval the revenue so calculations are solved.
+        eval(revenue_s.to_s.gsub(/,/, '.')).to_f.round(NUMBER_ROUND).abs
+      end
+    end
+    
+    # @TODO replace with Wumber.
+    def expense(expense_s)
+      if !expense_s.nil? && expense_s.length > 0
+        # Replace , with . in numbers. '1,23' means '1.23'.
+        # eval the revenue so calculations are solved.
+        # Expenses are always minus.
+        -eval(expense_s.to_s.gsub(/,/, '.')).to_f.round(NUMBER_ROUND).abs
+      end
+    end
+    
+  end
+  
 end

data/lib/wallet/command_categories.rb

@@ -1,16 +1,16 @@
 
 module TheFox::Wallet
-	
-	# List all used categories.
-	class CategoriesCommand < Command
-		
-		NAME = 'categories'
-		
-		def run
-			wallet = Wallet.new(@options[:wallet_path])
-			puts wallet.categories
-		end
-		
-	end
-	
+  
+  # List all used categories.
+  class CategoriesCommand < Command
+    
+    NAME = 'categories'
+    
+    def run
+      wallet = Wallet.new(@options[:wallet_path])
+      puts wallet.categories
+    end
+    
+  end
+  
 end

data/lib/wallet/command_clear.rb

@@ -2,17 +2,17 @@
 require 'pathname'
 
 module TheFox::Wallet
-	
-	# Clear temp and cache files.
-	class ClearCommand < Command
-		
-		NAME = 'clear'
-		
-		def run
-			wallet = Wallet.new(@options[:wallet_path])
-			wallet.logger = @options[:logger]
-			wallet.clear
-		end
-		
-	end
+  
+  # Clear temp and cache files.
+  class ClearCommand < Command
+    
+    NAME = 'clear'
+    
+    def run
+      wallet = Wallet.new(@options[:wallet_path])
+      wallet.logger = @options[:logger]
+      wallet.clear
+    end
+    
+  end
 end

data/lib/wallet/command_csv.rb

@@ -1,33 +1,33 @@
 
 module TheFox::Wallet
-	
-	# Import or export to/from CSV file format.
-	class CsvCommand < Command
-		
-		NAME = 'csv'
-		
-		def run
-			if @options[:path].nil?
-				raise "Option --path is required for command '#{NAME}'"
-			end
-			
-			wallet = Wallet.new(@options[:wallet_path])
-			wallet.logger = @options[:logger]
-			
-			# Import by default.
-			if @options[:is_import] || !@options[:is_export]
-				# Import
-				@options[:logger].info("import csv #{@options[:path]} ...") if @options[:logger]
-				wallet.import_csv_file(@options[:path])
-				@options[:logger].info("import csv #{@options[:path]} done") if @options[:logger]
-			elsif @options[:is_export]
-				# Export
-				@options[:logger].info("export csv #{@options[:path]} ...") if @options[:logger]
-				wallet.export_csv_file(@options[:path])
-				@options[:logger].info("export csv #{@options[:path]} done") if @options[:logger]
-			end
-		end
-		
-	end
-	
+  
+  # Import or export to/from CSV file format.
+  class CsvCommand < Command
+    
+    NAME = 'csv'
+    
+    def run
+      if @options[:path].nil?
+        raise "Option --path is required for command '#{NAME}'"
+      end
+      
+      wallet = Wallet.new(@options[:wallet_path])
+      wallet.logger = @options[:logger]
+      
+      # Import by default.
+      if @options[:is_import] || !@options[:is_export]
+        # Import
+        @options[:logger].info("import csv #{@options[:path]} ...") if @options[:logger]
+        wallet.import_csv_file(@options[:path])
+        @options[:logger].info("import csv #{@options[:path]} done") if @options[:logger]
+      elsif @options[:is_export]
+        # Export
+        @options[:logger].info("export csv #{@options[:path]} ...") if @options[:logger]
+        wallet.export_csv_file(@options[:path])
+        @options[:logger].info("export csv #{@options[:path]} done") if @options[:logger]
+      end
+    end
+    
+  end
+  
 end

data/lib/wallet/command_html.rb

@@ -2,24 +2,24 @@
 require 'pathname'
 
 module TheFox::Wallet
-	
-	# Exports a wallet as HTML.
-	# List all years in an index HTML file and all months for each year.
-	# Generates a HTML file for each month based on entries.
-	class HtmlCommand < Command
-		
-		NAME = 'html'
-		
-		def run
-			if @options[:path]
-				html_path = Pathname.new(@options[:path]).expand_path
-			end
-			
-			wallet = Wallet.new(@options[:wallet_path])
-			wallet.logger = @options[:logger]
-			wallet.generate_html(html_path, @options[:entry_date_start], @options[:entry_date_end], @options[:entry_category])
-		end
-		
-	end
-	
+  
+  # Exports a wallet as HTML.
+  # List all years in an index HTML file and all months for each year.
+  # Generates a HTML file for each month based on entries.
+  class HtmlCommand < Command
+    
+    NAME = 'html'
+    
+    def run
+      if @options[:path]
+        html_path = Pathname.new(@options[:path]).expand_path
+      end
+      
+      wallet = Wallet.new(@options[:wallet_path])
+      wallet.logger = @options[:logger]
+      wallet.generate_html(html_path, @options[:entry_date_start], @options[:entry_date_end], @options[:entry_category])
+    end
+    
+  end
+  
 end

data/lib/wallet/command_list.rb

@@ -1,176 +1,171 @@
 
 module TheFox::Wallet
-	
-	# List entries. Per default this command lists all entries of today.
-	# @TODO Use terminal-table for output? https://github.com/tj/terminal-table
-	class ListCommand < Command
-		
-		NAME = 'list'
-		
-		def run
-			puts
-			
-			wallet = Wallet.new(@options[:wallet_path])
-			entries = wallet.entries(@options[:entry_date], @options[:entry_category].to_s)
-			
-			# Get max length of all columns.
-			entries_l = entries
-				.map{ |day_name, day_items| day_items.count }
-				.inject{ |sum, n| sum + n }
-				.to_s
-				.length
-			title_l = entries
-				.map{ |month_item| month_item[1].map{ |day_item| day_item['title'].length }}
-				.flatten
-				.max
-				.to_i
-			revenue_l = entries
-				.map{ |month_item| month_item[1].map{ |day_item| (NUMBER_FORMAT % day_item['revenue']).length } }
-				.flatten
-				.max
-				.to_i
-			expense_l = entries
-				.map{ |month_item| month_item[1].map{ |day_item| (NUMBER_FORMAT % day_item['expense']).length } }
-				.flatten
-				.max
-				.to_i
-			balance_l = entries
-				.map{ |month_item| month_item[1].map{ |day_item| (NUMBER_FORMAT % day_item['balance']).length } }
-				.flatten
-				.max
-				.to_i
-			category_l = entries
-				.map{ |month_item| month_item[1].map{ |day_item| day_item['category'].length } }
-				.flatten
-				.max
-				.to_i
-			comment_l = entries
-				.map{ |month_item| month_item[1].map{ |day_item| day_item['comment'].length } }
-				.flatten
-				.max
-				.to_i
-			
-			has_category_col = entries.map{ |month_item| month_item[1].map{ |day_item| day_item['category'] } }.flatten.select{ |i| i != 'default' }.count > 0
-			has_comment_col = entries
-				.map{ |month_item| month_item[1].map{ |day_item| day_item['comment'] } }
-				.flatten
-				.select{ |i| i != '' }
-				.count > 0
-			
-			# Limit some columns to a maximum length.
-			if title_l < 6
-				title_l = 6
-			end
-			if title_l > 25
-				title_l = 25
-			end
-			
-			if revenue_l < 7
-				revenue_l = 7
-			end
-			if expense_l < 7
-				expense_l = 7
-			end
-			if balance_l < 7
-				balance_l = 7
-			end
-			if category_l < 8
-				category_l = 8
-			end
-			if comment_l > 25
-				comment_l = 25
-			end
-			
-			# Format String for each column.
-			entries_f = "%#{entries_l}s"
-			title_f = "%-#{title_l}s"
-			revenue_f = "%#{revenue_l}s"
-			expense_f = "%#{expense_l}s"
-			balance_f = "%#{balance_l}s"
-			category_f = "%-#{category_l}s"
-			comment_f = "%-#{comment_l}s"
-			
-			# Create a table header.
-			header = ''
-			header << '#' * entries_l << '  '
-			header << 'Date ' << ' ' * 7
-			header << title_f % 'Title' << '  '
-			header << revenue_f % 'Revenue' << '  '
-			header << expense_f % 'Expense' << '  '
-			header << balance_f % 'Balance'
-			if has_category_col
-				header << '  ' << category_f % 'Category'
-			end
-			if has_comment_col
-				header << '  ' << comment_f % 'Comment'
-			end
-			
-			header_l = header.length
-			header.sub!(/ +$/, '')
-			
-			# Print table header.
-			puts header
-			puts '-' * header_l
-			
-			# Sums
-			revenue_total = 0.0
-			expense_total = 0.0
-			balance_total = 0.0
-			
-			# Do not repeat the same date over and over again.
-			previous_date = ''
-			
-			entry_no = 0
-			
-			# Iterate all days.
-			entries.sort.each do |day_name, day_items|
-				# Iterate all entries of a day.
-				day_items.each do |entry|
-					entry_no += 1
-					
-					title = entry['title']
-					if title.length >= 25
-						title = title[0, 22] << '...'
-					end
-					
-					revenue_total += entry['revenue']
-					expense_total += entry['expense']
-					balance_total += entry['balance']
-					
-					category = entry['category'] == 'default' ? '' : entry['category']
-					
-					comment = entry['comment']
-					if comment.length >= 25
-						comment = comment[0, 22] << '...'
-					end
-					
-					out = ''
-					out << entries_f % entry_no
-					out << '  ' << '%10s' % (entry['date'] == previous_date ? '' : entry['date'])
-					out << '  ' << title_f % title
-					out << '  ' << revenue_f % (NUMBER_FORMAT % entry['revenue'])
-					out << '  ' << expense_f % (NUMBER_FORMAT % entry['expense'])
-					out << '  ' << balance_f % (NUMBER_FORMAT % entry['balance'])
-					out << '  ' << category_f % category if has_category_col
-					out << '  ' << comment_f % comment if has_comment_col
-					
-					out.sub!(/ +$/, '')
-					puts out
-					
-					previous_date = entry['date']
-				end
-			end
-			puts
-			
-			out = ''
-			out << ' ' * (12 + entries_l)
-			out << '  ' << title_f % 'TOTAL'
-			out << '  ' << revenue_f % (NUMBER_FORMAT % revenue_total)
-			out << '  ' << expense_f % (NUMBER_FORMAT % expense_total)
-			out << '  ' << balance_f % (NUMBER_FORMAT % balance_total)
-			puts out
-		end
-		
-	end
-	
+  
+  # List entries. Per default this command lists all entries of today.
+  # @TODO Use terminal-table for output? https://github.com/tj/terminal-table
+  class ListCommand < Command
+    
+    NAME = 'list'
+    
+    def run
+      puts
+      
+      wallet = Wallet.new(@options[:wallet_path])
+      entries = wallet.entries(@options[:entry_date], @options[:entry_category].to_s)
+      
+      # Get max length of all columns.
+      entries_l = entries
+        .map{ |day_name, day_items| day_items.count }
+        .inject{ |sum, n| sum + n }
+        .to_s
+        .length
+      title_l = entries
+        .map{ |month_item| month_item[1].map{ |day_item| day_item['title'].length }}
+        .flatten
+        .max
+        .to_i
+      revenue_l = entries
+        .map{ |month_item| month_item[1].map{ |day_item| (NUMBER_FORMAT % day_item['revenue']).length } }
+        .flatten
+        .max
+        .to_i
+      expense_l = entries
+        .map{ |month_item| month_item[1].map{ |day_item| (NUMBER_FORMAT % day_item['expense']).length } }
+        .flatten
+        .max
+        .to_i
+      balance_l = entries
+        .map{ |month_item| month_item[1].map{ |day_item| (NUMBER_FORMAT % day_item['balance']).length } }
+        .flatten
+        .max
+        .to_i
+      category_l = entries
+        .map{ |month_item| month_item[1].map{ |day_item| day_item['category'].length } }
+        .flatten
+        .max
+        .to_i
+      comment_l = entries
+        .map{ |month_item| month_item[1].map{ |day_item| day_item['comment'].length } }
+        .flatten
+        .max
+        .to_i
+      
+      has_category_col = entries.map{ |month_item| month_item[1].map{ |day_item| day_item['category'] } }.flatten.select{ |i| i != 'default' }.count > 0
+      has_comment_col = entries
+        .map{ |month_item| month_item[1].map{ |day_item| day_item['comment'] } }
+        .flatten
+        .select{ |i| i != '' }
+        .count > 0
+      
+      # Limit some columns to a maximum length.
+      if title_l < 6
+        title_l = 6
+      end
+      if title_l > 25
+        title_l = 25
+      end
+      
+      if revenue_l < 7
+        revenue_l = 7
+      end
+      if expense_l < 7
+        expense_l = 7
+      end
+      if balance_l < 7
+        balance_l = 7
+      end
+      if category_l < 8
+        category_l = 8
+      end
+      if comment_l > 25
+        comment_l = 25
+      end
+      
+      # Format String for each column.
+      entries_f = "%#{entries_l}s"
+      title_f = "%-#{title_l}s"
+      revenue_f = "%#{revenue_l}s"
+      expense_f = "%#{expense_l}s"
+      balance_f = "%#{balance_l}s"
+      category_f = "%-#{category_l}s"
+      comment_f = "%-#{comment_l}s"
+      
+      # Create a table header.
+      header = ''
+      header << '#' * entries_l << '  '
+      header << 'Date ' << ' ' * 7
+      header << title_f % 'Title' << '  '
+      header << revenue_f % 'Revenue' << '  '
+      header << expense_f % 'Expense' << '  '
+      header << balance_f % 'Balance'
+      if has_category_col
+        header << '  ' << category_f % 'Category'
+      end
+      if has_comment_col
+        header << '  ' << comment_f % 'Comment'
+      end
+      
+      header_l = header.length
+      header.sub!(/ +$/, '')
+      
+      # Print table header.
+      puts header
+      puts '-' * header_l
+      
+      # Sums
+      revenue_total = 0.0
+      expense_total = 0.0
+      balance_total = 0.0
+      
+      entry_no = 0
+      
+      # Iterate all days.
+      entries.sort.each do |day_name, day_items|
+        # Iterate all entries of a day.
+        day_items.each do |entry|
+          entry_no += 1
+          
+          title = entry['title']
+          if title.length >= 25
+            title = title[0, 22] << '...'
+          end
+          
+          revenue_total += entry['revenue']
+          expense_total += entry['expense']
+          balance_total += entry['balance']
+          
+          category = entry['category'] == 'default' ? '' : entry['category']
+          
+          comment = entry['comment']
+          if comment.length >= 25
+            comment = comment[0, 22] << '...'
+          end
+          
+          out = ''
+          out << entries_f % entry_no
+          out << '  ' << '%10s' % entry['date']
+          out << '  ' << title_f % title
+          out << '  ' << revenue_f % (NUMBER_FORMAT % entry['revenue'])
+          out << '  ' << expense_f % (NUMBER_FORMAT % entry['expense'])
+          out << '  ' << balance_f % (NUMBER_FORMAT % entry['balance'])
+          out << '  ' << category_f % category if has_category_col
+          out << '  ' << comment_f % comment if has_comment_col
+          
+          out.sub!(/ +$/, '')
+          puts out
+        end
+      end
+      puts
+      
+      out = ''
+      out << ' ' * (12 + entries_l)
+      out << '  ' << title_f % 'TOTAL'
+      out << '  ' << revenue_f % (NUMBER_FORMAT % revenue_total)
+      out << '  ' << expense_f % (NUMBER_FORMAT % expense_total)
+      out << '  ' << balance_f % (NUMBER_FORMAT % balance_total)
+      puts out
+    end
+    
+  end
+  
 end