fly.io-rails 0.0.3-x86_64-darwin → 0.0.4-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f76f7f8f758e7f3df3c22ed93a6ac83e543515844e6f7fce91d3902ac45f53a
-  data.tar.gz: 23741fd32ddcd05f7bd6b7aaec10143f2c3c1c03b7a92a37f8561d7685468609
+  metadata.gz: d761c2159031bb548a02c3a3d014530970cecf70e064211ea5de62648ebe0a98
+  data.tar.gz: 4776fc2127f179a975bfbada9db38924a57ac5eac84df74518076b0a214c8e89
 SHA512:
-  metadata.gz: f80a247c806c267b4ed8c8f9daff5b5669fc38c8a3377345b151ab29612a7e6e25b46905c66520f73c1f05fe6afaba17fabd50a0e0f59542e7c1482f213200ca
-  data.tar.gz: 5da664fc355d08af2b5bfb1dbd761262d743c6d387ddbe4e1bdbaf457847705d24eec78c56e45757cd89809fee3dac034ae2b91983f2d4c04425f77c5eeec11a
+  metadata.gz: 8c3ac89e880120c9122fd628f2b08fec1bac1741f46a082a356d1d8f867ca231d65285e89eb3b9345af64060f0f0081a7a5d6194042c4ec9f20e91668825efa1
+  data.tar.gz: c90c79e99f143d57b7c36706f9db27de14bb472a55367ed67605ceedcf393f5e84115e2994749eac6d04fd005d461f1859a4c725a62414762115dc84ba549ced

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_64-darwin
 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