thefox-wallet 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56796aa16f66d2b8b8b7b8652e96ea8902378868
-  data.tar.gz: 6c0613faf7cf12813eeb2e6ba502ff465dc00d8c
+  metadata.gz: bd4e8feceab54fde2f7ffb5ce5782cb48ca3213b
+  data.tar.gz: 00b9ca606122f5fd4c0f181442b3a0a044105169
 SHA512:
-  metadata.gz: f44c9aba9e010c71ff9e33a9718d593a2d9cee845c472afc3ca079f912374e1bd7483b42fb9b1f5fa5a50835230d47fa5224c468953bdc9c40280bbbc3d82de8
-  data.tar.gz: 8e9dc9c815689b7accd033091b2e5228d41b05a18fc58bf2b43af5bc00f44637f292d7c6ab8a534834512219fbcf761165570784ebdc822c4397b7e02af3f626
+  metadata.gz: 2d37b581624f6f9895f29a8639a5625894c0438916b38c6ddec5058d4c489bd242d67570326475c4b31cf2a3cd5b8cd52b50db0c3638b4978336cdb10b839908
+  data.tar.gz: 34eb1d12045a4cd6792b455df3bfb06c6c7077507ef4ffa8d8e1309cd5853593192678bb3ebd30df1aec51c5c977aa3221bcb5ce6136910a47cea0fb567fbe3c

data/Makefile

@@ -5,7 +5,11 @@ include Makefile.common
 
 .PHONY: test
 test:
-	RUBYOPT=-w $(BUNDLER) exec ./test/suite_all.rb
+	RUBYOPT=-w $(BUNDLER) exec ./test/suite_all.rb -v
+
+.PHONY: cov
+cov:
+	RUBYOPT=-w TZ=Europe/Vienna COVERAGE=1 $(BUNDLER) exec ./test/suite_all.rb -v
 
 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.12'
+	gem 'thefox-wallet', '~>0.13'
 
 Use it in your sources:
 
@@ -37,7 +37,8 @@ Use it in your sources:
 - [Travis CI Repository](https://travis-ci.org/TheFox/wallet)
 
 ## License
-Copyright (C) 2015 Christian Mayer <http://fox21.at>
+
+Copyright (C) 2015 Christian Mayer <https://fox21.at>
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

data/bin/wallet

@@ -75,6 +75,10 @@ opts = OptionParser.new do |o|
 		options[:force] = true
 	end
 	
+	o.on('--no-force', 'Do not force add command.') do
+		options[:force] = false
+	end
+	
 	o.on_tail('-V', '--version', 'Show version.') do
 		puts "#{::TheFox::Wallet::NAME} #{::TheFox::Wallet::VERSION} (#{::TheFox::Wallet::DATE})"
 		puts TheFox::Wallet::HOMEPAGE

data/lib/wallet/command_add.rb

@@ -53,6 +53,8 @@ module TheFox::Wallet
 				raise "Option --title is required for command '#{NAME}'"
 			end
 			
+			is_unique = !@options[:force] && @options[:entry_id]
+			
 			puts "id:       '#{@options[:entry_id]}'"
 			puts "title:    '#{@options[:entry_title]}'"
 			puts "date:      " + Date.parse(@options[:entry_date]).to_s
@@ -62,12 +64,15 @@ 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'}"
 			
 			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])
-			added = wallet.add(entry, !@options[:force])
+			added = wallet.add(entry, is_unique)
 			
 			puts "added:    #{added ? 'YES' : 'NO'}"
+			
+			added
 		end
 		
 		def revenue(revenue_s)

data/lib/wallet/version.rb

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

data/lib/wallet/wallet.rb

@@ -17,11 +17,12 @@ module TheFox
 		
 		class Wallet
 			
+			attr_writer :logger
 			attr_reader :html_path
 			
 			def initialize(dir_path = 'wallet')
 				@exit = false
-				@log = nil
+				@logger = nil
 				@dir_path = dir_path
 				@data_path = File.expand_path('data', @dir_path)
 				@html_path = File.expand_path('html', @dir_path)
@@ -39,10 +40,6 @@ 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'
@@ -841,7 +838,7 @@ module TheFox
 			
 			def build_entry_by_id_index(force = false)
 				if @entries_by_ids.nil? || force
-					@log.debug('build entry-by-id index') if @log
+					@logger.debug('build entry-by-id index') if @logger
 					
 					glob = File.expand_path('month_*.yml', @data_path)
 					

data/thefox-wallet.gemspec

@@ -25,6 +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_dependency 'uuid', '~>2.3'
 end

data/wallet.sublime-project

@@ -3,8 +3,8 @@
 		{
 			"path": ".",
 			"name": "Wallet",
-			"folder_exclude_patterns": [ ],
+			"folder_exclude_patterns": [ "coverage", "releases" ],
 			"file_exclude_patterns": [ ]
 		}
 	]
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-wallet
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: simplecov-phpunit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement