pec2 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c423952fa8333500b2fd92609486eee8091bfd3e
-  data.tar.gz: 7ab971186c28854893605c0f7bb1ee68ad58d433
+  metadata.gz: 221b02cfeb12fc1307eba9f1d8d4e267af138a10
+  data.tar.gz: 684b5a45a8bd2e3ebb4121230bf7a380622487ac
 SHA512:
-  metadata.gz: e65faac1a7c3a5f36a4a49bbbe7f6c9455aafe1ab6f2a4d2cbdb43e4b067b221915174adec28a40a6395561e2b6995011995ad2980f445791be534851daa26e3
-  data.tar.gz: c6b0bbdd12c15b1b6a98e73c70f383e406ade474727adefab9d285fcdc1b387ab281b157ce57da25ebe2f9ad0522e0bf72b32fef96e8488a7eb0b0b5763d3420
+  metadata.gz: ef6ddb6106717e08eff3e48e2675159e922cc60ad4851d286816247d5cc62f6fa08007bc699aaaf817ef413a9aabf880ea6d035af3fa4492cd8b6d8cb4242758
+  data.tar.gz: cb6b3ae20f18033ea181a1c0130b957681cb8a9072a56981617d90ce4f13eac716edc35a7a71f9e06d69ccea7cda3699e820fd8dc66aec88090135732c0b1c93

data/lib/pec2.rb

@@ -1,4 +1,5 @@
 require 'pec2/version'
 require 'pec2/constants'
-require 'pec2/core'
+require 'pec2/ec2'
+require 'pec2/pssh'
 require 'pec2/cli'

data/lib/pec2/cli.rb

@@ -1,7 +1,6 @@
 require "thor"
 require "tempfile"
 require "logger"
-require 'shellwords'
 
 module Pec2
   class CLI < Thor
@@ -12,22 +11,28 @@ module Pec2
     def initialize(args = [], options = {}, config = {})
       super(args, options, config)
       @global_options = config[:shell].base.options
-      @core = Core.new
-      @pssh_path = File.expand_path('../../../exe/bin/pssh', __FILE__)
+      @core = Ec2.new
       @logger = Logger.new(STDOUT)
     end
 
     desc 'run_command', 'run command'
-    option :command, aliases: '-c', type: :string, required: true, desc: 'command'
+    option :command, aliases: '-c', type: :string, desc: 'command'
     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'
     def run_command
       addresses = @core.instances_hash(options[:tag]).map do |instance|
-        instance.private_ip_address
+        if options[:resolve] == 'private_ip_address'
+          instance.private_ip_address
+        elsif options[:resolve] == 'public_ip_address'
+          instance.public_ip_address
+        elsif options[:resolve] == 'name_tag'
+          instance.tags.select{|tag| tag["key"] == "Name" }.first["value"]
+        end
       end
 
       if addresses.empty?
@@ -35,37 +40,28 @@ module Pec2
         exit
       end
 
+      @logger.info(%Q{listing connection to #{addresses.join(', ')}.})
+
       tf = Tempfile.open("pec2") { |fp|
         fp.puts(addresses.join("\n"))
         fp
       }
 
-      cmd = "#{@pssh_path} -t 0 -x '-tt' -h #{tf.path} -O StrictHostKeyChecking=no"
-      if options[:print]
-        cmd = "#{cmd} -P"
-      end
+      pssh = Pssh.new(options, tf.path)
 
-      if options[:user]
-        cmd = "#{cmd} -l #{options[:user]}"
-      end
-
-      if options[:log]
-        cmd = "#{cmd} -o #{options[:log]}"
-      end
+      interactive = options[:command] ? false : true
 
-      if options[:parallel]
-        cmd = "#{cmd} -p #{options[:parallel]}"
-      end
-
-      if options[:sudo_password]
-        cmd = %Q{(echo #{options[:sudo_password]}) | #{cmd} -I #{Shellwords.escape(options[:command])}}
+      if interactive
+        while true
+          command = ask(">:")
+          pssh.exec_pssh_command(command)
+        end
       else
-        cmd = %Q{#{cmd} -i #{Shellwords.escape(options[:command])}}
-      end
-
-      unless system(cmd)
-        tf.close
-        exit 1
+        ret = pssh.exec_pssh_command(options[:command])
+        unless ret
+          tf.close
+          exit 1
+        end
       end
       tf.close
     end

data/lib/pec2/{core.rb → ec2.rb}

@@ -10,7 +10,7 @@ class Pec2Mash < ::Hashie::Mash
 end
 
 module Pec2
-  class Core
+  class Ec2
 
     def initialize
       @logger = Logger.new(STDOUT)

data/lib/pec2/pssh.rb

@@ -0,0 +1,42 @@
+require 'shellwords'
+
+module Pec2
+  class Pssh
+
+    PSSH_PATH = File.expand_path('../../../exe/bin/pssh', __FILE__)
+
+    def initialize(options, hosts_file)
+      @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
+
+      if options[:parallel]
+        @pssh_command = "#{@pssh_command} -p #{options[:parallel]}"
+      end
+      @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
+    end
+
+    def exec_pssh_command(command)
+      return false if command.nil? || command.empty?
+      build_command = build_pssh_command(command)
+      system(build_command)
+    end
+  end
+end

data/lib/pec2/version.rb

@@ -1,4 +1,4 @@
 module Pec2
   # pec2 version
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/spec/cli_spec.rb

@@ -3,6 +3,7 @@ require 'pec2'
 
 describe Pec2::CLI do
   before do
+    ENV['AWS_REGION'] = 'us-east-1'
   end
 
   it "should stdout sample" do

data/spec/{core_spec.rb → ec2_spec.rb}

@@ -1,9 +1,8 @@
 require 'spec_helper'
 require 'pec2'
 
-describe Pec2::Core do
+describe Pec2::Ec2 do
   before do
-    @core = Core.new
   end
 
   after do

data/spec/pssh_spec.rb

@@ -0,0 +1,76 @@
+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)
+  end
+
+  it "test exec_pssh_command empty" do
+    ret = @pssh.exec_pssh_command('')
+
+    expect(ret).to eq(false)
+  end
+
+  it "test exec_pssh_command nil" do
+    ret = @pssh.exec_pssh_command(nil)
+
+    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.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -190,12 +190,14 @@ files:
 - lib/pec2.rb
 - lib/pec2/cli.rb
 - lib/pec2/constants.rb
-- lib/pec2/core.rb
+- lib/pec2/ec2.rb
+- lib/pec2/pssh.rb
 - lib/pec2/version.rb
 - pec2.gemspec
 - spec/cli_spec.rb
-- spec/core_spec.rb
+- spec/ec2_spec.rb
 - spec/pec2_spec.rb
+- spec/pssh_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/toyama0919/pec2
 licenses:
@@ -223,6 +225,7 @@ specification_version: 4
 summary: run parallel ssh command. ec2 tag base operation.
 test_files:
 - spec/cli_spec.rb
-- spec/core_spec.rb
+- spec/ec2_spec.rb
 - spec/pec2_spec.rb
+- spec/pssh_spec.rb
 - spec/spec_helper.rb