mpw 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb595c7923b05fc36c530b58f5a8f31405e0a76
-  data.tar.gz: c600a418220b168995b0e5a9d3ac31da98c40635
+  metadata.gz: bd7cabb7232c353bce58aa23e034f4475d4c784e
+  data.tar.gz: abcae3e4e64eed61a021dbfbaedcf220b06942ce
 SHA512:
-  metadata.gz: d5287a720386e8f24e108680e8b65d7cdaabc39e5d8696c469e693b9921977123456c9499c625cb01edcef1b1bc1f6a996b90ad8848db1fe5affbee0934fd759
-  data.tar.gz: 38c3df720e08f950318ff232fd5fa7e64e7cf77e0e852a73a8ce247dd76cb103f1131f5bc208d8937e3c5e9456befae6ce84478651b58addaa401f49fe1dc91b
+  metadata.gz: 00f35bb2da6bf78f3140b0697eac7caa07c387310dec5ab101e21551413b82182701667057e25a4d7648f55232d229a677e797966a3db0fa2780caeb84d6ecb5
+  data.tar.gz: f0e3c8b3e3b7338bb93e994376ac0e606f708a6700475dbf30a65f176abe0f0aebf59f07c63253c5162365590110536aa86854ff7fb495befa3cf2201ef536f2

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 # CHANGELOG
+## v4.2.2 (2017-08-15)
+
+  * minor improvements in the interface
+
 ## v4.2.1 (2017-07-30)
 
   * fix bug in otp generator

data/README.md

@@ -1,5 +1,5 @@
 # MPW: Manage your passwords!
-[![Version](https://img.shields.io/badge/latest_version-4.2.1-green.svg)](https://github.com/nishiki/manage-password/releases)
+[![Version](https://img.shields.io/badge/latest_version-4.2.2-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)
 

data/VERSION

@@ -1 +1 @@
-4.2.1
+4.2.2

data/i18n/en.yml

@@ -91,7 +91,9 @@ en:
     wallet_dir: "Set the wallets folder"
 
   form:
-    select: "Select the item: "
+    select:
+      choice: "Select the item: "
+      error: "No item selected"
     add_key:
       valid: "Key has been added!"
     add_item:

data/i18n/fr.yml

@@ -91,7 +91,9 @@ fr:
     wallet_dir: "Spécifie le répertoire des portefeuilles"
 
   form:
-    select: "Sélectionner l'élément: "
+    select:
+      choice: "Sélectionner l'élément: "
+      error: "Aucun élément sélectionné"
     add_key:
       valid: "La clé a bien été ajoutée!"
     add_item:

data/lib/mpw/cli.rb

@@ -286,9 +286,22 @@ module MPW
       return items[0] if items.length == 1
 
       items.sort! { |a, b| a.group.to_s.downcase <=> b.group.to_s.downcase }
-      choice = ask(I18n.t('form.select')).to_i
+      choice = ask(I18n.t('form.select.choice')).to_i
 
-      choice >= 1 && choice <= items.length ? items[choice - 1] : nil
+      raise I18n.t('form.select.error') unless choice >= 1 && choice <= items.length
+
+      items[choice - 1]
+    end
+
+    # Print help message for clipboard mode
+    # @param item [Item]
+    def clipboard_help(item)
+      puts "----- #{I18n.t('form.clipboard.help.name')} -----".cyan
+      puts I18n.t('form.clipboard.help.url')
+      puts I18n.t('form.clipboard.help.login')
+      puts I18n.t('form.clipboard.help.password')
+      puts I18n.t('form.clipboard.help.otp_code') if item.otp
+      puts I18n.t('form.clipboard.help.quit')
     end
 
     # Copy in clipboard the login and password
@@ -339,7 +352,10 @@ module MPW
           end
 
         when 'o', 'otp'
-          if clipboard
+          if !item.otp
+            clipboard_help(item)
+            next
+          elsif clipboard
             Clipboard.copy(@mpw.get_otp_code(item.id))
           else
             puts @mpw.get_otp_code(item.id)
@@ -347,13 +363,7 @@ module MPW
           puts I18n.t('form.clipboard.otp', time: @mpw.get_otp_remaining_time).yellow
 
         else
-          puts "----- #{I18n.t('form.clipboard.help.name')} -----".cyan
-          puts I18n.t('form.clipboard.help.url')
-          puts I18n.t('form.clipboard.help.login')
-          puts I18n.t('form.clipboard.help.password')
-          puts I18n.t('form.clipboard.help.otp_code')
-          puts I18n.t('form.clipboard.help.quit')
-          next
+          clipboard_help(item)
         end
       end
 

data/lib/mpw/config.rb

@@ -161,6 +161,7 @@ module MPW
     # @param wallet [String] wallet name
     def set_wallet_path(path, wallet)
       path = @wallet_dir if path == 'default'
+      path = File.absolute_path(path)
 
       return if path == @wallet_dir && File.exist?("#{@wallet_dir}/#{wallet}.mpw")
       return if path == @wallet_paths[wallet]

data/templates/add_form.erb

@@ -1,9 +1,17 @@
 ---
-host: <%= options[:host] %>         # <%= I18n.t('form.add_item.host') %>
-user: <%= options[:user] %>         # <%= I18n.t('form.add_item.login') %>
-group: <%= options[:group] %>       # <%= I18n.t('form.add_item.group') %> 
-protocol: <%= options[:protocol] %> # <%= I18n.t('form.add_item.protocol') %><% unless password %>
-password:                           # <%= I18n.t('form.add_item.password') %><% end %>
-port: <%= options[:port] %>         # <%= I18n.t('form.add_item.port') %>
-comment: <%= options[:comment] %>   # <%= I18n.t('form.add_item.comment') %>
-otp_key: <%= options[:otp] %>       # <%= I18n.t('form.add_item.otp_key') %>
+# <%= I18n.t('form.add_item.host') %>
+host: <%= options[:host] %>
+# <%= I18n.t('form.add_item.login') %>
+user: <%= options[:user] %>
+# <%= I18n.t('form.add_item.group') %>
+group: <%= options[:group] %>
+# <%= I18n.t('form.add_item.protocol') %>
+protocol: <%= options[:protocol] %><% unless password %>
+# <%= I18n.t('form.add_item.password') %>
+password:<% end %>
+# <%= I18n.t('form.add_item.port') %>
+port: <%= options[:port] %>
+# <%= I18n.t('form.add_item.comment') %>
+comment: <%= options[:comment] %>
+# <%= I18n.t('form.add_item.otp_key') %>
+otp_key: <%= options[:otp] %>

data/test/test_cli.rb

@@ -142,7 +142,6 @@ class TestConfig < Test::Unit::TestCase
   end
 
   def test_07_setup_wallet
-    path    = '/tmp/'
     gpg_key = 'test2@example.com'
 
     output = %x(echo #{@password} | mpw wallet --add-gpg-key #{gpg_key})
@@ -167,14 +166,14 @@ class TestConfig < Test::Unit::TestCase
     puts output
     assert_match('| default', output)
 
-    output = %x(mpw wallet --path #{path})
+    output = %x(mpw wallet --path '.')
     puts output
     assert_match(I18n.t('form.set_wallet_path.valid'), output)
 
     output = %x(mpw config)
     puts output
-    assert_match(%r{path_wallet_default.+\| #{path}/default.mpw}, output)
-    assert(File.exist?("#{path}/default.mpw"))
+    assert_match(%r{path_wallet_default.+\| #{Dir.pwd}/default.mpw}, output)
+    assert(File.exist?("#{Dir.pwd}/default.mpw"))
 
     output = %x(mpw wallet --default-path)
     puts output

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpw
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Adrien Waksberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-30 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n