osp 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9ad26b1c10b870b57a7f93e87d959e2793cc428
-  data.tar.gz: 73b18ffd7ba322d4e012d4a0be7b65d7c50e85d5
+  metadata.gz: 569423a826e7be5a16b70daa0d1726a2ec4d3ca9
+  data.tar.gz: 94d944406202809244d7d4438c466bf6f7af8284
 SHA512:
-  metadata.gz: ec993b8319cdab6f467944092e2473f390ea172f8228548ee85e4f2064e61cc290c388f10355832ab3ca10c578d76dc759e3a0c054793069f753a49b34abd254
-  data.tar.gz: 2e803c40d74bd5e7629b6f25650cf2431fbb1837e1b26b34904fb6957185356a90ecb018054b073655aeb8343607a8d09026bb2b00f0403bf861393326395469
+  metadata.gz: d2f63e1c0e2ee680fa92c6dfae02109cf7e79938eb852701d4b87fc2f5a40e1a1e520703838230e75169d9e33335e5e8c04cf497997b891cc11c8dac030a06f3
+  data.tar.gz: 9a763890d156cf60f2b9f0a2ef1d4a54d9266c7680c2e5799901a3a489b1f79ca00b8169066e4d6fb5a4559b9071b65497624a4f2c15b898263f2342b20144d1

data/Makefile

@@ -3,6 +3,8 @@ GEM_NAME = osp
 
 include Makefile.common
 
+# Email: root
+# Password: password
 dev:
 	RUBYOPT=-rbundler/setup ruby --debug ./bin/osp -d passwords.osp
 

data/Makefile.common

@@ -1,6 +1,6 @@
 
 # Ruby Common Big
-# 2015-12-21
+# 2016-02-14
 
 MV = mv -nv
 RM = rm -rf
@@ -9,8 +9,8 @@ BUNDLER = bundle
 BUNDLER_OPTIONS = --jobs=5 --retry=3
 GEMSPEC_FILE = $(GEM_NAME).gemspec
 
-.PHONY: all $(ALL_TARGETS_EXT)
-all: setup
+.PHONY: all
+all: setup $(ALL_TARGETS_EXT)
 
 .PHONY: setup
 setup: .setup

data/README.md

@@ -9,10 +9,11 @@ The preferred method of installation is via RubyGems.org:
 
 or via `Gemfile`:
 
-	gem 'osp', '~>0.3'
+	gem 'osp', '~>0.4'
 
 ## Project Links
 
+- [Usage Video](https://asciinema.org/a/32521)
 - [Blog Post about OSP](http://blog.fox21.at/2015/12/19/one-shall-pass-for-command-line.html)
 - [Gem](https://rubygems.org/gems/osp)
 - [Travis CI Repository](https://travis-ci.org/TheFox/osp)

data/bin/osp

@@ -8,15 +8,17 @@ require 'msgpack'
 require 'osp'
 
 
-options = {
+@options = {
 	:database_path => "#{Dir.home}/.osp",
+	:database_lock_path => "#{Dir.home}/.osp~lock",
 }
 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_path] = path
+		@options[:database_lock_path] = "#{path}~lock"
 	end
 	
 	o.on_tail('--version', 'Show version.') do
@@ -44,6 +46,16 @@ puts "OSP - OneShallPass #{TheFox::OSP::VERSION}"
 puts TheFox::OSP::HOMEPAGE
 puts
 
+if File.exist?(@options[:database_lock_path])
+	puts "WARNING: lock file exist: '#{@options[:database_lock_path]}'"
+	overwrite = @cli.ask('Overwrite? '){ |q| q.default = 'n' }.downcase
+	if overwrite == 'n'
+		puts 'Quit.'
+		exit
+	end
+end
+File.binwrite(@options[:database_lock_path], Process.pid)
+
 puts 'Master Login'
 email    = @cli.ask('   Email: ')
 password = @cli.ask('Password: '){ |q| q.echo = '*' }
@@ -71,7 +83,13 @@ def database_write_step(step, msg)
 	puts "#{step} #{msg}"
 end
 
-@database = TheFox::OSP::Database.new(options[:database_path], @osp)
+def remove_lock
+	if File.exist?(@options[:database_lock_path])
+		FileUtils.rm(@options[:database_lock_path])
+	end
+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
@@ -80,6 +98,7 @@ rescue Exception => e
 	puts
 	puts "FATAL ERROR: couldn't open database:"
 	puts "#{e}"
+	remove_lock
 	exit 1
 end
 
@@ -95,8 +114,7 @@ def host_show(host, regenerate_password = false)
 		puts ' done'
 	end
 	
-	puts
-	puts "      Name: #{host.name}"
+	puts "  Hostname: #{host.name}"
 	puts "Generation: #{host.generation}"
 	puts "    Length: #{host.length}"
 	puts "   Symbols: #{host.symbols}"
@@ -107,7 +125,11 @@ end
 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
+	puts
+	puts 'New Host'
+	puts
+	
+	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?
@@ -369,3 +391,5 @@ while true
 	puts
 	actions << @cli.ask('[nlsxwq?] > '){ |q| q.character = true }.downcase
 end
+
+remove_lock

data/lib/osp/version.rb

@@ -1,9 +1,9 @@
 
 module TheFox
 	module OSP
-		RELEASE_ID = 0
-		VERSION = '0.3.2'
-		DATE = '2015-12-25'
+		RELEASE_ID = 6
+		VERSION = '0.4.0'
+		DATE = '2016-03-05'
 		HOMEPAGE = 'https://github.com/TheFox/osp'
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osp
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest