loginx 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 920a5a937388e313c81e1383cd7594562ee04500
-  data.tar.gz: de0c3104052e1bcfa1082dc19e83836fee371ecd
+  metadata.gz: c17913cf8a33a6bdcb415d76fddf9ab728800bac
+  data.tar.gz: 917dd83345570e64b4a3a303f398427c65b6d4d0
 SHA512:
-  metadata.gz: 3cb622f48af1a00e465e070310dcfed482201ab7c6a6bdad214b39f426f5d982fdb174db0b5a8ff47bf7a736913b04365f6471714294524ea3ff889ab635511c
-  data.tar.gz: d49f6806edfa4af9cb4f248c91a8d560a3df34bec9ac2671f90016a9bec4b30b6c20bd9c3e5f8919c0328f0b30d338f4e09c0c7253fb3a425a6cd6599abc7bb5
+  metadata.gz: dd94344833eaedddc6216c5b74c2a611b6c1df6a21679fe228da400c31e5486849d629f339ff31859d3d84b6b2450b3daf278fd258761feb7e1388053ec13d40
+  data.tar.gz: 4e35bfcac705d61497b2d620b9b676437e4fe2d3e62f57ced7609c4c4f5f7a0d6f1d1ad0c20c4fa7f27586b195407e595433572a399596a5a2a1c2a6af60f763

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    loginx (1.2.1)
+    loginx (1.3.1)
       methadone (>= 1.9.3)
       ruby_expect
 

data/lib/core.rb

@@ -29,49 +29,39 @@ class Core_p
         puts "sorry the server alias does not exist"
         exit 1
       end
-    user = config['config']['user']
-    port = config['config']['port']
-    ip = info[self.server_alias]['ip']
-    password = info[self.server_alias]['password']
-    cmd = "ssh -p #{port} #{user}@#{ip}"
-    exp = RubyExpect::Expect.spawn("#{cmd}")
-    exp.procedure do
-      any do
-        expect /Permission denied/ do
-          puts "this user is not allowed"
-        end
-
-        expect /Connection refused/ do
-          puts "please check your port setting or password"
-        end
-
-        expect /continue connecting/ do
-          send "yes"
-        end
-
-        expect /\$\s+$/ do
-          puts "login successfully and press return to continue"
-          interact
-        end
-
-        expect /\#\s+$/ do
-          puts "login successfully and press return to continue"
-          interact
-        end
+      user = config['config']['user']
+      port = config['config']['port']
+      ip = info[self.server_alias]['ip']
+      password = info[self.server_alias]['password']
 
-        expect /assword/ do
-          cmd = "ssh-copy-id -i #{user}@#{ip}"
-          exp2 = RubyExpect::Expect.spawn("#{cmd}")
-          exp2.procedure do
+        puts "do you want to send your ssh key"
+        puts "enter return to skip or 'y' to continue to send your key"
+        flag = STDIN.gets.chomp
+        if flag == 'y'
+          cmd2 = "ssh-copy-id -i #{user}@#{ip}"
+          #exec "#{cmd2}"
+          exp = RubyExpect::Expect.spawn("#{cmd2}")
+          exp.procedure do
             any do
               expect /Permission denied/ do
                 puts "this user is not allowed"
+                exit 0
               end
 
               expect /continue connecting/ do
                 send "yes"
               end
 
+              expect /Connection refused/ do
+                puts "please check your port setting or password"
+                exit 0
+              end
+
+              expect /already exist/ do
+                puts "you already added keys before"
+                exit 0
+              end
+
               expect /assword/ do
                 send "#{password}"
                 sleep 3
@@ -84,9 +74,8 @@ class Core_p
           end
         end
 
-        run
-      end
-    end
+      cmd = "ssh -p #{port} #{user}@#{ip}"
+      exec "#{cmd}"
     else
       puts "project does not exist"
       exit 1

data/lib/loginx/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module Loginx
-  VERSION = "1.2.1"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loginx
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - terryshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler