From 96073ca10395d4c8b0e30539e1cd4e1cd44bd5fe Mon Sep 17 00:00:00 2001 From: nishiki Date: Wed, 4 Sep 2013 19:48:06 +0200 Subject: [PATCH] move lib in the folder lib --- Cli.rb => lib/Cli.rb | 4 ++-- CliSSH.rb => lib/CliSSH.rb | 2 +- MPW.rb => lib/MPW.rb | 0 mpw | 2 +- mpw-ssh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename Cli.rb => lib/Cli.rb (98%) rename CliSSH.rb => lib/CliSSH.rb (96%) rename MPW.rb => lib/MPW.rb (100%) diff --git a/Cli.rb b/lib/Cli.rb similarity index 98% rename from Cli.rb rename to lib/Cli.rb index 48f408a..44fe163 100644 --- a/Cli.rb +++ b/lib/Cli.rb @@ -7,7 +7,7 @@ require 'rubygems' require 'highline/import' require 'pathname' -require "#{APP_ROOT}/MPW.rb" +require "#{APP_ROOT}/lib/MPW.rb" class Cli @@ -91,7 +91,7 @@ class Cli item[MPW::PORT].nil? ? (port = '') : (port = ":#{item[MPW::PORT]}") if item[MPW::PASSWORD].nil? || item[MPW::PASSWORD].empty? - if item[MPW::LOGIN].index('@').eql?(nil) + if item[MPW::LOGIN].include('@') puts "# #{item[MPW::ID]} #{item[MPW::PROTOCOL]}://#{item[MPW::LOGIN]}@#{item[MPW::SERVER]}#{port}" else puts "# #{item[MPW::ID]} #{item[MPW::PROTOCOL]}://{#{item[MPW::LOGIN]}}@#{item[MPW::SERVER]}#{port}" diff --git a/CliSSH.rb b/lib/CliSSH.rb similarity index 96% rename from CliSSH.rb rename to lib/CliSSH.rb index f7e5e1c..bc11593 100644 --- a/CliSSH.rb +++ b/lib/CliSSH.rb @@ -3,7 +3,7 @@ # mail: nishiki@yaegashi.fr # info: a simple script who manage your passwords -require "#{APP_ROOT}/Cli.rb" +require "#{APP_ROOT}/lib/Cli.rb" class CliSSH < Cli diff --git a/MPW.rb b/lib/MPW.rb similarity index 100% rename from MPW.rb rename to lib/MPW.rb diff --git a/mpw b/mpw index c4db372..fdb7f8f 100755 --- a/mpw +++ b/mpw @@ -8,7 +8,7 @@ require 'optparse' require 'pathname' APP_ROOT = File.dirname(Pathname.new(__FILE__).realpath) -require "#{APP_ROOT}/Cli.rb" +require "#{APP_ROOT}/lib/Cli.rb" options = {} options[:force] = false diff --git a/mpw-ssh b/mpw-ssh index 5366521..c1b42a6 100755 --- a/mpw-ssh +++ b/mpw-ssh @@ -8,7 +8,7 @@ require 'optparse' require 'pathname' APP_ROOT = File.dirname(Pathname.new(__FILE__).realpath) -require "#{APP_ROOT}/CliSSH.rb" +require "#{APP_ROOT}/lib/CliSSH.rb" cli = CliSSH.new() search = ARGV[0]