osp 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 765b0bc1616f91a2da8a4ec9bb41e46146fe0e58
-  data.tar.gz: d7ea9546689038040a86571bd05c5d4be2da1f90
+  metadata.gz: 7800ccd69d8e4045f39ef0e9192c03799848a94d
+  data.tar.gz: f5826cfda6a244cfef3f710c3e03921b7d762e25
 SHA512:
-  metadata.gz: 9e6211266c619d2ebaa89907e1f6f8581f1d26c7bb58c2288a87106b91b836b66c80807e87fc5ae470810ed96601b12742c9d83bd0b804b9270957ba5e4ae3df
-  data.tar.gz: 0632221c03282e0a437a07fcb2333169ded00eea8a446f396a09330e0ae6656b8dbc263087b0d977974a83e8e3efba32561c0b751d91af65d51833de42208997
+  metadata.gz: 9afd2094afdd07081f83232836b6fe32080a9f9b68325264d2f4cfbda4ed60161ed1aa391e53973e6409501af2c6ffbbaeaa6f6b9683fbe77f32876327168268
+  data.tar.gz: 3d66ae7ca70f34427deeb6240495a6347f2e3f57118e73b787f2c001325bf22daabddc2b9db0c8f0a282898a1dc8b6de9bcdb13314f9478810f0ee90dea5e800

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
 .setup
+/bin/dev
 CHANGELOG-*.txt
 /releases/

data/.travis.yml

@@ -6,4 +6,4 @@ before_install:
     - ruby --version
 script:
     - make test
-    - make install
+    - ./bin/osp --version

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osp (0.1.0)
+    osp (0.2.0)
       highline (~> 1.7)
       msgpack (~> 0.7)
       thefox-ext (~> 1.2)

data/bin/osp

@@ -17,13 +17,18 @@ options = {
 	:database_path => "#{Dir.home}/.osp",
 }
 opts = OptionParser.new do |opts|
-	opts.banner = 'Usage: osp'
+	opts.banner = 'Usage: osp [options]'
 	opts.separator('')
 	
 	opts.on('-d', '--database <path>', 'Path to the database file.') do |path|
 		options[:database_path] = path
 	end
 	
+	opts.on_tail('--version', 'Show version.') do
+		puts TheFox::OSP::VERSION
+		exit
+	end
+	
 	opts.on_tail('-h', '--help', 'Show this message.') do
 		puts opts
 		puts
@@ -33,6 +38,10 @@ end
 args = opts.parse(ARGV)
 
 
+if !STDIN.tty?
+	raise "STDIN isn't a TTY."
+end
+
 @cli = HighLine.new
 
 puts "OSP - OneShallPass #{TheFox::OSP::VERSION}"
@@ -50,78 +59,38 @@ puts '   Email: *****'
 puts 'Password: *****'
 puts
 
-printf "Calculating base hash: #{TheFox::OSP::HASHES_N} (#{TheFox::OSP::HASHES_EXP}-bit) - please wait ..."
-osp = TheFox::OSP::OSP.new(email, password, TheFox::OSP::HASHES_N)
-osp.key_derivation
+@osp_class = TheFox::OSP::OSP
+#@osp_class = TheFox::OSP::OSPDev
+
+printf "Calculating base hash: #{@osp_class::HASHES_N} (#{@osp_class::HASHES_EXP}-bit) - please wait ..."
+@osp = @osp_class.new(email, password)
+@osp.key_derivation
 puts ' done'
 
-database = {
-	'meta' => {
-		'version' => 1,
-		'created_at' => DateTime.now.to_s,
-		'updated_at' => DateTime.now.to_s,
-	},
-	'hosts' => {}
-}
-has_database = false
-has_database_changes = false
-if File.exist?(options[:database_path])
-	puts "Use database file: #{options[:database_path]}",
-		'Try to open it ...'
-	
-	begin
-		puts "Read file '#{options[:database_path]}'."
-		db_meta = File.binread(options[:database_path])
-		
-		puts 'Process metadata.'
-		db_meta = Base64.strict_decode64(db_meta)
-		db_meta = MessagePack.unpack(db_meta)
-		
-		db_e = Base64.strict_decode64(db_meta['db'])
-		mac = OpenSSL::Digest::SHA256.digest(db_e)
-		if db_meta['mac'] == mac
-			puts 'Setup database encryption.'
-			dk_sha256 = OpenSSL::Digest::SHA256.digest(osp.dk)
-			iv = Base64.strict_decode64(db_meta['iv'])
-			
-			aes = OpenSSL::Cipher::Cipher.new('AES-256-CBC')
-			aes.decrypt
-			aes.key = dk_sha256
-			aes.iv = iv
-			
-			begin
-				puts 'Decrypt database.'
-				db_b64 = aes.update(db_e)
-				db_b64 << aes.final
-			rescue Exception => e
-				raise 'Incorrect email and password combination.'
-			end
-			
-			puts 'Build database.'
-			database = MessagePack.unpack(Base64.strict_decode64(db_b64))
-			
-			database['hosts'] = database['hosts'].map{ |name, host|
-				host_o = TheFox::OSP::Host.from_h(host)
-				host_o.osp = osp
-				[name, host_o]
-			}.to_h
-			
-			puts 'Startup done.'
-		else
-			raise 'Integrity check failed.'
-		end
-	rescue Exception => e
-		puts "FATAL ERROR: couldn't open database:"
-		puts "#{e}"
-		
-		exit 1
-	end
+def database_load_step(step, msg)
+	puts "#{step} #{msg}"
+end
+
+def database_write_step(step, msg)
+	puts "#{step} #{msg}"
+end
+
+@database = TheFox::OSP::Database.new(options[:database_path], @osp)
+@database.load_callback_method = self.method('database_load_step')
+@database.write_callback_method = self.method('database_write_step')
+begin
+	@database.load
+rescue Exception => e
+	puts
+	puts "FATAL ERROR: couldn't open database:"
+	puts "#{e}"
+	exit 1
 end
 
 def password_callback_method(step, pw)
 	printf '.'
 end
-osp.password_callback_method = self.method('password_callback_method')
+@osp.password_callback_method = self.method('password_callback_method')
 
 def host_show(host, regenerate_password = false)
 	if !host.has_generated_password? || regenerate_password
@@ -139,8 +108,8 @@ def host_show(host, regenerate_password = false)
 	puts "  Password: #{host.password}"
 end
 
-def host_edit(osp, host = nil)
-	host = TheFox::OSP::Host.new(osp) if host.nil?
+def host_edit(host = nil)
+	host = TheFox::OSP::Host.new(@osp) if host.nil?
 	
 	tmp = @cli.ask('      Name: ' + (!host.name.nil? ? "[#{host.name}]" : '') + ' ').strip.to_s
 	host.name = tmp if tmp != ''
