kumogata 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Njc2ZGUyZjQzOTBmN2Q2NmM1ZjczMjc0MWMyMWM5MWFhZGMwYzE2OQ==
-  data.tar.gz: !binary |-
-    ODY3ODA4NDcxYTgyYmMwOWUyYzI2ZGI0ZjEzODZkMTdiZGE3N2U1MA==
+SHA1:
+  metadata.gz: 9f8f5c3adbd22698119c42ffcb9864f11d284ca8
+  data.tar.gz: 170ec529a9b83979bed211fa9c56e7dfc640022c
 SHA512:
-  metadata.gz: !binary |-
-    NGY5OTBmNjU2NDYxNzkyMTc0NDNmZmI4NGE5ZjIxYTVmMGI1MGVlMTk5OTBl
-    NWVhYjVhYWIxZWJkNzllMDg2MmJhZTRlZmY5ODIxNzNmNGEwZDA0YWMxYTA0
-    OGU0MTM1MDVkMTBjYzIzZGRkODIyM2U5MTk0MjdmZWQzMDQ0ZjM=
-  data.tar.gz: !binary |-
-    NWM3MTE3ZjhiYjE2MzEyZTcxZjZiNzIxNDI1YWRiNDU3MzI1NDUwMTJiZWJl
-    Zjk4Y2I3MTlkNDU0ZTRiYzJiODBlNWJkOGVhOThlYzkzYjUxMzJjMjdlYjky
-    NDkyZGEwZTdjODM4NGUwODExZDk1YTVjZjJkZjk3OTExNjQ2MzA=
+  metadata.gz: aa6a1443184c5f44b79b54213828a97b78f32d5a668337d1c0282e4bd18490b21b5a54d2843f93768a07840ec9506913dd2f9621a14ab4cfbb8fb2f171377515
+  data.tar.gz: ecbfb98d07bd4b716fe1cba9b5697f0188c299c4233987bf9c033c01ebeb978258aff415e932dc2a9eea04b5314b19627d036cace2498c266c642b8a115c1e65

data/README.md

@@ -5,8 +5,8 @@
 
 Kumogata is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformation/).
 
-[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403121452)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403121452)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403122152)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403122152)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -307,8 +307,9 @@ _post do
       user "ec2-user"
       # see http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
       #options :timeout => 300
-      #connect_tries 10
+      #connect_tries 36
       #retry_interval 5
+      #request_pty true
     end
     command <<-EOS
       hostname
@@ -322,12 +323,10 @@ end
 ...
 Command: my_shell_command
 Status: 0
----
 1> 54.199.251.30
 
 Command: my_ssh_command
 Status: 0
----
 1> ip-10-0-129-20
 
 (Save to `/foo/bar/command_result.json`)

data/lib/kumogata/post_processing.rb

@@ -111,6 +111,8 @@ class Kumogata::PostProcessing
     if options and not options.kind_of?(Hash)
       raise "Invalid post processing ssh options: #{name} => #{options.inspect}"
     end
+
+    ssh['request_pty'] = !!((ssh['request_pty'] || true).to_s =~ /\Atrue\Z/)
   end
 
   def run_command(attrs, outputs)
@@ -136,6 +138,7 @@ class Kumogata::PostProcessing
     retry_interval = (ssh['retry_interval'] || 5).to_i
 
     stderr_orig = nil
+    ssh_exec_opts = {:request_pty => ssh['request_pty']}
 
     begin
       stderr_orig = STDERR.dup
@@ -143,7 +146,7 @@ class Kumogata::PostProcessing
 
       begin
         retryable(:tries => connect_tries, :on => Net::SSH::Disconnect, :sleep => retry_interval) do
-          Net::SSH.start(*args) {|ssh| ssh_exec!(ssh, command) }
+          Net::SSH.start(*args) {|ssh| ssh_exec!(ssh, command, ssh_exec_opts) }
         end
       rescue Net::SSH::HostKeyMismatch => e
         e.remember_host!
@@ -154,7 +157,7 @@ class Kumogata::PostProcessing
     end
   end
 
-  def ssh_exec!(ssh, command)
+  def ssh_exec!(ssh, command, options)
     stdout_data = ''
     stderr_data = ''
     exit_code = nil
@@ -164,6 +167,14 @@ class Kumogata::PostProcessing
     stderr_stream = create_stderr_stream
 
     ssh.open_channel do |channel|
+      if options[:request_pty]
+        channel.request_pty do |ch, success|
+          unless success
+            raise "Couldn't obtain pty (ssh.channel.request_pty)"
+          end
+        end
+      end
+
       channel.exec(command) do |ch, success|
         unless success
           raise "Couldn't execute command #{command.inspect} (ssh.channel.exec)"

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/kumogata_create_spec.rb

@@ -246,7 +246,7 @@ end
 
       client.instance_variable_get(:@post_processing)
            .should_receive(:run_ssh_command)
-           .with({"host"=>"<%= Key \"PublicIp\" %>", "user"=>"ec2-user"}, "      ls\n", {"PublicIp"=>"127.0.0.1"})
+           .with({"host"=>"<%= Key \"PublicIp\" %>", "user"=>"ec2-user", "request_pty"=>true}, "      ls\n", {"PublicIp"=>"127.0.0.1"})
            .and_return(["file1\nfile2\n", "", 0])
 
       client.instance_variable_get(:@post_processing)

data/spec/kumogata_update_spec.rb

@@ -238,7 +238,7 @@ end
 
       client.instance_variable_get(:@post_processing)
            .should_receive(:run_ssh_command)
-           .with({"host"=>"<%= Key \"PublicIp\" %>", "user"=>"ec2-user"}, "      ls\n", {"PublicIp"=>"127.0.0.1"})
+           .with({"host"=>"<%= Key \"PublicIp\" %>", "user"=>"ec2-user", "request_pty"=>true}, "      ls\n", {"PublicIp"=>"127.0.0.1"})
            .and_return(["file1\nfile2\n", "", 0])
 
       client.instance_variable_get(:@post_processing)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Genki Sugawara
@@ -14,196 +14,196 @@ dependencies:
   name: aws-sdk
   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: coderay
   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: diffy
   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: dslh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: hashie
   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: highline
   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: json
   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: 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: retryable
   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: term-ansicolor
   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: uuidtools
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
 description: A tool for AWS CloudFormation. It can define a template in Ruby DSL.
@@ -262,17 +262,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A tool for AWS CloudFormation.
@@ -293,3 +293,4 @@ test_files:
 - spec/kumogata_validate_spec.rb
 - spec/spec_helper.rb
 - spec/string_stream_spec.rb
+has_rdoc: