osp 0.3.0.pre.dev.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29a7260e8467924c0cfb61511807d2562a1dc102
-  data.tar.gz: 8d47df4ac02c3a0be9c129a370c415c85e2e9b7a
+  metadata.gz: a4c1c9cfa0c03b3bf0b9d49993c599d977ca17fb
+  data.tar.gz: 71bddbe633aedc04160f3743a10841ce3b2b1e6b
 SHA512:
-  metadata.gz: 831f2ae320e236c5f01e74076b5a1aa76aa289aee68109cd501e2da58864cd51a3563692b9c775668dce9c9339c53bc5869fba377c83fab7ffe05bec7bae13a4
-  data.tar.gz: d855ad637941341b19425b6b9c5dd7d2f33e4df9e1c6438b97c544ccb95d6ab073b60921d68ab1510e0ef9dd42fb1bdbdb26c3d0084ee1d7948fcacd7c5f5bf0
+  metadata.gz: 56dcef1066c82389ec100152a834c79bb16351731e1871d298a7407da1669be36a001a3ec1b97b222e526f68185b9702f272bc82f6c5032bbb38b856829ece08
+  data.tar.gz: 325c774f4eb87ec8c955a3a1ba45797c8fcd44375ac1fa2fbebd474ecbcc0052ef2eb87f048284cedbad3d89acbf95f5928914f0561f537a1e19432bef7ff0d0

data/Gemfile.lock

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

data/bin/osp

@@ -60,7 +60,7 @@ puts 'Password: *****'
 puts
 
 @osp_class = TheFox::OSP::OSP
-@osp_class = TheFox::OSP::OSPDev
+#@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)
@@ -212,22 +212,25 @@ while true
 					index = 1
 					if found_hosts.count > 1
 						index = @cli.ask('Show host, select by number: ', Integer){ |q|
-							q.character = true if found_hosts.count < 10
-							q.in = 1..(found_hosts.count) }.to_i
+							q.character = true if found_hosts.count < 10 }.to_i
 						puts
 					end
 					
-					puts "Host ##{index} selected:"
-					index -= 1
-					selected_host = nil
-					begin
-						selected_host = found_hosts.values[index]
-					rescue Exception => e
-						puts "ERROR: #{e}"
-					end
-					
-					if !selected_host.nil?
-						host_show(selected_host)
+					if index >= 1 && index <= found_hosts.count
+						puts "Host ##{index} selected:"
+						index -= 1
+						selected_host = nil
+						begin
+							selected_host = found_hosts.values[index]
+						rescue Exception => e
+							puts "ERROR: #{e}"
+						end
+						
+						if !selected_host.nil?
+							host_show(selected_host)
+						end
+					else
+						puts 'Abort.'
 					end
 				else
 					puts 'No hosts found.'
@@ -238,25 +241,28 @@ while true
 					index = 1
 					if found_hosts.count > 1
 						index = @cli.ask('Edit, select host by number: ', Integer){ |q|
-							q.character = true if found_hosts.count < 10
-							q.in = 1..(found_hosts.count) }.to_i
+							q.character = true if found_hosts.count < 10 }.to_i
 						puts
 					end
 					
-					puts "Host ##{index} selected:"
-					index -= 1
-					selected_host = nil
-					begin
-						selected_host = found_hosts.values[index].clone
-					rescue Exception => e
-						puts "ERROR: #{e}"
-					end
-					
-					if !selected_host.nil?
-						host_edit(selected_host)
-						host_show(selected_host, true)
+					if index >= 1 && index <= found_hosts.count
+						puts "Host ##{index} selected:"
+						index -= 1
+						selected_host = nil
+						begin
+							selected_host = found_hosts.values[index].clone
+						rescue Exception => e
+							puts "ERROR: #{e}"
+						end
 						
-						@database.add_host(selected_host)
+						if !selected_host.nil?
+							host_edit(selected_host)
+							host_show(selected_host, true)
+							
+							@database.add_host(selected_host)
+						end
+					else
+						puts 'Abort.'
 					end
 				else
 					puts 'No hosts found.'
@@ -267,22 +273,30 @@ while true
 					index = 1
 					if found_hosts.count > 1
 						index = @cli.ask('Delete, select host by number: ', Integer){ |q|
-							q.character = true if found_hosts.count < 10
-							q.in = 1..(found_hosts.count) }.to_i
+							q.character = true if found_hosts.count < 10 }.to_i
 						puts
 					end
 					
-					puts "Delete host ##{index}."
-					index -= 1
-					selected_host = nil
-					begin
-						selected_host = found_hosts.values[index]
-					rescue Exception => e
-						puts "ERROR: #{e}"
-					end
-					
-					if !selected_host.nil?
-						@database.remove_host(selected_host)
+					if index >= 1 && index <= found_hosts.count
+						puts "Delete host ##{index}."
+						index -= 1
+						selected_host = nil
+						begin
+							selected_host = found_hosts.values[index]
+						rescue Exception => e
+							puts "ERROR: #{e}"
+						end
+						
+						if !selected_host.nil?
+							if @database.remove_host(selected_host)
+								found_hosts.delete(selected_host.name)
+								puts "Host '#{selected_host.name}' deleted."
+							else
+								puts "ERROR: Can't delete host '#{selected_host.name}'."
+							end
+						end
+					else
+						puts 'Abort.'
 					end
 				else
 					puts 'No hosts found.'
@@ -296,7 +310,7 @@ while true
 				puts "\tl - List found hosts."
 				puts "\ti - Print informations about a host found by a search."
 				puts "\te - Edit a host found by search."
-				# puts "\td - Delete a host found by search."
+				puts "\td - Delete a host found by search."
 				puts "\tq - Quit search."
 				puts "\t? - Print help."
 			else
@@ -306,7 +320,7 @@ while true
 			next if search_actions.count > 0
 			
 			puts
-			search_actions << @cli.ask('[slieq?] >> '){ |q| q.character = true }.downcase
+			search_actions << @cli.ask('[sliedq?] >> '){ |q| q.character = true }.downcase
 		end
 	when 'x'
 		actions << 'q'
@@ -326,12 +340,14 @@ while true
 				actions << 'x'
 			else
 				really = @cli.ask('Really? [yN] ', String){ |q| q.character = true }.strip.downcase
-				really = 'y' if really == ''
+				really = 'n' if really == ''
 				puts "Answer: '#{really}'"
 				
 				if really == 'y'
 					@database.has_changed = false
 					actions << 'q'
+				else
+					puts 'Qutting aborted.'
 				end
 			end
 		else

data/lib/osp/database.rb

@@ -160,6 +160,17 @@ module TheFox
 				@has_changed = true
 			end
 			
+			def remove_host(host)
+				if @data['hosts'].has_key?(host.name)
+					@data['hosts'].delete(host.name)
+					update
+					@has_changed = true
+					true
+				else
+					false
+				end
+			end
+			
 		end
 		
 	end

data/lib/osp/version.rb

@@ -2,7 +2,7 @@
 module TheFox
 	module OSP
 		RELEASE_ID = 0
-		VERSION = '0.3.0-dev.1'
+		VERSION = '0.3.0'
 		DATE = '2015-12-20'
 		HOMEPAGE = 'https://github.com/TheFox/osp'
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osp
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.dev.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Christian Mayer
@@ -123,9 +123,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.7