@@ -155,7 +124,7 @@ def host_edit(osp, host = nil)
 	
 	host.length     = @cli.ask("    Length: [#{host.length}] ", Integer){ |q|
 		q.default = host.length
-		q.in = TheFox::OSP::PASSWORD_MIN_SIZE..TheFox::OSP::PASSWORD_MAX_SIZE }.to_i
+		q.in = @osp_class::PASSWORD_MIN_SIZE..@osp_class::PASSWORD_MAX_SIZE }.to_i
 	
 	host.symbols    = @cli.ask("   Symbols: [#{host.symbols}] ", Integer){ |q|
 		q.default = host.symbols
@@ -174,7 +143,7 @@ while true
 		puts "Type '?' for help."
 	when 'n'
 		puts
-		host = host_edit(osp)
+		host = host_edit
 		if !host.nil?
 			host_show(host)
 			puts
@@ -184,9 +153,7 @@ while true
 			puts "Answer: '#{add}'"
 			
 			if add == 'y'
-				has_database_changes = true
-				
-				database['hosts'][host.name] = host
+				@database.add_host(host)
 			end
 		else
 			puts "ERROR: hostname can't be nothing."
@@ -196,11 +163,11 @@ while true
 		puts 'List Hosts'
 		puts
 		
-		hosts_n = database['hosts'].count
+		hosts_n = @database.hosts.count
 		format = '%' + hosts_n.to_s.length.to_s + 'd'
 		
 		n = 0
-		database['hosts'].values.each do |host|
+		@database.hosts.values.each do |host|
 			n += 1
 			printf "#{format}. %s\n", n, host.name
 		end
@@ -221,7 +188,7 @@ while true
 				host_name = @cli.ask('Search host names: ', String).strip.downcase
 				re = Regexp.new(host_name, Regexp::IGNORECASE)
 				
-				found_hosts = database['hosts'].select{ |name, host| re.match(host.name) }
+				found_hosts = @database.hosts.select{ |name, host| re.match(host.name) }
 				
 				search_actions << 'l'
 			when 'l'
@@ -280,12 +247,10 @@ while true
 					end
 					
 					if !selected_host.nil?
-						host_edit(osp, selected_host)
+						host_edit(selected_host)
 						host_show(selected_host, true)
 						
-						database['hosts'][selected_host.name] = selected_host
-						
-						has_database_changes = true
+						@database.add_host(selected_host)
 					end
 				else
 					puts 'No hosts found.'
@@ -323,61 +288,9 @@ while true
 		actions << 'q'
 		actions << 'w'
 	when 'w'
-		if has_database_changes
-			tmp = "#{options[:database_path]}~"
-			
-			database['meta']['updated_at'] = DateTime.now.to_s
-			
-			# http://stackoverflow.com/questions/9049789/aes-encryption-key-versus-iv
-			# http://keepass.info/help/base/security.html
-			# https://gist.github.com/byu/99651
-			
-			puts 'Make temp database.'
-			db_c = database.clone
-			db_c['hosts'] = db_c['hosts'].map{ |name, host| [name, host.to_h] }.to_h
-			
-			puts 'Setup database encryption.'
-			dk_sha256 = OpenSSL::Digest::SHA256.digest(osp.dk)
-			iv = OpenSSL::Cipher::Cipher.new('AES-256-CBC').random_iv
-			
-			aes = OpenSSL::Cipher::Cipher.new('AES-256-CBC')
-			aes.encrypt
-			aes.key = dk_sha256
-			aes.iv = iv
-			
-			puts 'Encrypt database.'
-			db_e = aes.update(Base64.strict_encode64(db_c.to_msgpack))
-			db_e << aes.final
-			
-			mac = OpenSSL::Digest::SHA256.digest(db_e)
-			
-			db_out = {
-				'version' => 1,
-				'iv' => Base64.strict_encode64(iv),
-				'db' => Base64.strict_encode64(db_e),
-				'mac' => mac,
-			}
-			db_out = db_out.to_msgpack
-			db_out = Base64.strict_encode64(db_out)
-			
-			puts "Write temp file to '#{tmp}'."
-			File.binwrite(tmp, db_out)
-			
-			backup_dts = Time.now.strftime('%Y%m%d-%H%M%S')
-			backup = "#{options[:database_path]}~backup_#{backup_dts}_" + Digest::SHA256.file(tmp).hexdigest[0..7]
-			
-			puts "Backup temp file to '#{backup}'."
-			FileUtils.cp(tmp, backup)
-			
-			puts "Finally, move temp file to '#{options[:database_path]}'."
-			FileUtils.mv(tmp, options[:database_path])
-			
-			has_database_changes = false
-		else
-			puts 'Nothing changed, nothing written.'
-		end
+		@database.write
 	when 'q'
-		if has_database_changes
+		if @database.has_changed
 			puts
 			puts 'You have unsaved database changes.'
 			
@@ -393,7 +306,7 @@ while true
 				puts "Answer: '#{really}'"
 				
 				if really == 'y'
-					has_database_changes = false
+					@database.has_changed = false
 					actions << 'q'
 				end
 			end

data/lib/osp.rb

@@ -3,4 +3,7 @@ require 'ext/string'
 
 require 'osp/version'
 require 'osp/osp'
+require 'osp/ospdotcom'
+require 'osp/ospdev'
 require 'osp/host'
+require 'osp/database'

data/lib/osp/database.rb

@@ -0,0 +1,166 @@
+
+module TheFox
+	module OSP
+		
+		class Database
+			
+			attr_accessor :has_changed
+			
+			def initialize(file_path, osp)
+				@file_path = file_path
+				@osp = osp
+				@load_callback_method = nil
+				@write_callback_method = nil
+				@has_changed = false
+				
+				@data = {
+					'meta' => {
+						'version' => 1,
+						'created_at' => DateTime.now.to_s,
+						'updated_at' => DateTime.now.to_s,
+					},
+					'hosts' => {}
+				}
+			end
+			
+			def load_callback_method=(m)
+				@load_callback_method = m
+			end
+			
+			def load_callback(*o)
+				@load_callback_method.call(*o) if !@load_callback_method.nil?
+			end
+			
+			def load
+				load_callback(1000, 'Check for existing database file.')
+				
+				if File.exist?(@file_path)
+					load_callback(1050, "Use database file: #{@file_path}")
+					
+					load_callback(1100, "Read file '#{@file_path}'.")
+					db_meta = File.binread(@file_path)
+					
+					load_callback(1200, 'Process database metadata.')
+					db_meta = Base64.strict_decode64(db_meta)
+					db_meta = MessagePack.unpack(db_meta)
+					
+					db_e = Base64.strict_decode64(db_meta['db'])
+					mac = OpenSSL::Digest::SHA256.digest(db_e)
+					if db_meta['mac'] == mac
+						load_callback(1300, 'Setup database decryption.')
+						dk_sha256 = OpenSSL::Digest::SHA256.digest(@osp.dk)
+						iv = Base64.strict_decode64(db_meta['iv'])
+						
+						aes = OpenSSL::Cipher::Cipher.new('AES-256-CBC')
+						aes.decrypt
+						aes.key = dk_sha256
+						aes.iv = iv
+						
+						begin
+							load_callback(1350, 'Decrypt database.')
+							db_b64 = aes.update(db_e)
+							db_b64 << aes.final
+						rescue Exception #=> e
+							raise 'Incorrect email and password combination.'
+						end
+						
+						load_callback(1400, 'Build database.')
+						@data = MessagePack.unpack(Base64.strict_decode64(db_b64))
+						
+						@data['hosts'] = @data['hosts'].map{ |name, host|
+							host_o = TheFox::OSP::Host.from_h(host)
+							host_o.osp = @osp
+							[name, host_o]
+						}.to_h
+						
+						load_callback(9000, 'Database startup done.')
+					else
+						raise 'Database integrity check failed.'
+					end
+				else
+					load_callback(9500, 'Database startup done.')
+				end
+			end
+			
+			def write_callback_method=(m)
+				@write_callback_method = m
+			end
+			
+			def write_callback(*o)
+				@write_callback_method.call(*o) if !@write_callback_method.nil?
+			end
+			
+			def write
+				write_callback(1000, 'Check database for changes.')
+				
+				if @has_changed
+					tmp = "#{@file_path}~"
+					
+					# http://stackoverflow.com/questions/9049789/aes-encryption-key-versus-iv
+					# http://keepass.info/help/base/security.html
+					# https://gist.github.com/byu/99651
+					
+					write_callback(1100, 'Make temp database.')
+					db_c = @data
+					db_c['hosts'] = db_c['hosts'].map{ |name, host| [name, host.to_h] }.to_h
+					
+					write_callback(1200, 'Setup database encryption.')
+					dk_sha256 = OpenSSL::Digest::SHA256.digest(@osp.dk)
+					iv = OpenSSL::Cipher::Cipher.new('AES-256-CBC').random_iv
+					
+					aes = OpenSSL::Cipher::Cipher.new('AES-256-CBC')
+					aes.encrypt
+					aes.key = dk_sha256
+					aes.iv = iv
+					
+					write_callback(1250, 'Encrypt database.')
+					db_e = aes.update(Base64.strict_encode64(db_c.to_msgpack))
+					db_e << aes.final
+					
+					mac = OpenSSL::Digest::SHA256.digest(db_e)
+					
+					db_out = {
+						'version' => 1,
+						'iv' => Base64.strict_encode64(iv),
+						'db' => Base64.strict_encode64(db_e),
+						'mac' => mac,
+					}
+					db_out = db_out.to_msgpack
+					db_out = Base64.strict_encode64(db_out)
+					
+					write_callback(1300, "Write temp file to '#{tmp}'.")
+					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]
+					
+					write_callback(1350, "Backup temp file to '#{backup}'.")
+					FileUtils.cp(tmp, backup)
+					
+					write_callback(1390, "Finally, move temp file to '#{@file_path}'.")
+					FileUtils.mv(tmp, @file_path)
+					
+					@has_changed = false
+				else
+					write_callback(9500, 'Nothing changed, nothing written.')
+				end
+			end
+			
+			def update
+				@data['meta']['updated_at'] = DateTime.now.to_s
+			end
+			
+			def hosts
+				@data['hosts']
+			end
+			
+			def add_host(host)
+				@data['hosts'][host.name] = host
+				update
+				@has_changed = true
+			end
+			
+		end
+		
+	end
+end

data/lib/osp/osp.rb

@@ -9,19 +9,19 @@ require 'thefox-ext'
 module TheFox
 	module OSP
 		
-		ID = 'TheFox-OSP'
-		HASHES_EXP = 24
-		HASHES_N = 2 ** HASHES_EXP
-		PASSWORD_MIN_SIZE = 8
-		PASSWORD_MAX_SIZE = 32
-		SYMBOLS = 1
-		
 		class OSP
 			
+			ID = 'TheFox-OSP'
+			HASHES_EXP = 24
+			HASHES_N = 2 ** HASHES_EXP
+			PASSWORD_MIN_SIZE = 8
+			PASSWORD_MAX_SIZE = 32
+			SYMBOLS = 1
+			
 			attr_accessor :dk
 			attr_accessor :hashes
 			
-			def initialize(email, password, hashes = HASHES_N)
+			def initialize(email, password, hashes = self.class::HASHES_N)
 				@email = email
 				@password = password
 				@hashes = hashes
@@ -33,7 +33,7 @@ module TheFox
 				@dk = OpenSSL::PKCS5.pbkdf2_hmac(@password, @email, @hashes, 64, OpenSSL::Digest::SHA512.new)
 			end
 			
-			def password(host_name, length = 16, generation = 1, symbols = 1)
+			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
 				
 				key_derivation if @dk.nil?
@@ -41,7 +41,7 @@ module TheFox
 				pw = nil
 				step = 0
 				while pw.nil?
-					raw = [ID, @email, host_name, generation, step]
+					raw = [self.class::ID, @email, host_name, generation, step]
 					data = raw.to_msgpack
 					hmac_p = OpenSSL::HMAC.digest(OpenSSL::Digest::SHA512.new, @dk, data)
 					hmac_b64 = Base64.strict_encode64(hmac_p)
@@ -57,7 +57,7 @@ module TheFox
 					_b64map = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
 					
 					indices = []
-					(0..PASSWORD_MIN_SIZE).each do |n|
+					(0..self.class::PASSWORD_MIN_SIZE).each do |n|
 						c = pw[n]
 						if c.method(sub_method).call
 							indices << n
@@ -97,7 +97,7 @@ module TheFox
 				lowers = 0
 				digits = 0
 				
-				(0...PASSWORD_MIN_SIZE).each do |n|
+				(0...self.class::PASSWORD_MIN_SIZE).each do |n|
 					c = pw[n]
 					
 					if c.is_digit?
@@ -117,7 +117,7 @@ module TheFox
 					return false
 				end
 				
-				(PASSWORD_MIN_SIZE...PASSWORD_MAX_SIZE).each do |n|
+				(self.class::PASSWORD_MIN_SIZE...self.class::PASSWORD_MAX_SIZE).each do |n|
 					if !pw[n].is_valid?
 						return false
 					end
@@ -131,7 +131,7 @@ module TheFox
 				lowers = 0
 				digits = 0
 				
-				(0...PASSWORD_MIN_SIZE).each do |n|
+				(0...self.class::PASSWORD_MIN_SIZE).each do |n|
 					c = pw[n]
 					if c.is_digit?
 						digits += 1

data/lib/osp/ospdev.rb

@@ -0,0 +1,13 @@
+
+module TheFox
+	module OSP
+		
+		class OSPDev < OSP
+			
+			HASHES_EXP = 10
+			HASHES_N = 2 ** HASHES_EXP
+			
+		end
+		
+	end
+end

data/lib/osp/ospdotcom.rb

@@ -0,0 +1,17 @@
+
+module TheFox
+	module OSP
+		
+		class OSPDotCom < OSP
+			
+			ID = 'OneShallPass v2.0'
+			HASHES_EXP = 10
+			HASHES_N = 2 ** HASHES_EXP
+			PASSWORD_MIN_SIZE = 8
+			PASSWORD_MAX_SIZE = 16
+			SYMBOLS = 1
+			
+		end
+		
+	end
+end

data/lib/osp/version.rb

@@ -2,8 +2,8 @@
 module TheFox
 	module OSP
 		RELEASE_ID = 0
-		VERSION = '0.1.0'
-		DATE = '2015-12-19'
+		VERSION = '0.2.0'
+		DATE = '2015-12-20'
 		HOMEPAGE = 'https://github.com/TheFox/osp'
 	end
 end

data/tests/tc_osp.rb

@@ -23,41 +23,40 @@ class TestOsp < MiniTest::Test
 		assert_equal(2 ** 20, osp.hashes)
 	end
 	
-	# def test_password1
-	#	#ID = 'OneShallPass v2.0'
-	# 	osp = TheFox::OSP::OSP.new('example@example.com', 'test1', 2 ** 10)
-	# 	osp.key_derivation
+	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
+		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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,8 +97,11 @@ files:
 - bin/osp
 - lib/ext/string.rb
 - lib/osp.rb
+- lib/osp/database.rb
 - lib/osp/host.rb
 - lib/osp/osp.rb
+- lib/osp/ospdev.rb
+- lib/osp/ospdotcom.rb
 - lib/osp/version.rb
 - osp.gemspec
 - osp.sublime-project