thefox-wallet 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cbb979259e323ea7267d725982ce79a4031b915
-  data.tar.gz: 97e01ebf34e7fe376b1898fc4154527f64e41f71
+  metadata.gz: 371beb2557b5d4b13a93fa29ec2a4314d3988253
+  data.tar.gz: 557b1b3fd12d91150875cae58ca6a7226f2aaa1a
 SHA512:
-  metadata.gz: dbb7973fbd8bbe143409c33d2c329480e04d4acb20bfbedd31ce3fce400e3c9856174c9b715bccc2dc4595971d1253dbf95a2d62701f4deb037ce61e50948e8e
-  data.tar.gz: 9be10133bac53c6b17ad37905345517c408f9b1d0b1b1a68b957820ce0c436dc94b83075211f53d9563a5881fd6c6c337911d06866132311a108e965564fc0bf
+  metadata.gz: 626f9cc9eb31732942d00247bed4059b0652923a11b842e46b54803817c6abd7a3ca489ad0acc441d44f6d158910e0553c0afc2d9654ea51920287e29063f378
+  data.tar.gz: 7fe39b9adf2b48a9d95d1cc89e1e4b3f2c7152ff3159442c3191b36b2962bc4cae53f12787540df836ea26b005efd20fff1d0d2db45364dff18dccd8d4c3ad0d

data/bin/wallet

@@ -17,10 +17,11 @@ opts = OptionParser.new do |o|
 	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('    clear        Clear temp and cache files')
 	o.separator('    csv          Import/Export CSV file')
+	o.separator('    html         Generate HTML files')
+	o.separator('    list         List entries')
 	o.separator('    vi           Import per VIM editor')
 	o.separator('')
 	
@@ -72,7 +73,7 @@ opts = OptionParser.new do |o|
 		@options[:is_export] = true
 	end
 	
-	o.on('-p', '--path <path>', 'Path used for csv import/export.') do |path|
+	o.on('-p', '--path <path>', 'Path used for csv import/export and html directory path.') do |path|
 		@options[:path] = path
 	end
 	

data/lib/wallet/command.rb

@@ -35,10 +35,11 @@ module TheFox::Wallet
 		def self.create_by_name(name, options = nil)
 			classes = [
 				AddCommand,
-				ListCommand,
 				CategoriesCommand,
-				HtmlCommand,
+				ClearCommand,
 				CsvCommand,
+				HtmlCommand,
+				ListCommand,
 			]
 			
 			classes.each do |cclass|

data/lib/wallet/command_add.rb

@@ -16,7 +16,12 @@ module TheFox::Wallet
 				print "title: [#{@options[:entry_title]}] "
 				title_t = STDIN.gets.strip
 				if title_t.length > 0
-					@options[:entry_title] = title_t
+					if @options[:entry_title] =~ /%d/
+						@options[:entry_title] = @options[:entry_title] % title_t.split(',').map{ |s| s.strip }
+					else
+						@options[:entry_title] = title_t
+					end
+					puts "title: #{@options[:entry_title]}"
 				end
 				
 				print "date: [#{@options[:entry_date]}] "

data/lib/wallet/command_clear.rb

@@ -0,0 +1,17 @@
+
+require 'pathname'
+
+module TheFox::Wallet
+	
+	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_html.rb

@@ -1,4 +1,6 @@
 
+require 'pathname'
+
 module TheFox::Wallet
 	
 	class HtmlCommand < Command
@@ -6,17 +8,13 @@ module TheFox::Wallet
 		NAME = 'html'
 		
 		def run
-			wallet = Wallet.new(@options[:wallet_path])
-			wallet.logger = @options[:logger]
-			
-			html_path = Pathname.new('html').expand_path(wallet.dir_path)
 			if @options[:path]
 				html_path = Pathname.new(@options[:path]).expand_path
 			end
 			
-			@options[:logger].info("generate html to #{html_path} ...") if @options[:logger]
-			wallet.gen_html(html_path, @options[:entry_date_start], @options[:entry_date_end], @options[:entry_category])
-			@options[:logger].info('generate html done') if @options[:logger]
+			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

data/lib/wallet/version.rb

@@ -2,8 +2,8 @@
 module TheFox
 	module Wallet
 		NAME = 'Wallet'
-		VERSION = '0.15.0'
-		DATE = '2016-11-13'
+		VERSION = '0.16.0'
+		DATE = '2017-02-19'
 		HOMEPAGE = 'https://github.com/TheFox/wallet'
 		
 		NUMBER_FORMAT = '%.2f'

data/lib/wallet/wallet.rb

@@ -6,6 +6,7 @@ require 'yaml'
 require 'yaml/store'
 require 'csv'
 require 'pathname'
+require 'fileutils'
 require 'ostruct' # OpenStruct use to generate HTML.
 # require 'pp'
 
@@ -25,6 +26,7 @@ module TheFox
 				@dir_path_basename_s = @dir_path_basename.to_s
 				@data_path = Pathname.new('data').expand_path(@dir_path)
 				@tmp_path = Pathname.new('tmp').expand_path(@dir_path)
+				@html_path = Pathname.new('html').expand_path(@dir_path)
 				
 				@has_transaction = false
 				@transaction_files = Hash.new
@@ -35,7 +37,7 @@ module TheFox
 				@entries_index_is_loaded = false
 				
 				Signal.trap('SIGINT') do
-					@logger.warning('received SIGINT. break ...') if @logger
+					#@logger.warn('received SIGINT. break ...') if @logger
 					@exit = true
 				end
 			end
@@ -302,7 +304,15 @@ module TheFox
 				categories_a
 			end
 			
-			def gen_html(html_path, date_start = nil, date_end = nil, category = nil)
+			##
+			# Generate HTML files from date_start to date_end.
+			def generate_html(html_path = nil, date_start = nil, date_end = nil, category = nil)
+				# @FIXME use @exit on all loops in this function
+				
+				html_path ||= @html_path
+				
+				@logger.info("generate html to #{html_path} ...") if @logger
+				
 				create_dirs
 				
 				unless html_path.exist?
@@ -336,6 +346,7 @@ module TheFox
 				categories_total_balance = Hash.new
 				categories_available.map{ |item| categories_total_balance[item] = 0.0 }
 				
+				# Ignore the html directory.
 				gitignore_file_path = Pathname.new('.gitignore').expand_path(html_path)
 				gitignore_file = File.open(gitignore_file_path, 'w')
 				gitignore_file.write('*')
@@ -366,21 +377,10 @@ module TheFox
 				')
 				css_file.close
 				
-				index_file_path = Pathname.new('index.html').expand_path(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_basename_s << '</title>
-							<link rel="stylesheet" href="style.css" type="text/css" />
-						</head>
-						<body>
-							<h1>' << @dir_path_basename_s << '</h1>
-							<p>Generated @ ' << DateTime.now.strftime('%F %T') << ' by <a href="' << HOMEPAGE << '">' << NAME << '</a> v' << VERSION << '</p>
-				')
-				
+				# Use this for index.html.
 				years_total = Hash.new
+				
+				# Iterate over all years.
 				years(date_start, date_end).each do |year|
 					year_s = year.to_s
 					year_file_name_s = "year_#{year}.html"
@@ -458,23 +458,24 @@ module TheFox
 						entry_n = 0
 						data = YAML.load_file(file_path)
 						
-						generate_html = false
+						# Determine if the html file should be updated.
+						write_html = false
 						if html_options['changes'][file_name_s]
 							if html_options['changes'][file_name_s]['updated_at'] != data['meta']['updated_at']
 								html_options['changes'][file_name_s]['updated_at'] = data['meta']['updated_at']
-								generate_html = true
+								write_html = true
 							end
 						else
 							html_options['changes'][file_name_s] = {
 								'updated_at' => data['meta']['updated_at'],
 							}
-							generate_html = true
+							write_html = true
 						end
 						unless month_file_path.exist?
-							generate_html = true
+							write_html = true
 						end
 						
-						if generate_html
+						if write_html
 							@logger.debug("file: #{month_file_name_s} (from #{file_name_s})") if @logger
 							
 							month_file = File.open(month_file_path, 'w')
@@ -509,13 +510,7 @@ module TheFox
 								entry_date = Date.parse(entry['date'])
 								entry_date_s = entry_date.strftime('%d.%m.%y')
 								
-								date_start_oor = date_start > entry_date
-								date_end_oor = date_end < entry_date
-								
-								if category && !categories_available.include?(entry['category']) ||
-									date_start > entry_date ||
-									date_end < entry_date
-									
+								if category && !categories_available.include?(entry['category'])
 									next
 								end
 								
@@ -532,7 +527,7 @@ module TheFox
 								category_out = entry['category'] == 'default' ? '&nbsp;' : entry['category']
 								comment_out = entry['comment'] == '' ? '&nbsp;' : entry['comment']
 								
-								if generate_html
+								if write_html
 									month_file.write('
 										<tr>
 											<td valign="top" class="left">' << entry_n.to_s << '</td>
@@ -569,7 +564,7 @@ module TheFox
 						if balance_month < 0
 							balance_class = 'red'
 						end
-						if generate_html
+						if write_html
 							month_file.write('
 									<tr>
 										<th>&nbsp;</th>
@@ -671,6 +666,21 @@ module TheFox
 				
 				years_total.sort.inject(0.0){ |sum, item| item[1].balance_total = (sum + item[1].balance).round(NUMBER_ROUND) }
 				
+				index_file_path = Pathname.new('index.html').expand_path(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_basename_s << '</title>
+							<link rel="stylesheet" href="style.css" type="text/css" />
+						</head>
+						<body>
+							<h1>' << @dir_path_basename_s << '</h1>
+							<p>Generated @ ' << DateTime.now.strftime('%F %T') << ' by <a href="' << HOMEPAGE << '">' << NAME << '</a> v' << VERSION << '</p>
+				')
+				
+				# Write total to index.html file.
 				index_file.write('
 						<table class="list">
 							<tr>
@@ -680,6 +690,8 @@ module TheFox
 								<th class="right">Balance</th>
 								<th class="right">Balance &#8721;</th>
 							</tr>')
+				
+				# Write years total to index.html file.
 				years_total.each do |year_name, year_data|
 					index_file.write('
 						<tr>
@@ -694,18 +706,16 @@ module TheFox
 				balance_total = years_total.inject(0.0){ |sum, item| sum + item[1].balance }
 				
 				index_file.write('
-						<tr>
-							<th class="left"><b>TOTAL</b></th>
-							<th class="right">' << NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].revenue } << '</th>
-							<th class="right red">' << NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].expense } << '</th>
-							<th class="right ' << (balance_total < 0 ? 'red' : '') << '">' << NUMBER_FORMAT % balance_total << '</th>
-							<th>&nbsp;</th>
-						</tr>
-					</table>
-					
-					<p><img src="total.png"></p>
-				')
-				index_file.write('
+								<tr>
+									<th class="left"><b>TOTAL</b></th>
+									<th class="right">' << NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].revenue } << '</th>
+									<th class="right red">' << NUMBER_FORMAT % years_total.inject(0.0){ |sum, item| sum + item[1].expense } << '</th>
+									<th class="right ' << (balance_total < 0 ? 'red' : '') << '">' << NUMBER_FORMAT % balance_total << '</th>
+									<th>&nbsp;</th>
+								</tr>
+							</table>
+					
+							<p><img src="total.png"></p>
 						</body>
 					</html>
 				')
@@ -723,11 +733,13 @@ module TheFox
 				end
 				totaldat_file_c = totaldat_file_c.join("\n")
 				
+				# DAT file for GNUPlot.
 				totaldat_file_path = Pathname.new('total.dat').expand_path(@tmp_path)
 				totaldat_file = File.new(totaldat_file_path, 'w')
 				totaldat_file.write(totaldat_file_c)
 				totaldat_file.close
 				
+				# Generate image with GNUPlot.
 				png_file_path = Pathname.new('total.png').expand_path(html_path)
 				
 				gnuplot_file_path = Pathname.new('total.gp').expand_path(@tmp_path)
@@ -755,6 +767,8 @@ module TheFox
 				gnuplot_file.close
 				
 				system("gnuplot #{gnuplot_file_path} &> /dev/null")
+				
+				@logger.info('generate html done') if @logger
 			end
 			
 			def import_csv_file(file_path)
@@ -864,6 +878,33 @@ module TheFox
 				@entries_by_ids[id]
 			end
 			
+			def clear
+				c = 0
+				
+				# Take the standard html path instead of --path option.
+				# Do not provide the functionality to delete files from --path.
+				# If a user uses --path to generate html files outside of the
+				# wallet path the user needs to manual remove these files.
+				children = @tmp_path.children + @html_path.children
+				
+				children.each do |child|
+					
+					if child.basename.to_s[0] == '.'
+						# Ignore 'hidden' files like .gitignore.
+						next
+					end
+					
+					# puts "child #{child}"
+					FileUtils.rm_rf(child)
+					
+					c += 1
+					if c > 100
+						# If something goes wrong do not delete to whole harddisk. ;)
+						break
+					end
+				end
+			end
+			
 			private
 			
 			def create_dirs

data/lib/wallet.rb

@@ -4,7 +4,8 @@ require 'wallet/wallet'
 require 'wallet/entry'
 require 'wallet/command'
 require 'wallet/command_add'
-require 'wallet/command_list'
 require 'wallet/command_categories'
-require 'wallet/command_html'
+require 'wallet/command_clear'
 require 'wallet/command_csv'
+require 'wallet/command_html'
+require 'wallet/command_list'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-wallet
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-13 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -102,6 +102,7 @@ files:
 - lib/wallet/command.rb
 - lib/wallet/command_add.rb
 - lib/wallet/command_categories.rb
+- lib/wallet/command_clear.rb
 - lib/wallet/command_csv.rb
 - lib/wallet/command_html.rb
 - lib/wallet/command_list.rb
@@ -130,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Finances Tracking