thefox-wallet 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f25d2660b54e8632abc6d1eccf1b5eab45ce187e
-  data.tar.gz: bf3d8220d2041a5bf2c287d79fdbe165b2c20f41
+  metadata.gz: b777e3c55bf57dfcef12a6f140f714b53ac43b91
+  data.tar.gz: 8c889702061c3f94edd2853d7f790233d4f1262c
 SHA512:
-  metadata.gz: e900d5a0c2ac751250667e6a0f0740d78cf6d58cb06e26699370706196e3276d120622beecc5f1fc2cafccc21aa689e71bebd878c51e14b358ae5e3e452e52c6
-  data.tar.gz: 33cac727648eae7e8e7189e6d1909d58f84ae6c8dbe2e20bcdeb4f1403988c2771a0a21297cc7cbd77532f470442c8aa555c45656e346718133d3719eba46dab
+  metadata.gz: c5658968fafe93f915466bc7f76dea49fb15b30fb6773ba6f41436a3512c3602c0b692ddc943423aef9fb1ef3b075f60c95971e86399acea52a09794e5a584e3
+  data.tar.gz: 300e6b51667e753e5fac037e8f9d34c56a4c90b726baa9954ef40a3098e911dc142ed826f7e38dbe1ea2cf230426de6a8f047e2534a82b8f4f8059867fb5993d

data/Makefile

@@ -6,3 +6,6 @@ include Makefile.common
 .PHONY: test
 test:
 	RUBYOPT=-w $(BUNDLER) exec ./tests/ts_all.rb
+
+dev:
+	RUBYOPT=-rbundler/setup ruby ./bin/wallet

data/Makefile.common

@@ -1,6 +1,6 @@
 
 # Ruby Common Big
-# 2015-12-21
+# 2016-02-14
 
 MV = mv -nv
 RM = rm -rf
@@ -9,8 +9,8 @@ BUNDLER = bundle
 BUNDLER_OPTIONS = --jobs=5 --retry=3
 GEMSPEC_FILE = $(GEM_NAME).gemspec
 
-.PHONY: all $(ALL_TARGETS_EXT)
-all: setup
+.PHONY: all
+all: setup $(ALL_TARGETS_EXT)
 
 .PHONY: setup
 setup: .setup

data/README.md

@@ -32,6 +32,7 @@ Use it in your sources:
 
 ## Project Links
 
