RubyGems - thefox-wallet - Versions diffs - 0.13.0 → 0.14.0 - Mend

thefox-wallet 0.13.0 → 0.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4e8feceab54fde2f7ffb5ce5782cb48ca3213b
-  data.tar.gz: 00b9ca606122f5fd4c0f181442b3a0a044105169
+  metadata.gz: 83c52b0183b88eef28a1e430a10266cbc926be80
+  data.tar.gz: 313cbc717b9eea9cb79444fb871bba40a6f9cad1
 SHA512:
-  metadata.gz: 2d37b581624f6f9895f29a8639a5625894c0438916b38c6ddec5058d4c489bd242d67570326475c4b31cf2a3cd5b8cd52b50db0c3638b4978336cdb10b839908
-  data.tar.gz: 34eb1d12045a4cd6792b455df3bfb06c6c7077507ef4ffa8d8e1309cd5853593192678bb3ebd30df1aec51c5c977aa3221bcb5ce6136910a47cea0fb567fbe3c
+  metadata.gz: ceb2875dbc61138cc094ea6a8d0f755f599017869bd966ed42960efa863d712320b270d69c59807cf8539ef709cebdd1720f159cf03b97c1f6a69418e61216af
+  data.tar.gz: ce729b9878f78f02f923bc37c15a6ec3827dfb6e44069b12a68996fa0ff6c182da8c74e63c3aba9f04558ddae2fe9b3dba04b7a46027a968674f1f261214036b

data/.gitlab-ci.yml ADDED Viewed

@@ -0,0 +1,48 @@
+before_script:
+    - ruby -v
+    - gem update --system
+    - gem install bundler -v '~>1.13'
+    - bundler --version
+    - make
+stages:
+    - test
+    - release
+test_21:
+    image: ruby:2.1
+    stage: test
+    environment: test
+    only:
+        - master
+    script:
+        - make test
+test_22:
+    image: ruby:2.2
+    stage: test
+    environment: test
+    only:
+        - master
+    script:
+        - make test
+test_23:
+    image: ruby:2.3
+    stage: test
+    environment: test
+    only:
+        - master
+    script:
+        - make test
+release_gem:
+    image: ruby:2.3
+    stage: release
+    environment: release
+    only:
+        - tags
+    script:
+        - mkdir -p ~/.gem
+        - 'printf "%s\n:rubygems_api_key: %s" "---" "${RUBYGEMSORG_API_KEY}" > ~/.gem/credentials; chmod 0600 ~/.gem/credentials'
+        - make release

data/.travis.yml CHANGED Viewed

@@ -3,11 +3,12 @@ rvm:
     - 2.1
     - 2.2
     - 2.3
+    - 2.4.0-preview2
     - ruby-head
 sudo: required
 before_install:
     - gem update --system
-    - gem install bundler -v '~>1.11'
+    - gem install bundler -v '~>1.13'
     - bundler --version
 install:
     - make

data/Makefile CHANGED Viewed

@@ -12,4 +12,4 @@ cov:
 	RUBYOPT=-w TZ=Europe/Vienna COVERAGE=1 $(BUNDLER) exec ./test/suite_all.rb -v
 dev:
-	RUBYOPT=-rbundler/setup ruby ./bin/wallet
+	bundler exec ./bin/wallet -w test_wallet add -t 'test' -e 5 -c 'test'

data/README.md CHANGED Viewed

@@ -24,7 +24,7 @@ The preferred method of installation is via RubyGems.org:
 or via `Gemfile`:
-	gem 'thefox-wallet', '~>0.13'
+	gem 'thefox-wallet', '~>0.14'
 Use it in your sources:

data/bin/wallet CHANGED Viewed

@@ -4,7 +4,7 @@ require 'optparse'
 require 'wallet'
 require 'tempfile'
-options = {}
+options = Hash.new
 opts = OptionParser.new do |o|
 	o.banner = 'Usage: wallet <command> [options]'
 	o.separator('')

data/lib/wallet/command.rb CHANGED Viewed

@@ -8,8 +8,8 @@ module TheFox::Wallet
 		NAME = 'default'
-		def initialize(options = {})
-			@options = options || {}
+		def initialize(options = Hash.new)
+			@options = options || Hash.new
 			@options[:wallet_path] ||= 'wallet'
 			@options[:entry_id] ||= nil
 			@options[:entry_title] ||= nil

data/lib/wallet/command_add.rb CHANGED Viewed

@@ -64,7 +64,7 @@ module TheFox::Wallet
 			puts "category:  #{@options[:entry_category]}"
 			puts "comment:  '#{@options[:entry_comment]}'"
 			puts "force:    #{@options[:force] ? 'YES' : 'NO'}"
-			puts "unique:   #{is_unique ? 'YES' : 'NO'}"
+			puts "unique:   #{is_unique ? 'YES' : 'NO'} (#{is_unique})"
 			entry = Entry.new(@options[:entry_id], @options[:entry_title], @options[:entry_date], @options[:entry_revenue], @options[:entry_expense], @options[:entry_category], @options[:entry_comment])
 			wallet = Wallet.new(@options[:wallet_path])

data/lib/wallet/version.rb CHANGED Viewed

@@ -2,8 +2,8 @@
 module TheFox
 	module Wallet
 		NAME = 'Wallet'
-		VERSION = '0.13.0'
-		DATE = '2016-09-14'
+		VERSION = '0.14.0'
+		DATE = '2016-10-20'
 		HOMEPAGE = 'https://github.com/TheFox/wallet'
 		NUMBER_FORMAT = '%.2f'

data/lib/wallet/wallet.rb CHANGED Viewed

@@ -29,9 +29,12 @@ module TheFox
 				@tmp_path = File.expand_path('tmp', @dir_path)
 				@has_transaction = false
-				@transaction_files = {}
+				@transaction_files = Hash.new
 				@entries_by_ids = nil
+				@entries_index_file_path = File.expand_path('index.yml', @data_path)
+				@entries_index = Array.new
+				@entries_index_is_loaded = false
 				Signal.trap('SIGINT') do
 					puts
@@ -49,24 +52,27 @@ module TheFox
 				# puts "add, is_unique    #{is_unique}"
 				# puts "add, entry_exist? #{entry_exist?(entry)}"
 				# puts
 				if is_unique && entry_exist?(entry)
 					return false
 				end
 				date = entry.date
 				date_s = date.to_s
-				dbfile_basename = 'month_' + date.strftime('%Y_%m') + '.yml'
+				dbfile_basename = "month_#{date.strftime('%Y_%m')}.yml"
 				dbfile_path = File.expand_path(dbfile_basename, @data_path)
-				tmpfile_path = dbfile_path + '.tmp'
+				tmpfile_path = "#{dbfile_path}.tmp"
 				file = {
 					'meta' => {
 						'version' => 1,
 						'created_at' => DateTime.now.to_s,
 						'updated_at' => DateTime.now.to_s,
 					},
-					'days' => {}
+					'days' => Hash.new,
 				}
+				@entries_index << entry.id
 				# puts 'dbfile_basename: ' + dbfile_basename
 				# puts 'dbfile_path:     ' + dbfile_path
 				# puts 'tmpfile_path:    ' + tmpfile_path
@@ -90,10 +96,10 @@ module TheFox
 					end
 					if file['days'].is_a?(Array)
-						file['days'] = {}
+						file['days'] = Hash.new
 					end
 					if !file['days'].has_key?(date_s)
-						file['days'][date_s] = []
+						file['days'][date_s] = Array.new
 					end
 					file['days'][date_s].push(entry.to_h)
@@ -108,10 +114,10 @@ module TheFox
 					end
 					if file['days'].is_a?(Array)
-						file['days'] = {}
+						file['days'] = Hash.new
 					end
 					if !file['days'].has_key?(date_s)
-						file['days'][date_s] = []
+						file['days'][date_s] = Array.new
 					end
 					file['days'][date_s].push(entry.to_h)
@@ -122,13 +128,15 @@ module TheFox
 						store['days'] = file['days']
 					end
+					save_entries_index_file
 					if File.exist?(tmpfile_path)
 						File.rename(tmpfile_path, dbfile_path)
 					end
 				end
 				if @entries_by_ids.nil?
-					@entries_by_ids = {}
+					@entries_by_ids = Hash.new
 				end
 				@entries_by_ids[entry.id] = entry
@@ -137,7 +145,7 @@ module TheFox
 			def transaction_start
 				@has_transaction = true
-				@transaction_files = {}
+				@transaction_files = Hash.new
 				create_dirs
 			end
@@ -148,6 +156,7 @@ module TheFox
 						if @exit
 							throw :done
 						end
 						# puts 'keys left: ' + @transaction_files.keys.count.to_s
 						# puts 'tr_file_key: ' + tr_file_key
 						# puts 'path:        ' + tr_file_data['path']
@@ -167,8 +176,10 @@ module TheFox
 					end
 				end
+				save_entries_index_file
 				@has_transaction = false
-				@transaction_files = {}
+				@transaction_files = Hash.new
 			end
 			def sum(year = nil, month = nil, day = nil, category = nil)
@@ -180,20 +191,20 @@ module TheFox
 				expense = 0.0
 				balance = 0.0
-				glob = @data_path + '/month_'
+				glob = File.expand_path('month_', @data_path)
 				if year == nil && month == nil
-					glob += '*.yml'
+					glob << '*.yml'
 				elsif year && month == nil
-					glob += year_s + '_*.yml'
+					glob << "#{year_s}_*.yml"
 				elsif year && month
-					glob += year_s + '_' + month_f + '.yml'
+					glob << "#{year_s}_#{month_f}.yml"
 				end
 				Dir[glob].each do |file_path|
 					data = YAML.load_file(file_path)
 					if day
-						day_key = year_s + '-' + month_f + '-' + day_f
+						day_key = "#{year_s}-#{month_f}-#{day_f}"
 						if data['days'].has_key?(day_key)
 							day_sum = calc_day(data['days'][day_key], category)
 							revenue += day_sum[:revenue]
@@ -216,7 +227,7 @@ module TheFox
 				diff = revenue + expense - balance
 				if diff != 0
-					raise RuntimeError, 'diff between revenue and expense to balance is ' + diff.to_s
+					raise RuntimeError, "diff between revenue and expense to balance is #{diff}"
 				end
 				{
@@ -237,13 +248,13 @@ module TheFox
 				begin_month_f = '%02d' % begin_month.to_i
 				begin_day_f = '%02d' % begin_day.to_i
-				glob = "#{@data_path}/month_"
+				glob = File.expand_path('month_', @data_path)
 				if begin_year == nil && begin_month == nil
-					glob += '*.yml'
+					glob << '*.yml'
 				elsif begin_year && begin_month == nil
-					glob += "#{begin_year_s}_*.yml"
+					glob << "#{begin_year_s}_*.yml"
 				elsif begin_year && begin_month
-					glob += "#{begin_year_s}_#{begin_month_f}.yml"
+					glob << "#{begin_year_s}_#{begin_month_f}.yml"
 				end
 				category = category.to_s.downcase
@@ -255,14 +266,14 @@ module TheFox
 				# puts 'category:       ' + '%-10s' % category.class.to_s + '   = "' + category.to_s + '"'
 				# puts
-				entries_a = {}
+				entries_a = Hash.new
 				Dir[glob].each do |file_path|
 					#puts "path: #{file_path}"
 					data = YAML.load_file(file_path)
 					if category.length == 0
 						if begin_day
-							day_key = begin_year_s + '-' + begin_month_f + '-' + begin_day_f
+							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
@@ -271,7 +282,7 @@ module TheFox
 						end
 					else
 						if begin_day
-							day_key = begin_year_s + '-' + begin_month_f + '-' + begin_day_f
+							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
@@ -294,8 +305,8 @@ module TheFox
 			end
 			def categories
-				categories_h = {}
-				Dir[@data_path + '/month_*.yml'].each do |file_path|
+				categories_h = Hash.new
+				Dir[File.expand_path('month_*.yml', @data_path)].each do |file_path|
 					data = YAML.load_file(file_path)
 					data['days'].each do |day_name, day_items|
@@ -320,14 +331,14 @@ module TheFox
 			def gen_html
 				create_dirs
-				html_options_path = "#{@html_path}/options.yml"
+				html_options_path = File.expand_path('options.yml', @html_path)
 				html_options = {
 					'meta' => {
 						'version' => 1,
 						'created_at' => DateTime.now.to_s,
 						'updated_at' => DateTime.now.to_s,
 					},
-					'changes' => {},
+					'changes' => Hash.new,
 				}
 				if Dir.exist?(@html_path)
 					if File.exist?(html_options_path)
@@ -338,16 +349,16 @@ module TheFox
 					Dir.mkdir(@html_path)
 				end
-				categories_available = categories()
+				categories_available = categories
-				categories_total_balance = {}
+				categories_total_balance = Hash.new
 				categories_available.map{ |item| categories_total_balance[item] = 0.0 }
-				gitignore_file = File.open(@html_path + '/.gitignore', 'w')
+				gitignore_file = File.open(File.expand_path('.gitignore', @html_path), 'w')
 				gitignore_file.write('*')
 				gitignore_file.close
-				css_file_path = @html_path + '/style.css'
+				css_file_path = File.expand_path('style.css', @html_path)
 				css_file = File.open(css_file_path, 'w')
 				css_file.write('
 					html {
@@ -372,75 +383,75 @@ module TheFox
 				')
 				css_file.close
-				index_file_path = @html_path + '/index.html'
+				index_file_path = File.expand_path('index.html', @html_path)
 				index_file = File.open(index_file_path, 'w')
 				index_file.write('
 					<html>
 						<head>
 							<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-							<title>' + @dir_path + '</title>
+							<title>' << @dir_path << '</title>
 							<link rel="stylesheet" href="style.css" type="text/css" />
 						</head>
 						<body>
-							<h1>' + @dir_path + '</h1>
-							<p>Generated @ ' + DateTime.now.strftime('%Y-%m-%d %H:%M:%S') + ' by  <a href="' + ::TheFox::Wallet::HOMEPAGE + '">' + ::TheFox::Wallet::NAME + '</a> ' + ::TheFox::Wallet::VERSION + '</p>
+							<h1>' << @dir_path << '</h1>
+							<p>Generated @ ' << DateTime.now.strftime('%Y-%m-%d %H:%M:%S') << ' by  <a href="' << ::TheFox::Wallet::HOMEPAGE << '">' << ::TheFox::Wallet::NAME << '</a> ' << ::TheFox::Wallet::VERSION << '</p>
 				')
-				years_total = {}
+				years_total = Hash.new
 				years.each do |year|
 					year_s = year.to_s
-					year_file_name = 'year_' + year_s + '.html'
-					year_file_path = @html_path + '/' + year_file_name
+					year_file_name = "year_#{year}.html"
+					year_file_path = File.expand_path(year_file_name, @html_path)
 					year_file = File.open(year_file_path, 'w')
 					year_file.write('
 						<html>
 							<head>
 								<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-								<title>' + year_s + ' - ' + @dir_path + '</title>
+								<title>' << year_s << ' - ' << @dir_path << '</title>
 								<link rel="stylesheet" href="style.css" type="text/css" />
 							</head>
 							<body>
-								<h1><a href="index.html">' + @dir_path + '</a></h1>
-								<p>Generated @ ' + DateTime.now.strftime('%Y-%m-%d %H:%M:%S') + ' by  <a href="' + ::TheFox::Wallet::HOMEPAGE + '">' + ::TheFox::Wallet::NAME + '</a> ' + ::TheFox::Wallet::VERSION + '</p>
+								<h1><a href="index.html">' << @dir_path << '</a></h1>
+								<p>Generated @ ' << DateTime.now.strftime('%Y-%m-%d %H:%M:%S') << ' by  <a href="' << ::TheFox::Wallet::HOMEPAGE << '">' << ::TheFox::Wallet::NAME << '</a> ' << ::TheFox::Wallet::VERSION << '</p>
-								<h2>Year: ' + year_s + '</h2>
+								<h2>Year: ' << year_s << '</h2>
 								<table class="list">
 									<tr>
 										<th class="left">Month</th>
 										<th class="right">Revenue</th>
 										<th class="right">Expense</th>
 										<th class="right">Balance</th>
-										<th colspan="' + categories_available.count.to_s + '">' + categories_available.count.to_s + ' Categories</th>
+										<th colspan="' << categories_available.count.to_s << '">' << categories_available.count.to_s << ' Categories</th>
 									</tr>
 									<tr>
 										<th colspan="4">&nbsp;</th>
 					')
 					categories_available.each do |category|
-						year_file.write('<th class="right">' + category + '</th>')
+						year_file.write('<th class="right">' << category << '</th>')
 					end
 					year_file.write('</tr>')
 					revenue_year = 0.0
 					expense_year = 0.0
 					balance_year = 0.0
-					categories_year_balance = {}
+					categories_year_balance = Hash.new
 					categories_available.map{ |item| categories_year_balance[item] = 0.0 }
-					year_total = {}
+					year_total = Hash.new
-					puts 'generate year ' + year_s
-					Dir[@data_path + '/month_' + year_s + '_*.yml'].each do |file_path|
+					puts "generate year #{year}"
+					Dir[File.expand_path("month_#{year}_*.yml", @data_path)].each do |file_path|
 						file_name = File.basename(file_path)
 						month_n = file_name[11, 2]
-						month_file_name = 'month_' + year_s + '_' + month_n + '.html'
-						month_file_path = @html_path + '/' + month_file_name
+						month_file_name = "month_#{year}_#{month_n}.html"
+						month_file_path = File.expand_path(month_file_name, @html_path)
-						month_s = Date.parse('2015-' + month_n + '-15').strftime('%B')
+						month_s = Date.parse("2015-#{month_n}-15").strftime('%B')
 						revenue_month = 0.0
 						expense_month = 0.0
 						balance_month = 0.0
-						categories_month_balance = {}
+						categories_month_balance = Hash.new
 						categories_available.map{ |item| categories_month_balance[item] = 0.0 }
 						entry_n = 0
@@ -463,21 +474,21 @@ module TheFox
 						end
 						if generate_html
-							puts "\t" + 'file: ' + month_file_name + ' (from ' + file_name + ')'
+							puts "\tfile: #{month_file_name} (from #{file_name})"
 							month_file = File.open(month_file_path, 'w')
 							month_file.write('
 								<html>
 									<head>
 										<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-										<title>' + month_s + ' ' + year_s + ' - ' + @dir_path + '</title>
+										<title>' << month_s << ' ' << year_s << ' - ' << @dir_path << '</title>
 										<link rel="stylesheet" href="style.css" type="text/css" />
 									</head>
 									<body>
-										<h1><a href="index.html">' + @dir_path + '</a></h1>
-										<p>Generated @ ' + DateTime.now.strftime('%Y-%m-%d %H:%M:%S') + ' by  <a href="' + ::TheFox::Wallet::HOMEPAGE + '">' + ::TheFox::Wallet::NAME + '</a> ' + ::TheFox::Wallet::VERSION + ' from <code>' + file_name + '</code></p>
+										<h1><a href="index.html">' << @dir_path << '</a></h1>
+										<p>Generated @ ' << DateTime.now.strftime('%Y-%m-%d %H:%M:%S') << ' by  <a href="' << ::TheFox::Wallet::HOMEPAGE << '">' << ::TheFox::Wallet::NAME << '</a> ' << ::TheFox::Wallet::VERSION << ' from <code>' << file_name << '</code></p>
-										<h2>Month: ' + month_s + ' <a href="' + year_file_name + '">' + year_s + '</a></h2>
+										<h2>Month: ' << month_s << ' <a href="' << year_file_name << '">' << year_s << '</a></h2>
 										<table class="list">
 											<tr>
 												<th class="left">#</th>
@@ -493,7 +504,6 @@ module TheFox
 						end
 						data['days'].sort.each do |day_name, day_items|
-							#puts "\t\t" + 'day: ' + day_name
 							day_items.each do |entry|
 								entry_n += 1
 								revenue_month += entry['revenue']
@@ -511,14 +521,14 @@ module TheFox
 								if generate_html
 									month_file.write('
 										<tr>
-											<td valign="top" class="left">' + entry_n.to_s + '</td>
-											<td valign="top" class="left">' + Date.parse(entry['date']).strftime('%d.%m.%y') + '</td>
-											<td valign="top" class="left">' + entry['title'][0, 50] + '</td>
-											<td valign="top" class="right">' + revenue_out + '</td>
-											<td valign="top" class="right red">' + expense_out + '</td>
-											<td valign="top" class="right ' + (entry['balance'] < 0 ? 'red' : '') + '">' + ::TheFox::Wallet::NUMBER_FORMAT % entry['balance'] + '</td>
-											<td valign="top" class="right">' + category_out + '</td>
-											<td valign="top" class="left">' + comment_out + '</td>
+											<td valign="top" class="left">' << entry_n.to_s << '</td>
+											<td valign="top" class="left">' << Date.parse(entry['date']).strftime('%d.%m.%y') << '</td>
+											<td valign="top" class="left">' << entry['title'][0, 50] << '</td>
+											<td valign="top" class="right">' << revenue_out << '</td>
+											<td valign="top" class="right red">' << expense_out << '</td>
+											<td valign="top" class="right ' << (entry['balance'] < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % entry['balance'] << '</td>
+											<td valign="top" class="right">' << category_out << '</td>
+											<td valign="top" class="left">' << comment_out << '</td>
 										</tr>
 									')
 								end
@@ -551,9 +561,9 @@ module TheFox
 										<th>&nbsp;</th>
 										<th>&nbsp;</th>
 										<th class="left"><b>TOTAL</b></th>
-										<th class="right">' + ::TheFox::Wallet::NUMBER_FORMAT % revenue_month + '</th>
-										<th class="right red">' + ::TheFox::Wallet::NUMBER_FORMAT % expense_month + '</th>
-										<th class="right ' + balance_class + '">' + ::TheFox::Wallet::NUMBER_FORMAT % balance_month + '</th>
+										<th class="right">' << ::TheFox::Wallet::NUMBER_FORMAT % revenue_month << '</th>
+										<th class="right red">' << ::TheFox::Wallet::NUMBER_FORMAT % expense_month << '</th>
+										<th class="right ' << balance_class << '">' << ::TheFox::Wallet::NUMBER_FORMAT % balance_month << '</th>
 										<th>&nbsp;</th>
 										<th>&nbsp;</th>
 									</tr>
@@ -564,13 +574,13 @@ module TheFox
 						year_file.write('
 							<tr>
-								<td class="left"><a href="' + month_file_name + '">' + month_s + '</a></td>
-								<td class="right">' + ::TheFox::Wallet::NUMBER_FORMAT % revenue_month + '</td>
-								<td class="right red">' + ::TheFox::Wallet::NUMBER_FORMAT % expense_month + '</td>
-								<td class="right ' + balance_class + '">' + ::TheFox::Wallet::NUMBER_FORMAT % balance_month + '</td>')
+								<td class="left"><a href="' << month_file_name << '">' << month_s << '</a></td>
+								<td class="right">' << ::TheFox::Wallet::NUMBER_FORMAT % revenue_month << '</td>
+								<td class="right red">' << ::TheFox::Wallet::NUMBER_FORMAT % expense_month << '</td>
+								<td class="right ' << balance_class << '">' << ::TheFox::Wallet::NUMBER_FORMAT % balance_month << '</td>')
 						categories_available.each do |category|
 							category_balance = categories_month_balance[category]
-							year_file.write('<td class="right ' + (category_balance < 0 ? 'red' : '') + '">' + ::TheFox::Wallet::NUMBER_FORMAT % category_balance + '</td>')
+							year_file.write('<td class="right ' << (category_balance < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % category_balance << '</td>')
 						end
 						year_file.write('</tr>')
 					end
@@ -580,12 +590,12 @@ module TheFox
 					year_file.write('
 							<tr>
 								<th class="left"><b>TOTAL</b></th>
-								<th class="right">' + ::TheFox::Wallet::NUMBER_FORMAT % revenue_year + '</th>
-								<th class="right red">' + ::TheFox::Wallet::NUMBER_FORMAT % expense_year + '</th>
-								<th class="right ' + (balance_year < 0 ? 'red' : '') + '">' + ::TheFox::Wallet::NUMBER_FORMAT % balance_year + '</th>')
+								<th class="right">' << ::TheFox::Wallet::NUMBER_FORMAT % revenue_year << '</th>
+								<th class="right red">' << ::TheFox::Wallet::NUMBER_FORMAT % expense_year << '</th>
+								<th class="right ' << (balance_year < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % balance_year << '</th>')
 					categories_available.each do |category|
 						category_balance = categories_year_balance[category]
-						year_file.write('<td class="right ' + (category_balance < 0 ? 'red' : '') + '">' + ::TheFox::Wallet::NUMBER_FORMAT % category_balance + '</td>')
+						year_file.write('<td class="right ' << (category_balance < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % category_balance << '</td>')
 					end
 					year_file.write('
@@ -593,11 +603,11 @@ module TheFox
 						</table>
 					')
-					year_file.write("<p><img src=\"year_#{year_s}.png\"></p>")
+					year_file.write(%{<p><img src="year_#{year_s}.png"></p>})
 					year_file.write('</body></html>')
 					year_file.close
-					yeardat_file_path = "#{@tmp_path}/year_#{year_s}.dat"
+					yeardat_file_path = File.expand_path("year_#{year_s}.dat", @tmp_path)
 					yeardat_file = File.new(yeardat_file_path, 'w')
 					yeardat_file.write(year_total
 						.map{ |k, m| "#{year_s}-#{m.month_s} #{m.revenue} #{m.expense} #{m.balance} #{m.balance_total} #{m.balance_total}" }
@@ -632,7 +642,7 @@ module TheFox
 					# puts "#{year_max} #{year_max.to_s.length} #{year_max_r} #{year_max_rl}"
 					# puts "#{year_min} #{year_min.to_s.length} #{year_min_r} #{year_min_rl}"
-					gnuplot_file = File.new("#{@tmp_path}/year_#{year_s}.gp", 'w')
+					gnuplot_file = File.new(File.expand_path("year_#{year_s}.gp", @tmp_path), 'w')
 					gnuplot_file.puts("set title 'Year #{year_s}'")
 					gnuplot_file.puts("set xlabel 'Months'")
 					gnuplot_file.puts("set ylabel 'Euro'")
@@ -655,14 +665,14 @@ module TheFox
 					gnuplot_file.puts("set style line 4 linecolor rgb '#0000ff' linewidth 2 linetype 1 pointtype 2")
 					gnuplot_file.puts("set style data linespoints")
 					gnuplot_file.puts("set terminal png enhanced")
-					gnuplot_file.puts("set output '#{@html_path}/year_#{year_s}.png'")
+					gnuplot_file.puts("set output '" << File.expand_path("year_#{year_s}.png", @html_path) << "'")
 					gnuplot_file.puts("plot sum = 0, \\")
 					gnuplot_file.puts("\t'#{yeardat_file_path}' using 1:2 linestyle 1 title 'Revenue', \\")
 					gnuplot_file.puts("\t'' using 1:3 linestyle 2 title 'Expense', \\")
 					gnuplot_file.puts("\t'' using 1:4 linestyle 3 title 'Balance', \\")
 					gnuplot_file.puts("\t'' using 1:5 linestyle 4 title '∑ Balance'")
 					gnuplot_file.close
-					system("gnuplot #{@tmp_path}/year_#{year_s}.gp")
+					system("gnuplot " << File.expand_path("year_#{year_s}.gp", @tmp_path))
 					years_total[year_s] = ::OpenStruct.new({
 						year: year_s,
@@ -686,11 +696,11 @@ module TheFox
 				years_total.each do |year_name, year_data|
 					index_file.write('
 						<tr>
-							<td class="left"><a href="year_' + year_name + '.html">' + year_name + '</a></td>
-							<td class="right">' + ::TheFox::Wallet::NUMBER_FORMAT % year_data.revenue + '</td>
-							<td class="right red">' + ::TheFox::Wallet::NUMBER_FORMAT % year_data.expense + '</td>
-							<td class="right ' + (year_data.balance < 0 ? 'red' : '') + '">' + ::TheFox::Wallet::NUMBER_FORMAT % year_data.balance + '</td>
-							<td class="right ' + (year_data.balance_total < 0 ? 'red' : '') + '">' + ::TheFox::Wallet::NUMBER_FORMAT % year_data.balance_total + '</td>
+							<td class="left"><a href="year_' << year_name << '.html">' << year_name << '</a></td>
+							<td class="right">' << ::TheFox::Wallet::NUMBER_FORMAT % year_data.revenue << '</td>
+							<td class="right red">' << ::TheFox::Wallet::NUMBER_FORMAT % year_data.expense << '</td>
+							<td class="right ' << (year_data.balance < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % year_data.balance << '</td>
+							<td class="right ' << (year_data.balance_total < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % year_data.balance_total << '</td>
 						</tr>')
 				end
@@ -699,9 +709,9 @@ module TheFox
 				index_file.write('
 						<tr>
 							<th class="left"><b>TOTAL</b></th>
-							<th class="right">' + ::TheFox::Wallet::NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].revenue } + '</th>
-							<th class="right red">' + ::TheFox::Wallet::NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].expense } + '</th>
-							<th class="right ' + (balance_total < 0 ? 'red' : '') + '">' + ::TheFox::Wallet::NUMBER_FORMAT % balance_total + '</th>
+							<th class="right">' << ::TheFox::Wallet::NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].revenue } << '</th>
+							<th class="right red">' << ::TheFox::Wallet::NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].expense } << '</th>
+							<th class="right ' << (balance_total < 0 ? 'red' : '') << '">' << ::TheFox::Wallet::NUMBER_FORMAT % balance_total << '</th>
 							<th>&nbsp;</th>
 						</tr>
 					</table>
@@ -726,12 +736,12 @@ module TheFox
 				end
 				totaldat_file_c = totaldat_file_c.join("\n")
-				totaldat_file_path = "#{@tmp_path}/total.dat"
+				totaldat_file_path = File.expand_path('total.dat', @tmp_path)
 				totaldat_file = File.new(totaldat_file_path, 'w')
 				totaldat_file.write(totaldat_file_c)
 				totaldat_file.close
-				gnuplot_file = File.new("#{@tmp_path}/total.gp", 'w')
+				gnuplot_file = File.new(File.expand_path('total.gp', @tmp_path), 'w')
 				gnuplot_file.puts("set title 'Total'")
 				gnuplot_file.puts("set xlabel 'Years'")
 				gnuplot_file.puts("set ylabel 'Euro'")
@@ -746,14 +756,15 @@ module TheFox
 				gnuplot_file.puts("set style line 4 linecolor rgb '#0000ff' linewidth 2 linetype 1 pointtype 2")
 				gnuplot_file.puts("set style data linespoints")
 				gnuplot_file.puts("set terminal png enhanced")
-				gnuplot_file.puts("set output '#{@html_path}/total.png'")
+				gnuplot_file.puts("set output '" << File.expand_path('total.png', @html_path) << "'")
 				gnuplot_file.puts("plot sum = 0, \\")
 				gnuplot_file.puts("\t'#{totaldat_file_path}' using 1:2 linestyle 1 title 'Revenue', \\")
 				gnuplot_file.puts("\t'' using 1:3 linestyle 2 title 'Expense', \\")
 				gnuplot_file.puts("\t'' using 1:4 linestyle 3 title 'Balance', \\")
 				gnuplot_file.puts("\t'' using 1:5 linestyle 4 title '∑ Balance'")
 				gnuplot_file.close
-				system("gnuplot #{@tmp_path}/total.gp")
+				system("gnuplot " << File.expand_path('total.gp', @tmp_path))
 			end
 			def import_csv_file(file_path)
@@ -805,7 +816,7 @@ module TheFox
 					# :encoding => 'ISO-8859-1',
 				}
 				CSV.open(file_path, 'wb', csv_options) do |csv|
-					Dir[@data_path + '/month_*.yml'].each do |yaml_file_path|
+					Dir[File.expand_path('month_*.yml', @data_path)].each do |yaml_file_path|
 						puts 'export ' + File.basename(yaml_file_path)
 						data = YAML.load_file(yaml_file_path)
@@ -830,10 +841,13 @@ module TheFox
 			def entry_exist?(entry)
 				if !entry.is_a?(Entry)
-					raise ArgumentError, 'variable must be a Entry instance'
+					raise ArgumentError, 'variable must be an Entry instance'
 				end
-				!find_entry_by_id(entry.id).nil?
+				if @entries_index.count == 0
+					load_entries_index_file
+				end
+				@entries_index.include?(entry.id)
 			end
 			def build_entry_by_id_index(force = false)
@@ -878,12 +892,20 @@ module TheFox
 					Dir.mkdir(@tmp_path)
 				end
-				tmp_gitignore_path = @tmp_path + '/.gitignore'
+				tmp_gitignore_path = File.expand_path('.gitignore', @tmp_path)
 				if !File.exist?(tmp_gitignore_path)
 					gitignore_file = File.open(tmp_gitignore_path, 'w')
 					gitignore_file.write('*')
 					gitignore_file.close
 				end
+				if File.exist?(@entries_index_file_path)
+					load_entries_index_file
+				else
+					build_entry_by_id_index(true)
+					@entries_index = @entries_by_ids.keys
+					save_entries_index_file
+				end
 			end
 			def calc_day(day, category = nil)
@@ -916,7 +938,24 @@ module TheFox
 			end
 			def years
-				Dir[@data_path + '/month_*.yml'].map{ |file_path| File.basename(file_path)[6, 4].to_i }.uniq
+				Dir[File.expand_path('month_*.yml', @data_path)].map{ |file_path| File.basename(file_path)[6, 4].to_i }.uniq
+			end
+			def load_entries_index_file
+				unless @entries_index_is_loaded
+					@entries_index_is_loaded = true
+					if File.exist?(@entries_index_file_path)
+						data = YAML.load_file(@entries_index_file_path)
+						@entries_index = data['index']
+					end
+				end
+			end
+			def save_entries_index_file
+				store = YAML::Store.new(@entries_index_file_path)
+				store.transaction do
+					store['index'] = @entries_index
+				end
 			end
 		end

data/thefox-wallet.gemspec CHANGED Viewed

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency 'minitest', '~>5.7'
 	spec.add_development_dependency 'simplecov', '~>0.12'
-	spec.add_development_dependency 'simplecov-phpunit', '~>0.2'
+	spec.add_development_dependency 'simplecov-phpunit', '~>0.4'
-	spec.add_dependency 'uuid', '~>2.3'
+	spec.add_runtime_dependency 'uuid', '~>2.3'
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-wallet
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,7 @@ files:
 - ".ackrc"
 - ".editorconfig"
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".travis.yml"
 - Gemfile
 - Makefile
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key:
 specification_version: 4
 summary: Finances Tracking