mpw 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d0eff317597b9307b65264bd5c42547b32588d6
-  data.tar.gz: a374e4ec216d629846f5848e7648d606634eaf2f
+  metadata.gz: ef1f27beb1e85561895eeaec053e65339d404a18
+  data.tar.gz: b69ea026f373f5b3039a71776e4acc9ec4d44e3c
 SHA512:
-  metadata.gz: d4b873e23e0065cbe83eb0273e16186a721acfb162974f73036d8eee8f49588172e64cc4ef2ad859971989bf141a2253f7af3cf184a6e730b53d8f967454a7ed
-  data.tar.gz: 1d6c99d6e62f544139ffd11aa5185b99346f2e8b6c9777a32b42cd472be4db9f067a21a9a2fe9e11658c14649b8b997f08fa998c35fc78e88abdaf3137b6180e
+  metadata.gz: 46c34128083ac6a70fcbb1ef3b9e0fb29b9bb58419a51d0b3623d0dbc34dd8b6371c8bed9c13b4dc61ffd7c9d0a2de06f37a61477e296b78934878edcf62959c
+  data.tar.gz: 0ff807e8c938d31abec7bce1f4a18b4f795eacf87065c8166430ffc9f86e3a9533f9098032db6ca94455345761099ea89c006072017868cac29aff6e1a381443

data/Gemfile

@@ -6,3 +6,4 @@ gem 'gpgme'
 gem 'colorize'
 gem 'net-ssh'
 gem 'net-scp'
+gem 'clipboard'

data/README.md

@@ -1,13 +1,14 @@
 # Manage your passwords!
 
 MPW is a little software which stores your passwords in an GPG encrypted file.
-MPW can synchronize your password with via SSH or FTP.
+MPW can synchronize your password with SSH or FTP.
 
 # Installation
 
 This program work with ruby >= 2.0
 
 * install ruby and rubygems on your computer
+* install xclip
 * gem install mpw
 
 # How to use

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

data/bin/mpw

@@ -48,12 +48,13 @@ I18n.locale         = lang.to_sym
 # Options
 # --------------------------------------------------------- #
 
-options = {}
-options[:force]  = false
-options[:sync]   = true
-options[:group]  = nil
-options[:config] = nil
-options[:wallet] = nil
+options             = {}
+options[:force]     = false
+options[:sync]      = true
+options[:clipboard] = true
+options[:group]     = nil
+options[:config]    = nil
+options[:wallet]    = nil
 
 OptionParser.new do |opts|
 	opts.banner = "#{I18n.t('option.usage')}: mpw [options]"
@@ -71,6 +72,10 @@ OptionParser.new do |opts|
 		options[:config] = config
 	end
 
+	opts.on('-C', '--no-clipboard', I18n.t('option.clipboard')) do
+		options[:clipboard] = false
+	end
+
 	opts.on('-d', '--delete', I18n.t('option.remove')) do
 		options[:delete] = true
 	end
@@ -142,61 +147,68 @@ end.parse!
 # Main
 # --------------------------------------------------------- #
 
-config = MPW::Config.new(options[:config])
-cli    = MPW::Cli.new(config, options[:sync])
-	
-# Setup a new config 
-if not config.is_valid? or not options[:setup].nil?
-	cli.setup(lang)
-elsif not config.check_gpg_key?
-	cli.setup_gpg_key
-end
-
-cli.get_wallet(options[:wallet])
-cli.decrypt
-
-# Display the item's informations
-if not options[:show].nil?
-	opts = {search:    options[:show],
-	        group:     options[:group],
-	       }
-
-	cli.display(opts)
-
-# Remove an item
-elsif not options[:delete].nil? and not options[:id].nil?
-	cli.delete(options[:id], options[:force])
-
-# Update an item
-elsif not options[:update].nil? and not options[:id].nil?
-	cli.update(options[:id])
-
-# Add a new item
-elsif not options[:add].nil? and options[:key].nil?
-	cli.add
-
-# Add a new public key in wallet
-elsif not options[:add].nil? and not options[:key].nil?
-	cli.add_key(options[:key], options[:file])
-
-# Delete a public key in wallet
-elsif not options[:delete].nil? and not options[:key].nil?
-	cli.delete_key(options[:key])
-
-# Export
-elsif not options[:export].nil? and not options[:file].nil?
-	cli.export(options[:file])
-
-# Add a new item
-elsif not options[:import].nil? and not options[:file].nil?
-	cli.import(options[:file])
+begin
+	config = MPW::Config.new(options[:config])
+	cli    = MPW::Cli.new(config, options[:clipboard], options[:sync])
+		
+	# Setup a new config 
+	if not options[:setup].nil?
+		cli.setup(lang)
+		exit 0
+	end
 
-# Setup wallet config
-elsif not options[:setup_wallet].nil?
-	cli.setup_wallet_config
+	cli.setup(lang)   if not config.is_valid?
+	cli.setup_gpg_key if not config.check_gpg_key?
+	
+	cli.get_wallet(options[:wallet])
+	cli.decrypt
+	
+	# Display the item's informations
+	if not options[:show].nil?
+		opts = {search:    options[:show],
+		        group:     options[:group],
+		       }
+	
+		cli.display(opts)
+	
+	# Remove an item
+	elsif not options[:delete].nil? and not options[:id].nil?
+		cli.delete(options[:id], options[:force])
+	
+	# Update an item
+	elsif not options[:update].nil? and not options[:id].nil?
+		cli.update(options[:id])
+	
+	# Add a new item
+	elsif not options[:add].nil? and options[:key].nil?
+		cli.add
+	
+	# Add a new public key in wallet
+	elsif not options[:add].nil? and not options[:key].nil?
+		cli.add_key(options[:key], options[:file])
+	
+	# Delete a public key in wallet
+	elsif not options[:delete].nil? and not options[:key].nil?
+		cli.delete_key(options[:key])
+	
+	# Export
+	elsif not options[:export].nil? and not options[:file].nil?
+		cli.export(options[:file])
+	
+	# Add a new item
+	elsif not options[:import].nil? and not options[:file].nil?
+		cli.import(options[:file])
+	
+	# Setup wallet config
+	elsif not options[:setup_wallet].nil?
+		cli.setup_wallet_config
+	
+	end
+	
+	cli = nil
+	
+	exit 0
 
+rescue SystemExit, Interrupt
+	exit 3
 end
-
-cli = nil
-
-exit 0

data/i18n/en.yml

@@ -23,7 +23,7 @@ en:
     update:
       name_empty: "You must define a name!"
     sync: 
-      general: "An error is appeared durint the sync"
+      general: "An error has appeared during the sync"
       connection: "Connection fail!"
       communication: "A communication problem with the server is appeared!"
       download: "Can't download the file!"
@@ -38,6 +38,7 @@ en:
   option:
     add: "Add an item or key"
     config: "Specify the configuration file to use"
+    clipboard: "Disable the clipboard feature"
     export: "Export a wallet in an yaml file"
     file: "Specify a file, to use with the options [--import | --export | --add]"
     force: "No ask to confirm when you delete an item"
@@ -51,7 +52,7 @@ en:
     setup: "Create a new configuration file" 
     setup_wallet: "Create a new configuration file for a wallet"
     show: "Search and show the items"
-    show_all: "Show all items"
+    show_all: "List all items"
     remove: "Delete an item"
     update: "Update an item"
     usage: "Usage"
@@ -72,6 +73,10 @@ en:
       port: "Enter the connection port (optional): "
       comment: "Enter a comment (optional): "
       valid: "Item has been added!"
+    clipboard:
+      clean: "The clipboard has been cleaned."
+      login: "The login has been copied in clipboard, press any key to continue."
+      password: "The password has been copied in clipboard for 30s!"
     delete_key:
       valid: "Key has been deleted!"
     delete_item:
@@ -86,11 +91,12 @@ en:
       title: "Setup a new config file"
       lang: "Choose your language (en, fr, ...) [default=%{lang}]: "
       gpg_key: "Enter the GPG key [ex: test@host.local]: " 
+      gpg_exe: "Enter the executable GPG path (optional): "
       wallet_dir: "Enter the wallets's folder path [default=%{home}/wallets]: "
       valid: "The config file has been created!"
     setup_wallet:
       title: "Wallet setup"
-      sync_type: "Synchronization type (ssh, ftp, or nil): "
+      sync_type: "Synchronization type (ssh, ftp): "
       sync_host: "Synchronization server: "
       sync_port: "Port of the synchronization server: "
       sync_user: "Username for the synchronization: "

data/i18n/fr.yml

@@ -38,6 +38,7 @@ fr:
   option:
     add: "Ajoute un élément ou une clé"
     config: "Spécifie le fichier de configuration à utiliser"
+    clipboard: "Désactive la fonction presse papier"
     export: "Exporte un portefeuille dans un fichier yaml"
     file: "Spécifie un fichier, à utiliser avec les options [--import | --export | --add]"
     force: "Ne demande pas de confirmation pour la suppression d'un élément"
@@ -51,7 +52,7 @@ fr:
     setup: "Création d'un nouveau fichier de configuration"
     setup_wallet: "Création d'un nouveau fichier de configuration pour un portefeuille"
     show: "Recherche et affiche les éléments"
-    show_all: "Affiche tous les éléments"
+    show_all: "Liste tous les éléments"
     remove: "Supprime un élément"
     update: "Met à jour un élément"
     usage: "Utilisation"
@@ -72,6 +73,10 @@ fr:
       port: "Entrez le port de connexion (optionnel): "
       comment: "Entrez un commentaire (optionnel): "
       valid: "L'élément a bien été ajouté!"
+    clipboard:
+      clean: "Le presse papier a été nettoyé."
+      login: "L'identifiant a été copié dans le presse papier, pressez n'importe quelle touche pour continuer."
+      password: "Le mot de passe a été copié dans le presse papier pour 30s!"
     delete_key:
       valid: "La clé a bien été supprimée!"
     delete_item:
@@ -86,6 +91,7 @@ fr:
       title: "Création d'un nouveau fichier de configuration"
       lang: "Choisissez votre langue (en, fr, ...) [défaut=%{lang}]: "
       gpg_key: "Entrez la clé GPG [ex: test@host.local]: " 
+      gpg_exe: "Entrez le chemin de l'exécutable GPG (optionnel): "
       wallet_dir: "Entrez le chemin du répertoire qui contiendra les porte-feuilles de mot de passe [défaut=%{home}/wallets]: "
       valid: "Le fichier de configuration a bien été créé!"
     setup_wallet:

data/lib/mpw/config.rb

@@ -30,6 +30,7 @@ class Config
 	attr_accessor :lang
 	attr_accessor :config_dir
 	attr_accessor :wallet_dir
+	attr_accessor :gpg_exe
 
 	# Constructor
 	# @args: config_file -> the specify config file
@@ -53,8 +54,9 @@ class Config
 	# @args: key -> the gpg key to encrypt
 	#        lang -> the software language
 	#        wallet_dir -> the  directory where are the wallets password
+	#        gpg_exe -> the  path of gpg executable
 	# @rtrn: true if le config file is create
-	def setup(key, lang, wallet_dir)
+	def setup(key, lang, wallet_dir, gpg_exe)
 
 		if not key =~ /[a-zA-Z0-9.-_]+\@[a-zA-Z0-9]+\.[a-zA-Z]+/
 			raise I18n.t('error.config.key_bad_format')
@@ -67,6 +69,7 @@ class Config
 		config = {'config' => {'key'        => key,
 		                       'lang'       => lang,
 		                       'wallet_dir' => wallet_dir,
+		                       'gpg_exe'    => gpg_exe,
 		                      }
 		         }
 
@@ -118,6 +121,7 @@ class Config
 		@key        = config['config']['key']
 		@lang       = config['config']['lang']
 		@wallet_dir = config['config']['wallet_dir']
+		@gpg_exe    = config['config']['gpg_exe']
 
 		raise if @key.empty? or @wallet_dir.empty?
 			

data/lib/mpw/mpw.rb

@@ -28,10 +28,15 @@ module MPW
 class MPW
 
 	# Constructor
-	def initialize(key, wallet_file, gpg_pass=nil)
+	def initialize(key, wallet_file, gpg_pass=nil, gpg_exe=nil)
 		@key         = key
 		@gpg_pass    = gpg_pass
+		@gpg_exe     = gpg_exe
 		@wallet_file = wallet_file
+
+		if @gpg_exe
+			GPGME::Engine.set_info(GPGME::PROTOCOL_OpenPGP, @gpg_exe, "#{Dir.home}/.gnupg")
+		end
 	end
 
 	# Read mpw file
@@ -311,12 +316,13 @@ class MPW
 	end
 
 	# Sync data with remote file
-	def sync
-		return if @config.empty? or @config['sync'].nil?
+	# @args: force -> force the sync
+	def sync(force=false)
+		return if @config.empty? or @config['sync']['type'].to_s.empty?
+		return if get_last_sync < Time.now.to_i + 300 and not force
 		
 		tmp_file  = "#{@wallet_file}.sync"
-		last_sync = @config['last_sync'].to_i
-
+		
 		case @config['sync']['type']
 		when 'sftp', 'scp', 'ssh'
 			require "#{APP_ROOT}/../lib/mpw/sync/ssh.rb"
@@ -331,7 +337,7 @@ class MPW
 		sync.connect
 		sync.get(tmp_file)
 
-		remote = MPW.new(@key, tmp_file, @gpg_pass)
+		remote = MPW.new(@key, tmp_file, @gpg_pass, @gpg_exe)
 		remote.read_data
 
 		File.unlink(tmp_file) if File.exist?(tmp_file)
@@ -365,7 +371,7 @@ class MPW
 				end
 
 				# Remove an old item
-				if not update and item.last_sync.to_i < last_sync and item.last_edit < last_sync
+				if not update and item.last_sync.to_i < get_last_sync and item.last_edit < get_last_sync
 					item.delete
 				end
 			end

data/lib/mpw/ui/cli.rb

@@ -20,6 +20,7 @@ require 'readline'
 require 'i18n'
 require 'colorize'
 require 'highline/import'
+require 'clipboard'
 
 #TODO
 require "#{APP_ROOT}/../lib/mpw/item.rb"
@@ -31,9 +32,10 @@ class Cli
 	# Constructor
 	# @args: config -> the config
 	#        sync -> boolean for sync or not
-	def initialize(config, sync=true)
-		@config = config
-		@sync   = sync
+	def initialize(config, clipboard=true, sync=true)
+		@config    = config
+		@clipboard = clipboard
+		@sync      = sync
 	end
 
 	# Create a new config file
@@ -44,13 +46,14 @@ class Cli
 		language   = ask(I18n.t('form.setup_config.lang', lang: lang)).to_s
 		key        = ask(I18n.t('form.setup_config.gpg_key')).to_s
 		wallet_dir = ask(I18n.t('form.setup_config.wallet_dir', home: "#{@config.config_dir}")).to_s
+		gpg_exe    = ask(I18n.t('form.setup_config.gpg_exe')).to_s
 
 		if language.nil? or language.empty?
 			language = lang
 		end
 		I18n.locale = language.to_sym
 
-		@config.setup(key, lang, wallet_dir)
+		@config.setup(key, lang, wallet_dir, gpg_exe)
 
 		raise I18n.t('error.config.check') if not @config.is_valid?
 
@@ -103,11 +106,14 @@ class Cli
 		puts I18n.t('form.setup_wallet.title')
 		puts '--------------------'
 		config['sync']['type']     = ask(I18n.t('form.setup_wallet.sync_type')).to_s
-		config['sync']['host']     = ask(I18n.t('form.setup_wallet.sync_host')).to_s
-		config['sync']['port']     = ask(I18n.t('form.setup_wallet.sync_port')).to_s
-		config['sync']['user']     = ask(I18n.t('form.setup_wallet.sync_user')).to_s
-		config['sync']['password'] = ask(I18n.t('form.setup_wallet.sync_pwd')).to_s
-		config['sync']['path']     = ask(I18n.t('form.setup_wallet.sync_path')).to_s
+
+		if ['ftp', 'ssh'].include?(config['sync']['type'].downcase)
+			config['sync']['host']     = ask(I18n.t('form.setup_wallet.sync_host')).to_s
+			config['sync']['port']     = ask(I18n.t('form.setup_wallet.sync_port')).to_s
+			config['sync']['user']     = ask(I18n.t('form.setup_wallet.sync_user')).to_s
+			config['sync']['password'] = ask(I18n.t('form.setup_wallet.sync_pwd')).to_s
+			config['sync']['path']     = ask(I18n.t('form.setup_wallet.sync_path')).to_s
+		end
 
 		@mpw.set_config(config)
 		@mpw.write_data
@@ -122,7 +128,7 @@ class Cli
 	def decrypt
 		if not defined?(@mpw)
 			@password = ask(I18n.t('display.gpg_password')) {|q| q.echo = false}
-			@mpw = MPW.new(@config.key, @wallet_file, @password)
+			@mpw      = MPW.new(@config.key, @wallet_file, @password, @config.gpg_exe)
 		end
 
 		@mpw.read_data
@@ -141,11 +147,23 @@ class Cli
 		case result.length
 		when 0
 			puts I18n.t('display.nothing')
+
 		when 1
 			display_item(result.first)
+
 		else
-			i = 1
+			group = nil
+			i     = 1
+
+			result.sort! { |a,b| a.group.downcase <=> b.group.downcase }
+
 			result.each do |item|
+				if group != item.group
+					group = item.group
+					puts "#{I18n.t('display.group')}: #{group}".yellow
+				end
+
+				print " |_ ".yellow
 				print "#{i}: ".cyan
 				print item.name
 				print " -> #{item.comment}".magenta if not item.comment.to_s.empty?
@@ -180,11 +198,34 @@ class Cli
 		print "#{I18n.t('display.login')}: ".cyan
 		puts  item.user
 		print "#{I18n.t('display.password')}: ".cyan
-		puts  @mpw.get_password(item.id)
+		if @clipboard
+			puts '***********'
+		else
+			puts  @mpw.get_password(item.id)
+		end
 		print "#{I18n.t('display.port')}: ".cyan
 		puts  item.port
 		print "#{I18n.t('display.comment')}: ".cyan
 		puts  item.comment
+
+		clipboard(item) if @clipboard
+	end
+
+	# Copy in clipboard the login and password
+	def clipboard(item)
+		Clipboard.copy(item.user)
+		print "\n#{I18n.t('form.clipboard.login')}".green
+		gets
+
+		Clipboard.copy(@mpw.get_password(item.id))
+		puts I18n.t('form.clipboard.password').yellow
+
+		sleep(30)
+
+		Clipboard.clear
+		puts I18n.t('form.clipboard.clean').green
+	rescue SystemExit, Interrupt
+		Clipboard.clear
 	end
 
 	# Display the wallet
@@ -226,7 +267,7 @@ class Cli
 	def add_key(key, file=nil)
 		@mpw.add_key(key, file)
 		@mpw.write_data
-		@mpw.sync if @sync
+		@mpw.sync(true) if @sync
 
 		puts "#{I18n.t('form.add_key.valid')}".green
 	rescue Exception => e
@@ -238,7 +279,7 @@ class Cli
 	def delete_key(key)
 		@mpw.delete_key(key)
 		@mpw.write_data
-		@mpw.sync if @sync
+		@mpw.sync(true) if @sync
 
 		puts "#{I18n.t('form.delete_key.valid')}".green
 	rescue Exception => e
@@ -265,7 +306,7 @@ class Cli
 		@mpw.add(item)
 		@mpw.set_password(item.id, password)
 		@mpw.write_data
-		@mpw.sync if @sync
+		@mpw.sync(true) if @sync
 
 		puts "#{I18n.t('form.add_item.valid')}".green
 	end
@@ -294,7 +335,7 @@ class Cli
 			item.update(options)
 			@mpw.set_password(item.id, password) if not password.empty?
 			@mpw.write_data
-			@mpw.sync if @sync
+			@mpw.sync(true) if @sync
 
 			puts "#{I18n.t('form.update_item.valid')}".green
 		else
@@ -326,7 +367,7 @@ class Cli
 
 		item.delete
 		@mpw.write_data
-		@mpw.sync if @sync
+		@mpw.sync(true) if @sync
 
 		puts "#{I18n.t('form.delete_item.valid', id: id)}".green
 	rescue Exception => e

data/mpw.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Adrien Waksberg']
   spec.email         = ['mpw@yae.im']
   spec.summary       = 'MPW is a software to crypt and manage your passwords'
-  spec.description   = 'Manage your passwords in all security with MPW, we use GPG to crypt your passwords'
+  spec.description   = 'Manage your passwords in all security with MPW, we use GPG to encrypt your passwords'
   spec.homepage      = 'https://github.com/nishiki/manage-password'
   spec.license       = 'GPL-2.0'
 
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colorize"
   spec.add_dependency "net-ssh"
   spec.add_dependency "net-scp"
+  spec.add_dependency "clipboard"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpw
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Adrien Waksberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -108,8 +108,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Manage your passwords in all security with MPW, we use GPG to crypt your
-  passwords
+- !ruby/object:Gem::Dependency
+  name: clipboard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Manage your passwords in all security with MPW, we use GPG to encrypt
+  your passwords
 email:
 - mpw@yae.im
 executables: