script_executor 1.3.2 → 1.3.4

data/lib/script_executor/remote_command.rb

@@ -0,0 +1,91 @@
+require 'script_executor/output_buffer'
+require 'net/ssh'
+require "highline"
+
+class RemoteCommand
+  attr_reader :domain, :user, :password, :identity_file, :suppress_output,  :capture_output, :simulate
+
+  def initialize params
+    @domain = params[:domain]
+    @user = params[:user]
+    @password = params[:password]
+    @identity_file = params[:identity_file]
+    @suppress_output = params[:suppress_output]
+    @capture_output = params[:capture_output]
+    @simulate = params[:simulate]
+  end
+
+  def execute commands, line_action
+    print commands, $stdout
+
+    unless simulate
+      storage = capture_output ? OutputBuffer.new : nil
+      output = suppress_output ? nil : $stdout
+
+      password = HighLine.new.ask("Enter password for #{user}: ") { |q| q.echo = '*' } if @password.nil?
+
+      Net::SSH.start(domain, user, :password => password) do |session|
+        session.exec(commands) do |channel, _, line|
+          if ask_password?(line)
+            channel.request_pty
+            channel.send_data password + "\n"
+          else
+            output.print(line) if output
+            storage.save(line.chomp) if storage
+
+            line_action.call(line) if line_action
+          end
+        end
+
+        session.loop # run the aggregated event loop
+      end
+
+      storage.buffer.join("\n") if storage
+    end
+  end
+
+  private
+
+  def print commands, output
+    ssh_command = ssh_command(domain, user, identity_file)
+
+    if simulate
+      output.puts "Remote script: '#{ssh_command}'"
+      output.puts "-------"
+
+      lines = StringIO.new commands
+
+      lines.each_line do |line|
+        output.puts line
+      end
+
+      output.puts "-------"
+    else
+      output.puts "Remote execution on: '#{ssh_command}'"
+      output.puts "-------"
+
+      lines = StringIO.new commands
+
+      lines.each_line do |line|
+        output.puts line
+      end
+
+      output.puts "-------"
+    end
+  end
+
+  def ssh_command domain, user, identity_file
+    cmd = user.nil? ? domain : "#{user}@#{domain}"
+
+    cmd << " -i #{identity_file}" if identity_file
+
+    #cmd << " -t -t"
+
+    "ssh #{cmd}"
+  end
+
+  def ask_password? line
+    line =~ /^\[sudo\] password for user:/ || line =~ /sudo password:/ || line =~ /Password:/
+  end
+end
+

data/lib/script_executor/version.rb

@@ -1,3 +1,3 @@
-module ScriptExecutor
-  VERSION = "1.3.2"
+class ScriptExecutor
+  VERSION = "1.3.4"
 end

data/lib/script_locator.rb

@@ -1,3 +1 @@
-require 'rubygems' unless Object.const_defined?(:Gem)
-
 require 'script_executor/script_locator'

data/spec/executable_spec.rb

@@ -11,7 +11,7 @@ describe MyExecutable do
   subject { MyExecutable.new }
 
   before :all do
-    @password ||= ask("Enter password for #{ENV['USER']}:  ") { |q| q.echo = '*' }
+    @password ||= HighLine.new.ask("Enter password for #{ENV['USER']}:  ") { |q| q.echo = '*' }
   end
 
   describe "local execution" do
@@ -46,7 +46,6 @@ describe MyExecutable do
       )
       end
 
-      puts "2 #{@password}"
       result.to_s.should == "root\nroot"
     end
   end

data/spec/script_locator_spec.rb

@@ -11,18 +11,18 @@ describe MyScriptLocator do
   subject { MyScriptLocator.new }
 
   it "should read after __END__" do
-    result = subject.scripts(__FILE__)
+    scripts = subject.scripts(__FILE__)
 
-    result.should_not be_nil
+    scripts.should_not be_nil
   end
 
   it "should locate script" do
-    result = subject.scripts(__FILE__)
+    scripts = subject.scripts(__FILE__)
 
     name = "alisa"
-    script = subject.evaluate_script_body(result['test1'], binding)
+    result = subject.evaluate_script_body(scripts['test1'], binding)
 
-    script.should =~ /#{name}/
+    result.should =~ /#{name}/
   end
 
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: script_executor
 version: !ruby/object:Gem::Version
-  version: 1.3.2
-  prerelease: 
+  version: 1.3.4
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,6 +75,7 @@ files:
 - .gitignore
 - .idea/.name
 - .idea/.rakeTasks
+- .idea/codeStyleSettings.xml
 - .idea/encodings.xml
 - .idea/misc.xml
 - .idea/modules.xml
@@ -91,9 +83,8 @@ files:
 - .idea/script_executor.iml
 - .idea/vcs.xml
 - .idea/workspace.xml
-- .rbenv-gemsets
-- .rbenv-version
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - CHANGES
 - Gemfile
 - Gemfile.lock
@@ -103,7 +94,9 @@ files:
 - lib/executable.rb
 - lib/script_executor.rb
 - lib/script_executor/executable.rb
+- lib/script_executor/local_command.rb
 - lib/script_executor/output_buffer.rb
+- lib/script_executor/remote_command.rb
 - lib/script_executor/script_executor.rb
 - lib/script_executor/script_locator.rb
 - lib/script_executor/version.rb
@@ -115,27 +108,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/shvets/script_executor
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This library helps to execute code, locally or remote over ssh
 test_files:
 - spec/executable_spec.rb

data/.rbenv-gemsets

@@ -1 +0,0 @@
-script_executor

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p327

data/.rvmrc

@@ -1,5 +0,0 @@
-rvm_gemset_create_on_use_flag=1
-rvm_pretty_print_flag=1
-
-rvm use 1.9.3@script_executor
-#rvm use ruby-2.0.0-preview1@script_executor