thefox-wallet 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c52b0183b88eef28a1e430a10266cbc926be80
-  data.tar.gz: 313cbc717b9eea9cb79444fb871bba40a6f9cad1
+  metadata.gz: 2cbb979259e323ea7267d725982ce79a4031b915
+  data.tar.gz: 97e01ebf34e7fe376b1898fc4154527f64e41f71
 SHA512:
-  metadata.gz: ceb2875dbc61138cc094ea6a8d0f755f599017869bd966ed42960efa863d712320b270d69c59807cf8539ef709cebdd1720f159cf03b97c1f6a69418e61216af
-  data.tar.gz: ce729b9878f78f02f923bc37c15a6ec3827dfb6e44069b12a68996fa0ff6c182da8c74e63c3aba9f04558ddae2fe9b3dba04b7a46027a968674f1f261214036b
+  metadata.gz: dbb7973fbd8bbe143409c33d2c329480e04d4acb20bfbedd31ce3fce400e3c9856174c9b715bccc2dc4595971d1253dbf95a2d62701f4deb037ce61e50948e8e
+  data.tar.gz: 9be10133bac53c6b17ad37905345517c408f9b1d0b1b1a68b957820ce0c436dc94b83075211f53d9563a5881fd6c6c337911d06866132311a108e965564fc0bf

data/.gitignore

@@ -2,11 +2,12 @@
 .setup
 CHANGELOG-*.txt
 /coverage/
-/bin/test
 Gemfile.lock
 /releases/
+/test_wallet/
 /tmp/
 /wallet/
 /wallet_test/
+/wallet_test2/
 *.csv
 *.txt

data/.gitlab-ci.yml

@@ -1,5 +1,4 @@
 before_script:
-    - ruby -v
     - gem update --system
     - gem install bundler -v '~>1.13'
     - bundler --version
@@ -14,7 +13,7 @@ test_21:
     stage: test
     environment: test
     only:
-        - master
+        - tags
     script:
         - make test
 
@@ -23,7 +22,7 @@ test_22:
     stage: test
     environment: test
     only:
-        - master
+        - tags
     script:
         - make test
 
@@ -32,14 +31,14 @@ test_23:
     stage: test
     environment: test
     only:
-        - master
+        - tags
     script:
         - make test
 
 release_gem:
     image: ruby:2.3
     stage: release
-    environment: release
+    environment: gem
     only:
         - tags
     script:

data/Gemfile

@@ -1,3 +1,11 @@
 
 source 'https://rubygems.org'
+
+group(:development) do
+	if ENV['SIMPLECOV_PHPUNIT_LOAD_PATH']
+		# Load SimpleCov PHPUnit Formatter from a local path.
+		gem 'simplecov-phpunit', :path => ENV['SIMPLECOV_PHPUNIT_LOAD_PATH']
+	end
+end
+
 gemspec

data/Makefile

@@ -3,6 +3,10 @@ GEM_NAME = thefox-wallet
 
 include Makefile.common
 
+.PHONY: dev
+dev:
+	$(BUNDLER) exec ./bin/wallet -w wallet_test2 add -t 'test' -e 5 -c 'test'
+
 .PHONY: test
 test:
 	RUBYOPT=-w $(BUNDLER) exec ./test/suite_all.rb -v
@@ -11,5 +15,6 @@ test:
 cov:
 	RUBYOPT=-w TZ=Europe/Vienna COVERAGE=1 $(BUNDLER) exec ./test/suite_all.rb -v
 
-dev:
-	bundler exec ./bin/wallet -w test_wallet add -t 'test' -e 5 -c 'test'
+.PHONY: cov_local
+cov_local:
+	RUBYOPT=-w TZ=Europe/Vienna SIMPLECOV_PHPUNIT_LOAD_PATH=../simplecov-phpunit COVERAGE=1 $(BUNDLER) exec ./test/suite_all.rb -v

data/Makefile.common

@@ -1,12 +1,11 @@
 
-# Ruby Common Big
-# 2016-05-20
+# Ruby Common Big 2016-11-08
 
 MV = mv -nv
 RM = rm -rfd
 MKDIR = mkdir -p
 CHMOD = chmod
-BUNDLER = bundle
+BUNDLER = bundler
 BUNDLER_OPTIONS = --jobs=5 --retry=3
 GEMSPEC_FILE = $(GEM_NAME).gemspec
 
@@ -17,18 +16,21 @@ all: setup $(ALL_TARGETS_EXT)
 setup: .setup
 
 .setup:
+	which ruby &> /dev/null
+	which $(BUNDLER) &> /dev/null
+	ruby -v
 	$(BUNDLER) install $(BUNDLER_OPTIONS)
 	touch $@
 
 .PHONY: install
 install:
-	gem_file=$$(gem build $(GEMSPEC_FILE) | grep 'File:' | tail -1 | awk '{ print $$2 }'); \
-	sudo gem install $$gem_file; \
+	gem_file=$$(gem build $(GEMSPEC_FILE) 2> /dev/null | grep 'File:' | tail -1 | awk '{ print $$2 }'); \
+	gem install $$gem_file; \
 	$(RM) $$gem_file
 
 .PHONY: uninstall
 uninstall:
