mpw 4.0.0 → 4.1.0

data/mpw.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -12,18 +13,18 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/nishiki/manage-password'
   spec.license       = 'GPL-2.0'
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = %x(git ls-files -z).split("\x0")
   spec.executables   = ['mpw']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency "i18n",      "~> 0.7", ">= 0.7.0"
-  spec.add_dependency "gpgme",     "~> 2.0", ">= 2.0.12"
-  spec.add_dependency "highline",  "~> 1.7", ">= 1.7.8"
-  spec.add_dependency "locale",    "~> 2.1", ">= 2.1.2"
-  spec.add_dependency "colorize",  "~> 0.8", ">= 0.8.1"
-  spec.add_dependency "net-ssh",   "~> 3.2", ">= 3.2.0"
-  spec.add_dependency "net-sftp",  "~> 2.1", ">= 2.1.2"
-  spec.add_dependency "clipboard", "~> 1.1", ">= 1.1.1"
-  spec.add_dependency "rotp",      "~> 3.1", ">= 3.1.0"
+  spec.required_ruby_version = '>= 2.1'
+
+  spec.add_dependency 'i18n',      '~> 0.7', '>= 0.7.0'
+  spec.add_dependency 'gpgme',     '~> 2.0', '>= 2.0.12'
+  spec.add_dependency 'highline',  '~> 1.7', '>= 1.7.8'
+  spec.add_dependency 'locale',    '~> 2.1', '>= 2.1.2'
+  spec.add_dependency 'colorize',  '~> 0.8', '>= 0.8.1'
+  spec.add_dependency 'clipboard', '~> 1.1', '>= 1.1.1'
+  spec.add_dependency 'rotp',      '~> 3.1', '>= 3.1.0'
 end

data/templates/add_form.erb

@@ -1,9 +1,9 @@
 ---
-host:           # <%= I18n.t('form.add_item.host') %>
-user:           # <%= I18n.t('form.add_item.login') %>
-group:          # <%= I18n.t('form.add_item.group') %> 
-protocol:       # <%= I18n.t('form.add_item.protocol') %><% if not password %>
-password:       # <%= I18n.t('form.add_item.password') %><% end %>
-port:           # <%= I18n.t('form.add_item.port') %>
-comment:        # <%= I18n.t('form.add_item.comment') %>
-otp_key:        # <%= I18n.t('form.add_item.otp_key') %>
+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') %>

data/templates/update_form.erb

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

data/test/test_config.rb

@@ -6,59 +6,74 @@ require 'locale'
 require 'i18n'
 
 class TestConfig < Test::Unit::TestCase
-	def setup
-		lang = Locale::Tag.parse(ENV['LANG']).to_simple.to_s[0..1]
-		
-		if defined?(I18n.enforce_available_locales)
-			I18n.enforce_available_locales = true
-		end
-		
-		I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-		I18n.load_path      = Dir["#{File.expand_path('../../i18n', __FILE__)}/*.yml"]
-		I18n.default_locale = :en
-		I18n.locale         = lang.to_sym
-	end
-
-	def test_00_config
-		data = { gpg_key: 'test@example.com',
-		         lang: 'en',
-		         wallet_dir: '/tmp/test',
-		         gpg_exe: '',
-		       }
-
-		@config = MPW::Config.new
-		@config.setup(data)
-		@config.load_config
-
-		data.each do |k,v|
-			assert_equal(v, @config.send(k))
-		end
-
-		@config.setup_gpg_key('password', 'test@example.com', 2048)
-		assert(@config.check_gpg_key?)
-	end
-
-	def test_01_password
-		data = { pwd_alpha: false,
-		         pwd_numeric: false,
-		         pwd_special: true,
-		         pwd_length: 32,
-		       }
-
-		@config = MPW::Config.new
-		@config.load_config
-
-		assert_equal(@config.password[:length], 16)
-		assert(@config.password[:alpha])
-		assert(@config.password[:numeric])
-		assert(!@config.password[:special])
-
-		@config.setup(data)
-		@config.load_config
-
-		assert_equal(@config.password[:length], data[:pwd_length])
-		assert(!@config.password[:alpha])
-		assert(!@config.password[:numeric])
-		assert(@config.password[:special])
-	end
+  def setup
+    lang = Locale::Tag.parse(ENV['LANG']).to_simple.to_s[0..1]
+
+    if defined?(I18n.enforce_available_locales)
+      I18n.enforce_available_locales = true
+    end
+
+    I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+    I18n.load_path      = Dir["#{File.expand_path('../../i18n', __FILE__)}/*.yml"]
+    I18n.default_locale = :en
+    I18n.locale         = lang.to_sym
+  end
+
+  def test_00_config
+    data = { gpg_key: 'test@example.com',
+             lang: 'en',
+             wallet_dir: '/tmp/test',
+             gpg_exe: '',
+           }
+
+    @config = MPW::Config.new
+    @config.setup(data)
+    @config.load_config
+
+    data.each do |k,v|
+      assert_equal(v, @config.send(k))
+    end
+
+    @config.setup_gpg_key('password', 'test@example.com', 2048)
+    assert(@config.check_gpg_key?)
+  end
+
+  def test_01_password
+    data = { pwd_alpha: false,
+             pwd_numeric: false,
+             pwd_special: true,
+             pwd_length: 32,
+           }
+
+    @config = MPW::Config.new
+    @config.load_config
+
+    assert_equal(@config.password[:length], 16)
+    assert(@config.password[:alpha])
+    assert(@config.password[:numeric])
+    assert(!@config.password[:special])
+
+    @config.setup(data)
+    @config.load_config
+
+    assert_equal(@config.password[:length], data[:pwd_length])
+    assert(!@config.password[:alpha])
+    assert(!@config.password[:numeric])
+    assert(@config.password[:special])
+  end
+
+  def test_02_wallet_paths
+    new_path = '/tmp/mpw-test'
+
+    @config = MPW::Config.new
+    @config.load_config
+
+    assert(!@config.wallet_paths['default'])
+
+    @config.set_wallet_path(new_path, 'default')
+    assert_equal(@config.wallet_paths['default'], new_path)
+
+    @config.set_wallet_path('default', 'default')
+    assert(!@config.wallet_paths['default'])
+  end
 end

