atk_toolbox 0.0.137 → 0.0.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f03ce4f6d8ce0f70c36e8595bf808fffe271cba120f013b2553410de8d66d4
-  data.tar.gz: 699ad2b4f51e6415bdaf99815f3e7a370cf9b36a76b1996f46166b7db551193c
+  metadata.gz: e1fca183d8a55e40db853c94d3dd8b3e3e299c85e5ac7ff2dbda79ec9801b5d0
+  data.tar.gz: de4210e5a7f73c9f59b2f44d0a1a9449b0ddcc3a831d135e8d0a584f1e33e352
 SHA512:
-  metadata.gz: a393fa9beba2b99b1c6837e5f28530dda5c36f8bfd797c82ef675e19de942537d5ac09fbbbca59357b70f58f4f65f081787166d0e061b385656392549c3787d6
-  data.tar.gz: 0f99a7624f8f37d8f277a9d851a8885ee924108c37b4b073515c84c697cbf32996215ede33e7ce3cfec23dc39618d2d7dff3380a09301d34df26f718efdce0a5
+  metadata.gz: 93a4d1176a611db19c2f86b61424c97b939532a15e1ee52c0cab15f44fb63275294c75ca09f17c51dfcc98faa50d18120a3d98bde8e225c32fab43767bf4d31a
+  data.tar.gz: 9fb9bc9461beca3359136240f51a8d6ccf5a10a9f5ac217b7ffa394a7c09c62f27922d4f890b39c35513184f76993d7485b86863f6988a1bcc8a1d9480dcced1

data/lib/atk/console.rb

@@ -1,5 +1,6 @@
 require_relative "./os.rb"
 require_relative "../console_colors.rb"
+require_relative "./remove_indent.rb"
 
 # easy access to the commandline
 class String
@@ -10,8 +11,9 @@ class String
 end
 
 class CommandResult
-    def initialize(io_object)
+    def initialize(io_object, process_object)
         @io_object = io_object
+        @process_object = process_object
     end
     
     def read
@@ -26,6 +28,19 @@ class CommandResult
             return Errno::ENOENT.new
         end
     end
+    
+    class Error < Exception
+        attr_accessor :command_result, :message
+        
+        def initialize(message, command_result)
+            @message = message
+            @command_result = command_result
+        end
+        
+        def to_s
+            return @message
+        end
+    end
 end
 
 
@@ -99,10 +114,14 @@ Console = Class.new do
         if command.is_a?(String)
             # by default return a string with stderr included
             begin
-                result = CommandResult.new(IO.popen(command, err: [:child, :out]))
+                command_info = IO.popen(command, err: [:child, :out])
+                Process.wait(command_info.pid)
+                process_info = $?
+                result = CommandResult.new(command_info, process_info)
                 puts result.read
             rescue
-                result = CommandResult.new(nil)
+                process_info = $?
+                result = CommandResult.new(nil, process_info)
             end
             return result
         else
@@ -136,21 +155,32 @@ Console = Class.new do
     # 
     def run(command)
         if command.is_a?(String)
-            # if the command failed
-            if !system(command)
-                # throw an error
-                raise <<-HEREDOC.remove_indent
+            # by default return a string with stderr included
+            begin
+                command_info = IO.popen(command, err: [:child, :out])
+                Process.wait(command_info.pid)
+                process_info = $?
+                result = CommandResult.new(command_info, process_info)
+                puts result.read
+            rescue
+                process_info = $?
+                result = CommandResult.new(nil, process_info)
+            end
+            # if ended with error
+            if !process_info.success?
+                # then raise an error
+                raise CommandResult::Error.new(<<-HEREDOC.remove_indent, result)
                     
                     
                     From run(command)
                     The command: #{command.color_as :code}
-                    Failed with a exitcode of: #{$?.exitstatus}
+                    Failed with a exitcode of: #{process_info.exitstatus}
                     
-                    #{"This likely means the command could not be found" if $?.exitstatus == 127}
-                    #{"Hopefully there is additional error info above" if $?.exitstatus != 127}
+                    #{"This likely means the command could not be found" if process_info.exitstatus == 127}
+                    #{"Hopefully there is additional error info above" if process_info.exitstatus != 127}
                 HEREDOC
             end
-            return $?
+            return result
         else
             raise <<-HEREDOC.remove_indent
                 

data/lib/atk_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AtkToolbox
-    VERSION = '0.0.137'
+    VERSION = '0.0.138'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.137
+  version: 0.0.138
 platform: ruby
 authors:
 - Jeff Hykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt