arduino_ci 0.1.5 → 0.1.6

data/lib/arduino_ci/display_manager.rb

@@ -150,10 +150,8 @@ module ArduinoCI
       end
     end
 
-    # run a command in a display
-    # @return [bool]
-    def run(*args, **kwargs)
-      ret = false
+    def wrap_run(work_fn, *args, **kwargs)
+      ret = nil
       # do some work to extract & merge environment variables if they exist
       has_env = !args.empty? && args[0].class == Hash
       with_display do |env_vars|
@@ -161,15 +159,21 @@ module ArduinoCI
         env_vars.merge!(args[0]) if has_env
         actual_args = has_env ? args[1..-1] : args  # need to shift over if we extracted args
         full_cmd = env_vars.empty? ? actual_args : [env_vars] + actual_args
-        ret = Host.run(*full_cmd, **kwargs)
+        ret = work_fn.call(*full_cmd, **kwargs)
       end
       ret
     end
 
-    # run a command in a display with no output
+    # run a command in a display, outputting to stdout
+    # @return [bool]
+    def run_and_output(*args, **kwargs)
+      wrap_run((proc { |*a, **k| Host.run_and_output(*a, **k) }), *args, **kwargs)
+    end
+
+    # run a command in a display, capturing output
     # @return [bool]
-    def run_silent(*args)
-      run(*args, out: File::NULL, err: File::NULL)
+    def run_and_capture(*args, **kwargs)
+      wrap_run((proc { |*a, **k| Host.run_and_capture(*a, **k) }), *args, **kwargs)
     end
 
     # @return [Hash] the environment variables for the display

data/lib/arduino_ci/host.rb

@@ -1,4 +1,5 @@
 require 'os'
+require 'open3'
 
 module ArduinoCI
 
@@ -20,8 +21,12 @@ module ArduinoCI
       nil
     end
 
-    # run a command in a display
-    def self.run(*args, **kwargs)
+    def self.run_and_capture(*args, **kwargs)
+      stdout, stderr, status = Open3.capture3(*args, **kwargs)
+      { out: stdout, err: stderr, success: status.exitstatus.zero? }
+    end
+
+    def self.run_and_output(*args, **kwargs)
       system(*args, **kwargs)
     end
 

data/lib/arduino_ci/version.rb

@@ -1,3 +1,3 @@
 module ArduinoCI
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arduino_ci
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ian Katz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -103,6 +103,7 @@ files:
 - cpp/arduino/Stream.h
 - cpp/arduino/WCharacter.h
 - cpp/arduino/WString.h
+- cpp/arduino/WString.h.orig
 - cpp/arduino/avr/README.md
 - cpp/arduino/avr/common.h
 - cpp/arduino/avr/fuse.h
@@ -375,6 +376,7 @@ files:
 - cpp/arduino/avr/iox8e5.h
 - cpp/arduino/avr/lock.h
 - cpp/arduino/avr/pgmspace.h
+- cpp/arduino/avr/pgmspace.h.orig
 - cpp/arduino/avr/portpins.h
 - cpp/arduino/avr/version.h
 - cpp/arduino/avr/xmega.h
@@ -397,6 +399,7 @@ files:
 - lib/arduino_ci/arduino_installation.rb
 - lib/arduino_ci/ci_config.rb
 - lib/arduino_ci/cpp_library.rb
+- lib/arduino_ci/cpp_library.rb.orig
 - lib/arduino_ci/display_manager.rb
 - lib/arduino_ci/host.rb
 - lib/arduino_ci/version.rb