data/test/test_item.rb

@@ -1,172 +1,172 @@
 #!/usr/bin/ruby
- 
+
 require 'mpw/item'
 require 'test/unit'
 require 'yaml'
- 
+
 class TestItem < Test::Unit::TestCase
-	def setup
-		@fixture_file = 'test/files/fixtures.yml'
-		@fixtures = YAML.load_file(@fixture_file)
-		
-		if defined?(I18n.enforce_available_locales)
-			I18n.enforce_available_locales = false
-		end
-
-		I18n.load_path      = Dir['./i18n/cli/*.yml']
-		I18n.default_locale = :en
-
-
-		puts
-	end
-
-	def test_00_add_without_name
-		assert_raise(RuntimeError){MPW::Item.new}
-	end
-
-	def test_01_add_new
-		data = { group:    @fixtures['add_new']['group'],
-		         host:     @fixtures['add_new']['host'],
-		         protocol: @fixtures['add_new']['protocol'],
-		         user:     @fixtures['add_new']['user'],
-		         port:     @fixtures['add_new']['port'],
-		         comment:  @fixtures['add_new']['comment'],
-		       }
-		
-		item = MPW::Item.new(data)
-
-		assert(!item.nil?)
-		assert(!item.empty?)
-
-		assert_equal(@fixtures['add_new']['group'],     item.group)
-		assert_equal(@fixtures['add_new']['host'],      item.host)
-		assert_equal(@fixtures['add_new']['protocol'],  item.protocol)
-		assert_equal(@fixtures['add_new']['user'],      item.user)
-		assert_equal(@fixtures['add_new']['port'].to_i, item.port)
-		assert_equal(@fixtures['add_new']['comment'],   item.comment)
-	end
-
-	def test_02_add_existing
-		data = { id:       @fixtures['add_existing']['id'],
-		         group:    @fixtures['add_existing']['group'],
-		         host:     @fixtures['add_existing']['host'],
-		         protocol: @fixtures['add_existing']['protocol'],
-		         user:     @fixtures['add_existing']['user'],
-		         port:     @fixtures['add_existing']['port'],
-		         comment:  @fixtures['add_existing']['comment'],
-		         created:  @fixtures['add_existing']['created'],
-		       }
-
-		item = MPW::Item.new(data)
-
-		assert(!item.nil?)
-		assert(!item.empty?)
-
-		assert_equal(@fixtures['add_existing']['id'],        item.id)
-		assert_equal(@fixtures['add_existing']['group'],     item.group)
-		assert_equal(@fixtures['add_existing']['host'],      item.host)
-		assert_equal(@fixtures['add_existing']['protocol'],  item.protocol)
-		assert_equal(@fixtures['add_existing']['user'],      item.user)
-		assert_equal(@fixtures['add_existing']['port'].to_i, item.port)
-		assert_equal(@fixtures['add_existing']['comment'],   item.comment)
-		assert_equal(@fixtures['add_existing']['created'],   item.created)
-	end
-
-	def test_03_update
-		data = { group:    @fixtures['add_new']['group'],
-		         host:     @fixtures['add_new']['host'],
-		         protocol: @fixtures['add_new']['protocol'],
-		         user:     @fixtures['add_new']['user'],
-		         port:     @fixtures['add_new']['port'],
-		         comment:  @fixtures['add_new']['comment'],
-		       }
-		
-		item = MPW::Item.new(data)
-
-		assert(!item.nil?)
-		assert(!item.empty?)
-
-		created   = item.created
-		last_edit = item.last_edit
-
-		data = { group:    @fixtures['update']['group'],
-		         host:     @fixtures['update']['host'],
-		         protocol: @fixtures['update']['protocol'],
-		         user:     @fixtures['update']['user'],
-		         port:     @fixtures['update']['port'],
-		         comment:  @fixtures['update']['comment'],
-		       }
-		
-		sleep(1)
-		assert(item.update(data))
-
-		assert(!item.empty?)
-
-		assert_equal(@fixtures['update']['group'],     item.group)
-		assert_equal(@fixtures['update']['host'],      item.host)
-		assert_equal(@fixtures['update']['protocol'],  item.protocol)
-		assert_equal(@fixtures['update']['user'],      item.user)
-		assert_equal(@fixtures['update']['port'].to_i, item.port)
-		assert_equal(@fixtures['update']['comment'],   item.comment)
-
-		assert_equal(created, item.created)
-		assert_not_equal(last_edit, item.last_edit)
-	end
-
-	def test_05_update_one_element
-		data = { group:    @fixtures['add_new']['group'],
-		         host:     @fixtures['add_new']['host'],
-		         protocol: @fixtures['add_new']['protocol'],
-		         user:     @fixtures['add_new']['user'],
-		         port:     @fixtures['add_new']['port'],
-		         comment:  @fixtures['add_new']['comment'],
-		       }
-		
-		item = MPW::Item.new(data)
-
-		assert(!item.nil?)
-		assert(!item.empty?)
-
-		last_edit = item.last_edit
-
-		sleep(1)
-		assert(item.update({comment: @fixtures['update']['comment']}))
-
-		assert_equal(@fixtures['add_new']['group'],     item.group)
-		assert_equal(@fixtures['add_new']['host'],      item.host)
-		assert_equal(@fixtures['add_new']['protocol'],  item.protocol)
-		assert_equal(@fixtures['add_new']['user'],      item.user)
-		assert_equal(@fixtures['add_new']['port'].to_i, item.port)
-		assert_equal(@fixtures['update']['comment'],    item.comment)
-	
-		assert_not_equal(last_edit, item.last_edit)
-	end
-
-	def test_05_delete
-		data = { group:    @fixtures['add_new']['group'],
-		         host:     @fixtures['add_new']['host'],
-		         protocol: @fixtures['add_new']['protocol'],
-		         user:     @fixtures['add_new']['user'],
-		         port:     @fixtures['add_new']['port'],
-		         comment:  @fixtures['add_new']['comment'],
-		       }
-		
-		item = MPW::Item.new(data)
-
-		assert(!item.nil?)
-		assert(!item.empty?)
-
-		item.delete
-		assert(!item.nil?)
-		assert(item.empty?)
-
-		assert_equal(nil, item.id)
-		assert_equal(nil, item.group)
-		assert_equal(nil, item.host)
-		assert_equal(nil, item.protocol)
-		assert_equal(nil, item.user)
-		assert_equal(nil, item.port)
-		assert_equal(nil, item.comment)
-		assert_equal(nil, item.created)
-	end
-end 
+  def setup
+    @fixture_file = 'test/files/fixtures.yml'
+    @fixtures = YAML.load_file(@fixture_file)
+
+    if defined?(I18n.enforce_available_locales)
+      I18n.enforce_available_locales = false
+    end
+
+    I18n.load_path      = Dir['./i18n/cli/*.yml']
+    I18n.default_locale = :en
+
+
+    puts
+  end
+
+  def test_00_add_without_name
+    assert_raise(RuntimeError){MPW::Item.new}
+  end
+
+  def test_01_add_new
+    data = { group:    @fixtures['add_new']['group'],
+             host:     @fixtures['add_new']['host'],
+             protocol: @fixtures['add_new']['protocol'],
+             user:     @fixtures['add_new']['user'],
+             port:     @fixtures['add_new']['port'],
+             comment:  @fixtures['add_new']['comment'],
+           }
+
+    item = MPW::Item.new(data)
+
+    assert(!item.nil?)
+    assert(!item.empty?)
+
+    assert_equal(@fixtures['add_new']['group'],     item.group)
+    assert_equal(@fixtures['add_new']['host'],      item.host)
+    assert_equal(@fixtures['add_new']['protocol'],  item.protocol)
+    assert_equal(@fixtures['add_new']['user'],      item.user)
+    assert_equal(@fixtures['add_new']['port'].to_i, item.port)
+    assert_equal(@fixtures['add_new']['comment'],   item.comment)
+  end
+
+  def test_02_add_existing
+    data = { id:       @fixtures['add_existing']['id'],
+             group:    @fixtures['add_existing']['group'],
+             host:     @fixtures['add_existing']['host'],
+             protocol: @fixtures['add_existing']['protocol'],
+             user:     @fixtures['add_existing']['user'],
+             port:     @fixtures['add_existing']['port'],
+             comment:  @fixtures['add_existing']['comment'],
+             created:  @fixtures['add_existing']['created'],
+           }
+
+    item = MPW::Item.new(data)
+
+    assert(!item.nil?)
+    assert(!item.empty?)
+
+    assert_equal(@fixtures['add_existing']['id'],        item.id)
+    assert_equal(@fixtures['add_existing']['group'],     item.group)
+    assert_equal(@fixtures['add_existing']['host'],      item.host)
+    assert_equal(@fixtures['add_existing']['protocol'],  item.protocol)
+    assert_equal(@fixtures['add_existing']['user'],      item.user)
+    assert_equal(@fixtures['add_existing']['port'].to_i, item.port)
+    assert_equal(@fixtures['add_existing']['comment'],   item.comment)
+    assert_equal(@fixtures['add_existing']['created'],   item.created)
+  end
+
+  def test_03_update
+    data = { group:    @fixtures['add_new']['group'],
+             host:     @fixtures['add_new']['host'],
+             protocol: @fixtures['add_new']['protocol'],
+             user:     @fixtures['add_new']['user'],
+             port:     @fixtures['add_new']['port'],
+             comment:  @fixtures['add_new']['comment'],
+           }
+
+    item = MPW::Item.new(data)
+
+    assert(!item.nil?)
+    assert(!item.empty?)
+
+    created   = item.created
+    last_edit = item.last_edit
+
+    data = { group:    @fixtures['update']['group'],
+             host:     @fixtures['update']['host'],
+             protocol: @fixtures['update']['protocol'],
+             user:     @fixtures['update']['user'],
+             port:     @fixtures['update']['port'],
+             comment:  @fixtures['update']['comment'],
+           }
+
+    sleep(1)
+    assert(item.update(data))
+
+    assert(!item.empty?)
+
+    assert_equal(@fixtures['update']['group'],     item.group)
+    assert_equal(@fixtures['update']['host'],      item.host)
+    assert_equal(@fixtures['update']['protocol'],  item.protocol)
+    assert_equal(@fixtures['update']['user'],      item.user)
+    assert_equal(@fixtures['update']['port'].to_i, item.port)
+    assert_equal(@fixtures['update']['comment'],   item.comment)
+
+    assert_equal(created, item.created)
+    assert_not_equal(last_edit, item.last_edit)
+  end
+
+  def test_05_update_one_element
+    data = { group:    @fixtures['add_new']['group'],
+             host:     @fixtures['add_new']['host'],
+             protocol: @fixtures['add_new']['protocol'],
+             user:     @fixtures['add_new']['user'],
+             port:     @fixtures['add_new']['port'],
+             comment:  @fixtures['add_new']['comment'],
+           }
+
+    item = MPW::Item.new(data)
+
+    assert(!item.nil?)
+    assert(!item.empty?)
+
+    last_edit = item.last_edit
+
+    sleep(1)
+    assert(item.update({comment: @fixtures['update']['comment']}))
+
+    assert_equal(@fixtures['add_new']['group'],     item.group)
+    assert_equal(@fixtures['add_new']['host'],      item.host)
+    assert_equal(@fixtures['add_new']['protocol'],  item.protocol)
+    assert_equal(@fixtures['add_new']['user'],      item.user)
+    assert_equal(@fixtures['add_new']['port'].to_i, item.port)
+    assert_equal(@fixtures['update']['comment'],    item.comment)
+
+    assert_not_equal(last_edit, item.last_edit)
+  end
+
+  def test_05_delete
+    data = { group:    @fixtures['add_new']['group'],
+             host:     @fixtures['add_new']['host'],
+             protocol: @fixtures['add_new']['protocol'],
+             user:     @fixtures['add_new']['user'],
+             port:     @fixtures['add_new']['port'],
+             comment:  @fixtures['add_new']['comment'],
+           }
+
+    item = MPW::Item.new(data)
+
+    assert(!item.nil?)
+    assert(!item.empty?)
+
+    item.delete
+    assert(!item.nil?)
+    assert(item.empty?)
+
+    assert_equal(nil, item.id)
+    assert_equal(nil, item.group)
+    assert_equal(nil, item.host)
+    assert_equal(nil, item.protocol)
+    assert_equal(nil, item.user)
+    assert_equal(nil, item.port)
+    assert_equal(nil, item.comment)
+    assert_equal(nil, item.created)
+  end
+end