fly.io-rails 0.0.3-x86-linux → 0.0.4-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b107b6f0a1d405450d9efe86350339f0a7a5b4de07774b854826965b21f296ab
-  data.tar.gz: 8fe798444417fb97c7f6b892fac88fc3b5f607a2eaac56ec1bd6669050d31b16
+  metadata.gz: 2847da1cdff886e9f3df88a52ace5e3d943cc62f0090de4106dc02fc3afce5da
+  data.tar.gz: a174797b3a03d1016eaf8ee58a18de6b648b39a9a38cdaed6b765a822ce7a13a
 SHA512:
-  metadata.gz: d0a111804f63104db38ec05a8238328ba9d425920c9f8501b5d3fc6d1b06a2bcbdb6c181134088a9f3070ab45987840907e66ffb72439cb867227da56b40767b
-  data.tar.gz: 1a744d5bddfd15e089efe49b21d80e79faeef6e9575a420ed4427a0f164a30fb025e73cbd8c9b45e71aeda97c8dc11049284e23ad147d9311a0d8df31a74d331
+  metadata.gz: 7808efc72840acd5bd929316a2a896632dfbde21626282cf338c3674d179437f127ae1f3ccbe8d10957c4bd94a073d391e4f25198b602eb0183c457d72337572
+  data.tar.gz: 5c8cf0a5dda311b5380f2341aea73627cc705f059a7ca634dceaa5672766d8a468def3a7ca6948f4a74969bda0c10fbb21ac9a2f7446fd44730e6675b01c425e

data/lib/fly.io-rails/utils.rb

@@ -1,4 +1,4 @@
-require 'open3'
+require 'pty'
 
 module FlyIoRails
   module Utils
@@ -9,27 +9,23 @@ module FlyIoRails
     end
     
     def self.tee cmd
-      data = {:out => [], :err => []}
+      data = []
 
-      Open3.popen3(cmd) do |stdin, stdout, stderr, thread|
-	{ out: stdout, err: stderr }.each do |key, stream|
-	  Thread.new do
-	    until (raw_line = stream.gets).nil? do
-	      data[key].push raw_line
-	      
-	      if key == :out
-		STDOUT.print raw_line
-	      else
-		STDERR.print raw_line
-	      end
-	    end
+      begin
+	PTY.spawn( cmd ) do |stdin, stdout, pid|
+	  begin
+	    # Do stuff with the output here. Just printing to show it works
+	    stdin.each do |line| 
+              print line
+              data << line
+            end
+	  rescue Errno::EIO
 	  end
 	end
-
-	thread.join
+      rescue PTY::ChildExited
       end
 
-      [data[:out].join, data[:err].join]
+      data.join
     end
 
   end

data/lib/fly.io-rails/version.rb

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/generators/terraform_generator.rb

@@ -14,7 +14,7 @@ class TerraformGenerator < Rails::Generators::Base
       "flyctl apps create --generate-name --org #{options[:org].inspect}"
     end
 
-    output, error = tee cmd
+    output = tee cmd
     exit 1 unless output =~ /^New app created: /
 
     @app = output.split.last

data/lib/tasks/fly.rake

@@ -1,8 +1,8 @@
 namespace :fly do
   desc 'Deploy fly application'
   task :deploy do
-    out, err = FlyIoRails::Utils.tee 'fly deploy --build-only --push'
-    image = err[/image:\s+(.*)/, 1]
+    out = FlyIoRails::Utils.tee 'fly deploy --build-only --push'
+    image = out[/image:\s+(.*)/, 1]
 
     if image
       tf = IO.read('main.tf')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: x86-linux
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby