yamp 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d4147065962bc1538c030e019e60e3d0b7f6b0
-  data.tar.gz: e4d7a5c84938d78bc8b5256d35ce31596b8a331c
+  metadata.gz: af599784fb31d967ffc9f696ddc11691a5a294e8
+  data.tar.gz: 288685df62e89aa8ec9c77e9b837c06e561b7419
 SHA512:
-  metadata.gz: 17ad410c73d0a142e8524b229871ae5411627908fbdd5ddddd044e7ddb877545f336539ffc7b23ffcbadefade141ed28d5c819c4443c88063630cc02657f0912
-  data.tar.gz: bd62ec4f70c9fdfb76f391f6e0de457aa48014b58f63ee14f76e5ef6f9f85475e1ae7038eb7a0898719d85909276f7b0e81ba049c0e3b25979f35fb6eeef694f
+  metadata.gz: 4eec8131dc8f1f9b9c90992e32f6d37aaa79abf9b0092f51048c27669ed7159241cf88c09eb5cbfaad6d8e9bf4b39798523dbc2d2ca4f0f6151f3f3e78302b8d
+  data.tar.gz: 91b4c2ed2b91d8ac24eb6cc6b7e7c0ce4df2445400a4a7e62ff1726ebf7fe804fcad9e4a1ae8fc896df42823793e93411863eaf6b206a6552b969c6bf2ca6557

data/bin/yamp

@@ -3,9 +3,12 @@
 require 'io/console'
 require 'clipboard'
 require 'optparse'
+require 'yaml'
 require 'yamp'
 
-trap "SIGINT" do puts "\nByeBye!"; exit(130) end
+ARGV << '-h' if ARGV.empty?
+
+trap "SIGINT" do puts "\nk bye!"; exit(130) end
 
 class String
 	def red;			"\033[31m#{self}\033[0m" end
@@ -13,12 +16,10 @@ class String
 	def yellow;		"\033[33m#{self}\033[0m" end
 end
 
-ARGV << '-h' if ARGV.empty?
+CONFIG         = ENV['HOME'] + "/.yamp"
+PASSWORD_CHARS = [*'0'..'9', *'a'..'z',*'A'..'Z','#','!','?','$','/','(',')','[',']']
 
-vault = nil
 options = {}
-password_chars = [*'0'..'9', *'a'..'z',*'A'..'Z','#','!','?','$','/','(',')','[',']']
-
 OptionParser.new do |opts|
 	opts.banner = %q(
 	Usage: yamp [options]
@@ -31,10 +32,10 @@ OptionParser.new do |opts|
 		yamp -g twitter --to-clipboard
 		yamp --delete facebook
 	)
-	opts.on('-a', '--add ENTRY',       'create an entry')         {|id| options[:add] = id}
-	opts.on('-g', '--get ENTRY',       'read an entry')           {|id| options[:get] = id}
-	opts.on('-u', '--update ENTRY',    'update an entry')         {|id| options[:upd] = id}
-	opts.on('-d', '--delete ENTRY',    'delete an entry')         {|id| options[:del] = id}
+	opts.on('-a', '--add ENTRY',    'create an entry')            {|id| options[:add] = id}
+	opts.on('-g', '--get ENTRY',    'read an entry')              {|id| options[:get] = id}
+	opts.on('-u', '--update ENTRY', 'update an entry')            {|id| options[:upd] = id}
+	opts.on('-d', '--delete ENTRY', 'delete an entry')            {|id| options[:del] = id}
 	opts.on('-p', '--password PWD', 'specify a password')         {|pwd| options[:pwd] = pwd}
 	opts.on('-n', '--username USR', 'specify a username')         {|usr| options[:usr] = usr}
 	opts.on('-l', '--list',         'list all entries')           {options[:lst] = true}
@@ -46,18 +47,38 @@ unless (options.keys & [:add, :del, :upd, :get, :lst]).size == 1
 	exit
 end
 
-print RUBY_PLATFORM =~ /darwin/ ? "🙈 " : ">"
+unless File.file? CONFIG
+	File.open CONFIG, 'w' do |f|
+		f.write "ui:\n"
+		f.write "    prompt: #{RUBY_PLATFORM =~ /darwin/ ? "\"🙈 \"\n" : "\"~>\"\n"}"
+		f.write "redis:\n"
+    f.write "    ip: 127.0.0.1\n"
+		f.write "    port: 6379\n"
+		f.write "    db: 0\n"
+		f.write "    protected: no\n"
+	end
+end
+cfg = YAML.load_file(CONFIG)
+
+print cfg['ui']['prompt']
 master = STDIN.noecho(&:gets).chomp!; puts "\n"
+redis = Redis.new(
+	url: "redis://" +
+			 (cfg['redis']['protected'] ? ":#{master}@" : "") +
+			 "#{cfg['redis']['ip']}:" +
+			 "#{cfg['redis']['port']}/" +
+			 "#{cfg['redis']['db']}"
+)
 begin
-	vault = YAMP::Vault.new master
+	@vault = YAMP::Vault.new master, redis
 rescue Exception => e
 	puts e.message
 	exit
 end
 
 if id = options[:add]
-	pwd = options[:pwd] ? options[:pwd] : 32.times.map {password_chars.sample}.join
-	unless vault.add id, pwd, options[:usr]
+	pwd = options[:pwd] ? options[:pwd] : 32.times.map {PASSWORD_CHARS.sample}.join
+	unless @vault.add id, pwd, options[:usr]
 		puts "entry already exists"
 	else
 		puts "+".green + " #{id}"
@@ -67,7 +88,7 @@ if id = options[:add]
 end
 
 if id = options[:del]
-	unless vault.remove id
+	unless @vault.remove id
 		puts "no such entry"
 	else
 		puts "-".red + " #{id}"
@@ -83,10 +104,10 @@ if id = options[:upd]
 	pwd_updated = false
 	usr_updated = false
 	if pwd = options[:pwd]
-		pwd_updated = vault.update id, :pwd, pwd
+		pwd_updated = @vault.update id, :pwd, pwd
 	end
 	if usr = options[:usr]
-		usr_updated = vault.update id, :usr, usr
+		usr_updated = @vault.update id, :usr, usr
 	end
 	unless pwd_updated || usr_updated
 		puts "no such entry"
@@ -98,8 +119,8 @@ if id = options[:upd]
 end
 
 if id = options[:get]
-	password = vault.get id, :pwd
-	username = vault.get id, :usr
+	password = @vault.get id, :pwd
+	username = @vault.get id, :usr
 	unless password || username
 		puts "no such entry"
 	else
@@ -114,6 +135,6 @@ if id = options[:get]
 end
 
 if options[:lst]
-	puts vault.list.sort
+	puts @vault.list.sort
 	exit
 end

data/lib/yamp.rb

@@ -13,7 +13,7 @@ module YAMP
       if master_hash && master_salt
         @master_key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(master, master_salt, 10000, 32)
         unless OpenSSL::Digest::SHA512.hexdigest(@master_key) == master_hash
-          raise ArgumentError, "access denied"
+          raise ArgumentError, 'ERR invalid password'
         end
       else
         salt = OpenSSL::Random.random_bytes(32)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yamp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Tobias Heilig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -61,7 +61,7 @@ extra_rdoc_files: []
 files:
 - bin/yamp
 - lib/yamp.rb
-homepage: http://rubygems.org/gems/yamp
+homepage: https://github.com/HIGHphen/yamp
 licenses:
 - MIT
 metadata: {}