thefox-wallet 0.11.1 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf365b008e5d9b802de0eb91ae0af58b6d6c0e6f
-  data.tar.gz: 2f080b576a13d23d478444a06c923572cf3fb66e
+  metadata.gz: 56796aa16f66d2b8b8b7b8652e96ea8902378868
+  data.tar.gz: 6c0613faf7cf12813eeb2e6ba502ff465dc00d8c
 SHA512:
-  metadata.gz: f9a52143371846aea71e3b95fca402e39402cf43241651ad96aef60ace651f69443698634c01686c91e9e81c86029c9b870226ccf3f05d049e090b671d236dd1
-  data.tar.gz: 732497bdff090fc7adcec7533ea926cc8e0cfc3592ffc5ba66c892bb68e97f6588fd2f6d4d5e5985f894c351e57af6a44557f6048002d79713f6cb9aa05a09dc
+  metadata.gz: f44c9aba9e010c71ff9e33a9718d593a2d9cee845c472afc3ca079f912374e1bd7483b42fb9b1f5fa5a50835230d47fa5224c468953bdc9c40280bbbc3d82de8
+  data.tar.gz: 8e9dc9c815689b7accd033091b2e5228d41b05a18fc58bf2b43af5bc00f44637f292d7c6ab8a534834512219fbcf761165570784ebdc822c4397b7e02af3f626

data/.ackrc

@@ -0,0 +1,7 @@
+
+--type=ruby
+--type=yaml
+
+--ignore-dir=coverage
+--ignore-dir=tmp
+

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 .setup
 CHANGELOG-*.txt
+/coverage/
 /bin/test
 Gemfile.lock
 /releases/
@@ -8,4 +9,4 @@ Gemfile.lock
 /wallet/
 /wallet_test/
 *.csv
-*.txt
+*.txt

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-    - 2.0
     - 2.1
     - 2.2
     - 2.3

data/Makefile

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

data/README.md

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

data/lib/wallet/command.rb

@@ -28,7 +28,7 @@ module TheFox::Wallet
 		def run
 		end
 		
-		def self.create_by_name(name, options)
+		def self.create_by_name(name, options = nil)
 			classes = [
 				AddCommand,
 				ListCommand,

data/lib/wallet/command_add.rb

@@ -8,6 +8,7 @@ module TheFox::Wallet
 			if @options[:entry_category].nil?
 				@options[:entry_category] = 'default'
 			end
+			
 			if @options[:is_interactively]
 				print "title: [#{@options[:entry_title]}] "
 				title_t = STDIN.gets.strip

data/lib/wallet/command_csv.rb

@@ -6,26 +6,6 @@ module TheFox::Wallet
 		NAME = 'csv'
 		
 		def run
-			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?
 				raise "Option --path is required for command '#{NAME}'"
 			end
@@ -36,11 +16,6 @@ module TheFox::Wallet
 				puts "import csv #{@options[:path]} ..."
 				wallet.import_csv_file(@options[:path])
 				puts "import csv #{@options[:path]} done"
-				
-				if @options[:is_interactively]
-					puts "delete #{@options[:path]}"
-					File.unlink(@options[:path])
-				end
 			elsif @options[:is_export]
 				puts "export csv #{@options[:path]} ..."
 				wallet.export_csv_file(@options[:path])

data/lib/wallet/entry.rb

@@ -1,5 +1,6 @@
 
 require 'uuid'
+require 'date'
 
 module TheFox
 	module Wallet
@@ -56,13 +57,20 @@ module TheFox
 			end
 			
 			def date=(date)
-				if date.is_a?(String)
-					# puts "date parse: '#{date}'"
+				# puts "class: #{date.class}"
+				case date
+				when String
+					# puts 'String'
 					@date = Date.parse(date)
-				elsif date.is_a?(Date)
+				when Fixnum
+					# puts 'Fixnum'
+					@date = Time.at(date).to_date
+				when Date
+					# puts 'Date'
 					@date = date
 				else
-					raise ArgumentError, 'date must be a String or a Date instance'
+					# puts 'RAISE'
+					raise ArgumentError, "Wrong class: #{date.class}"
 				end
 			end
 			

data/lib/wallet/version.rb

@@ -2,8 +2,8 @@
 module TheFox
 	module Wallet
 		NAME = 'Wallet'
-		VERSION = '0.11.1'
-		DATE = '2016-09-10'
+		VERSION = '0.12.1'
+		DATE = '2016-09-12'
 		HOMEPAGE = 'https://github.com/TheFox/wallet'
 		NUMBER_FORMAT = '%.2f'
 		NUMBER_ROUND = 5

data/lib/wallet/wallet.rb

@@ -1,6 +1,7 @@
 
 # Schmeisst die Fuffies durch den Club und schreit Boah Boah!
 
+require 'logger'
 require 'yaml'
 require 'yaml/store'
 require 'csv'
@@ -20,6 +21,7 @@ module TheFox
 			
 			def initialize(dir_path = 'wallet')
 				@exit = false
+				@log = nil
 				@dir_path = dir_path
 				@data_path = File.expand_path('data', @dir_path)
 				@html_path = File.expand_path('html', @dir_path)
@@ -37,6 +39,10 @@ module TheFox
 				end
 			end
 			
+			def log=(log)
+				@log = log
+			end
+			
 			def add(entry, is_unique = false)
 				if !entry.is_a?(Entry)
 					raise ArgumentError, 'variable must be a Entry instance'
@@ -86,6 +92,9 @@ module TheFox
 						}
 					end
 					
+					if file['days'].is_a?(Array)
+						file['days'] = {}
+					end
 					if !file['days'].has_key?(date_s)
 						file['days'][date_s] = []
 					end
@@ -101,6 +110,9 @@ module TheFox
 						file['meta']['updated_at'] = DateTime.now.to_s
 					end
 					
+					if file['days'].is_a?(Array)
+						file['days'] = {}
+					end
 					if !file['days'].has_key?(date_s)
 						file['days'][date_s] = []
 					end
@@ -827,8 +839,10 @@ module TheFox
 				!find_entry_by_id(entry.id).nil?
 			end
 			
-			def find_entry_by_id(id)
-				if @entries_by_ids.nil?
+			def build_entry_by_id_index(force = false)
+				if @entries_by_ids.nil? || force
+					@log.debug('build entry-by-id index') if @log
+					
 					glob = File.expand_path('month_*.yml', @data_path)
 					
 					@entries_by_ids = Dir[glob].map { |file_path|
@@ -844,6 +858,10 @@ module TheFox
 					
 					# pp @entries_by_ids
 				end
+			end
+			
+			def find_entry_by_id(id)
+				build_entry_by_id_index
 				
 				@entries_by_ids[id]
 			end

data/thefox-wallet.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |spec|
 	spec.bindir        = 'bin'
 	spec.executables   = ['wallet']
 	spec.require_paths = ['lib']
-	spec.required_ruby_version = '>=2.0.0'
+	spec.required_ruby_version = '>=2.1.0'
 	
 	spec.add_development_dependency 'minitest', '~>5.7'
+	spec.add_development_dependency 'simplecov', '~>0.12'
 	
 	spec.add_dependency 'uuid', '~>2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-wallet
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.1
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.7'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +59,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ackrc"
 - ".editorconfig"
 - ".gitignore"
 - ".travis.yml"
@@ -64,10 +79,6 @@ files:
 - lib/wallet/entry.rb
 - lib/wallet/version.rb
 - lib/wallet/wallet.rb
-- tests/tc_command_add.rb
-- tests/tc_entry.rb
-- tests/tc_wallet.rb
-- tests/ts_all.rb
 - thefox-wallet.gemspec
 - wallet.sublime-project
 homepage: https://github.com/TheFox/wallet
@@ -82,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/tests/tc_command_add.rb

@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'minitest/autorun'
-require 'wallet'
-
-
-class TestAddCommand < MiniTest::Test
-	
-	include TheFox::Wallet
-	
-	def test_revenue
-		cmd = AddCommand.new
-		
-		# String
-		assert_equal(nil, cmd.revenue(nil))
-		assert_equal(nil, cmd.revenue(''))
-		assert_equal(21.0, cmd.revenue('21'))
-		assert_equal(21.0, cmd.revenue(' 21 '))
-		
-		# Negative
-		assert_equal(21.0, cmd.revenue('-21'))
-		
-		# Float
-		assert_equal(21.2, cmd.revenue('21.2'))
-		assert_equal(21.2, cmd.revenue('21.20'))
-		assert_equal(21.87, cmd.revenue('21.87'))
-		
-		# Calc
-		assert_equal(16, cmd.revenue('21-5'))
-		assert_equal(15.8, cmd.revenue('21.7-5.9'))
-		assert_equal(14.8, cmd.revenue('22,7-7,9'))
-		assert_equal(29, cmd.revenue('21-50'))
-		assert_equal(0.1, cmd.revenue('0,1-0,2'))
-		assert_equal(0.0, cmd.revenue('0,1-0,1'))
-	end
-	
-	def test_expense
-		cmd = AddCommand.new
-		
-		# String
-		assert_equal(nil, cmd.expense(nil))
-		assert_equal(nil, cmd.expense(''))
-		assert_equal(-21.0, cmd.expense('21'))
-		assert_equal(-21.0, cmd.expense(' 21 '))
-		
-		# Positive
-		assert_equal(-21.0, cmd.expense('-21'))
-		assert_equal(-21.0, cmd.expense('21'))
-		
-		# Float
-		assert_equal(-21.2, cmd.expense('21.2'))
-		assert_equal(-21.2, cmd.expense('21.20'))
-		assert_equal(-21.87, cmd.expense('21.87'))
-		
-		# Calc
-		assert_equal(-16, cmd.expense('21-5'))
-		assert_equal(-15.8, cmd.expense('21.7-5.9'))
-		assert_equal(-14.8, cmd.expense('22,7-7,9'))
-		assert_equal(-29, cmd.expense('21-50'))
-		assert_equal(-0.1, cmd.expense('0,1-0,2'))
-		assert_equal(0.0, cmd.expense('0,1-0,1'))
-	end
-end

data/tests/tc_entry.rb

@@ -1,140 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'minitest/autorun'
-require 'wallet'
-
-
-class TestEntry < MiniTest::Test
-	
-	include TheFox::Wallet
-	
-	def test_base
-		entry = Entry.new
-		
-		assert_equal('TheFox::Wallet::Entry', entry.class.to_s)
-	end
-	
-	def test_set_title
-		entry = Entry.new(nil, 'test1')
-		assert_equal('test1', entry.title)
-		
-		entry.title = 'test2'
-		assert_equal('test2', entry.title)
-	end
-	
-	def test_set_date
-		now = Date.today
-		
-		entry = Entry.new
-		assert_equal('Date', entry.date.class.to_s)
-		assert_equal(now.to_s, entry.date.to_s)
-		
-		entry = Entry.new(nil, 'test', '2015-02-21')
-		assert_equal('Date', entry.date.class.to_s)
-		assert_equal('2015-02-21', entry.date.to_s)
-		
-		entry.date = '2015-01-01'
-		assert_equal('2015-01-01', entry.date.to_s)
-		
-		entry = Entry.new(nil, 'test', '2014-2-21')
-		assert_equal('2014-02-21', entry.date.to_s)
-		
-		entry.date = '2013-1-1'
-		assert_equal('2013-01-01', entry.date.to_s)
-		
-		entry = Entry.new(nil, 'test', Date.parse('2015-01-02'))
-		assert_equal('2015-01-02', entry.date.to_s)
-		
-		entry = Entry.new
-		entry.date = Date.today
-		assert_equal(now.to_s, entry.date.to_s)
-		
-		assert_raises(ArgumentError){ entry.date = 12 }
-		assert_raises(ArgumentError){ entry.date = '2014-4-31' }
-	end
-	
-	def test_set_revenue_expense
-		entry = Entry.new
-		assert_equal(0, entry.revenue)
-		assert_equal(0, entry.expense)
-		
-		entry = Entry.new(nil, 'test', '2015-02-21', 20)
-		assert_equal(20, entry.revenue)
-		assert_equal(0, entry.expense)
-		assert_equal(20, entry.balance)
-		
-		entry = Entry.new(nil, 'test', '2015-02-21', '20', '-21')
-		assert_equal(20, entry.revenue)
-		assert_equal(-21, entry.expense)
-		assert_equal(-1, entry.balance)
-		
-		entry.revenue = 24
-		entry.expense = -25
-		assert_equal(24, entry.revenue)
-		assert_equal(-25, entry.expense)
-		assert_equal(-1, entry.balance)
-		
-		entry.revenue = 1.01
-		entry.expense = -1.02
-		assert_equal(1.01, entry.revenue)
-		assert_equal(-1.02, entry.expense)
-		assert_equal(-0.01, entry.balance)
-		
-		entry.revenue = 1
-		entry.expense = -2.02
-		assert_equal(1, entry.revenue)
-		assert_equal(-2.02, entry.expense)
-		assert_equal(-1.02, entry.balance)
-		
-		entry = Entry.new(nil, 'test', '2015-02-21', -42)
-		assert_equal(0, entry.revenue)
-		assert_equal(-42, entry.expense)
-		assert_equal(-42, entry.balance)
-		
-		entry = Entry.new(nil, 'test', '2015-02-21', -30.03)
-		assert_equal(0, entry.revenue)
-		assert_equal(-30.03, entry.expense)
-		assert_equal(-30.03, entry.balance)
-		
-		entry.revenue = 'string1'
-		assert_equal(0, entry.revenue)
-		
-		entry.expense = 'string1'
-		assert_equal(0, entry.expense)
-		
-		assert_raises(RangeError){ entry.revenue = -1.23 }
-		assert_raises(RangeError){ entry.expense = 1.23 }
-	end
-	
-	def test_set_category
-		entry = Entry.new(nil, 'test', '2015-02-21', 20, 0, 'c1')
-		assert_equal('c1', entry.category)
-		
-		entry.category = 'c2'
-		assert_equal('c2', entry.category)
-		
-		entry.category = 1.23
-		assert_equal('1.23', entry.category)
-	end
-	
-	def test_set_comment
-		entry = Entry.new(nil, 'test', '2015-02-21', 20, 0, 'c1', 'co1')
-		assert_equal('co1', entry.comment)
-		
-		entry.comment = 'co2'
-		assert_equal('co2', entry.comment)
-		
-		entry.comment = 1.23
-		assert_equal('1.23', entry.comment)
-	end
-	
-	def test_to_hash
-		entry = Entry.new(nil, 'test', '2015-02-21', 20, -12.34, 'c3')
-		
-		assert_equal('2015-02-21', entry.to_h['date'].to_s)
-		assert_equal(20, entry.to_h['revenue'])
-		assert_equal(-12.34, entry.to_h['expense'])
-		assert_equal(7.66, entry.to_h['balance'])
-		assert_equal('c3', entry.to_h['category'])
-	end
-end

data/tests/tc_wallet.rb

@@ -1,236 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'minitest/autorun'
-require 'fileutils'
-require 'wallet'
-
-
-class TestWallet < MiniTest::Test
-	
-	include TheFox::Wallet
-	
-	def test_that_it_has_a_version_number
-		refute_nil(::TheFox::Wallet::VERSION)
-	end
-	
-	def test_base
-		wallet = Wallet.new('wallet_test')
-		
-		assert_equal('TheFox::Wallet::Wallet', wallet.class.to_s)
-		assert_equal(true, !Dir.exist?('wallet_test'))
-	end
-	
-	def test_add1
-		wallet = Wallet.new('wallet_test')
-		
-		wallet.add(Entry.new(nil, 'test', '2014-01-01', 100))
-		wallet.add(Entry.new(nil, 'test', '2014-01-01', 50))
-		wallet.add(Entry.new(nil, 'test', '2014-01-01', -10))
-		wallet.add(Entry.new(nil, 'test', '2014-01-02', -10))
-		wallet.add(Entry.new(nil, 'test', '2015-01-01', 100, 0, 'c1'))
-		wallet.add(Entry.new(nil, 'test', '2015-01-02', 0, -10, 'c2'))
-		wallet.add(Entry.new(nil, 'test', '2015-02-21', 20))
-		wallet.add(Entry.new(nil, 'test', '2015-02-21', 0, -5, 'c1'))
-		wallet.add(Entry.new(nil, 'test', '2015-02-21', 0, -1.5, 'c2'))
-		wallet.add(Entry.new(nil, 'test', '2015-02-22', 10))
-		
-		sum = wallet.sum
-		assert_equal(280, sum[:revenue])
-		assert_equal(-36.5, sum[:expense])
-		assert_equal(243.5, sum[:balance])
-		
-		sum = wallet.sum(2014)
-		assert_equal(150, sum[:revenue])
-		assert_equal(-20, sum[:expense])
-		assert_equal(130, sum[:balance])
-		
-		sum = wallet.sum(2014, 1)
-		assert_equal(150, sum[:revenue])
-		assert_equal(-20, sum[:expense])
-		assert_equal(130, sum[:balance])
-		
-		sum = wallet.sum(2014, 1, 1)
-		assert_equal(150, sum[:revenue])
-		assert_equal(-10, sum[:expense])
-		assert_equal(140, sum[:balance])
-		
-		sum = wallet.sum(2015)
-		assert_equal(130, sum[:revenue])
-		assert_equal(-16.5, sum[:expense])
-		assert_equal(113.5, sum[:balance])
-		
-		sum = wallet.sum(2015, 1)
-		assert_equal(100, sum[:revenue])
-		assert_equal(-10, sum[:expense])
-		assert_equal(90, sum[:balance])
-		
-		sum = wallet.sum(2015, 2)
-		assert_equal(30, sum[:revenue])
-		assert_equal(-6.5, sum[:expense])
-		assert_equal(23.5, sum[:balance])
-		
-		sum = wallet.sum(2015, 2, 21)
-		assert_equal(20, sum[:revenue])
-		assert_equal(-6.5, sum[:expense])
-		assert_equal(13.5, sum[:balance])
-		
-		sum = wallet.sum(2015, 2, 22)
-		assert_equal(10, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(10, sum[:balance])
-		
-		sum = wallet.sum(nil, nil, nil, 'c1')
-		assert_equal(100, sum[:revenue])
-		assert_equal(-5, sum[:expense])
-		assert_equal(95, sum[:balance])
-		
-		sum = wallet.sum(2014, nil, nil, 'c1')
-		assert_equal(0, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(0, sum[:balance])
-		
-		sum = wallet.sum(2014, 1, nil, 'c1')
-		assert_equal(0, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(0, sum[:balance])
-		
-		sum = wallet.sum(2014, 1, 1, 'c1')
-		assert_equal(0, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(0, sum[:balance])
-		
-		sum = wallet.sum(2015, nil, nil, 'c1')
-		assert_equal(100, sum[:revenue])
-		assert_equal(-5, sum[:expense])
-		assert_equal(95, sum[:balance])
-		
-		sum = wallet.sum(2015, 1, nil, 'c1')
-		assert_equal(100, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(100, sum[:balance])
-		
-		sum = wallet.sum(2015, 1, 1, 'c1')
-		assert_equal(100, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(100, sum[:balance])
-		
-		sum = wallet.sum(2015, 2, nil, 'c1')
-		assert_equal(0, sum[:revenue])
-		assert_equal(-5, sum[:expense])
-		assert_equal(-5, sum[:balance])
-		
-		sum = wallet.sum(2015, 2, 1, 'c1')
-		assert_equal(0, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(0, sum[:balance])
-		
-		sum = wallet.sum(2015, 2, 21, 'c1')
-		assert_equal(0, sum[:revenue])
-		assert_equal(-5, sum[:expense])
-		assert_equal(-5, sum[:balance])
-		
-		sum = wallet.sum(nil, nil, nil, 'c2')
-		assert_equal(0, sum[:revenue])
-		assert_equal(-11.5, sum[:expense])
-		assert_equal(-11.5, sum[:balance])
-		
-		sum = wallet.sum(2014, nil, nil, 'c2')
-		assert_equal(0, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(0, sum[:balance])
-		
-		sum = wallet.sum(2014, 1, nil, 'c2')
-		assert_equal(0, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(0, sum[:balance])
-		
-		sum = wallet.sum(2014, 1, 1, 'c2')
-		assert_equal(0, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(0, sum[:balance])
-		
-		sum = wallet.sum(2015, nil, nil, 'c2')
-		assert_equal(0, sum[:revenue])
-		assert_equal(-11.5, sum[:expense])
-		assert_equal(-11.5, sum[:balance])
-		
-		sum = wallet.sum(2015, 1, nil, 'c2')
-		assert_equal(0, sum[:revenue])
-		assert_equal(-10, sum[:expense])
-		assert_equal(-10, sum[:balance])
-		
-		sum = wallet.sum(2015, 1, 1, 'c2')
-		assert_equal(0, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(0, sum[:balance])
-		
-		sum = wallet.sum(2015, 2, nil, 'c2')
-		assert_equal(0, sum[:revenue])
-		assert_equal(-1.5, sum[:expense])
-		assert_equal(-1.5, sum[:balance])
-		
-		sum = wallet.sum(2015, 2, 1, 'c2')
-		assert_equal(0, sum[:revenue])
-		assert_equal(0, sum[:expense])
-		assert_equal(0, sum[:balance])
-		
-		sum = wallet.sum(2015, 2, 21, 'c2')
-		assert_equal(0, sum[:revenue])
-		assert_equal(-1.5, sum[:expense])
-		assert_equal(-1.5, sum[:balance])
-		
-		assert_equal(['default', 'c1', 'c2'], wallet.categories)
-	end
-	
-	def test_add2
-		wallet = Wallet.new('wallet_test')
-		
-		assert_equal(true, wallet.add(Entry.new(nil, 'test', '2014-01-01', 1)))
-		assert_equal(true, wallet.add(Entry.new(nil, 'test', '2014-01-01', 1), true))
-		
-		assert_equal(true, wallet.add(Entry.new(1, 'test', '2014-01-01', 1), true))
-		assert_equal(false, wallet.add(Entry.new(1, 'test', '2014-01-01', 1), true))
-		
-		assert_equal(true, wallet.add(Entry.new('my_id', 'test', '2014-01-01', 1), true))
-		assert_equal(false, wallet.add(Entry.new('my_id', 'test', '2014-01-01', 1), true))
-		assert_equal(true, wallet.add(Entry.new('my_id', 'test', '2014-01-01', 1), false))
-	end
-	
-	def test_exceptions
-		wallet = Wallet.new('wallet_test')
-		
-		assert_raises(ArgumentError) do
-			wallet.add(12)
-		end
-	end
-	
-	def test_find_entry_by_id
-		wallet = Wallet.new('wallet_test')
-		
-		wallet.add(Entry.new(nil, 'test', '2014-01-01', -1))
-		wallet.add(Entry.new(1, 'test', '2014-01-01', 1))
-		wallet.add(Entry.new(2, 'test', '2014-01-02', 2))
-		wallet.add(Entry.new(3, 'test', '2015-03-04', 3))
-		
-		found_entry = wallet.find_entry_by_id(1)
-		assert_instance_of(Entry, found_entry)
-		assert_equal(1, found_entry.id)
-		
-		found_entry = wallet.find_entry_by_id(2)
-		assert_instance_of(Entry, found_entry)
-		assert_equal(2, found_entry.id)
-		
-		found_entry = wallet.find_entry_by_id(3)
-		assert_instance_of(Entry, found_entry)
-		assert_equal(3, found_entry.id)
-		
-		assert_nil(wallet.find_entry_by_id(4))
-		assert_nil(wallet.find_entry_by_id(5))
-		assert_nil(wallet.find_entry_by_id(6))
-	end
-	
-	def teardown
-		FileUtils.rm_r('wallet_test', {:force => true})
-	end
-	
-end

data/tests/ts_all.rb

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative 'tc_wallet'
-require_relative 'tc_entry'
-require_relative 'tc_command_add'