voltos 0.3.0.rc13 → 0.3.0.rc14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e594103ccbf29608d37923e3141e336bf582a18
-  data.tar.gz: f720443f9faed4fef87c4d4ba5b4c90d08e52c77
+  metadata.gz: 8f69a0b9facf15ca91edcc3aacdb778fc2a1d8f2
+  data.tar.gz: fd98f3520fc48862d4c46e8679c9eb8c9ce781d7
 SHA512:
-  metadata.gz: b5d7a8d20db529f7b7da561fa8757c401dda70997a52404507a4d01ac65ac6b6eb62d320516f008ba21a4104fc3c0fdcd55f13e1333b23dc741fb17fdc37fb69
-  data.tar.gz: cd30de76a9c925a67db2ddbd96b7fdff237d3731fcfd058e82f0223a70e3cc4d390c61fe28a7b25d32e8055d86a403c006077c7bbb6336da035ac5222f05b3ab
+  metadata.gz: dfb16c318abf9d9776d71a3898de74f1fe3700b1dcbbd0e16997e0774cc28bbd4f9be5650d9aa239ee7f98f5bc6dfbeaf157f1ba44a5e23803a75f9e38ec35d6
+  data.tar.gz: 6946992dfd179d36970d063b4096f8cb614a3e0b309f6f46008a2ece34506ee2df787aa8845191e3372f3d992c8a073ee14281925431373de9ac6da2963a7142

data/exe/voltos

@@ -1,79 +1,8 @@
 #!/usr/bin/env ruby
-require 'pty'
-require 'open3'
-require 'readline'
-
-def run_as_tty(bin, args)
-  STDOUT.sync = true
-  status = PTY.spawn(bin, *args) do |stdout, stdin, pid|
-    stdout.sync = true
-    Thread.new do
-      loop do
-        STDOUT.print stdout.getc
-      end
-    end
-    Thread.new do
-      loop do
-        input = Readline.readline("", true)
-        if input.nil?
-          stdout.flush
-          stdout.close
-          stdin.close
-        end
-        stdin.puts input.strip
-      end
-    end
-    begin
-      Process::waitpid(pid) rescue nil
-    rescue SystemExit, Interrupt
-      Process.kill('INT', pid)
-      Process::waitpid(pid) rescue nil
-      retry
-    rescue EOFError
-    rescue IOError, Errno::EIO
-    end
-  end
-  status
-end
-
-def run_as_daemon(bin, args)
-  process = nil
-  Open3.popen3(bin, *ARGV) do |stdin, stdout, stderr, thread|
-    Thread.new do
-      while !stdin.closed? do
-        input = Readline.readline("", true).strip
-        stdin.puts input
-      end
-    end
-
-    errThread = Thread.new do
-      while !stderr.eof?  do
-        putc stderr.readchar
-      end
-    end
-
-    outThread = Thread.new do
-      while !stdout.eof?  do
-        putc stdout.readchar
-      end
-    end
-
-    begin
-      Process::waitpid(thread.pid) rescue nil
-      errThread.join
-      outThread.join
-      process = thread.value
-    rescue SystemExit, Interrupt
-      retry
-    end
-  end
-  return process.exitstatus if process
-end
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'voltos/exe'
 
 bin = "#{Gem.bin_path('voltos', 'voltos')}-cli"
-if STDIN.tty?
-  status = run_as_tty(bin, ARGV)
-else
-  status = run_as_daemon(bin, ARGV)
-end
+process = Voltos::Process.new
+status = process.run(bin, *ARGV)
 exit(status.to_i)

data/lib/voltos/exe.rb

@@ -0,0 +1,146 @@
+require 'voltos/logger'
+require 'pty'
+require 'open3'
+require 'readline'
+
+module Voltos
+  class Process
+    def initialize(input = STDIN, output = STDOUT, err = STDOUT)
+      Readline.input = input
+      @in  = input
+      @out = output
+      @err = err
+    end
+
+    def tty?
+      STDIN.tty?
+    end
+
+    def pid=(pid)
+      logger.debug "Storing spawned process pid: #{pid}"
+      @pid = pid
+    end
+
+    def pid
+      @pid
+    end
+
+    def run(command, *args)
+      logger.debug "Running: #{command} #{args.join(' ')}"
+      Signal.trap('INT') do
+        ctrl_c!
+      end
+      Signal.trap('TERM') do
+        ctrl_c!
+      end
+      if tty?
+        run_as_tty(command, *args)
+      else
+        run_as_daemon(command, *args)
+      end
+    end
+
+    def ctrl_c!
+      pid_to_kill = pid || ::Process.pid
+      logger.debug "Sending ^C to: #{pid_to_kill}"
+      ::Process.kill('TERM', pid_to_kill)
+      ::Process.waitall
+    end
+
+    def ctrl_d!
+      logger.debug "Sending ^D"
+      @process_stdin.close if @process_stdin
+      @process_stdout.close if @process_stdout
+      logger.debug "Sent."
+    end
+
+    private
+    def logger
+      return @logger if @logger
+      @logger = Voltos::Logger
+    end
+
+    def run_as_tty(bin, *args)
+      @out.sync = true
+      status = PTY.spawn(bin, *args) do |stdout, stdin, pid|
+        self.pid = pid
+        @process_stdin = stdin
+        @process_stdout = stdout
+        stdout.sync = true
+        Thread.new do
+          loop do
+            @out.print stdout.getc
+          end
+        end
+        Thread.new do
+          loop do
+            input = Readline.readline('', true)
+            if input.nil?
+              logger.debug "Cleaning up STDIN & STDOUT..."
+              stdout.flush
+              stdout.close
+              stdin.close
+            end
+            stdin.puts input.strip
+          end
+        end
+        begin
+          logger.debug "Waiting for process to finish: #{pid}"
+          ::Process::waitpid(pid) rescue nil
+          ::Process.waitall
+          logger.debug "Process finished."
+          while out = stdout.getc do
+            @out.print out
+          end
+        rescue SystemExit, Interrupt
+          logger.debug "Rescued interrupt."
+          ctrl_c!
+          retry
+        rescue EOFError
+          logger.debug "Rescued EOF."
+        rescue IOError, Errno::EIO
+          logger.debug "Rescued IOError."
+        end
+      end
+      status
+    end
+
+    def run_as_daemon(bin, *args)
+      process = nil
+      Open3.popen3(bin, *args) do |stdin, stdout, stderr, thread|
+        self.pid = thread.pid
+        Thread.new do
+          while !stdin.closed? do
+            input = Readline.readline('', true).strip
+            stdin.puts input
+          end
+        end
+
+        errThread = Thread.new do
+          while !stderr.eof?  do
+            @err.putc stderr.readchar
+          end
+        end
+
+        outThread = Thread.new do
+          while !stdout.eof?  do
+            putc stdout.readchar
+          end
+        end
+
+        begin
+          logger.debug "Waiting for process to finish #{thread.pid}."
+          Process::waitpid(thread.pid) rescue nil
+          errThread.join
+          outThread.join
+          logger.debug "Process finished."
+          process = thread.value
+        rescue SystemExit, Interrupt
+          logger.debug "Rescued interrupt."
+          retry
+        end
+      end
+      return process.exitstatus if process
+    end
+  end
+end

data/lib/voltos/logger.rb

@@ -0,0 +1,26 @@
+require 'logger'
+module Voltos
+  module Logger
+    @@levels = ["FATAL", "ERROR", "WARN", "INFO", "DEBUG"]
+    @@levels.each do |level|
+      define_singleton_method level.downcase.to_sym do |msg|
+        logger.send(level.downcase.to_sym, 'Voltos Process - ' + msg)
+      end
+    end
+
+    def self.logger
+      return @logger if @logger
+      @logger = ::Logger.new(STDOUT)
+      @logger.level = ::Logger::WARN
+      if level = ENV["LOG_LEVEL"]
+        if @@levels.include? level.upcase
+          @logger.level = ::Logger.const_get(level.upcase.to_sym)
+        else
+          @logger.warn "Log level '#{level.upcase}' is unknown. Supported levels are: #{levels.join(", ")}."
+        end
+      end
+      @logger
+    end
+  end
+end
+

data/lib/voltos/version.rb

@@ -1,3 +1,3 @@
 module Voltos
-  VERSION = "0.3.0.rc13"
+  VERSION = "0.3.0.rc14"
 end

data/voltos.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   # spec.add_development_dependency "curb", '~> 0'
   # spec.add_development_dependency "json", '~> 1.8.3'
   spec.add_development_dependency 'json', '~> 1.8', '>= 1.8.3'
+  spec.add_development_dependency 'byebug', '> 0'
 
   # spec.add_development_dependency "bundler"
   # spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voltos
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc13
+  version: 0.3.0.rc14
 platform: ruby
 authors:
 - Daniel May
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.3
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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: curb
   requirement: !ruby/object:Gem::Requirement
@@ -118,9 +132,12 @@ files:
 - bin/console
 - bin/setup
 - exe/voltos
+- exe/voltos-cli
 - ext/Makefile
 - ext/extconf.rb
 - lib/voltos.rb
+- lib/voltos/exe.rb
+- lib/voltos/logger.rb
 - lib/voltos/rails.rb
 - lib/voltos/version.rb
 - voltos.gemspec