mpw 2.0.3 → 3.0.0

data/lib/mpw/ui/cli.rb

@@ -1,92 +1,65 @@
 #!/usr/bin/ruby
-# author: nishiki
-# mail: nishiki@yaegashi.fr
-# info: a simple script who m your passwords
+# MPW is a software to crypt and manage your passwords
+# Copyright (C) 2016  Adrien Waksberg <mpw@yae.im>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'rubygems'
-require 'highline/import'
-require 'pathname'
 require 'readline'
 require 'i18n'
 require 'colorize'
-require 'mpw/sync'
-require 'mpw/mpw'
-require 'mpw/item'
+require 'highline/import'
+
+#TODO
+require "#{APP_ROOT}/../lib/mpw/item.rb"
+require "#{APP_ROOT}/../lib/mpw/mpw.rb"
 
+module MPW
 class Cli
 
 	# Constructor
-	# @args: lang -> the operating system language
-	#        config_file -> a specify config file
-	def initialize(config)
+	# @args: config -> the config
+	#        sync -> boolean for sync or not
+	def initialize(config, sync=true)
 		@config = config
-	end
-
-	# Sync the data with the server
-	# @args: allow_sync -> allow or disable sync (boolean)
-	# @rtnr: true if the synchro is finish
-	def sync(allow_sync=nil)
-		if not allow_sync.nil?
-			@allow_sync = allow_sync
-		end
-
-		return true if not @allow_sync
-
-		@sync = MPW::Sync.new(@config, @mpw, @password) 
-
-		raise(@sync.error_msg) if not @sync.get_remote
-		raise(@sync.error_msg) if not @sync.sync
-
-		return true
-	rescue Exception => e
-		puts "#{I18n.t('display.error')} #7: #{e}".red
-		return false
+		@sync   = sync
 	end
 
 	# Create a new config file
 	# @args: lang -> the software language
 	def setup(lang)
-		puts I18n.t('form.setup.title')
+		puts I18n.t('form.setup_config.title')
 		puts '--------------------'
-		language    = ask(I18n.t('form.setup.lang', lang: lang)).to_s
-		key         = ask(I18n.t('form.setup.gpg_key')).to_s
-		share_keys  = ask(I18n.t('form.setup.share_gpg_keys')).to_s
-		file_gpg    = ask(I18n.t('form.setup.gpg_file', home: @conf.dir_config)).to_s
-		sync_type   = ask(I18n.t('form.setup.sync_type')).to_s
-
-		if ['ssh', 'ftp', 'mpw'].include?(sync_type)
-			sync_host   = ask(I18n.t('form.setup.sync_host')).to_s
-			sync_port   = ask(I18n.t('form.setup.sync_port')).to_s
-			sync_user   = ask(I18n.t('form.setup.sync_user')).to_s
-			sync_pwd    = ask(I18n.t('form.setup.sync_pwd')).to_s
-			sync_path   = ask(I18n.t('form.setup.sync_path')).to_s
-		end
-		
+		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
+
 		if language.nil? or language.empty?
 			language = lang
 		end
 		I18n.locale = language.to_sym
 
-		sync_type = sync_type.nil? or sync_type.empty? ? nil : sync_type
-		sync_host = sync_host.nil? or sync_host.empty? ? nil : sync_host
-		sync_port = sync_port.nil? or sync_port.empty? ? nil : sync_port.to_i
-		sync_user = sync_user.nil? or sync_user.empty? ? nil : sync_user
-		sync_pwd  = sync_pwd.nil?  or sync_pwd.empty?  ? nil : sync_pwd
-		sync_path = sync_path.nil? or sync_path.empty? ? nil : sync_path
+		@config.setup(key, lang, wallet_dir)
 
-		if @config.setup(key, share_keys, language, file_gpg, sync_type, sync_host, sync_port, sync_user, sync_pwd, sync_path)
-			puts "#{I18n.t('form.setup.valid')}".green
-		else
-			puts "#{I18n.t('display.error')} #8: #{@config.error_msg}".red
-			exit 2
-		end
+		raise I18n.t('error.config.check') if not @config.is_valid?
 
-		if not @config.checkconfig
-			puts "#{I18n.t('display.error')} #9: #{@config.error_msg}".red
-			exit 2
-		end
+		puts "#{I18n.t('form.setup_config.valid')}".green
+	rescue Exception => e
+		puts "#{I18n.t('display.error')} #8: #{e}".red
+		exit 2
 	end
-
+	
 	# Setup a new GPG key
 	def setup_gpg_key
 		puts I18n.t('form.setup_gpg_key.title')
@@ -94,8 +67,7 @@ class Cli
 		ask      = ask(I18n.t('form.setup_gpg_key.ask')).to_s
 		
 		if not ['Y', 'y', 'O', 'o'].include?(ask)
-			puts I18n.t('form.setup_gpg_key.no_create')
-			exit 2
+			raise I18n.t('form.setup_gpg_key.no_create')
 		end
 
 		name     = ask(I18n.t('form.setup_gpg_key.name')).to_s
@@ -103,8 +75,7 @@ class Cli
 		confirm  = ask(I18n.t('form.setup_gpg_key.confirm_password')) {|q| q.echo = false}
 
 		if password != confirm 
-			puts I18n.t('form.setup_gpg_key.error_password')
-			exit 2
+			raise I18n.t('form.setup_gpg_key.error_password')
 		end
 
 		length   = ask(I18n.t('form.setup_gpg_key.length')).to_s
@@ -116,25 +87,49 @@ class Cli
 
 		puts I18n.t('form.setup_gpg_key.wait')
 		
-		if @config.setup_gpg_key(password, name, length, expire)
-			puts "#{I18n.t('form.setup_gpg_key.valid')}".green
-		else
-			puts "#{I18n.t('display.error')} #10: #{@config.error_msg}".red
-			exit 2
-		end
+		@config.setup_gpg_key(password, name, length, expire)
+
+		puts "#{I18n.t('form.setup_gpg_key.valid')}".green
+	rescue Exception => e
+		puts "#{I18n.t('display.error')} #8: #{e}".red
+		exit 2
 	end
 
+	# Setup wallet config for sync
+	def setup_wallet_config
+		config         = {}
+		config['sync'] = {}
+
+		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
+
+		@mpw.set_config(config)
+		@mpw.write_data
+
+		puts "#{I18n.t('form.setup_wallet.valid')}".green
+	rescue Exception => e
+		puts "#{I18n.t('display.error')} #10: #{e}".red
+		exit 2
+	end
+	
 	# Request the GPG password and decrypt the file
 	def decrypt
 		if not defined?(@mpw)
-			@mpw = MPW::MPW.new(@config.file_gpg, @config.key, @config.share_keys)
+			@password = ask(I18n.t('display.gpg_password')) {|q| q.echo = false}
+			@mpw = MPW.new(@config.key, @wallet_file, @password)
 		end
 
-		@password = ask(I18n.t('display.gpg_password')) {|q| q.echo = false}
-		if not @mpw.decrypt(@password)
-			puts "#{I18n.t('display.error')} #11: #{@mpw.error_msg}".red
-			exit 2
-		end
+		@mpw.read_data
+		@mpw.sync if @sync
+	rescue Exception => e
+		puts "#{I18n.t('display.error')} #11: #{e}".red
+		exit 2
 	end
 
 	# Display the query's result
@@ -185,41 +180,96 @@ class Cli
 		print "#{I18n.t('display.login')}: ".cyan
 		puts  item.user
 		print "#{I18n.t('display.password')}: ".cyan
-		puts  item.password
+		puts  @mpw.get_password(item.id)
 		print "#{I18n.t('display.port')}: ".cyan
 		puts  item.port
 		print "#{I18n.t('display.comment')}: ".cyan
 		puts  item.comment
 	end
 
-	# Form to add a new item
-	def add
-		options = {}
+	# Display the wallet
+	# @args: wallet -> the wallet name
+	def get_wallet(wallet=nil)
+		if wallet.to_s.empty?
+			wallets = Dir.glob("#{@config.wallet_dir}/*.mpw")
 
-		puts I18n.t('form.add.title')
-		puts '--------------------'
-		options[:name]     = ask(I18n.t('form.add.name')).to_s
-		options[:group]    = ask(I18n.t('form.add.group')).to_s
-		options[:host]     = ask(I18n.t('form.add.server')).to_s
-		options[:protocol] = ask(I18n.t('form.add.protocol')).to_s
-		options[:user]     = ask(I18n.t('form.add.login')).to_s
-		options[:password] = ask(I18n.t('form.add.password')).to_s
-		options[:port]     = ask(I18n.t('form.add.port')).to_s
-		options[:comment]  = ask(I18n.t('form.add.comment')).to_s
-
-		item = MPW::Item.new(options)
-		if @mpw.add(item)
-			if @mpw.encrypt
-				sync
-				puts "#{I18n.t('form.add.valid')}".green
+			case wallets.length
+			when 0
+				puts I18n.t('display.nothing')
+			when 1
+				@wallet_file = wallets[0]
 			else
-				puts "#{I18n.t('display.error')} #12: #{@mpw.error_msg}".red
+				i = 1
+				wallets.each do |wallet|
+						print "#{i}: ".cyan
+						puts File.basename(wallet, '.mpw')
+
+						i += 1
+				end
+
+				choice = ask(I18n.t('form.select')).to_i
+
+				if choice >= 1 and choice < i
+					@wallet_file = wallets[choice-1]
+				else
+					puts "#{I18n.t('display.warning')}: #{I18n.t('warning.select')}".yellow
+				end
 			end
 		else
-			puts "#{I18n.t('display.error')} #13: #{item.error_msg}".red
+			@wallet_file = "#{@config.wallet_dir}/#{wallet}.mpw"
 		end
 	end
 
+	# Add a new public key
+	# args: key -> the key name to add
+	#       file -> gpg public file to import
+	def add_key(key, file=nil)
+		@mpw.add_key(key, file)
+		@mpw.write_data
+		@mpw.sync if @sync
+
+		puts "#{I18n.t('form.add_key.valid')}".green
+	rescue Exception => e
+		puts "#{I18n.t('display.error')} #13: #{e}".red
+	end
+
+	# Add new public key
+	# args: key -> the key name to delete
+	def delete_key(key)
+		@mpw.delete_key(key)
+		@mpw.write_data
+		@mpw.sync if @sync
+
+		puts "#{I18n.t('form.delete_key.valid')}".green
+	rescue Exception => e
+		puts "#{I18n.t('display.error')} #15: #{e}".red
+	end
+
+	# Form to add a new item
+	def add
+		options = {}
+
+		puts I18n.t('form.add_item.title')
+		puts '--------------------'
+		options[:name]     = ask(I18n.t('form.add_item.name')).to_s
+		options[:group]    = ask(I18n.t('form.add_item.group')).to_s
+		options[:host]     = ask(I18n.t('form.add_item.server')).to_s
+		options[:protocol] = ask(I18n.t('form.add_item.protocol')).to_s
+		options[:user]     = ask(I18n.t('form.add_item.login')).to_s
+		password           = ask(I18n.t('form.add_item.password')).to_s
+		options[:port]     = ask(I18n.t('form.add_item.port')).to_s
+		options[:comment]  = ask(I18n.t('form.add_item.comment')).to_s
+
+		item = Item.new(options)
+
+		@mpw.add(item)
+		@mpw.set_password(item.id, password)
+		@mpw.write_data
+		@mpw.sync if @sync
+
+		puts "#{I18n.t('form.add_item.valid')}".green
+	end
+
 	# Update an item
 	# @args: id -> the item's id
 	def update(id)
@@ -228,104 +278,80 @@ class Cli
 		if not item.nil?
 			options = {}
 
-			puts I18n.t('form.update.title')
+			puts I18n.t('form.update_item.title')
 			puts '--------------------'
-			options[:name]     = ask(I18n.t('form.update.name'    , name:     item.name)).to_s
-			options[:group]    = ask(I18n.t('form.update.group'   , group:    item.group)).to_s
-			options[:host]     = ask(I18n.t('form.update.server'  , server:   item.host)).to_s
-			options[:protocol] = ask(I18n.t('form.update.protocol', protocol: item.protocol)).to_s
-			options[:user]     = ask(I18n.t('form.update.login'   , login:    item.user)).to_s
-			options[:password] = ask(I18n.t('form.update.password')).to_s
-			options[:port]     = ask(I18n.t('form.update.port'    , port:     item.port)).to_s
-			options[:comment]  = ask(I18n.t('form.update.comment' , comment:  item.comment)).to_s
+			options[:name]     = ask(I18n.t('form.update_item.name'    , name:     item.name)).to_s
+			options[:group]    = ask(I18n.t('form.update_item.group'   , group:    item.group)).to_s
+			options[:host]     = ask(I18n.t('form.update_item.server'  , server:   item.host)).to_s
+			options[:protocol] = ask(I18n.t('form.update_item.protocol', protocol: item.protocol)).to_s
+			options[:user]     = ask(I18n.t('form.update_item.login'   , login:    item.user)).to_s
+			password           = ask(I18n.t('form.update_item.password')).to_s
+			options[:port]     = ask(I18n.t('form.update_item.port'    , port:     item.port)).to_s
+			options[:comment]  = ask(I18n.t('form.update_item.comment' , comment:  item.comment)).to_s
 
 			options.delete_if { |k,v| v.empty? }
 				
-			if item.update(options)
-				if @mpw.encrypt
-					sync
-					puts "#{I18n.t('form.update.valid')}".green
-				else
-					puts "#{I18n.t('display.error')} #14: #{@mpw.error_msg}".red
-				end
-			else
-				puts "#{I18n.t('display.error')} #15: #{item.error_msg}".red
-			end
+			item.update(options)
+			@mpw.set_password(item.id, password) if not password.empty?
+			@mpw.write_data
+			@mpw.sync if @sync
+
+			puts "#{I18n.t('form.update_item.valid')}".green
 		else
 			puts I18n.t('display.nothing')
 		end
+	rescue Exception => e
+		puts "#{I18n.t('display.error')} #14: #{e}".red
 	end
 
 	# Remove an item
 	# @args: id -> the item's id
 	#        force -> no resquest a validation
 	def delete(id, force=false)
-		if not force
-			item = @mpw.search_by_id(id)
-
-			if not item.nil?
-				display_item(item)
+		item = @mpw.search_by_id(id)
 
-				confirm = ask("#{I18n.t('form.delete.ask', id: id)} (y/N) ").to_s
-				if confirm =~ /^(y|yes|YES|Yes|Y)$/
-					force = true
-				end
-			else
-				puts I18n.t('display.nothing')
-			end
+		if item.nil?
+			puts I18n.t('form.delete_item.not_valid', id: id)
+			return
 		end
 
-		if force
-			item.delete
+		if not force
+			display_item(item)
 
-			if @mpw.encrypt
-				sync
-				puts "#{I18n.t('form.delete.valid', id: id)}".green
-			else
-				puts "#{I18n.t('display.error')} #16: #{@mpw.error_msg}".red
+			confirm = ask("#{I18n.t('form.delete_item.ask', id: id)} (y/N) ").to_s
+			if not confirm =~ /^(y|yes|YES|Yes|Y)$/
+				return
 			end
 		end
+
+		item.delete
+		@mpw.write_data
+		@mpw.sync if @sync
+
+		puts "#{I18n.t('form.delete_item.valid', id: id)}".green
+	rescue Exception => e
+		puts "#{I18n.t('display.error')} #16: #{e}".red
 	end
 
 	# Export the items in a CSV file
 	# @args: file -> the destination file
-	def export(file, type=:yaml)
-		if @mpw.export(file, type)
-			puts "#{I18n.t('export.valid', file)}".green
-		else
-			puts "#{I18n.t('display.error')} #17: #{@mpw.error_msg}".red
-		end
+	def export(file)
+		@mpw.export(file)
+
+		puts "#{I18n.t('export.export.valid', file)}".green
+	rescue Exception => e
+		puts "#{I18n.t('display.error')} #17: #{e}".red
 	end
 
-	# Import items from a CSV file
+	# Import items from a YAML file
 	# @args: file -> the import file
-	#        force -> no resquest a validation
-	def import(file, type=:yaml, force=false)
-
-		if not force
-			result = @mpw.import_preview(file, type)
-			if result.is_a?(Array) and not result.empty?
-				result.each do |r|
-					display_item(r)
-				end
+	def import(file)
+		@mpw.import(file)
+		@mpw.write_data
 
-				confirm = ask("#{I18n.t('form.import.ask', file: file)} (y/N) ").to_s
-				if confirm =~ /^(y|yes|YES|Yes|Y)$/
-					force = true
-				end
-			else
-				puts I18n.t('form.import.not_valid')
-			end
-		end
-
-		if force
-			if @mpw.import(file, type) and @mpw.encrypt
-				sync
-				puts "#{I18n.t('form.import.valid')}".green
-			else
-				puts "#{I18n.t('display.error')} #18: #{@mpw.error_msg}".red
-			end
-		end
+		puts "#{I18n.t('form.import.valid')}".green
+	rescue Exception => e
+		puts "#{I18n.t('display.error')} #18: #{e}".red
 	end
-
+end
 end

data/mpw.gemspec

@@ -5,22 +5,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   spec.name          = 'mpw'
   spec.version       = File.open('VERSION').read
-  spec.authors       = ['nishiki']
-  spec.email         = ['gems@yae.im']
-  spec.summary       = 'Manage your password'
-  spec.description   = 'Save and read your password with gpg'
+  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.homepage      = 'https://github.com/nishiki/manage-password'
-  spec.license       = 'GPL'
+  spec.license       = 'GPL-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = ['mpw', 'mpw-server', 'mpw-ssh']
+  spec.executables   = ['mpw']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency "i18n", "~> 0.6", ">= 0.6.9"
+  spec.add_dependency "i18n"
   spec.add_dependency "gpgme"
   spec.add_dependency "highline"
   spec.add_dependency "locale"
   spec.add_dependency "colorize"
-  spec.add_dependency "net-sftp"
+  spec.add_dependency "net-ssh"
+  spec.add_dependency "net-scp"
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mpw
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0
 platform: ruby
 authors:
-- nishiki
+- Adrien Waksberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gpgme
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-sftp
+  name: net-ssh
+  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'
+- !ruby/object:Gem::Dependency
+  name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -100,13 +108,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Save and read your password with gpg
+description: Manage your passwords in all security with MPW, we use GPG to crypt your
+  passwords
 email:
-- gems@yae.im
+- mpw@yae.im
 executables:
 - mpw
-- mpw-server
-- mpw-ssh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -117,22 +124,14 @@ files:
 - README.md
 - VERSION
 - bin/mpw
-- bin/mpw-server
-- bin/mpw-ssh
-- i18n/cli/en.yml
-- i18n/cli/fr.yml
-- i18n/server/en.yml
-- i18n/server/fr.yml
+- i18n/en.yml
+- i18n/fr.yml
 - lib/mpw/config.rb
 - lib/mpw/item.rb
 - lib/mpw/mpw.rb
-- lib/mpw/server.rb
-- lib/mpw/sync.rb
 - lib/mpw/sync/ftp.rb
-- lib/mpw/sync/mpw.rb
 - lib/mpw/sync/ssh.rb
 - lib/mpw/ui/cli.rb
-- lib/mpw/ui/clissh.rb
 - mpw.gemspec
 - test/files/fixtures.yml
 - test/files/test_import.csv
@@ -142,7 +141,7 @@ files:
 - test/tests.rb
 homepage: https://github.com/nishiki/manage-password
 licenses:
-- GPL
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -160,10 +159,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Manage your password
+summary: MPW is a software to crypt and manage your passwords
 test_files:
 - test/files/fixtures.yml
 - test/files/test_import.csv