pec2 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb66795b5285c636e91c6f868d3a8232ace8e6b0
-  data.tar.gz: e6adbd3a3fb3ecf2c79f9328b748b8a12fd0a6d1
+  metadata.gz: 550ba6ff5b0de826f866deeafc7d97eb159980b9
+  data.tar.gz: 6fcf46712f036133de9c7c489c8cc30fbb80dc72
 SHA512:
-  metadata.gz: 3eccd5049cebf61354803fdfe964051778b1ed79a13cf4589a482a28a91c1d477fed4c285497536f1b7fa1cdb88f5472dd9c633b7700f22a0ffbfb7e8f0e961a
-  data.tar.gz: c20e2e77b347f67499b19d9fc855ed5eb2488beb54c0237ff5ca8cc6007062b5d980932ad1e4e976d81625aded3f7ee043e49607813a94b72b20f64840bdba71
+  metadata.gz: 6935e5dda4e21de298670ee7c20eff00d7e031db0d92aaaee9bc2d0cb189c7f8c8baefe7592bf9d99de52fe1466e930f4a78aed03949ae822905e8379b2c6816
+  data.tar.gz: 93dd2d07b2852a0729c51f5c7862a337615ac53b40b5a59f8d3509dc55d7efc2cc4f563894132a527c4304f3a17fb2dc167a5233e3f37d7e4f33679a7ed22337

data/lib/pec2/cli.rb

@@ -20,7 +20,6 @@ module Pec2
     option :sudo_password, aliases: '-s', type: :string, desc: 'sudo_password'
     option :tag, aliases: '-t', type: :hash, default: {}, desc: 'tag'
     option :user, aliases: '-u', type: :string, desc: 'user'
-    option :log, aliases: '-o', type: :string, desc: 'log'
     option :parallel, aliases: '-p', type: :numeric, desc: 'parallel'
     option :print, aliases: '-P', type: :boolean, default: false, desc: 'print stdout.'
     option :resolve, aliases: '--resolve', type: :string, default: 'private_ip_address', enum: ['private_ip_address', 'public_ip_address', 'name_tag'], desc: 'resolve'
@@ -43,12 +42,7 @@ module Pec2
       @logger.info(%Q{connection size #{addresses.size}.})
       @logger.info(%Q{listing connection to #{addresses.join(', ')}.})
 
-      tf = Tempfile.open("pec2") { |fp|
-        fp.puts(addresses.join("\n"))
-        fp
-      }
-
-      pssh = Pssh.new(options, tf.path, addresses.size)
+      pssh = Pssh.new(options, addresses, addresses.size)
 
       interactive = options[:command] ? false : true
 
@@ -60,11 +54,9 @@ module Pec2
       else
         ret = pssh.exec_pssh_command(options[:command])
         unless ret
-          tf.close
           exit 1
         end
       end
-      tf.close
     end
 
     desc 'version', 'show version'

data/lib/pec2/pssh.rb

@@ -1,40 +1,70 @@
-require 'shellwords'
+require 'net/ssh'
+require 'parallel'
+require 'colorize'
 
 module Pec2
   class Pssh
 
-    PSSH_PATH = File.expand_path('../../../exe/bin/pssh', __FILE__)
-
-    def initialize(options, hosts_file, parallel = 1)
-      @pssh_command = "#{PSSH_PATH} -t 0 -x '-tt' -h #{hosts_file} -O StrictHostKeyChecking=no"
-      if options[:print]
-        @pssh_command = "#{@pssh_command} -P"
-      end
-
-      if options[:user]
-        @pssh_command = "#{@pssh_command} -l #{options[:user]}"
-      end
-
-      if options[:log]
-        @pssh_command = "#{@pssh_command} -o #{options[:log]}"
-      end
-
-      @pssh_command = "#{@pssh_command} -p #{options[:parallel] || parallel}"
+    def initialize(options, servers, parallel = 1)
+      @parallel = parallel
+      color_index = 0
+      colors = String.colors.select{ |color|
+        !color.to_s.start_with?('light_') && !color.to_s.include?('red') && !color.to_s.include?('yellow')
+      }
+      @servers = servers.map { |server|
+        result = {}
+        result[:host] = server
+        result[:color] = colors[color_index]
+        if colors.size == color_index + 1
+          color_index = 0
+        else
+          color_index = color_index + 1
+        end
+        result
+      }
+      @user = options[:user]
+      @print = options[:print]
       @sudo_password = options[:sudo_password]
-    end
-
-    def build_pssh_command(command)
-      if @sudo_password
-        %Q{(echo #{@sudo_password}) | #{@pssh_command} -I #{Shellwords.escape(command)}}
-      else
-        %Q{#{@pssh_command} -i #{Shellwords.escape(command)}}
-      end
+      @ssh_options = {
+        verify_host_key: false,
+        user_known_hosts_file: '/dev/null',
+      }
+      @logger = Logger.new(STDOUT)
     end
 
     def exec_pssh_command(command)
       return false if command.nil? || command.empty?
-      build_command = build_pssh_command(command)
-      system(build_command)
+      error_servers = []
+      Parallel.each(@servers, in_threads: @parallel) do |server|
+        begin
+          Net::SSH.start(server[:host], @user, @ssh_options) do |ssh|
+            channel = ssh.open_channel do |channel, success|
+              channel.on_data do |channel, data|
+                if data =~ /^\[sudo\] password for /
+                  channel.send_data "#{@sudo_password}\n"
+                else
+                  data.to_s.lines.each do |line|
+                    if @print
+                      print %Q{#{server[:host]}:#{line}}.colorize(server[:color])
+                    end
+                  end
+                end
+              end
+              channel.request_pty
+              channel.exec(command)
+              channel.wait
+            end
+            channel.wait
+          end
+        rescue => e
+          error_servers << server[:host]
+          puts "\n#{e.message}\n#{e.backtrace.join("\n")}"
+        end
+      end
+      if error_servers.size > 0
+        @logger.error "error servers => #{error_servers.join(', ')}".colorize(:red)
+      end
+      return true
     end
   end
 end

data/lib/pec2/version.rb

@@ -1,4 +1,4 @@
 module Pec2
   # pec2 version
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/pec2.gemspec

@@ -18,8 +18,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'thor'
-  gem.add_dependency 'aws-sdk'
+  gem.add_dependency 'aws-sdk', '~> 2.x'
   gem.add_dependency 'hashie'
+  gem.add_dependency 'net-ssh'
+  gem.add_dependency 'parallel'
+  gem.add_dependency 'colorize'
 
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'pry'

data/spec/cli_spec.rb

@@ -21,7 +21,6 @@ describe Pec2::CLI do
     expect(output).to include('--sudo-password')
     expect(output).to include('--tag')
     expect(output).to include('--user')
-    expect(output).to include('--log')
     expect(output).to include('--parallel')
     expect(output).to include('--print')
   end

data/spec/pssh_spec.rb

@@ -1,14 +1,9 @@
 require 'spec_helper'
 require 'pec2'
-require 'tempfile'
 
 describe Pec2::Pssh do
   before do
-    @tf = Tempfile.open("pec2") { |fp|
-      fp.puts("127.0.0.1")
-      fp
-    }
-    @pssh = Pssh.new({}, @tf.path)
+    @pssh = Pssh.new({}, ["127.0.0.1"])
   end
 
   it "test exec_pssh_command empty" do
@@ -23,54 +18,6 @@ describe Pec2::Pssh do
     expect(ret).to eq(false)
   end
 
-  it "test build_pssh_command empty" do
-    pssh_command = @pssh.build_pssh_command('')
-
-    expect(pssh_command).to include(%Q{-O StrictHostKeyChecking=no})
-    expect(pssh_command).to include(%Q{-t 0 -x '-tt'})
-    expect(pssh_command).to include(%Q{-i ''})
-  end
-
-  it "test build_pssh_command" do
-    pssh_command = @pssh.build_pssh_command('hostname')
-
-    expect(pssh_command).not_to start_with(%Q{(echo password) |})
-    expect(pssh_command).to include(%Q{-O StrictHostKeyChecking=no})
-    expect(pssh_command).to include(%Q{-t 0 -x '-tt'})
-    expect(pssh_command).to include(%Q{-i hostname})
-  end
-
-  it "test build_pssh_command with user option" do
-    pssh = Pssh.new({ user: 'app' }, @tf.path)
-    pssh_command = pssh.build_pssh_command('hostname')
-    expect(pssh_command).to include(%Q{ -l app})
-  end
-
-  it "test build_pssh_command with log option" do
-    pssh = Pssh.new({ log: 'hoge.log' }, @tf.path)
-    pssh_command = pssh.build_pssh_command('hostname')
-    expect(pssh_command).to include(%Q{ -o hoge.log})
-  end
-
-  it "test build_pssh_command with parallel option" do
-    pssh = Pssh.new({ parallel: 10 }, @tf.path)
-    pssh_command = pssh.build_pssh_command('hostname')
-    expect(pssh_command).to include(%Q{ -p 10})
-  end
-
-  it "test build_pssh_command with print option" do
-    pssh = Pssh.new({ print: true }, @tf.path)
-    pssh_command = pssh.build_pssh_command('hostname')
-    expect(pssh_command).to include(%Q{ -P})
-  end
-
-  it "test build_pssh_command with sudo_password option" do
-    pssh = Pssh.new({ sudo_password: 'password' }, @tf.path)
-    pssh_command = pssh.build_pssh_command('hostname')
-    expect(pssh_command).to start_with(%Q{(echo password) |})
-  end
-
   after do
-    @tf.close
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec2
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -26,6 +26,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.x
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.x
+- !ruby/object:Gem::Dependency
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +53,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -167,26 +209,6 @@ files:
 - README.md
 - Rakefile
 - bin/pec2
-- exe/bin/pnuke
-- exe/bin/prsync
-- exe/bin/pscp
-- exe/bin/pslurp
-- exe/bin/pssh
-- exe/bin/pssh-askpass
-- exe/man/man1/pnuke.1
-- exe/man/man1/prsync.1
-- exe/man/man1/pscp.1
-- exe/man/man1/pslurp.1
-- exe/man/man1/pssh.1
-- exe/psshlib/__init__.py
-- exe/psshlib/askpass_client.py
-- exe/psshlib/askpass_server.py
-- exe/psshlib/cli.py
-- exe/psshlib/color.py
-- exe/psshlib/manager.py
-- exe/psshlib/psshutil.py
-- exe/psshlib/task.py
-- exe/psshlib/version.py
 - lib/pec2.rb
 - lib/pec2/cli.rb
 - lib/pec2/constants.rb
@@ -219,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: run parallel ssh command. ec2 tag base operation.

data/exe/bin/pnuke

@@ -1,96 +0,0 @@
-#!/usr/bin/env python
-# -*- Mode: python -*-
-
-# Copyright (c) 2009-2012, Andrew McNabb
-# Copyright (c) 2003-2008, Brent N. Chun
-
-"""Nukes all processes that match pattern running as user on the set of nodes
-in hosts.txt.
-"""
-
-import os
-import sys
-
-parent, bindir = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))
-if os.path.exists(os.path.join(parent, 'psshlib')):
-    sys.path.insert(0, parent)
-
-from psshlib import psshutil
-from psshlib.task import Task
-from psshlib.manager import Manager, FatalError
-from psshlib.cli import common_parser, common_defaults
-
-_DEFAULT_TIMEOUT = 60
-
-def option_parser():
-    parser = common_parser()
-    parser.usage = "%prog [OPTIONS] pattern"
-    parser.epilog = "Example: pnuke -h hosts.txt -l irb2 java"
-    return parser
-
-def parse_args():
-    parser = option_parser()
-    defaults = common_defaults(timeout=_DEFAULT_TIMEOUT)
-    parser.set_defaults(**defaults)
-    opts, args = parser.parse_args()
-
-    if len(args) < 1:
-        parser.error('Pattern not specified.')
-
-    if len(args) > 1:
-        parser.error('Extra arguments given after the pattern.')
-
-    if not opts.host_files and not opts.host_strings:
-        parser.error('Hosts not specified.')
-
-    return opts, args
-
-def do_pnuke(hosts, pattern, opts):
-    if opts.outdir and not os.path.exists(opts.outdir):
-        os.makedirs(opts.outdir)
-    if opts.errdir and not os.path.exists(opts.errdir):
-        os.makedirs(opts.errdir)
-    manager = Manager(opts)
-    for host, port, user in hosts:
-        cmd = ['ssh', host, '-o', 'NumberOfPasswordPrompts=1']
-        if opts.options:
-            for opt in opts.options:
-                cmd += ['-o', opt]
-        if user:
-            cmd += ['-l', user]
-        if port:
-            cmd += ['-p', port]
-        if opts.extra:
-            cmd.extend(opts.extra)
-        cmd.append('pkill -9 %s' % pattern)
-        t = Task(host, port, user, cmd, opts)
-        manager.add_task(t)
-    try:
-        statuses = manager.run()
-    except FatalError:
-        sys.exit(1)
-
-    if min(statuses) < 0:
-        # At least one process was killed.
-        sys.exit(3)
-    for status in statuses:
-        if status == 255:
-            sys.exit(4)
-    for status in statuses:
-        if status != 0:
-            sys.exit(5)
-
-if __name__ == "__main__":
-    opts, args = parse_args()
-    pattern = args[0]
-    try:
-        hosts = psshutil.read_host_files(opts.host_files,
-            default_user=opts.user)
-    except IOError:
-        _, e, _ = sys.exc_info()
-        sys.stderr.write('Could not open hosts file: %s\n' % e.strerror)
-        sys.exit(1)
-    if opts.host_strings:
-        for s in opts.host_strings:
-            hosts.extend(psshutil.parse_host_string(s, default_user=opts.user))
-    do_pnuke(hosts, pattern, opts)