datacenter 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00e4f1db48d930b517c89d8a48f716109e49ac1d
-  data.tar.gz: cefbf9313f800f8988d5d6b0f6239c24d2c6b8c6
+  metadata.gz: 2098304fc0285b30cbe84d111c637bc2f9ed0ca9
+  data.tar.gz: 81dbb70a0d7e4a17dd5f1028ebccb97da5627e02
 SHA512:
-  metadata.gz: 2fceb78d5755b96ac6762a6d531a125383507a5f138c2b6edaddbdad2c84800615b55e90232bf626d0bebe7854c709f56d7d3d3fc7e73e6851f59f4a3b56ccb4
-  data.tar.gz: 5904e2beab150fc7552d78fb8f06c3c327f3a2d5cdec823c35b969261fc5855cf3e2cccae866d6fa53b4ac9be1389fb4239a97dbad2a5ac8c55e6a3c2e472e9f
+  metadata.gz: d72ca3f494c43436f9eda558deb0f24e0bd163e03581c51ff477db681d7347d4cd62a71681ca6ffd7154d3babb4a00d9ea59878678611d7f8db5330ebefd9350
+  data.tar.gz: eabe4a509235bfb64d5dee6f2cfeeb36bac9ead2d6eeec759b11db7cedd60817f37a660c9ae509497fc0568b3ee7712b48f4b64f60efed690655c902548c2db5

data/.travis.yml

@@ -4,8 +4,10 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - jruby
 before_install:
+  - gem install bundler
   - sudo apt-get -y install openssh-server
   - ssh-keygen -q -t rsa -N "" -f ~/.ssh/id_rsa
-  - cp $HOME/.ssh/id_rsa.pub $HOME/.ssh/authorized_keys
+  - cp $HOME/.ssh/id_rsa.pub $HOME/.ssh/authorized_keys

data/Rakefile

@@ -5,6 +5,7 @@ Rake::TestTask.new(:spec) do |t|
   t.libs << 'spec'
   t.pattern = 'spec/**/*_spec.rb'
   t.verbose = false
+  t.warning = false
 end
 
 desc 'Console'
@@ -15,4 +16,4 @@ task :console do
   Pry.start
 end
 
-task default: :spec
+task default: :spec

data/lib/datacenter.rb

@@ -2,6 +2,7 @@ require 'net/ssh'
 require 'open3'
 require 'class_config'
 require 'logger'
+require 'delegate'
 
 module Datacenter
   extend ClassConfig
@@ -9,4 +10,4 @@ module Datacenter
   attr_config :process_cache_expiration, 2
 end
 
-Dir.glob(File.expand_path('datacenter/*.rb', File.dirname(__FILE__))).sort.each { |f| require f }
+Dir.glob(File.expand_path('datacenter/**/*.rb', File.dirname(__FILE__))).sort.each { |f| require f }

data/lib/datacenter/shell/command_error.rb

@@ -0,0 +1,18 @@
+module Datacenter
+  module Shell
+    class CommandError < StandardError
+
+      attr_reader :command, :error
+
+      def initialize(command, error)
+        @command = command
+        @error = error
+      end
+
+      def message
+        "#{command}\n#{error}"
+      end
+
+    end
+  end
+end

data/lib/datacenter/shell/local.rb

@@ -0,0 +1,101 @@
+module Datacenter
+  module Shell
+    class Local
+
+      class SafeIO < SimpleDelegator
+        def initialize(io)
+          @io = io
+          super StringIO.new
+        end
+
+        def write(message)
+          super message
+          @io.write message
+        end
+      end
+
+      
+      def initialize
+        @mutex = Mutex.new
+      end
+
+      def run(command, options={})
+        Datacenter.logger.debug(self.class) { command }
+
+        opts = {
+          chdir: options[:chdir] || Dir.pwd,
+          out: options[:out] || StringIO.new,
+          err: options[:err] || StringIO.new
+        }
+
+        if RUBY_ENGINE == 'jruby'
+          run_system command, opts
+        else
+          run_open3 command, opts
+        end
+      end
+
+      def self.open(*args)
+        shell = new *args
+        yield shell
+      end
+
+      private
+
+      def run_open3(command, options)
+        status = nil
+        result = nil
+        error = nil
+
+        begin
+          Open3.popen3("#{command}", chdir: options[:chdir]) do |stdin, stdout, stderr, wait_thr|
+            status = wait_thr.value
+            result = stdout.read
+            error = stderr.read
+
+            options[:out] << result
+            options[:err] << error
+          end
+        rescue => ex
+          raise CommandError.new(command, ex.message)
+        end
+
+        raise CommandError.new(command, error) unless status.success?
+
+        result
+      end
+
+      def run_system(command, options)
+        @mutex.synchronize do
+          begin
+            stdout = $stdout
+            stderr = $stderr
+
+            $stdout = SafeIO.new options[:out]
+            $stderr = SafeIO.new options[:err]
+
+            Dir.chdir(options[:chdir]) { system "#{command}" }
+
+            status = $?
+
+            $stdout.rewind
+            $stderr.rewind
+            
+            result = $stdout.read.force_encoding('UTF-8')
+            error = $stderr.read.force_encoding('UTF-8')
+
+            raise CommandError.new(command, error) unless status.success?
+
+            result
+
+          ensure
+            $stdout = stdout
+            $stderr = stderr
+          end
+        end
+      end
+
+    end
+
+   end 
+end

data/lib/datacenter/shell/remote.rb

@@ -0,0 +1,80 @@
+module Datacenter
+  module Shell
+    class Remote
+      
+      def initialize(*args)
+        @args = args
+      end
+
+      def open
+        @session ||= Net::SSH.start *args
+      end
+
+      def close
+        if session && !session.closed?
+          session.close
+          @session = nil
+        end
+      end
+
+      def run(command, options={})
+        if session
+          run! command, options
+        else
+          self.class.open(*args) { |shell| shell.run command, options }
+        end
+      end
+
+      def self.open(*args)
+        shell = new *args
+        shell.open
+        yield shell
+      ensure
+        shell.close
+      end
+
+      private
+
+      attr_reader :args, :session
+
+      def run!(command, options={})
+        Datacenter.logger.debug(self.class) { command }
+
+        result = ''
+        error = ''
+        
+        out = options[:out] || StringIO.new
+        err = options[:err] || StringIO.new
+
+        exit_code = nil
+
+        session.open_channel do |channel|
+          channel.exec(command) do |ch, success|
+            abort "FAILED: couldn't execute command (ssh.channel.exec)" unless success
+            
+            channel.on_data do |ch, data|
+              out << data
+              result << data
+            end
+
+            channel.on_extended_data do |ch, type, data|
+              err << data
+              error << data
+            end
+
+            channel.on_request('exit-status') do |ch, data|
+              exit_code = data.read_long
+            end
+          end
+        end
+
+        session.loop
+
+        raise CommandError.new(command, error) unless exit_code == 0
+
+        result
+      end
+
+    end
+  end
+end

data/lib/datacenter/version.rb

@@ -1,3 +1,3 @@
 module Datacenter
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/spec/shell_spec.rb

@@ -3,21 +3,48 @@ require 'minitest_helper'
 describe Datacenter::Shell do
   
   module SharedExpamples
+
+    let(:shell) { shell_class.new *shell_args }
+    
     it 'Success' do
       filename = File.join '/tmp', Time.now.to_i.to_s
       shell.run "echo \"test file\" > #{filename}"
-      shell.run("cat #{filename}").must_equal 'test file'
+      shell.run("cat #{filename}").must_equal "test file\n"
     end
 
     it 'Error' do
       filename = '/invalid_dir/invalid_file'
-      shell.run("cat #{filename}").must_equal "cat: #{filename}: No such file or directory"
+      error = Proc.new { shell.run "cat #{filename}" }.must_raise Datacenter::Shell::CommandError
+      error.message.must_include "cat: #{filename}: No such file or directory"
+    end
+
+    it 'Block' do
+      shell_class.open(*shell_args) do |shell|
+        shell.run('ls /').must_equal `ls /`
+      end
+    end
+
+    it 'Redirect stdout' do
+      out = StringIO.new
+      shell.run 'ls /', out: out
+      out.rewind
+      out.read.must_equal `ls /`
     end
+
+    it 'Redirect stderr' do
+      err = StringIO.new
+      filename = '/invalid_dir/invalid_file'
+      Proc.new { shell.run "cat #{filename}", err: err }.must_raise Datacenter::Shell::CommandError
+      err.rewind
+      err.read.must_include "cat: #{filename}: No such file or directory"
+    end
+
   end
 
   describe 'Local' do
 
-    let(:shell) { Datacenter::Shell::Local.new }
+    let(:shell_args) { [] }
+    let(:shell_class) { Datacenter::Shell::Local }
 
     include SharedExpamples
 
@@ -25,17 +52,11 @@ describe Datacenter::Shell do
 
   describe 'Remote' do
 
-    let(:connection_args) { ['localhost', `whoami`.strip] }
-    let(:shell) { Datacenter::Shell::Remote.new *connection_args }
+    let(:shell_args) { ['localhost', `whoami`.strip] }
+    let(:shell_class) { Datacenter::Shell::Remote }
 
     include SharedExpamples
 
-    it 'Block' do
-      Datacenter::Shell::Remote.open(*connection_args) do |shell|
-        shell.run('ls /').must_equal `ls /`.strip
-      end
-    end
-
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacenter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -144,7 +144,9 @@ files:
 - lib/datacenter/machine.rb
 - lib/datacenter/os.rb
 - lib/datacenter/process.rb
-- lib/datacenter/shell.rb
+- lib/datacenter/shell/command_error.rb
+- lib/datacenter/shell/local.rb
+- lib/datacenter/shell/remote.rb
 - lib/datacenter/version.rb
 - spec/cache_spec.rb
 - spec/commands.yml

data/lib/datacenter/shell.rb

@@ -1,83 +0,0 @@
-module Datacenter
-  module Shell
-
-    class Local
-
-      def initialize
-        @mutex = Mutex.new
-      end
-
-      def run(command)
-        Datacenter.logger.debug(self.class) { command }
-        if RUBY_ENGINE == 'jruby'
-          run_system command
-        else
-          run_open3 command
-        end
-      end
-
-      private
-
-      def run_open3(command)
-        i,o,e,t = Open3.popen3 command
-        (o.readlines.join + e.readlines.join).strip
-      end
-
-      def run_system(command)
-        @mutex.synchronize do
-          begin
-            $stdout = StringIO.new
-            $stderr = StringIO.new
-
-            system command
-
-            [$stdout, $stderr].map do |io| 
-              io.rewind
-              io.readlines.join.force_encoding('UTF-8')
-            end.join.strip
-
-          ensure
-            $stdout = STDOUT
-            $stderr = STDERR
-          end
-        end
-      end
-    end
-
-    class Remote
-      attr_reader :options
-
-      def initialize(*args)
-        @options = args
-      end
-
-      def run(command)
-        Datacenter.logger.debug(self.class) { command }
-        if @session
-          @session.exec!(command).strip
-        else
-          Net::SSH.start(*options) { |ssh| ssh.exec! command }.to_s.strip
-        end
-      end
-
-      def open
-        @session ||= Net::SSH.start *options
-      end
-
-      def close
-        if @session
-          @session.close
-          @session = nil
-        end
-      end
-
-      def self.open(*args, &block)
-        shell = new *args
-        shell.open
-        block.call shell
-        shell.close
-      end
-    end
-
-  end
-end