mpw 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 449a8603fbd577dd5cb93ef7beefb0b8e9c45825
-  data.tar.gz: 763ee9163b7d0abac719853bdf48fa3b4a10ec7d
+  metadata.gz: 81608d9969c62b9a2d545b091e85e11e036d0fb6
+  data.tar.gz: ca92f9c9b5626d72af12dc5aaa9914376acd790e
 SHA512:
-  metadata.gz: f843a0c0918d63864f01c7929736f75f60bbe97ac3de0b0588b10bc90b50e87abf7f155622653c19947caa11648ac1147e88a38ff8a8756593020fb976d10d50
-  data.tar.gz: 571dc0eb3daa1d425f4ceae5137f1cfc41017828335d6b8fe081428c9d6bd7713badfee3cec0cc49fe45512305bcb176555c6c412c1dc8e13100b35e609b14e5
+  metadata.gz: e3c92de6bfbacbf52b143ce155795a544c987fc4ea683eb2dc43158f82035e6c33e2ae046dc90d3f12d1201c38c73298d94e71d01bbe96db7ebbf3bf37514864
+  data.tar.gz: '004278306d45d232007ff259a39b219899f1590c2000fccf864ea80d30dfaa060c6a36eeaab65348b212c766339acd61337d94bd9538c46318752e0e905e2e04'

data/.rubocop.yml

@@ -0,0 +1,122 @@
+
+AllCops:
+  Exclude:
+    - db/**/*
+    - config/**/*
+    - test/*
+    - Vagrantfile
+  TargetRubyVersion: 2.3
+
+Style/AccessorMethodName:
+  Enabled: false
+Style/NumericLiteralPrefix:
+  Enabled: false
+Style/TrailingCommaInArguments:
+  Enabled: false
+Style/TrailingCommaInLiteral:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Metrics/ParameterLists:
+  Max: 5
+  CountKeywordArgs: false
+Style/MutableConstant:
+  Enabled: false
+Metrics/LineLength:
+  Max: 120
+Metrics/AbcSize:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: false
+Style/AsciiComments:
+  Enabled: true
+Style/Documentation:
+  Enabled: false
+Style/SignalException:
+  Enabled: false
+Style/OptionHash:
+  Enabled: true
+Style/SymbolArray:
+  Enabled: true
+Performance/Casecmp:
+  Enabled: false
+Style/DoubleNegation:
+  Enabled: false
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+Style/RaiseArgs:
+  EnforcedStyle: exploded
+Style/SpaceInLambdaLiteral:
+  Enabled: false
+Lint/UnneededSplatExpansion:
+  Enabled: false
+
+
+# Generated configuration
+Style/HashSyntax:
+  Enabled: true
+  EnforcedStyle: ruby19
+  UseHashRocketsWithSymbolValues: false
+Style/MethodDefParentheses:
+  Enabled: true
+  EnforcedStyle: require_parentheses
+Style/MultilineAssignmentLayout:
+  Enabled: true
+  EnforcedStyle: new_line
+Style/IndentationConsistency:
+  Enabled: true
+  EnforcedStyle: normal
+Style/AlignParameters:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+Style/BlockDelimiters:
+  Enabled: true
+  EnforcedStyle: line_count_based
+Style/AndOr:
+  Enabled: true
+Style/DotPosition:
+  Enabled: true
+  EnforcedStyle: leading
+Style/EmptyLinesAroundClassBody:
+  Enabled: true
+  EnforcedStyle: no_empty_lines
+Style/EmptyLinesAroundModuleBody:
+  Enabled: true
+  EnforcedStyle: no_empty_lines
+Style/NumericPredicate:
+  Enabled: true
+  EnforcedStyle: comparison
+Style/EvenOdd:
+  Enabled: false
+Style/CollectionMethods:
+  Enabled: true
+  PreferredMethods:
+    collect: map
+    collect!: map!
+    inject: reduce
+    detect: find
+    find_all: select
+Style/EmptyLinesAroundAccessModifier:
+  Enabled: true
+Style/CommandLiteral:
+  Enabled: true
+  EnforcedStyle: percent_x
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: single_quotes
+Style/SpaceInsideBlockBraces:
+  EnforcedStyle: space
+Style/VariableNumber:
+  EnforcedStyle: snake_case

data/.travis.yml

@@ -7,8 +7,10 @@ rvm:
 install:
   - bundle install
   - gem install 'test-unit'
+  - gem install rubocop
   - echo 9999 > VERSION
   - gem build mpw.gemspec
   - gem install mpw-9999.gem
 script:
+  - rubocop
   - ruby ./test/tests.rb 

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 # CHANGELOG
+## v4.1.0
+
+ * feat: add options to update or add an item in command line
+ * feat: print config
+ * feat: add a specific path for a wallet
+ * feat: add rubocop to fix syntax
+ * fix: pinentry mode with gpg >= 2.1
+ * remove SSH and FTP synchronization
+
 ## v4.0.0
 
  * feature: set default wallet

data/Gemfile

@@ -1,10 +1,8 @@
 source 'https://rubygems.org'
-gem "i18n",      "~> 0.7", ">= 0.7.0"
-gem "gpgme",     "~> 2.0", ">= 2.0.12"
-gem "highline",  "~> 1.7", ">= 1.7.8"
-gem "locale",    "~> 2.1", ">= 2.1.2"
-gem "colorize",  "~> 0.8", ">= 0.8.1"
-gem "net-ssh",   "~> 3.2", ">= 3.2.0"
-gem "net-sftp",  "~> 2.1", ">= 2.1.2"
-gem "clipboard", "~> 1.1", ">= 1.1.1"
-gem "rotp",      "~> 3.1", ">= 3.1.0"
+gem 'clipboard', '~> 1.1', '>= 1.1.1'
+gem 'colorize',  '~> 0.8', '>= 0.8.1'
+gem 'gpgme',     '~> 2.0', '>= 2.0.12'
+gem 'highline',  '~> 1.7', '>= 1.7.8'
+gem 'i18n',      '~> 0.7', '>= 0.7.0'
+gem 'locale',    '~> 2.1', '>= 2.1.2'
+gem 'rotp',      '~> 3.1', '>= 3.1.0'

data/README.md

@@ -1,5 +1,5 @@
 # MPW: Manage your passwords!
-[![Version](https://img.shields.io/badge/latest_version-4.0.0-green.svg)](https://github.com/nishiki/manage-password/releases)
+[![Version](https://img.shields.io/badge/latest_version-4.1.0-green.svg)](https://github.com/nishiki/manage-password/releases)
 [![Build Status](https://travis-ci.org/nishiki/manage-password.svg?branch=master)](https://travis-ci.org/nishiki/manage-password)
 [![License](https://img.shields.io/badge/license-GPL--2.0-blue.svg)](https://github.com/nishiki/manage-password/blob/master/LICENSE)
 
@@ -11,7 +11,6 @@ mpw is a little software which stores your passwords in [GnuPG](http://www.gnupg
  * generate OTP code
  * copy your login, password or otp in clipboard
  * manage many wallets
- * synchronize your passwords with SSH or FTP.
  * share a wallet with others GPG keys
 
 ## Install
@@ -105,11 +104,6 @@ Remove a GPG key:
 mpw wallet --delete-gpg-key test42@localhost.com
 ```
 
-Add synchronize:
-```
-mpw wallet --protocol ssh --host example.com --user test --path /remote/path --password
-```
-
 ### Export and import data
 
 You can export your data in yaml file with your passwords in clear text:

data/VERSION

@@ -1 +1 @@
-4.0.0
+4.1.0

data/bin/mpw

@@ -1,22 +1,22 @@
 #!/usr/bin/ruby
 # MPW is a software to crypt and manage your passwords
-# Copyright (C) 2016  Adrien Waksberg <mpw@yae.im>
-# 
+# Copyright (C) 2017  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.
 
-$: << File.expand_path('../../lib', __FILE__)
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
 
 require 'locale'
 require 'set'
@@ -30,7 +30,7 @@ require 'colorize'
 lang = Locale::Tag.parse(ENV['LANG']).to_simple.to_s[0..1]
 
 if defined?(I18n.enforce_available_locales)
-	I18n.enforce_available_locales = true
+  I18n.enforce_available_locales = true
 end
 
 I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
@@ -45,25 +45,25 @@ I18n.locale         = lang.to_sym
 bin_dir = File.dirname(__FILE__)
 command = "#{bin_dir}/mpw-#{ARGV[0]}"
 
-if Dir.glob("#{bin_dir}/mpw-*").include?("#{command}")
-	begin
-		Kernel.load(command)
-	rescue OptionParser::ParseError => e
-		puts "#{I18n.t('display.error')}: #{e}".red
-	end
+if Dir.glob("#{bin_dir}/mpw-*").include?(command.to_s)
+  begin
+    Kernel.load(command)
+  rescue OptionParser::ParseError => e
+    puts "#{I18n.t('display.error')}: #{e}".red
+  end
 else
-	puts "#{I18n.t('option.usage')}: mpw COMMAND [options]\n\n"
-	puts 'Commands:'
-	puts "  add       #{I18n.t('command.add')}"
-	puts "  config    #{I18n.t('command.config')}"
-	puts "  copy      #{I18n.t('command.copy')}"
-	puts "  delete    #{I18n.t('command.delete')}"
-	puts "  export    #{I18n.t('command.export')}"
-	puts "  genpwd    #{I18n.t('command.genpwd')}"
-	puts "  import    #{I18n.t('command.import')}"
-	puts "  list      #{I18n.t('command.list')}"
-	puts "  update    #{I18n.t('command.update')}"
-	puts "  wallet    #{I18n.t('command.wallet')}"
+  puts "#{I18n.t('option.usage')}: mpw COMMAND [options]\n\n"
+  puts 'Commands:'
+  puts "  add       #{I18n.t('command.add')}"
+  puts "  config    #{I18n.t('command.config')}"
+  puts "  copy      #{I18n.t('command.copy')}"
+  puts "  delete    #{I18n.t('command.delete')}"
+  puts "  export    #{I18n.t('command.export')}"
+  puts "  genpwd    #{I18n.t('command.genpwd')}"
+  puts "  import    #{I18n.t('command.import')}"
+  puts "  list      #{I18n.t('command.list')}"
+  puts "  update    #{I18n.t('command.update')}"
+  puts "  wallet    #{I18n.t('command.wallet')}"
 
-	exit 3
+  exit 3
 end

data/bin/mpw-add

@@ -1,17 +1,17 @@
 #!/usr/bin/ruby
 # MPW is a software to crypt and manage your passwords
-# Copyright (C) 2016  Adrien Waksberg <mpw@yae.im>
-# 
+# Copyright (C) 2017  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.
@@ -24,38 +24,67 @@ require 'mpw/cli'
 # Options
 # --------------------------------------------------------- #
 
-options        = {}
-options[:sync] = true
+values                = {}
+options               = {}
+options[:text_editor] = true
 
 OptionParser.new do |opts|
-	opts.banner = "#{I18n.t('option.usage')}: mpw add [options]"
+  opts.banner = "#{I18n.t('option.usage')}: mpw add [options]"
 
-	opts.on('-c', '--config PATH', I18n.t('option.config')) do |config|
-		options[:config] = config
-	end
+  opts.on('-c', '--config PATH', I18n.t('option.config')) do |config|
+    options[:config] = config
+  end
 
-	opts.on('-h', '--help', I18n.t('option.help')) do
-		puts opts
-		exit 0
-	end
+  opts.on('-C', '--comment COMMENT', I18n.t('option.comment')) do |comment|
+    values[:comment] = comment
+  end
 
-	opts.on('-n', '--no-sync', I18n.t('option.no_sync')) do
-		options[:sync] = false
-	end
+  opts.on('-G', '--group NAME', I18n.t('option.new_group')) do |group|
+    values[:group] = group
+  end
 
-	opts.on('-r', '--random', I18n.t('option.random_password')) do
-		options[:password] = true
-	end
+  opts.on('-h', '--help', I18n.t('option.help')) do
+    puts opts
+    exit 0
+  end
 
-	opts.on('-w', '--wallet NAME', I18n.t('option.wallet')) do |wallet|
-		options[:wallet] = wallet
-	end
+  opts.on('-H', '--host HOST', I18n.t('option.host')) do |host|
+    values[:host] = host
+  end
+
+  opts.on('-o', '--otp-code CODE', I18n.t('option.otp_code')) do |otp|
+    values[:otp_key] = otp
+  end
+
+  opts.on('-O', '--protocol PROTOCOL', I18n.t('option.protocol')) do |protocol|
+    values[:protocol] = protocol
+  end
+
+  opts.on('-P', '--port NUMBER', I18n.t('option.port')) do |port|
+    values[:port] = port
+  end
+
+  opts.on('-r', '--random', I18n.t('option.random_password')) do
+    options[:password] = true
+  end
+
+  opts.on('-t', '--text-editor', I18n.t('option.text_editor')) do
+    options[:text_editor] = true
+  end
+
+  opts.on('-u', '--user USER', I18n.t('option.user')) do |user|
+    values[:user] = user
+  end
+
+  opts.on('-w', '--wallet NAME', I18n.t('option.wallet')) do |wallet|
+    options[:wallet] = wallet
+  end
 end.parse!
 
 config = MPW::Config.new(options[:config])
-cli    = MPW::Cli.new(config, options[:sync])
+cli    = MPW::Cli.new(config)
 
 cli.load_config
 cli.get_wallet(options[:wallet])
 cli.decrypt
-cli.add(options[:password])
+cli.add(options[:password], options[:text_editor], values)

data/bin/mpw-config

@@ -1,17 +1,17 @@
 #!/usr/bin/ruby
 # MPW is a software to crypt and manage your passwords
-# Copyright (C) 2016  Adrien Waksberg <mpw@yae.im>
-# 
+# Copyright (C) 2017  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.
@@ -28,81 +28,93 @@ options = {}
 values  = {}
 
 OptionParser.new do |opts|
-	opts.banner = "#{I18n.t('option.usage')}: mpw config [options]"
+  opts.banner = "#{I18n.t('option.usage')}: mpw config [options]"
 
-	opts.on('-c', '--config PATH', I18n.t('option.config')) do |config|
-		options[:config] = config
-	end
+  opts.on('-c', '--config PATH', I18n.t('option.config')) do |config|
+    options[:config] = config
+  end
 
-	opts.on('-d', '--default-wallet NAME', I18n.t('option.default_wallet')) do |default_wallet|
-		values[:default_wallet] = default_wallet
-	end
+  opts.on('-d', '--default-wallet NAME', I18n.t('option.default_wallet')) do |default_wallet|
+    values[:default_wallet] = default_wallet
+  end
 
-	opts.on('-g', '--gpg-exe PATH', I18n.t('option.gpg_exe')) do |gpg_exe|
-		values[:gpg_exe] = gpg_exe
-	end
+  opts.on('-g', '--gpg-exe PATH', I18n.t('option.gpg_exe')) do |gpg_exe|
+    values[:gpg_exe] = gpg_exe
+  end
 
-	opts.on('-h', '--help', I18n.t('option.help')) do
-		puts opts
-		exit 0
-	end
+  opts.on('-h', '--help', I18n.t('option.help')) do
+    puts opts
+    exit 0
+  end
 
-	opts.on('-i', '--init GPG_KEY', I18n.t('option.init')) do |gpg_key|
-		options[:init]   = true
-		values[:gpg_key] = gpg_key
-	end
+  opts.on('-i', '--init GPG_KEY', I18n.t('option.init')) do |gpg_key|
+    options[:init]   = true
+    values[:gpg_key] = gpg_key
+  end
 
-	opts.on('-k', '--key GPG_KEY', I18n.t('option.gpg_key')) do |gpg_key|
-		values[:gpg_key] = gpg_key
-	end
+  opts.on('-k', '--key GPG_KEY', I18n.t('option.gpg_key')) do |gpg_key|
+    values[:gpg_key] = gpg_key
+  end
 
-	opts.on('-L', '--lang LANG', I18n.t('option.lang')) do |lang|
-		values[:lang] = lang
-	end
+  opts.on('-L', '--lang LANG', I18n.t('option.lang')) do |lang|
+    values[:lang] = lang
+  end
 
-	opts.on('-w', '--wallet-dir PATH', I18n.t('option.wallet_dir')) do |wallet_dir|
-		values[:wallet_dir] = wallet_dir
-	end
+  opts.on('-P', '--enable-pinmode', I18n.t('option.pinmode')) do
+    values[:pinmode] = true
+  end
 
-	opts.on('-l', '--length NUMBER', I18n.t('option.length')) do |length|
-		values[:pwd_length] = length.to_i
-	end
+  opts.on('-p', '--disable-pinmode', I18n.t('option.disable_pinmode')) do
+    values[:pinmode] = false
+  end
 
-	opts.on('-n', '--numeric', I18n.t('option.numeric')) do
-		values[:pwd_numeric] = true
-	end
+  opts.on('-w', '--wallet-dir PATH', I18n.t('option.wallet_dir')) do |wallet_dir|
+    values[:wallet_dir] = wallet_dir
+  end
 
-	opts.on('-N', '--disable-numeric', I18n.t('option.disable_numeric')) do
-		values[:pwd_numeric] = false
-	end
+  opts.on('-l', '--length NUMBER', I18n.t('option.length')) do |length|
+    values[:pwd_length] = length.to_i
+  end
 
-	opts.on('-s', '--special-chars', I18n.t('option.special_chars')) do
-		values[:pwd_special] = true
-	end
+  opts.on('-n', '--numeric', I18n.t('option.numeric')) do
+    values[:pwd_numeric] = true
+  end
 
-	opts.on('-S', '--disable_special-chars', I18n.t('option.special_chars')) do
-		values[:pwd_special] = false
-	end
+  opts.on('-N', '--disable-numeric', I18n.t('option.disable_numeric')) do
+    values[:pwd_numeric] = false
+  end
 
-	opts.on('-a', '--alpha', I18n.t('option.alpha')) do
-		values[:pwd_alpha] = true
-	end
+  opts.on('-s', '--special-chars', I18n.t('option.special_chars')) do
+    values[:pwd_special] = true
+  end
 
-	opts.on('-A', '--disable-alpha', I18n.t('option.disable_alpha')) do
-		values[:pwd_alpha] = false
-	end
+  opts.on('-S', '--disable_special-chars', I18n.t('option.special_chars')) do
+    values[:pwd_special] = false
+  end
+
+  opts.on('-a', '--alpha', I18n.t('option.alpha')) do
+    values[:pwd_alpha] = true
+  end
+
+  opts.on('-A', '--disable-alpha', I18n.t('option.disable_alpha')) do
+    values[:pwd_alpha] = false
+  end
 end.parse!
 
 config = MPW::Config.new(options[:config])
-cli    = MPW::Cli.new(config, nil)
-
-if options.has_key?(:init)
-	cli.setup(values)
-	cli.load_config
-	cli.get_wallet
-	cli.setup_gpg_key(values[:gpg_key])
-	cli.setup_wallet_config
+cli    = MPW::Cli.new(config)
+
+if options.key?(:init)
+  cli.setup(values)
+  cli.load_config
+  cli.get_wallet
+  cli.setup_gpg_key(values[:gpg_key])
+  cli.setup_wallet_config
 else
-	cli.load_config
-	cli.set_config(values)
+  cli.load_config
+  if values.empty?
+    cli.list_config
+  else
+    cli.set_config(values)
+  end
 end