pack_rb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f65fc75dcf838baeccbb94bcdf3501939611b96c
-  data.tar.gz: 3a2a1392b3708a5d2441a3f4517270b60046f9b1
+  metadata.gz: 9fa9a2e4e584f27505b9c844749b682d7ec2d735
+  data.tar.gz: 10ca1ecf02e460a16ed096aeae8cd5bcf56dd9f1
 SHA512:
-  metadata.gz: 643b458325d3d61049f7ae01bd1024705bf2101aa99f37a5f0682edc20630bdd1302167164ef2d252ffb6882f7bfbe4e9be62c837ec52571054d6ea31ffd141b
-  data.tar.gz: 3505a8f2c6a9d65ae8bb0f4028c1923e7e0178bb33fb2501354e6e3a50fa8fc8f7edeb58c55c2d8aa664ca907431006941934c236fc4f2b879f2df2219226d59
+  metadata.gz: 85d6ca9698e520df0ae4a1e365fa621dcdb2884c1aa8cc25f7ff2af1e6fca45da1a239720085484bf2238c510594e3b6e147074a9f081b029890b49cfaa838b7
+  data.tar.gz: d801cb47c6f6f96b0dfa23a378709e20ac9e910cb152709bd311e5a7ddcc7b8648518e71e61ba2009724547391ff793245f2d6116c5ae233e4720c8a8092144a

data/README.md

@@ -73,7 +73,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/pack_rb.
+Bug reports and pull requests are welcome on GitHub at https://github.com/manheim/pack_rb.
 
 
 ## License

data/lib/pack_rb/executor.rb

@@ -0,0 +1,47 @@
+require 'open3'
+
+module PackRb
+  class Executor
+    # popen3 wrapper to simultaneously stream command output to the
+    # appropriate file descriptor, and capture it.
+    #
+    # @param cmd [String] command to run
+    # @param tpl [String] the template content
+    # @return [Array] - stdout [String], stderr [String], exit code [Fixnum]
+    def self.run_cmd_stream_output(cmd, tpl)
+      all_out = ''
+      all_err = ''
+      exit_status = nil
+      Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thread|
+        stdin.write(tpl)
+        stdin.close_write
+        begin
+          files = [stdout, stderr]
+          until files.find { |f| !f.eof }.nil?
+            ready = IO.select(files)
+            next unless ready
+            readable = ready[0]
+            readable.each do |f|
+              begin
+                data = f.read_nonblock(512)
+                if f.fileno == stdout.fileno
+                  puts data
+                  all_out << data
+                else
+                  STDERR.puts data
+                  all_err << data
+                end
+              rescue EOFError
+                nil
+              end
+            end
+          end
+        rescue IOError => e
+          STDERR.puts "IOError: #{e}"
+        end
+        exit_status = wait_thread.value.exitstatus
+      end
+      [all_out, all_err, exit_status]
+    end
+  end
+end

data/lib/pack_rb/sub_commands.rb

@@ -1,5 +1,4 @@
-require 'open3'
-
+require 'pack_rb/executor'
 require 'pack_rb/sub_commands/build'
 require 'pack_rb/sub_commands/inspect'
 require 'pack_rb/sub_commands/validate'
@@ -10,16 +9,16 @@ module PackRb
     include PackRb::SubCommands::Inspect
     include PackRb::SubCommands::Validate
 
+    # Execute a Packer command via {PackRb::Executor.run_cmd_stream_output}
+    #
+    # @param opts [Hash] options passed to the Packer class
+    #
+    # @return [Array] - stdout [String], stderr [String], exit code [Fixnum]
     def execute(opts)
       cmd = opts[:cmd]
       tpl = opts[:tpl]
 
-      out, err, status = Open3.capture3("#{cmd} -", stdin_data: tpl)
-
-      if status.exitstatus != 0
-        puts out if out
-        puts err if err
-      end
+      PackRb::Executor.run_cmd_stream_output("#{cmd} -", tpl)
     end
   end
 end

data/lib/pack_rb/version.rb

@@ -1,3 +1,3 @@
 module PackRb
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pack_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Niesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -100,6 +100,7 @@ files:
 - bin/setup
 - circle.yml
 - lib/pack_rb.rb
+- lib/pack_rb/executor.rb
 - lib/pack_rb/packer.rb
 - lib/pack_rb/sub_commands.rb
 - lib/pack_rb/sub_commands/build.rb