mpw 4.0.0 → 4.1.0

data/test/test_mpw.rb

@@ -1,140 +1,140 @@
 #!/usr/bin/ruby
- 
+
 require 'mpw/mpw'
 require 'mpw/item'
 require 'test/unit'
 require 'yaml'
 require 'csv'
- 
+
 class TestMPW < Test::Unit::TestCase
-	def setup
-		fixture_file = './test/files/fixtures.yml'
-
-		wallet_file = 'default.gpg'
-		key         = 'test@example.com'
-		password    = 'password'
-
-		if defined?(I18n.enforce_available_locales)
-			I18n.enforce_available_locales = false
-		end
-
-		@mpw      = MPW::MPW.new(key, wallet_file, password)
-		@fixtures = YAML.load_file(fixture_file)
-	end
- 
-	def test_00_decrypt_empty_file
-		@mpw.read_data
-		assert_equal(0, @mpw.list.length)
-	end
-
-	def test_01_encrypt_empty_file
-		@mpw.read_data
-		@mpw.write_data
-	end
-
-	def test_02_add_item
-		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?)
-
-		@mpw.read_data
-		@mpw.add(item)
-		@mpw.set_password(item.id, @fixtures['add_new']['password'])
-
-		assert_equal(1, @mpw.list.length)
-
-		item = @mpw.list[0]
-		@fixtures['add_new'].each do |k,v|
-			if k == 'password'
-				assert_equal(v, @mpw.get_password(item.id))
-			else
-				assert_equal(v, item.send(k).to_s)
-			end
-		end
-
-		@mpw.write_data
-	end
-
-	def test_03_decrypt_file
-		@mpw.read_data
-		assert_equal(1, @mpw.list.length)
-
-		item = @mpw.list[0]
-		@fixtures['add_new'].each do |k,v|
-			if k == 'password'
-				assert_equal(v, @mpw.get_password(item.id))
-			else
-				assert_equal(v, item.send(k).to_s)
-			end
-		end
-	end
-
-	def test_04_delete_item
-		@mpw.read_data
-
-		assert_equal(1, @mpw.list.length)
-
-		@mpw.list.each do |item|
-			item.delete
-		end
-
-		assert_equal(0, @mpw.list.length)
-
-		@mpw.write_data
-	end
-
-	def test_05_search
-		@mpw.read_data
-
-		@fixtures.each_value do |v|
-			data = { group:    v['group'],
-			         host:     v['host'],
-			         protocol: v['protocol'],
-			         user:     v['user'],
-			         port:     v['port'],
-			         comment:  v['comment'],
-			       }
-			
-			item = MPW::Item.new(data)
-	
-			assert(!item.nil?)
-			assert(!item.empty?)
-	
-			@mpw.add(item)
-			@mpw.set_password(item.id, v['password'])
-		end
-
-		assert_equal(3, @mpw.list.length)
-		assert_equal(1, @mpw.list(group:    @fixtures['add_new']['group']).length)
-		assert_equal(1, @mpw.list(pattern:  'existing').length)
-		assert_equal(2, @mpw.list(pattern:  'host_[eu]').length)
-	end
-
-	def test_06_add_gpg_key
-		@mpw.read_data
-
-		@mpw.add_key('test2@example.com')
-		assert_equal(2, @mpw.list_keys.length)
-
-		@mpw.write_data
-	end
-
-	def test_07_delete_gpg_key
-		@mpw.read_data
-		assert_equal(2, @mpw.list_keys.length)
-
-		@mpw.delete_key('test2@example.com')
-		assert_equal(1, @mpw.list_keys.length)
-
-		@mpw.write_data
-	end
+  def setup
+    fixture_file = './test/files/fixtures.yml'
+
+    wallet_file = 'default.gpg'
+    key         = 'test@example.com'
+    password    = 'password'
+
+    if defined?(I18n.enforce_available_locales)
+      I18n.enforce_available_locales = false
+    end
+
+    @mpw      = MPW::MPW.new(key, wallet_file, password)
+    @fixtures = YAML.load_file(fixture_file)
+  end
+
+  def test_00_decrypt_empty_file
+    @mpw.read_data
+    assert_equal(0, @mpw.list.length)
+  end
+
+  def test_01_encrypt_empty_file
+    @mpw.read_data
+    @mpw.write_data
+  end
+
+  def test_02_add_item
+    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?)
+
+    @mpw.read_data
+    @mpw.add(item)
+    @mpw.set_password(item.id, @fixtures['add_new']['password'])
+
+    assert_equal(1, @mpw.list.length)
+
+    item = @mpw.list[0]
+    @fixtures['add_new'].each do |k,v|
+      if k == 'password'
+        assert_equal(v, @mpw.get_password(item.id))
+      else
+        assert_equal(v, item.send(k).to_s)
+      end
+    end
+
+    @mpw.write_data
+  end
+
+  def test_03_decrypt_file
+    @mpw.read_data
+    assert_equal(1, @mpw.list.length)
+
+    item = @mpw.list[0]
+    @fixtures['add_new'].each do |k,v|
+      if k == 'password'
+        assert_equal(v, @mpw.get_password(item.id))
+      else
+        assert_equal(v, item.send(k).to_s)
+      end
+    end
+  end
+
+  def test_04_delete_item
+    @mpw.read_data
+
+    assert_equal(1, @mpw.list.length)
+
+    @mpw.list.each do |item|
+      item.delete
+    end
+
+    assert_equal(0, @mpw.list.length)
+
+    @mpw.write_data
+  end
+
+  def test_05_search
+    @mpw.read_data
+
+    @fixtures.each_value do |v|
+      data = { group:    v['group'],
+               host:     v['host'],
+               protocol: v['protocol'],
+               user:     v['user'],
+               port:     v['port'],
+               comment:  v['comment'],
+             }
+
+      item = MPW::Item.new(data)
+
+      assert(!item.nil?)
+      assert(!item.empty?)
+
+      @mpw.add(item)
+      @mpw.set_password(item.id, v['password'])
+    end
+
+    assert_equal(3, @mpw.list.length)
+    assert_equal(1, @mpw.list(group:    @fixtures['add_new']['group']).length)
+    assert_equal(1, @mpw.list(pattern:  'existing').length)
+    assert_equal(2, @mpw.list(pattern:  'host_[eu]').length)
+  end
+
+  def test_06_add_gpg_key
+    @mpw.read_data
+
+    @mpw.add_key('test2@example.com')
+    assert_equal(2, @mpw.list_keys.length)
+
+    @mpw.write_data
+  end
+
+  def test_07_delete_gpg_key
+    @mpw.read_data
+    assert_equal(2, @mpw.list_keys.length)
+
+    @mpw.delete_key('test2@example.com')
+    assert_equal(1, @mpw.list_keys.length)
+
+    @mpw.write_data
+  end
 end

data/test/test_translate.rb

@@ -4,28 +4,28 @@ require 'yaml'
 require 'test/unit'
 
 class TestTranslate < Test::Unit::TestCase
-	def test_00_check_translate
-		missing = 0
-		
-		Dir.glob('i18n/*.yml').each do |yaml|
-			lang      = File.basename(yaml, '.yml')
-			translate = YAML.load_file(yaml)
-		
-			`grep -r -o "I18n.t('.*)" bin/ lib/ | cut -d"'" -f2`.each_line do |line|
-				begin
-					t = translate[lang]
-					line.strip.split('.').each do |v|
-						t = t[v]
-					end
+  def test_00_check_translate
+    missing = 0
 
-					assert(!t.to_s.empty?)
-				rescue
-					puts "#{lang}.#{line}"
-					missing = 1
-				end
-			end
-		end
-		
-		assert_equal(0, missing)
-	end
+    Dir.glob('i18n/*.yml').each do |yaml|
+      lang      = File.basename(yaml, '.yml')
+      translate = YAML.load_file(yaml)
+
+      `grep -r -o "I18n.t('.*)" bin/ lib/ | cut -d"'" -f2`.each_line do |line|
+        begin
+          t = translate[lang]
+          line.strip.split('.').each do |v|
+            t = t[v]
+          end
+
+          assert(!t.to_s.empty?)
+        rescue
+          puts "#{lang}.#{line}"
+          missing = 1
+        end
+      end
+    end
+
+    assert_equal(0, missing)
+  end
 end

data/test/tests.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
- 
+
 require_relative 'init.rb'
 require_relative 'test_config.rb'
 require_relative 'test_item.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpw
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Adrien Waksberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -110,46 +110,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +160,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -223,8 +184,6 @@ files:
 - lib/mpw/config.rb
 - lib/mpw/item.rb
 - lib/mpw/mpw.rb
-- lib/mpw/sync/ftp.rb
-- lib/mpw/sync/ssh.rb
 - mpw.gemspec
 - templates/add_form.erb
 - templates/update_form.erb
@@ -247,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/mpw/sync/ftp.rb

@@ -1,68 +0,0 @@
-#!/usr/bin/ruby
-# 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 'i18n'
-require 'net/ftp'
-		
-module MPW
-class FTP
-
-	# Constructor
-	# @args: config -> the config
-	def initialize(config)
-		@host      = config['host']
-		@user      = config['user']
-		@password  = config['password']
-		@path      = config['path']
-		@port      = config['port'].instance_of?(Integer) ? 22 : config['port']
-	end
-
-
-	# Connect to server
-	def connect
-		Net::FTP.open(@host) do |ftp|
-			ftp.login(@user, @password)
-			break
-		end
-	rescue Exception => e
-		raise "#{I18n.t('error.sync.connection')}\n#{e}"
-	end
-
-	# Get data on server
-	# @args: file_tmp -> the path where download the file
-	def get(file_tmp)
-		Net::FTP.open(@host) do |ftp|
-			ftp.login(@user, @password)
-			ftp.gettextfile(@path, file_tmp)
-		end
-	rescue Exception => e
-		raise "#{I18n.t('error.sync.download')}\n#{e}"
-	end
-
-	# Update the remote data
-	# @args: file_gpg -> the data to send on server
-	def update(file_gpg)
-		Net::FTP.open(@host) do |ftp|
-			ftp.login(@user, @password)
-			ftp.puttextfile(file_gpg, @path)
-		end
-	rescue Exception => e
-		raise "#{I18n.t('error.sync.upload')}\n#{e}"
-	end
-end
-end