-	sudo gem uninstall $(GEM_NAME)
+	gem uninstall $(GEM_NAME)
 
 .PHONY: update
 update:

data/README.md

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

data/bin/dev

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'pp'
+require 'pry'
+require 'pathname'
+require 'wallet'
+
+include TheFox::Wallet
+
+wallet = Wallet.new(Pathname.new('wallet_test2'))
+
+binding.pry

data/bin/wallet

@@ -1,10 +1,16 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'pathname'
+require 'logger'
+require 'date'
 require 'wallet'
-require 'tempfile'
 
-options = Hash.new
+@logger = Logger.new(STDOUT)
+@logger.level = Logger::INFO
+
+@options = Hash.new
+@options[:logger] = @logger
 opts = OptionParser.new do |o|
 	o.banner = 'Usage: wallet <command> [options]'
 	o.separator('')
@@ -19,64 +25,71 @@ opts = OptionParser.new do |o|
 	o.separator('')
 	
 	o.on('-w', '--wallet <path>', 'Path to wallet directory.') do |path|
-		options[:wallet_path] = path
+		@options[:wallet_path] = Pathname.new(path).expand_path
 	end
 	
 	o.on('--id <id>', 'ID used for the entry.') do |id|
-		options[:entry_id] = id
+		@options[:entry_id] = id
 	end
 	
 	o.on('-t', '--title <title>', 'Title used for the entry.') do |title|
-		options[:entry_title] = title
+		@options[:entry_title] = title
 	end
 	
 	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
+		@options[:entry_date] = date
+	end
+	
+	o.on('--start <date>', 'Start date used for a range.') do |date|
+		@options[:entry_date_start] = Date.parse(date)
 	end
 	
-	#o.on('-z', '--end <date>', 'End date.') do |date|
-	#	options[:entry_end_date] = date
-	#end
+	o.on('--end <date>', 'End date used for a range.') do |date|
+		@options[:entry_date_end] = Date.parse(date)
+	end
 	
 	o.on('-r', '--revenue <revenue>', 'Revenue used for the entry.') do |revenue|
-		options[:entry_revenue] = revenue.to_s.sub(/,/, '.').to_f.abs
+		@options[:entry_revenue] = revenue.to_s.sub(/,/, '.').to_f.abs
 	end
 	
 	o.on('-e', '--expense <expense>', 'Expense used for the entry.') do |expense|
-		options[:entry_expense] = -expense.to_s.sub(/,/, '.').to_f.abs
+		@options[:entry_expense] = -expense.to_s.sub(/,/, '.').to_f.abs
 	end
 	
 	o.on('-c', '--category <category>', 'Category used for the entry.') do |category|
-		options[:entry_category] = category
+		@options[:entry_category] = category
 	end
 	
 	o.on('-o', '--comment <comment>', 'Comment used for the entry.') do |comment|
-		options[:entry_comment] = comment
+		@options[:entry_comment] = comment
 	end
 	
 	o.on('--import', 'Import') do
-		options[:is_import] = true
+		@options[:is_import] = true
 	end
 	
 	o.on('--export', 'Export') do
-		options[:is_export] = true
+		@options[:is_export] = true
 	end
 	
 	o.on('-p', '--path <path>', 'Path used for csv import/export.') do |path|
-		options[:path] = path
+		@options[:path] = path
 	end
 	
 	o.on('-i', '--interactive', 'Use some commands interactively.') do
-		options[:is_interactively] = true
+		@options[:is_interactively] = true
 	end
 	
 	o.on('-f', '--force', 'Force add command.') do
-		options[:force] = true
+		@options[:force] = true
 	end
 	
 	o.on('--no-force', 'Do not force add command.') do
-		options[:force] = false
+		@options[:force] = false
+	end
+	
+	o.on('-v', '--verbose', 'Log on debug level.') do
+		@logger.level = Logger::DEBUG
 	end
 	
 	o.on_tail('-V', '--version', 'Show version.') do
@@ -97,10 +110,10 @@ command_name = commands.shift
 
 if command_name
 	begin
-		command = TheFox::Wallet::Command.create_by_name(command_name, options)
+		command = TheFox::Wallet::Command.create_by_name(command_name, @options)
 		command.run
 	rescue Exception => e
-		puts "ERROR: #{e}"
+		@logger.error(e.to_s)
 		exit 1
 	end
 else

data/lib/wallet/command.rb

@@ -1,6 +1,6 @@
 
 require 'date'
-#require 'pp'
+require 'pathname'
 
 module TheFox::Wallet
 	
@@ -10,10 +10,14 @@ module TheFox::Wallet
 		
 		def initialize(options = Hash.new)
 			@options = options || Hash.new
-			@options[:wallet_path] ||= 'wallet'
+			@options[:logger] ||= nil
+			
+			@options[:wallet_path] ||= Pathname.new('wallet')
 			@options[:entry_id] ||= nil
 			@options[:entry_title] ||= nil
 			@options[:entry_date] ||= Date.today.to_s
+			@options[:entry_date_start] ||= Date.parse('1970-01-01')
+			@options[:entry_date_end] ||= Date.today
 			@options[:entry_revenue] ||= 0.0
 			@options[:entry_expense] ||= 0.0
 			@options[:entry_category] ||= nil

data/lib/wallet/command_add.rb

@@ -1,5 +1,8 @@
 
+require 'date'
+
 module TheFox::Wallet
+	
 	class AddCommand < Command
 		
 		NAME = 'add'
@@ -57,10 +60,10 @@ module TheFox::Wallet
 			
 			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 "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'}"

data/lib/wallet/command_categories.rb

@@ -7,9 +7,7 @@ module TheFox::Wallet
 		
 		def run
 			wallet = Wallet.new(@options[:wallet_path])
-			categories = wallet.categories
-			puts "categories: #{categories.count}"
-			puts "\t" + categories.join("\n\t")
+			puts wallet.categories
 		end
 		
 	end

data/lib/wallet/command_csv.rb

@@ -11,15 +11,16 @@ module TheFox::Wallet
 			end
 			
 			wallet = Wallet.new(@options[:wallet_path])
+			wallet.logger = @options[:logger]
 			
 			if @options[:is_import] || !@options[:is_export]
-				puts "import csv #{@options[:path]} ..."
+				@options[:logger].info("import csv #{@options[:path]} ...") if @options[:logger]
 				wallet.import_csv_file(@options[:path])
-				puts "import csv #{@options[:path]} done"
+				@options[:logger].info("import csv #{@options[:path]} done") if @options[:logger]
 			elsif @options[:is_export]
-				puts "export csv #{@options[:path]} ..."
+				@options[:logger].info("export csv #{@options[:path]} ...") if @options[:logger]
 				wallet.export_csv_file(@options[:path])
-				puts "export csv #{@options[:path]} done"
+				@options[:logger].info("export csv #{@options[:path]} done") if @options[:logger]
 			end
 		end
 		

data/lib/wallet/command_html.rb

@@ -7,9 +7,16 @@ module TheFox::Wallet
 		
 		def run
 			wallet = Wallet.new(@options[:wallet_path])
-			puts 'generate html to ' + wallet.html_path + ' ...'
-			wallet.gen_html
-			puts 'generate html done'
+			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]
 		end
 		
 	end

data/lib/wallet/command_list.rb

@@ -78,23 +78,27 @@ module TheFox::Wallet
 				comment_l = 25
 			end
 			
-			entries_f = '%' + entries_l.to_s + 's'
-			title_f = '%-' + title_l.to_s + 's'
-			revenue_f = '%' + revenue_l.to_s + 's'
-			expense_f = '%' + expense_l.to_s + 's'
-			balance_f = '%' + balance_l.to_s + 's'
-			category_f = '%-' + category_l.to_s + 's'
-			comment_f = '%-' + comment_l.to_s + 's'
+			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"
 			
 			header = ''
-			header += '#' * entries_l + '  '
-			header += 'Date ' + ' ' * 7
-			header += title_f % 'Title' + '  '
-			header += revenue_f % 'Revenue' + '  '
-			header += expense_f % 'Expense' + '  '
-			header += balance_f % 'Balance'
-			header += '  ' + category_f % 'Category' if has_category_col
-			header += '  ' + comment_f % 'Comment' if has_comment_col
+			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!(/ +$/, '')
@@ -111,7 +115,9 @@ module TheFox::Wallet
 					entry_no += 1
 					
 					title = entry['title']
-					title = title[0, 22] + '...' if title.length >= 25
+					if title.length >= 25
+						title = title[0, 22] << '...'
+					end
 					
 					revenue_total += entry['revenue']
 					expense_total += entry['expense']
@@ -121,17 +127,19 @@ module TheFox::Wallet
 					# has_category = category != ''
 					
 					comment = entry['comment']
-					comment = comment[0, 22] + '...' if comment.length >= 25
+					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 << 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
@@ -142,11 +150,11 @@ module TheFox::Wallet
 			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)
+			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
 		

data/lib/wallet/entry.rb

@@ -78,7 +78,7 @@ module TheFox
 				revenue_t = revenue.to_f
 				
 				if revenue_t < 0
-					raise RangeError, 'revenue (' + revenue_t.to_s + ') cannot be < 0. use expense instead!'
+					raise RangeError, "revenue (#{revenue_t}) cannot be < 0. use expense instead!"
 				end
 				
 				@revenue = revenue_t
@@ -89,7 +89,7 @@ module TheFox
 				expense_t = expense.to_f
 				
 				if expense_t > 0
-					raise RangeError, 'expense (' + expense_t.to_s + ') cannot be > 0. use revenue instead!'
+					raise RangeError, "expense (#{expense_t}) cannot be > 0. use revenue instead!"
 				end
 				
 				@expense = expense_t

data/lib/wallet/version.rb

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