+- [Blog Post about Wallet](http://blog.fox21.at/2015/07/09/wallet.html)
 - [Gem](https://rubygems.org/gems/thefox-wallet)
 - [Travis CI Repository](https://travis-ci.org/TheFox/wallet)
 

data/bin/wallet

@@ -1,205 +1,219 @@
 #!/usr/bin/env ruby
 
-require 'tempfile'
+require 'pp'
+require 'optparse'
 require 'wallet'
-require 'ArgsParser'
 
-
-parser = ArgsParser.parser
-parser.bind(:wallet, :w, 'Wallet', 'wallet')
-parser.bind(:title, :t, 'Title')
-parser.bind(:date, :d, 'Date', Date.today.to_s)
-parser.bind(:revenue, :r, 'Revenue', 0)
-parser.bind(:expense, :e, 'Expense', 0)
-parser.bind(:category, :c, 'Category')
-parser.bind(:comment, :o, 'Comment')
-parser.bind(:path, :p, 'Path')
-
-command, params = parser.parse(ARGV)
-command = command.to_s
-
-# puts 'command: ' + command.to_s
-# puts 'params:  ' + params.to_s
-# puts
-
-# Command Aliases
-if command == 'i'
-	command = 'int'
-elsif command == 'l'
-	command = 'list'
-elsif command == 'lc'
-	command = 'cat'
-end
-
-wallet = params[:wallet].to_s
-title = params[:title].to_s
-date = params[:date].to_s
-revenue = params[:revenue].to_s.gsub('.', '').sub(/,/, '.').to_f.round(3).abs
-category = params[:category].to_s
-comment = params[:comment].to_s
-path = params[:path].to_s
-import = params[:i]
-
-path_is_temp = false
-
-expense = 0.0
-export = false
-if params[:expense].is_a? TrueClass
-	export = true
-else
-	expense = -params[:expense].to_s.gsub('.', '').sub(/,/, '.').to_f.round(3).abs
-end
-
-# puts 'argv len: ' + ARGV.length.to_s
-# puts 'command:    ' + '%-10s' % command.class.to_s + '     "' + command.to_s + '"'
-# puts 'wallet:     ' + '%-10s' % wallet.class.to_s + '     "' + wallet.to_s + '"'
-# puts 'title:      ' + '%-10s' % title.class.to_s + '     "' + title + '"'
-# puts 'date:       ' + '%-10s' % date.class.to_s + '     "' + date + '"'
-# puts 'revenue:    ' + '%-10s' % revenue.class.to_s + '     "' + revenue.to_s + '"'
-# puts 'expense:    ' + '%-10s' % expense.class.to_s + '     "' + expense.to_s + '"'
-# puts 'category:   ' + '%-10s' % category.class.to_s + '     "' + category + '"'
-# puts 'comment:    ' + '%-10s' % comment.class.to_s + '     "' + comment.to_s + '"'
-# puts 'path:       ' + '%-10s' % path.class.to_s + '     "' + path.to_s + '"'
-# puts
-
-if command == 'help' || command.length == 0
-	script_name = File.basename(__FILE__)
-	padding = ' ' * (script_name.length + 8)
+options = {
+	:wallet_path => 'wallet',
 	
-	puts "#{::TheFox::Wallet::NAME} #{::TheFox::Wallet::VERSION} (#{::TheFox::Wallet::DATE})"
-	puts 'Usage: ' + script_name + ' COMMAND OPTIONS'
-	puts
-	puts 'Commands:'
-	puts padding + 'help                Show this help'
-	puts padding + 'add                 Add a new entry'
-	puts padding + 'i|int               Add a new entry interactively'
-	puts padding + 'l|list              List entries'
-	puts padding + 'lc|cat              List categories'
-	puts padding + 'html                Generate HTML files'
-	puts padding + 'csv                 Import/Export CSV file'
-	puts padding + 'vi                  Import per VIM editor'
-	puts
-	puts 'Options:'
-	puts padding + '-w|--wallet PATH    Optional'
-	puts padding + '-t|--title TITLE    Required for command "add"'
-	puts padding + '-d|--date           Optional'
-	puts padding + '-r|--revenue        Optional. Default: 0'
-	puts padding + '-e|--expense        Optional. Default: 0'
-	puts padding + '-c|--category       Optional. Default: default'
-	puts padding + '-o|--comment        Optional'
-	puts padding + '-i|-e               Import or Export. Default: -i'
-	puts padding + '-p|--path PATH      Required for command "csv"'
-	
-	exit 3
-end
-
-if command == 'int'
-	command = 'add'
+	:entry_title => nil,
+	:entry_date => Date.today.to_s,
+	#:entry_end_date => nil,
+	:entry_revenue => 0.0,
+	:entry_expense => 0.0,
+	:entry_category => nil,
+	:entry_comment => nil,
 	
-	print 'title: [' + title + '] '
-	title_t = STDIN.gets.strip
-	if title_t.length > 0
-		title = title_t
+	:is_import => false,
+	:is_export => false,
+	:path => nil,
+	:is_interactively => false,
+}
+balance = 0.0
+opts = OptionParser.new do |o|
+	o.banner = 'Usage: wallet <command> [options]'
+	o.separator('')
+	o.separator('Commands:')
+	o.separator('')
+	o.separator('    add          Add a new entry')
+	o.separator('    list         List entries')
+	o.separator('    categories   List categories')
+	o.separator('    html         Generate HTML files')
+	o.separator('    csv          Import/Export CSV file')
+	o.separator('    vi           Import per VIM editor')
+	o.separator('')
+	
+	o.on('-w', '--wallet <path>', 'Path to wallet directory.') do |path|
+		options[:wallet_path] = path
 	end
 	
-	print 'date: [' + date + '] '
-	date_t = STDIN.gets.strip
-	if date_t.length > 0
-		date = date_t
+	o.on('-t', '--title <title>', 'Title used for the entry.') do |title|
+		options[:entry_title] = title
 	end
 	
-	print 'revenue: [' + revenue.to_s + '] '
-	revenue_t = STDIN.gets.strip
-	if revenue_t.length > 0
-		revenue = revenue_t.to_s.gsub('.', '').sub(/,/, '.').to_f.round(3).abs
+	o.on('-d', '--date <date>', 'Date used for the entry.') do |date|
+	#o.on('-d', '--date <date>', 'Start date or date used for the entry.') do |date|
+		options[:entry_date] = date
 	end
 	
-	print 'expense: [' + expense.to_s + '] '
-	expense_t = STDIN.gets.strip
-	if expense_t.length > 0
-		expense = -expense_t.to_s.gsub('.', '').sub(/,/, '.').to_f.round(3).abs
+	#o.on('-z', '--end <date>', 'End date.') do |date|
+	#	options[:entry_end_date] = date
+	#end
+	
+	o.on('-r', '--revenue <revenue>', 'Revenue used for the entry.') do |revenue|
+		options[:entry_revenue] = revenue.to_s.sub(/,/, '.').to_f.abs
+		balance += options[:entry_revenue]
 	end
 	
-	if category.to_s.length == 0
-		category = 'default'
+	o.on('-e', '--expense <expense>', 'Expense used for the entry.') do |expense|
+		options[:entry_expense] = -expense.to_s.sub(/,/, '.').to_f.abs
+		balance += options[:entry_expense]
 	end
-	print 'category: [' + category + '] '
-	category_t = STDIN.gets.strip
-	if category_t.length > 0
-		category = category_t
+	
+	o.on('-c', '--category <category>', 'Category used for the entry.') do |category|
+		options[:entry_category] = category
 	end
 	
-	print 'comment: [' + comment + '] '
-	comment_t = STDIN.gets.strip
-	if comment_t.length > 0
-		comment = comment_t
+	o.on('-o', '--comment <comment>', 'Comment used for the entry.') do |comment|
+		options[:entry_comment] = comment
 	end
 	
-	puts '-' * 20
-elsif command == 'vi'
-	vi_file = Tempfile.create('wallet-vi-import', '/tmp')
-	vi_file.puts('# This is a comment line.')
-	vi_file.puts('# Date,Title,Revenue,Expense,Category,Comment')
-	vi_file.puts('# Date,Title,Expense')
-	vi_file.close
+	o.on('--import', 'Import') do
+		options[:is_import] = true
+	end
 	
-	puts 'cwd:    ' + Dir.pwd
-	puts 'editor: ' + ENV['EDITOR']
-	puts 'file:   ' + vi_file.path
-	sleep 1
+	o.on('--export', 'Export') do
+		options[:is_export] = true
+	end
 	
-	system(ENV['EDITOR'] + ' ' + vi_file.path)
-	system('grep -v "#" ' + vi_file.path + ' | grep -v ^$ > ' + vi_file.path + '.ok')
+	o.on('-p', '--path <path>', 'Path used for csv import/export.') do |path|
+		options[:path] = path
+	end
+	
+	o.on('-i', 'Use some commands interactively.') do
+		options[:is_interactively] = true
+	end
 	
-	command = 'csv'
-	path = vi_file.path + '.ok'
-	path_is_temp = true
-	import = true
+	o.on_tail('-V', '--version', 'Show version.') do
+		puts "#{::TheFox::Wallet::NAME} #{::TheFox::Wallet::VERSION} (#{::TheFox::Wallet::DATE})"
+		puts TheFox::Wallet::HOMEPAGE
+		exit
+	end
 	
-	File.unlink vi_file.path
+	o.on_tail('-h', '--help', 'Show this message.') do
+		puts o
+		puts
+		exit 3
+	end
 end
+ARGV << '-h' if ARGV.count == 0
+commands = opts.parse(ARGV)
+command = commands.shift
 
-wallet = TheFox::Wallet::Wallet.new(wallet)
+#pp commands
+#pp command
 
-if command == 'add'
-	if category.to_s.length == 0
-		category = 'default'
+case command
+when 'add'
+	if options[:entry_category].nil?
+		options[:entry_category] = 'default'
+	end
+	if options[:is_interactively]
+		print "title: [#{options[:entry_title]}] "
+		title_t = STDIN.gets.strip
+		if title_t.length > 0
+			options[:entry_title] = title_t
+		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 = STDIN.gets.strip
+		if revenue_t.length > 0
+			options[:entry_revenue] = revenue_t.to_s.sub(/,/, '.').to_f.round(TheFox::Wallet::NUMBER_ROUND).abs
+		end
+		
+		print "expense: [#{options[:entry_expense]}] "
+		expense_t = STDIN.gets.strip
+		if expense_t.length > 0
+			options[:entry_expense] = -expense_t.to_s.sub(/,/, '.').to_f.round(TheFox::Wallet::NUMBER_ROUND).abs
+		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 title == ''
-		puts 'ERROR: Option --title is required for command "' + command + '"'
+	if options[:entry_title].nil?
+		puts "ERROR: Option --title is required for command '#{command}'"
 		exit 1
 	end
 	
-	puts 'title:    ' + title
-	puts 'date:     ' + Date.parse(date).to_s
-	puts 'revenue:  ' + revenue.to_s
-	puts 'expense:  ' + expense.to_s
-	puts 'balance:  ' + (revenue + expense).to_f.round(3).to_s
-	puts 'category: ' + category.to_s
-	puts 'comment:  ' + comment.to_s
+	puts "title:    '#{options[:entry_title]}'"
+	puts "date:      " + Date.parse(options[:entry_date]).to_s
+	puts "revenue:   " + TheFox::Wallet::NUMBER_FORMAT % options[:entry_revenue]
+	puts "expense:   " + TheFox::Wallet::NUMBER_FORMAT % options[:entry_expense]
+	puts "balance:   " + TheFox::Wallet::NUMBER_FORMAT % balance
+	puts "category:  #{options[:entry_category]}"
+	puts "comment:  '#{options[:entry_comment]}'"
 	
-	wallet.add TheFox::Wallet::Entry.new(title, date, revenue, expense, category, comment)
-elsif command == 'list'
+	entry = TheFox::Wallet::Entry.new(options[:entry_title], options[:entry_date], options[:entry_revenue], options[:entry_expense], options[:entry_category], options[:entry_comment])
+	wallet = TheFox::Wallet::Wallet.new(options[:wallet_path])
+	wallet.add(entry)
+when 'list'
 	puts
 	
-	year, month, day = date.scan(/^(\d{2,4}).?(\d{0,2}).?(\d{0,2})/).shift.map{ |x|
-		y = x.to_i
-		y == 0 ? nil : y
-	}
+	wallet = TheFox::Wallet::Wallet.new(options[:wallet_path])
+	entries = wallet.entries(options[:entry_date], options[:entry_category].to_s)
+	#entries = wallet.entries(options[:entry_date], options[:entry_end_date], options[:entry_category].to_s)
 	
-	entries = wallet.entries(year, month, day, category)
-	
-	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| (::TheFox::Wallet::NUMBER_FORMAT % day_item['revenue']).length } }.flatten.max.to_i
-	expense_l = entries.map{ |month_item| month_item[1].map{ |day_item| (::TheFox::Wallet::NUMBER_FORMAT % day_item['expense']).length } }.flatten.max.to_i
-	balance_l = entries.map{ |month_item| month_item[1].map{ |day_item| (::TheFox::Wallet::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
+	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| (TheFox::Wallet::NUMBER_FORMAT % day_item['revenue']).length } }
+		.flatten
+		.max
+		.to_i
+	expense_l = entries
+		.map{ |month_item| month_item[1].map{ |day_item| (TheFox::Wallet::NUMBER_FORMAT % day_item['expense']).length } }
+		.flatten
+		.max
+		.to_i
+	balance_l = entries
+		.map{ |month_item| month_item[1].map{ |day_item| (TheFox::Wallet::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
+	has_comment_col = entries
+		.map{ |month_item| month_item[1].map{ |day_item| day_item['comment'] } }
+		.flatten
+		.select{ |i| i != '' }
+		.count > 0
 	
 	if title_l < 6
 		title_l = 6
@@ -273,9 +287,9 @@ elsif command == 'list'
 			out += entries_f % entry_no
 			out += '  ' + '%10s' % (entry['date'] == previous_date ? '' : entry['date'])
 			out += '  ' + title_f % title
-			out += '  ' + revenue_f % (::TheFox::Wallet::NUMBER_FORMAT % entry['revenue'])
-			out += '  ' + expense_f % (::TheFox::Wallet::NUMBER_FORMAT % entry['expense'])
-			out += '  ' + balance_f % (::TheFox::Wallet::NUMBER_FORMAT % entry['balance'])
+			out += '  ' + revenue_f % (TheFox::Wallet::NUMBER_FORMAT % entry['revenue'])
+			out += '  ' + expense_f % (TheFox::Wallet::NUMBER_FORMAT % entry['expense'])
+			out += '  ' + balance_f % (TheFox::Wallet::NUMBER_FORMAT % entry['balance'])
 			out += '  ' + category_f % category if has_category_col
 			out += '  ' + comment_f % comment if has_comment_col
 			
@@ -290,38 +304,60 @@ elsif command == 'list'
 	out = ''
 	out += ' ' * (12 + entries_l)
 	out += '  ' + title_f % 'TOTAL'
-	out += '  ' + revenue_f % (::TheFox::Wallet::NUMBER_FORMAT % revenue_total)
-	out += '  ' + expense_f % (::TheFox::Wallet::NUMBER_FORMAT % expense_total)
-	out += '  ' + balance_f % (::TheFox::Wallet::NUMBER_FORMAT % balance_total)
+	out += '  ' + revenue_f % (TheFox::Wallet::NUMBER_FORMAT % revenue_total)
+	out += '  ' + expense_f % (TheFox::Wallet::NUMBER_FORMAT % expense_total)
+	out += '  ' + balance_f % (TheFox::Wallet::NUMBER_FORMAT % balance_total)
 	puts out
-elsif command == 'cat'
+when 'categories'
+	wallet = TheFox::Wallet::Wallet.new(options[:wallet_path])
 	categories = wallet.categories
-	puts 'categories(' + categories.count.to_s + '):'
-	categories.each do |category_item|
-		puts "\t" + category_item
-	end
-elsif command == 'html'
+	puts "categories: #{categories.count}"
+	puts "\t" + categories.join("\n\t")
+when 'html'
+	wallet = TheFox::Wallet::Wallet.new(options[:wallet_path])
 	puts 'generate html to ' + wallet.html_path + ' ...'
 	wallet.gen_html
 	puts 'generate html done'
-elsif command == 'csv'
-	if path == ''
-		puts 'ERROR: Option --path is required for command "' + command + '"'
+when 'csv'
+	if options[:is_interactively]
+		vi_file = Tempfile.create('wallet-vi-import', '/tmp')
+		vi_file.puts('# This is a comment line.')
+		vi_file.puts('# Date,Title,Revenue,Expense,Category,Comment')
+		vi_file.puts('# Date,Title,Expense')
+		vi_file.puts
+		vi_file.puts
+		vi_file.close
+		
+		puts 'cwd:    ' + Dir.pwd
+		puts 'editor: ' + ENV['EDITOR']
+		puts 'file:   ' + vi_file.path
+		
+		system("#{ENV['EDITOR']} #{vi_file.path}")
+		system("grep -v '#' #{vi_file.path} | grep -v ^$ > #{vi_file.path}.ok")
+		
+		options[:path] = "#{vi_file.path}.ok"
+		File.unlink(vi_file.path)
+	end
+	
+	if options[:path].nil?
+		puts "ERROR: Option --path is required for command '#{command}'"
 		exit 1
 	end
 	
-	if import || !export
-		puts 'import csv ' + path + ' ...'
-		wallet.import_csv_file path
-		puts 'import csv ' + path + ' done'
+	wallet = TheFox::Wallet::Wallet.new(options[:wallet_path])
+	
+	if options[:is_import] || !options[:is_export]
+		puts "import csv #{options[:path]} ..."
+		wallet.import_csv_file(options[:path])
+		puts "import csv #{options[:path]} done"
 		
-		if path_is_temp
-			puts 'delete ' + path
-			File.unlink(path)
+		if options[:is_interactively]
+			puts "delete #{options[:path]}"
+			File.unlink(options[:path])
 		end
-	elsif export
-		puts 'export csv ' + path + ' ...'
-		wallet.export_csv_file path
-		puts 'export csv ' + path + ' done'
+	elsif options[:is_export]
+		puts "export csv #{options[:path]} ..."
+		wallet.export_csv_file(options[:path])
+		puts "export csv #{options[:path]} done"
 	end
 end

data/lib/wallet/entry.rb

@@ -40,9 +40,9 @@ module TheFox
 			end
 			
 			def date=(date)
-				if date.is_a? String
+				if date.is_a?(String)
 					@date = Date.parse(date)
-				elsif date.is_a? Date
+				elsif date.is_a?(Date)
 					@date = date
 				else
 					raise ArgumentError, 'date must be a String or a Date instance'
@@ -94,7 +94,7 @@ module TheFox
 			private
 			
 			def calc_balance
-				@balance = (@revenue.round(3) + @expense.round(3)).to_f.round(3)
+				@balance = (@revenue.round(NUMBER_ROUND) + @expense.round(NUMBER_ROUND)).to_f.round(NUMBER_ROUND)
 			end
 		end
 		

data/lib/wallet/version.rb

@@ -2,9 +2,10 @@
 module TheFox
 	module Wallet
 		NAME = 'Wallet'
-		VERSION = '0.8.2'
-		DATE = '2015-12-21'
+		VERSION = '0.9.0'
+		DATE = '2016-02-27'
 		HOMEPAGE = 'https://github.com/TheFox/wallet'
 		NUMBER_FORMAT = '%.2f'
+		NUMBER_ROUND = 5
 	end
 end

data/lib/wallet/wallet.rb

@@ -178,9 +178,9 @@ module TheFox
 					end
 				end
 				
-				revenue = revenue.to_f.round(3)
-				expense = expense.to_f.round(3)
-				balance = (revenue + expense).round(3)
+				revenue = revenue.to_f.round(NUMBER_ROUND)
+				expense = expense.to_f.round(NUMBER_ROUND)
+				balance = (revenue + expense).round(NUMBER_ROUND)
 				
 				diff = revenue + expense - balance
 				if diff != 0
@@ -198,57 +198,63 @@ module TheFox
 				sum(nil, nil, nil, category)
 			end
 			
-			def entries(year = nil, month = nil, day = nil, category = nil)
-				year_s = year.to_i.to_s
-				month_f = '%02d' % month.to_i
-				day_f = '%02d' % day.to_i
+			def entries(begin_date, category = nil)
+			#def entries(year = nil, month = nil, day = nil, category = nil)
+				begin_year, begin_month, begin_day = begin_date.split('-').map{ |n| n.to_i }
 				
-				glob = @data_path + '/month_'
-				if year == nil && month == nil
+				begin_year_s = begin_year.to_i.to_s
+				begin_month_f = '%02d' % begin_month.to_i
+				begin_day_f = '%02d' % begin_day.to_i
+				
+				glob = "#{@data_path}/month_"
+				if begin_year == nil && begin_month == nil
 					glob += '*.yml'
-				elsif year && month == nil
-					glob += year_s + '_*.yml'
-				elsif year && month
-					glob += year_s + '_' + month_f + '.yml'
+				elsif begin_year && begin_month == nil
+					glob += "#{begin_year_s}_*.yml"
+				elsif begin_year && begin_month
+					glob += "#{begin_year_s}_#{begin_month_f}.yml"
 				end
 				
+				category = category.to_s.downcase
+				
 				# puts 'glob:     ' + glob
-				# puts 'year:     ' + '%-10s' % year.class.to_s + '   = "' + year.to_s + '"'
-				# puts 'month:    ' + '%-10s' % month.class.to_s + '   = "' + month.to_s + '"'
-				# puts 'day:      ' + '%-10s' % day.class.to_s + '   = "' + day.to_s + '"'
-				# puts 'category: ' + '%-10s' % category.class.to_s + '   = "' + category.to_s + '"'
+				# puts 'begin_year:     ' + '%-10s' % begin_year.class.to_s + '   = "' + begin_year.to_s + '"'
+				# puts 'begin_month:    ' + '%-10s' % begin_month.class.to_s + '   = "' + begin_month.to_s + '"'
+				# puts 'begin_day:      ' + '%-10s' % begin_day.class.to_s + '   = "' + begin_day.to_s + '"'
+				# puts 'category:       ' + '%-10s' % category.class.to_s + '   = "' + category.to_s + '"'
 				# puts
 				
 				entries_a = {}
 				Dir[glob].each do |file_path|
+					#puts "path: #{file_path}"
+					
 					data = YAML.load_file(file_path)
-					if category.nil? || category.to_s.length == 0
-						if day
-							day_key = year_s + '-' + month_f + '-' + day_f
+					if category.length == 0
+						if begin_day
+							day_key = begin_year_s + '-' + begin_month_f + '-' + begin_day_f
 							if data['days'].has_key?(day_key)
 								entries_a[day_key] = data['days'][day_key]
 							end
 						else
-							entries_a.merge! data['days']
+							entries_a.merge!(data['days'])
 						end
 					else
-						category = category.to_s.downcase
-						if day
-							day_key = year_s + '-' + month_f + '-' + day_f
+						if begin_day
+							day_key = begin_year_s + '-' + begin_month_f + '-' + begin_day_f
 							if data['days'].has_key?(day_key)
 								entries_a[day_key] = data['days'][day_key].keep_if{ |day_item|
 									day_item['category'].downcase == category
 								}
 							end
 						else
-							entries_a.merge! data['days'].map{ |day_name, day_items|
+							entries_a.merge!(data['days'].map{ |day_name, day_items|
 								day_items.keep_if{ |day_item|
 									day_item['category'].downcase == category
 								}
 								[day_name, day_items]
 							}.to_h.keep_if{ |day_name, day_items|
 								day_items.count > 0
-							}
+							})
 						end
 					end
 					
@@ -492,9 +498,9 @@ module TheFox
 						expense_year += expense_month
 						balance_year += balance_month
 						
-						revenue_month_r = revenue_month.round(3)
-						expense_month_r = expense_month.round(3)
-						balance_month_r = balance_month.round(3)
+						revenue_month_r = revenue_month.round(NUMBER_ROUND)
+						expense_month_r = expense_month.round(NUMBER_ROUND)
+						balance_month_r = balance_month.round(NUMBER_ROUND)
 						
 						year_total[month_n] = ::OpenStruct.new({
 							month: month_n.to_i,
@@ -538,7 +544,7 @@ module TheFox
 						year_file.write('</tr>')
 					end
 					
-					year_total.sort.inject(0.0){ |sum, item| item[1].balance_total = (sum + item[1].balance).round(3) }
+					year_total.sort.inject(0.0){ |sum, item| item[1].balance_total = (sum + item[1].balance).round(NUMBER_ROUND) }
 					
 					year_file.write('
 							<tr>
@@ -629,13 +635,13 @@ module TheFox
 					
 					years_total[year_s] = ::OpenStruct.new({
 						year: year_s,
-						revenue: revenue_year.round(3),
-						expense: expense_year.round(3),
-						balance: balance_year.round(3),
+						revenue: revenue_year.round(NUMBER_ROUND),
+						expense: expense_year.round(NUMBER_ROUND),
+						balance: balance_year.round(NUMBER_ROUND),
 					})
 				end
 				
-				years_total.sort.inject(0.0){ |sum, item| item[1].balance_total = (sum + item[1].balance).round(3) }
+				years_total.sort.inject(0.0){ |sum, item| item[1].balance_total = (sum + item[1].balance).round(NUMBER_ROUND) }
 				
 				index_file.write('
 						<table class="list">

data/thefox-wallet.gemspec

@@ -24,6 +24,4 @@ Gem::Specification.new do |spec|
 	spec.required_ruby_version = '>=2.0.0'
 	
 	spec.add_development_dependency 'minitest', '~>5.7'
-	
-	spec.add_dependency 'ArgsParser', '~>1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-wallet
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.7'
-- !ruby/object:Gem::Dependency
-  name: ArgsParser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: A Ruby library for tracking your finances.
 email: christian@fox21.at
 executables: