evrone-common-spawn 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 186b7bf9721b478698a2b3c77f9b119fe4b02176
-  data.tar.gz: e79c0efd2b8f572299f088779a871843e7c8fa82
+  metadata.gz: 0ba5ac5008b3ed08ab6ab11244721aa25b5cf1de
+  data.tar.gz: fa1a01ee4855ba9a26c2384eef00fa5e7a5e2645
 SHA512:
-  metadata.gz: 234dcc6871880e9f2eda18613d30ff59270def67cf1afa4f2cde93fd8cd90b004877f374ba8dacdf5e87e179e7690c1f48473cb0954296318e1d62ec59de671d
-  data.tar.gz: 3b6cf25ec501c7b7c2302334061805ab5c6d6129522a672c56379eeb82691dfc4ead3250a31936a31bd345aaf507a7aea3bd92f1d8932edeac6b4cf27fa412e3
+  metadata.gz: 2bf4150280e499ca33df726d41d13a0d992d6067fb3530ec32756319c27a3123d93fd180af85430a15afb1ac15fe5c1cac5a562c8cadae72811ad201f2467ea7
+  data.tar.gz: c803c1f155e42c91d92fe1dce23ea1a7da6cc755a418197a2573a5eb2b5111af0837ba2fe61085ba02ddb45b68a8db60baa98b305b069eb7141f3c3bccdb300d

data/.travis.yml

@@ -9,4 +9,5 @@ before_script:
   - export SSH_USER=travis
   - export SSH_PASS=travis
   - export SSH_HOST=localhost
+  - export SSH_PORT=22
 script: bundle exec rake SPEC_OPTS='-fd --color --order=rand'

data/Rakefile

@@ -4,4 +4,3 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-

data/lib/evrone/common/spawn/ssh.rb

@@ -9,7 +9,6 @@ module Evrone
         class << self
           def open(host, user, options = {}, &block)
             ::Net::SSH.start(host, user, {
-              forward_agent: true,
               paranoid:      false
             }.merge(options)) do |ssh|
               yield new(ssh)
@@ -17,10 +16,10 @@ module Evrone
           end
         end
 
-        attr_reader :host, :user, :options
+        attr_reader :host, :user, :options, :connection
 
         def initialize(ssh)
-          @ssh = ssh
+          @connection = ssh
         end
 
         def spawn(*args, &block)
@@ -32,7 +31,8 @@ module Evrone
           timeout       = Spawn::Timeout.new options.delete(:timeout)
           read_timeout  = Spawn::ReadTimeout.new options.delete(:read_timeout)
 
-          channel = spawn_channel env, command, read_timeout, &block
+          command = build_command(env, command, options)
+          channel = spawn_channel command, read_timeout, &block
 
           channel.on_request("exit-status") do |_,data|
             exit_code = data.read_long
@@ -45,8 +45,21 @@ module Evrone
 
         private
 
+          def build_command(env, command, options)
+            cmd = command
+            unless env.empty?
+              e = env.map{|k,v| "#{k}=#{v}" }.join(" ")
+              cmd = "env #{e} #{cmd}"
+            end
+            if options.key?(:chdir)
+              e = "cd #{options[:chdir]}"
+              cmd = "#{e} ; #{cmd}"
+            end
+            cmd
+          end
+
           def pool(channel, timeout, read_timeout)
-            @ssh.loop Spawn.pool_interval do
+            @connection.loop Spawn.pool_interval do
               if read_timeout.happened? || timeout.happened?
                 false
               else
@@ -66,16 +79,16 @@ module Evrone
             end
           end
 
-          def spawn_channel(env, command, read_timeout, &block)
+          def spawn_channel(command, read_timeout, &block)
 
-            @ssh.open_channel do |channel|
+            @connection.open_channel do |channel|
               read_timeout.reset
 
-              env.each do |k, v|
-                channel.env k, v do |_, success|
-                  yield "FAILED: couldn't execute command (ssh.channel.env)\n" if block_given?
-                end
-              end
+              #env.each do |k, v|
+              #  channel.env k, v do |_, success|
+              #    yield "FAILED: couldn't execute command (ssh.channel.env)\n" if block_given?
+              #  end
+              #end
 
               channel.exec command do |_, success|
 

data/lib/evrone/common/spawn/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module Common
     module Spawn
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/spec/lib/spawn/ssh_spec.rb

@@ -3,9 +3,10 @@ require 'timeout'
 
 describe Evrone::Common::Spawn::SSH, ssh: true do
 
-  let(:user) { ENV['SSH_USER'] }
-  let(:host) { ENV['SSH_HOST'] }
-  let(:pass) { ENV['SSH_PASS'] }
+  let(:user) { ENV['SSH_USER'] || 'vagrant' }
+  let(:host) { ENV['SSH_HOST'] || 'localhost' }
+  let(:pass) { ENV['SSH_PASS'] || 'vagrant' }
+  let(:port) { ENV['SSH_PORT'] || 2222 }
   let(:collected) { '' }
 
   it "run command successfuly" do
@@ -21,8 +22,24 @@ describe Evrone::Common::Spawn::SSH, ssh: true do
   end
 
   it "run command with env successfuly" do
-    code = run_ssh({'FOO' => "BAR"}, 'echo $FOO')
-    expect(collected).to match(re "FAILED: couldn't execute command (ssh.channel.env)")
+    code = run_ssh({'FOO' => "BAR"}, "sh -c 'echo $FOO'")
+    expect(collected).to eq "BAR\n"
+    expect(code).to eq 0
+  end
+
+  it "run command with chdir successfuly" do
+    code = run_ssh("echo $(pwd)", chdir: "/tmp")
+    expect(collected).to eq "/tmp\n"
+    expect(code).to eq 0
+  end
+
+  it "run command with chdir and env successfuly" do
+    code = run_ssh(
+      {'FOO' => "BAR"},
+      "sh -c 'echo $FOO' ; echo $(pwd)",
+      chdir: '/tmp'
+    )
+    expect(collected).to eq "BAR\n/tmp\n"
     expect(code).to eq 0
   end
 
@@ -81,7 +98,7 @@ describe Evrone::Common::Spawn::SSH, ssh: true do
   end
 
   def open_ssh(&block)
-    described_class.open(host, user, password: pass, verbose: 2, &block)
+    described_class.open(host, user, password: pass, paranoid: false, verbose: 2, port: port, &block)
   end
 
   def re(s)

data/spec/lib/spawn_spec.rb

@@ -13,9 +13,14 @@ describe Evrone::Common::Spawn do
   end
 
   context "open_ssh" do
+    let(:user) { ENV['SSH_USER'] || 'vagrant' }
+    let(:host) { ENV['SSH_HOST'] || 'localhost' }
+    let(:pass) { ENV['SSH_PASS'] || 'vagrant' }
+    let(:port) { ENV['SSH_PORT'] || 2222 }
     let(:ssh) { nil }
+
     it "should be" do
-      subject.open_ssh(ENV['SSH_HOST'], ENV['SSH_USER'], password: ENV['SSH_PASS']) do |ssh|
+      subject.open_ssh(host, user, password: pass, port: port) do |ssh|
         expect(ssh.spawn 'true').to eq 0
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-common-spawn
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -139,3 +139,4 @@ test_files:
 - spec/lib/spawn/ssh_spec.rb
 - spec/lib/spawn_spec.rb
 - spec/spec_helper.rb
+has_rdoc: