osp 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46891f45eba94adf6d8a85f41ae72fad47af6238
-  data.tar.gz: e46f551edf7948e3625cea51260a2103af8cd6ac
+  metadata.gz: 4654dbc7d8acad6ea9ec6a2c0f49111b379e38f1
+  data.tar.gz: 16a9675d9a2118b38ec2e28cf889031a4dfb7136
 SHA512:
-  metadata.gz: 6b48c4218a002df463bae78e2986e5cfe9471ab96545534113f57f2acfb6fbe74b144e0dd632c436751bb902bf240fa381813cce02400df9126a49fa78070ef8
-  data.tar.gz: 6471f2c637e7ecc0a161f61138c29d57ac3e4ce9edd15b78f23ebe114bcafa2c24ba92133ddf0e3cb5335fedf52c2168e63f37f73b839e7286b2ec269d908551
+  metadata.gz: 2e6b89878f707725f3c191a646f6f5d2446562150b0ee7d3dae77df950caa66397cc0fa476571c9912f0c577baa2fb4a26a9a3450d0c77626615597ef19f6874
+  data.tar.gz: 7d926eda3f8d98cae260b0589223c217ccaa225f10b99052f6d71916c7187a75250db0f49117cd29f99fb87aea5a808a28037004ad2a13349eefd53d42583c70

data/.editorconfig

@@ -0,0 +1,14 @@
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = true
+
+[*.yml]
+indent_style = space

data/.gitignore

@@ -2,5 +2,8 @@
 .setup
 /bin/dev
 CHANGELOG-*.txt
+/coverage/
 Gemfile.lock
-/releases/
+/releases/
+*.osp
+*.osp~*

data/.gitlab-ci.yml

@@ -0,0 +1,47 @@
+before_script:
+    - 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:
+        - tags
+    script:
+        - make test
+
+test_22:
+    image: ruby:2.2
+    stage: test
+    environment: test
+    only:
+        - tags
+    script:
+        - make test
+
+test_23:
+    image: ruby:2.3
+    stage: test
+    environment: test
+    only:
+        - tags
+    script:
+        - make test
+
+release_gem:
+    image: ruby:2.3
+    stage: release
+    environment: gem
+    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

@@ -2,10 +2,13 @@ language: ruby
 rvm:
     - 2.1
     - 2.2
+    - 2.3
+    - 2.4.0
+    - 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
@@ -16,4 +19,4 @@ script:
     - make test
     - cd
     - which -a osp
-    - osp --version
+    - osp --version

data/Makefile

@@ -6,8 +6,16 @@ include Makefile.common
 # Email: example@example.com
 # Password: password
 dev:
-	RUBYOPT=-rbundler/setup ruby --debug ./bin/osp -d passwords.osp
+	RUBYOPT=--debug $(BUNDLER) exec ./bin/osp -d passwords.osp
 
 .PHONY: test
 test:
-	RUBYOPT=-w $(BUNDLER) exec ./tests/ts_all.rb
+	RUBYOPT=-w $(BUNDLER) exec ./test/suite_all.rb
+
+.PHONY: cov
+cov:
+	RUBYOPT=-w COVERAGE=1 $(BUNDLER) exec ./test/suite_all.rb -v
+
+.PHONY: cov_local
+cov_local:
+	RUBYOPT=-w 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-04-09
+# Ruby Common Big 2016-11-08
 
 MV = mv -nv
-RM = rm -rf
+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:
@@ -36,9 +38,7 @@ update:
 
 .PHONY: clean
 clean:
-	$(RM) .bundle
-	$(RM) .setup
-	$(RM) Gemfile.lock
+	$(RM) .bundle .setup Gemfile.lock
 
 .PHONY: release
 release: | releases

data/README.md

@@ -9,7 +9,7 @@ The preferred method of installation is via RubyGems.org:
 
 or via `Gemfile`:
 
-	gem 'osp', '~>0.4'
+	gem 'osp', '~>0.5'
 
 ## Project Links
 
@@ -26,7 +26,8 @@ or via `Gemfile`:
 - [Ruby AES Encryption using OpenSSL](https://gist.github.com/byu/99651)
 
 ## 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/osp

@@ -2,23 +2,23 @@
 # coding: UTF-8
 
 require 'optparse'
-require 'fileutils'
+require 'pathname'
 require 'highline'
 require 'msgpack'
 require 'osp'
 
 
 @options = {
-	:database_path => "#{Dir.home}/.osp",
-	:database_lock_path => "#{Dir.home}/.osp~lock",
+	:database_path => Pathname.new('.osp').expand_path(Dir.home),
+	:database_lock_path => Pathname.new('.osp~lock').expand_path(Dir.home),
 }
 opts = OptionParser.new do |o|
 	o.banner = 'Usage: osp [options]'
 	o.separator('')
 	
 	o.on('-d', '--database <path>', 'Path to the database file.') do |path|
-		@options[:database_path] = path
-		@options[:database_lock_path] = "#{path}~lock"
+		@options[:database_path] = Pathname.new(path).expand_path
+		@options[:database_lock_path] = Pathname.new("#{@options[:database_path]}~lock").expand_path
 	end
 	
 	o.on_tail('-V', '--version', 'Show version.') do
@@ -33,7 +33,7 @@ opts = OptionParser.new do |o|
 		exit 3
 	end
 end
-args = opts.parse(ARGV)
+opts.parse(ARGV)
 
 
 if !STDIN.tty?
@@ -42,11 +42,11 @@ end
 
 @cli = HighLine.new
 
-puts "OSP - OneShallPass #{TheFox::OSP::VERSION}"
+puts "OSP - OneShallPass v#{TheFox::OSP::VERSION}"
 puts TheFox::OSP::HOMEPAGE
 puts
 
-if File.exist?(@options[:database_lock_path])
+if @options[:database_lock_path].exist?
 	puts "WARNING: lock file exist: '#{@options[:database_lock_path]}'"
 	overwrite = @cli.ask('Overwrite? '){ |q| q.default = 'n' }.downcase
 	if overwrite == 'n'
@@ -55,7 +55,7 @@ if File.exist?(@options[:database_lock_path])
 	end
 end
 File.write(@options[:database_lock_path], 'tmp')
-File.chmod(0600, @options[:database_lock_path])
+@options[:database_lock_path].chmod(0600)
 File.binwrite(@options[:database_lock_path], Process.pid)
 
 puts 'Master Login'
@@ -91,8 +91,8 @@ def database_write_step(step, msg)
 end
 
 def remove_lock
-	if File.exist?(@options[:database_lock_path])
-		FileUtils.rm(@options[:database_lock_path])
+	if @options[:database_lock_path].exist?
+		@options[:database_lock_path].unlink
 	end
 end
 
@@ -136,7 +136,7 @@ def host_edit(host = nil)
 	puts 'New Host'
 	puts
 	
-	tmp = @cli.ask('  Hostname: ' + (!host.name.nil? ? "[#{host.name}]" : '') + ' ').strip.to_s
+	tmp = @cli.ask('  Hostname: ' + (host.name.nil? ? '[]' : "[#{host.name}]") + ' ').strip.to_s
 	host.name = tmp if tmp != ''
 	host.name = nil if host.name == ''
 	if host.name.nil?

data/lib/osp/database.rb

@@ -1,4 +1,6 @@
 
+require 'pathname'
+
 module TheFox
 	module OSP
 		
@@ -19,7 +21,7 @@ module TheFox
 						'created_at' => DateTime.now.to_s,
 						'updated_at' => DateTime.now.to_s,
 					},
-					'hosts' => {}
+					'hosts' => Hash.new,
 				}
 			end
 			
@@ -28,13 +30,15 @@ module TheFox
 			end
 			
 			def load_callback(*o)
-				@load_callback_method.call(*o) if !@load_callback_method.nil?
+				if !@load_callback_method.nil?
+					@load_callback_method.call(*o)
+				end
 			end
 			
 			def load
 				load_callback(1000, 'Check for existing database file.')
 				
-				if File.exist?(@file_path)
+				if @file_path.exist?
 					load_callback(1050, "Use database file: #{@file_path}")
 					
 					load_callback(1100, "Read file '#{@file_path}'.")
@@ -87,14 +91,16 @@ module TheFox
 			end
 			
 			def write_callback(*o)
-				@write_callback_method.call(*o) if !@write_callback_method.nil?
+				unless @write_callback_method.nil?
+					@write_callback_method.call(*o)
+				end
 			end
 			
 			def write
 				write_callback(1000, 'Check database for changes.')
 				
 				if @has_changed
-					tmp = "#{@file_path}~"
+					tmp = Pathname.new("#{@file_path}~").expand_path
 					
 					# http://stackoverflow.com/questions/9049789/aes-encryption-key-versus-iv
 					# http://keepass.info/help/base/security.html
@@ -130,21 +136,21 @@ module TheFox
 					
 					write_callback(1300, "Write temp file to '#{tmp}'.")
 					File.write(tmp, 'tmp')
-					File.chmod(0600, tmp)
+					tmp.chmod(0600)
 					File.binwrite(tmp, db_out)
 					
 					backup_dts = Time.now.strftime('%Y%m%d-%H%M%S')
-					backup = "#{@file_path}~backup_#{backup_dts}_" + Digest::SHA256.file(tmp).hexdigest[0..7]
+					backup = Pathname.new("#{@file_path}~backup_#{backup_dts}_" << Digest::SHA256.file(tmp.to_s).hexdigest[0..7])
 					
 					write_callback(1350, "Backup temp file to '#{backup}'.")
 					File.write(backup, 'tmp')
-					File.chmod(0600, backup)
+					backup.chmod(0600)
 					FileUtils.cp(tmp, backup)
 					
 					write_callback(1390, "Finally, move temp file to '#{@file_path}'.")
 					File.write(@file_path, 'tmp')
-					File.chmod(0600, @file_path)
-					FileUtils.mv(tmp, @file_path)
+					@file_path.chmod(0600)
+					tmp.rename(@file_path)
 					
 					@has_changed = false
 				else

data/lib/osp/host.rb

@@ -8,6 +8,10 @@ module TheFox
 			
 			attr_accessor :created_at
 			attr_accessor :updated_at
+			attr_reader :osp
+			attr_reader :name
+			attr_reader :hashes
+			attr_writer :password
 			
 			def initialize(osp = nil)
 				@osp = osp
@@ -20,20 +24,18 @@ module TheFox
 				@generation = 1
 				@length = 16
 				@symbols = 1
-				@hashes = !@osp.nil? ? @osp.hashes : nil
+				@hashes = @osp.nil? ? nil : @osp.hashes
 				@password = nil
 			end
 			
 			def osp=(v)
-				raise ArgumentError, 'Wrong type.' if !v.is_a?(TheFox::OSP::OSP)
+				if !v.is_a?(OSP)
+					raise ArgumentError, "Wrong type -- #{v.class}"
+				end
 				
 				@osp = v
 			end
 			
-			def osp
-				@osp
-			end
-			
 			def version=(v)
 				@version = v.to_i
 			end
@@ -43,12 +45,7 @@ module TheFox
 			end
 			
 			def name=(v)
-				v = nil if v == ''
-				@name = v
-			end
-			
-			def name
-				@name
+				@name = v == '' ? nil : v
 			end
 			
 			def generation=(v)
@@ -79,10 +76,6 @@ module TheFox
 				@hashes = v
 			end
 			
-			def hashes
-				@hashes
-			end
-			
 			def generate_password(regenerate = false)
 				if @password.nil? && !@osp.nil? || regenerate
 					@password = @osp.password(@name, @length, @generation, @symbols)
@@ -126,4 +119,3 @@ module TheFox
 		end
 	end
 end
-			

data/lib/osp/osp.rb

@@ -4,7 +4,6 @@ require 'openssl'
 require 'msgpack'
 require 'thefox-ext'
 
-
 module TheFox
 	module OSP
 		
@@ -33,7 +32,9 @@ module TheFox
 			end
 			
 			def password(host_name, length = 16, generation = 1, symbols = self.class::SYMBOLS)
-				raise ArgumentError, "'host_name' can't be '' or nil" if host_name.nil? || host_name == '' || !host_name
+				if host_name.nil? || host_name == '' || !host_name
+					raise ArgumentError, "'host_name' can't be '' or nil"
+				end
 				
 				key_derivation if @dk.nil?
 				
@@ -46,7 +47,9 @@ module TheFox
 					hmac_b64 = Base64.strict_encode64(hmac_p)
 					pw = hmac_b64 if is_ok_pw(hmac_b64)
 					
-					@password_callback_method.call(step, hmac_b64) if !@password_callback_method.nil?
+					unless @password_callback_method.nil?
+						@password_callback_method.call(step, hmac_b64)
+					end
 					step += 1
 				end
 				
@@ -55,7 +58,7 @@ module TheFox
 					
 					_b64map = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
 					
-					indices = []
+					indices = Array.new
 					(0..self.class::PASSWORD_MIN_SIZE).each do |n|
 						c = pw[n]
 						if c.method(sub_method).call
@@ -70,7 +73,7 @@ module TheFox
 					_map_len = _map.length
 					
 					last = 0
-					arr = []
+					arr = Array.new
 					indices.each do |index|
 						arr << pw[last...index]
 						c = pw[index]
@@ -117,7 +120,7 @@ module TheFox
 				end
 				
 				(self.class::PASSWORD_MIN_SIZE...self.class::PASSWORD_MAX_SIZE).each do |n|
-					if !pw[n].is_valid?
+					unless pw[n].is_valid?
 						return false
 					end
 				end
@@ -141,15 +144,13 @@ module TheFox
 					end
 				end
 				
-				rv = ''
 				if lowers >= caps && lowers >= digits then
-					rv = 'is_lower?'
+					'is_lower?'
 				elsif digits > lowers && digits >= caps
-					rv = 'is_digit?'
+					'is_digit?'
 				else
-					rv = 'is_upper?'
+					'is_upper?'
 				end
-				rv
 			end
 			
 		end

data/lib/osp/version.rb

@@ -1,9 +1,8 @@
 
 module TheFox
 	module OSP
-		RELEASE_ID = 7
-		VERSION = '0.5.0'
-		DATE = '2016-05-21'
+		VERSION = '0.6.0'
+		DATE = '2017-01-01'
 		HOMEPAGE = 'https://github.com/TheFox/osp'
 	end
 end

data/osp.gemspec

@@ -24,9 +24,11 @@ Gem::Specification.new do |spec|
 	spec.required_ruby_version = '>=2.1.0'
 	
 	spec.add_development_dependency 'minitest', '~>5.8'
+	spec.add_development_dependency 'simplecov', '~>0.12'
+	spec.add_development_dependency 'simplecov-phpunit', '~>1.0'
 	
-	spec.add_dependency 'highline', '~>1.7'
-	spec.add_dependency 'msgpack', '~>0.7'
+	spec.add_runtime_dependency 'highline', '~>1.7'
+	spec.add_runtime_dependency 'msgpack', '~>1.0'
 	
-	spec.add_dependency 'thefox-ext', '~>1.2'
+	spec.add_runtime_dependency 'thefox-ext', '~>1.2'
 end

data/osp.sublime-project

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osp
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2017-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
+- !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: simplecov-phpunit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thefox-ext
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +101,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".travis.yml"
 - Gemfile
 - Makefile
@@ -90,9 +120,6 @@ files:
 - lib/osp/version.rb
 - osp.gemspec
 - osp.sublime-project
-- tests/tc_host.rb
-- tests/tc_osp.rb
-- tests/ts_all.rb
 homepage: https://github.com/TheFox/osp
 licenses:
 - GPL-3.0
@@ -113,9 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: One Shall Pass
 test_files: []
-has_rdoc: 

data/tests/tc_host.rb

@@ -1,120 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'minitest/autorun'
-require 'osp'
-
-
-class TestHost < MiniTest::Test
-	def test_base
-		osp = TheFox::OSP::Host.new
-		
-		assert_equal('TheFox::OSP::Host', osp.class.to_s)
-	end
-	
-	def test_initialize
-		host = TheFox::OSP::Host.new
-		
-		assert_equal(nil, host.osp)
-		assert_equal(1, host.version)
-		# assert_equal(, host.created_at)
-		# assert_equal(, host.updated_at)
-		assert_equal(nil, host.name)
-		assert_equal(1, host.generation)
-		assert_equal(16, host.length)
-		assert_equal(1, host.symbols)
-		assert_equal(nil, host.hashes)
-		assert_equal(nil, host.password)
-	end
-	
-	def test_version
-		host = TheFox::OSP::Host.new
-		
-		host.version = 2
-		assert_equal(2, host.version)
-		
-		host.version = '3'
-		assert_equal(3, host.version)
-	end
-	
-	def test_created_at
-		host = TheFox::OSP::Host.new
-		
-		now = DateTime.now
-		host.created_at = now
-		assert_equal(now, host.created_at)
-	end
-	
-	def test_updated_at
-		host = TheFox::OSP::Host.new
-		
-		now = DateTime.now
-		host.updated_at = now
-		assert_equal(now, host.updated_at)
-	end
-	
-	def test_name
-		host = TheFox::OSP::Host.new
-		
-		host.name = ''
-		assert_equal(nil, host.name)
-		
-		host.name = 'host1'
-		assert_equal('host1', host.name)
-	end
-	
-	def test_generation
-		host = TheFox::OSP::Host.new
-		
-		host.generation = 2
-		assert_equal(2, host.generation)
-		
-		host.generation = '3'
-		assert_equal(3, host.generation)
-	end
-	
-	def test_length
-		host = TheFox::OSP::Host.new
-		
-		host.length = 2
-		assert_equal(2, host.length)
-		
-		host.length = '3'
-		assert_equal(3, host.length)
-	end
-	
-	def test_symbols
-		host = TheFox::OSP::Host.new
-		
-		host.symbols = 2
-		assert_equal(2, host.symbols)
-		
-		host.symbols = '3'
-		assert_equal(3, host.symbols)
-	end
-	
-	def test_hashes
-		host = TheFox::OSP::Host.new
-		
-		host.hashes = nil
-		assert_equal(nil, host.hashes)
-		
-		host.hashes = 2
-		assert_equal(2, host.hashes)
-		
-		host.hashes = '3'
-		assert_equal('3', host.hashes)
-	end
-	
-	def test_password
-		host = TheFox::OSP::Host.new
-		
-		host.password = nil
-		assert_equal(nil, host.password)
-		
-		host.password = 2
-		assert_equal(2, host.password)
-		
-		host.password = '3'
-		assert_equal('3', host.password)
-	end
-end

data/tests/tc_osp.rb

@@ -1,136 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'minitest/autorun'
-require 'osp'
-
-
-class TestOsp < MiniTest::Test
-	def test_that_it_has_a_version_number
-		refute_nil ::TheFox::OSP::VERSION
-	end
-	
-	def test_base
-		osp = TheFox::OSP::OSP.new('example@example.com', 'test1', 2 ** 10)
-		
-		assert_equal('TheFox::OSP::OSP', osp.class.to_s)
-	end
-	
-	def test_hashes
-		osp = TheFox::OSP::OSP.new('example@example.com', 'test1', 2 ** 10)
-		assert_equal(2 ** 10, osp.hashes)
-		
-		osp = TheFox::OSP::OSP.new('example@example.com', 'test1', 2 ** 20)
-		assert_equal(2 ** 20, osp.hashes)
-	end
-	
-	def test_password1
-		osp = TheFox::OSP::OSPDotCom.new('example@example.com', 'test1', 2 ** 10)
-		osp.key_derivation
-		
-		assert_equal('TA24hNn0', osp.password('host1', 8, 1, 0))
-		assert_equal('TA>4hNn0', osp.password('host1', 8, 1, 1))
-		assert_equal('TA>?hNn0', osp.password('host1', 8, 1, 2))
-		assert_equal('TA>?hNn,', osp.password('host1', 8, 1, 3))
-		
-		assert_equal('DHKzN7uY', osp.password('host2', 8, 1, 0))
-		assert_equal('@HKzN7uY', osp.password('host2', 8, 1, 1))
-		assert_equal('@^KzN7uY', osp.password('host2', 8, 1, 2))
-		assert_equal('@^(zN7uY', osp.password('host2', 8, 1, 3))
-		
-		assert_equal('Qf4lvgE7', osp.password('host3', 8, 1, 0))
-		assert_equal('Q!4lvgE7', osp.password('host3', 8, 1, 1))
-		assert_equal('Q!4&vgE7', osp.password('host3', 8, 1, 2))
-		assert_equal('Q!4&[gE7', osp.password('host3', 8, 1, 3))
-		
-		assert_equal('DHKzN7uYUBc3l0wi', osp.password('host2', 16, 1, 0))
-		assert_equal('@HKzN7uYUBc3l0wi', osp.password('host2', 16, 1, 1))
-		assert_equal('@^KzN7uYUBc3l0wi', osp.password('host2', 16, 1, 2))
-		assert_equal('@^(zN7uYUBc3l0wi', osp.password('host2', 16, 1, 3))
-		
-		assert_equal('wU0t38KE4tDQb3c0', osp.password('host2', 16, 2, 0))
-		assert_equal('wU,t38KE4tDQb3c0', osp.password('host2', 16, 2, 1))
-		assert_equal('wU,t.8KE4tDQb3c0', osp.password('host2', 16, 2, 2))
-		assert_equal('wU,t.!KE4tDQb3c0', osp.password('host2', 16, 2, 3))
-		
-		assert_equal('OezcZk881M3Jxw9Z', osp.password('host2', 16, 3, 0))
-		assert_equal('O~zcZk881M3Jxw9Z', osp.password('host2', 16, 3, 1))
-		assert_equal('O~:cZk881M3Jxw9Z', osp.password('host2', 16, 3, 2))
-		assert_equal('O~:/Zk881M3Jxw9Z', osp.password('host2', 16, 3, 3))
-	end
-	
-	# def test_password2
-	# 	#PASSWORD_MIN_SIZE = 8
-	# 	#PASSWORD_MAX_SIZE = 16
-		
-	# 	osp = TheFox::OSP::OSP.new('example@example.com', 'test1', 2 ** 10)
-	# 	osp.key_derivation
-		
-	# 	assert_equal('cXyE2Dq1', osp.password('host1', 8, 1, 0))
-	# 	assert_equal('/XyE2Dq1', osp.password('host1', 8, 1, 1))
-	# 	assert_equal('/X;E2Dq1', osp.password('host1', 8, 1, 2))
-	# 	assert_equal('/X;E2D_1', osp.password('host1', 8, 1, 3))
-		
-	# 	assert_equal('kT455AIH', osp.password('host2', 8, 1, 0))
-	# 	assert_equal('k]455AIH', osp.password('host2', 8, 1, 1))
-	# 	assert_equal('k]455`IH', osp.password('host2', 8, 1, 2))
-	# 	assert_equal('k]455`&H', osp.password('host2', 8, 1, 3))
-		
-	# 	assert_equal('RN1vFCCx', osp.password('host3', 8, 1, 0))
-	# 	assert_equal('}N1vFCCx', osp.password('host3', 8, 1, 1))
-	# 	assert_equal('}_1vFCCx', osp.password('host3', 8, 1, 2))
-	# 	assert_equal('}_1v$CCx', osp.password('host3', 8, 1, 3))
-		
-	# 	assert_equal('kT455AIHkWRmXRN9', osp.password('host2', 16, 1, 0))
-	# 	assert_equal('k]455AIHkWRmXRN9', osp.password('host2', 16, 1, 1))
-	# 	assert_equal('k]455`IHkWRmXRN9', osp.password('host2', 16, 1, 2))
-	# 	assert_equal('k]455`&HkWRmXRN9', osp.password('host2', 16, 1, 3))
-		
-	# 	assert_equal('SDBNsS7tMF4HjpPz', osp.password('host2', 16, 2, 0))
-	# 	assert_equal('[DBNsS7tMF4HjpPz', osp.password('host2', 16, 2, 1))
-	# 	assert_equal('[@BNsS7tMF4HjpPz', osp.password('host2', 16, 2, 2))
-	# 	assert_equal('[@~NsS7tMF4HjpPz', osp.password('host2', 16, 2, 3))
-		
-	# 	assert_equal('GZ8SAox0xBvFM9QL', osp.password('host2', 16, 3, 0))
-	# 	assert_equal('%Z8SAox0xBvFM9QL', osp.password('host2', 16, 3, 1))
-	# 	assert_equal('%>8SAox0xBvFM9QL', osp.password('host2', 16, 3, 2))
-	# 	assert_equal('%>8[Aox0xBvFM9QL', osp.password('host2', 16, 3, 3))
-	# end
-	
-	def test_password3
-		#PASSWORD_MIN_SIZE = 8
-		#PASSWORD_MAX_SIZE = 32
-		
-		osp = TheFox::OSP::OSP.new('example@example.com', 'test1', 2 ** 10)
-		osp.key_derivation
-		
-		assert_equal('cXyE2Dq1', osp.password('host1', 8, 1, 0))
-		assert_equal('/XyE2Dq1', osp.password('host1', 8, 1, 1))
-		assert_equal('/X;E2Dq1', osp.password('host1', 8, 1, 2))
-		assert_equal('/X;E2D_1', osp.password('host1', 8, 1, 3))
-		
-		assert_equal('ar7JQegF', osp.password('host2', 8, 1, 0))
-		assert_equal('.r7JQegF', osp.password('host2', 8, 1, 1))
-		assert_equal('.+7JQegF', osp.password('host2', 8, 1, 2))
-		assert_equal('.+7JQ~gF', osp.password('host2', 8, 1, 3))
-		
-		assert_equal('RN1vFCCx', osp.password('host3', 8, 1, 0))
-		assert_equal('}N1vFCCx', osp.password('host3', 8, 1, 1))
-		assert_equal('}_1vFCCx', osp.password('host3', 8, 1, 2))
-		assert_equal('}_1v$CCx', osp.password('host3', 8, 1, 3))
-		
-		assert_equal('ar7JQegFyBk737gQ', osp.password('host2', 16, 1, 0))
-		assert_equal('.r7JQegFyBk737gQ', osp.password('host2', 16, 1, 1))
-		assert_equal('.+7JQegFyBk737gQ', osp.password('host2', 16, 1, 2))
-		assert_equal('.+7JQ~gFyBk737gQ', osp.password('host2', 16, 1, 3))
-		
-		assert_equal('E3uJvG0rGFKwgpHD', osp.password('host2', 16, 2, 0))
-		assert_equal('E3}JvG0rGFKwgpHD', osp.password('host2', 16, 2, 1))
-		assert_equal('E3}J[G0rGFKwgpHD', osp.password('host2', 16, 2, 2))
-		assert_equal('E3}J[G0+GFKwgpHD', osp.password('host2', 16, 2, 3))
-		
-		assert_equal('7p51OI3QRAKGUcUc', osp.password('host2', 16, 3, 0))
-		assert_equal('~p51OI3QRAKGUcUc', osp.password('host2', 16, 3, 1))
-		assert_equal('~p/1OI3QRAKGUcUc', osp.password('host2', 16, 3, 2))
-		assert_equal('~p/<OI3QRAKGUcUc', osp.password('host2', 16, 3, 3))
-	end
-end

data/tests/ts_all.rb

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative 'tc_osp'
-require_relative 'tc_host'