* More robust stderr/stdout mixing when

running commandsserver side
* More robust streaming responses client side

TODO.md

@@ -35,6 +35,7 @@
 * ✅ Implement zero-downtime rollout (`faaso deploy`)
 * ✅ Cleanup `tmp/whatever` after use
 * `faaso scale` remote is broken
+* ✅ Setup linters/pre-commit/etc
 
 ## Things to do but not before release
 

src/commands/build.cr

@@ -58,10 +58,7 @@ module Faaso
             {"funko.tgz" => File.open(tmp), "name" => "funko.tgz"},
             user: user, password: password
           ) do |response|
-            loop do
+            IO.copy(response.body_io, STDOUT)
-              Log.info { response.body_io.gets }
-              break if response.body_io.closed?
-            end
           end
           Log.info { "Build finished successfully." }
         rescue ex : Crest::InternalServerError

src/commands/deploy.cr

@@ -41,10 +41,7 @@ module Faaso
         Crest.get(
           "#{Config.server}funkos/#{funko_name}/deploy/", \
              user: user, password: password) do |response|
-          loop do
+          IO.copy(response.body_io, STDOUT)
-            Log.info { response.body_io.gets }
-            break if response.body_io.closed?
-          end
         end
         0
       end

src/commands/scale.cr

@@ -10,14 +10,14 @@ module Faaso
     # In both cases stopped instances after the required
     # scale is reached are deleted.
     struct Scale
-      def local(options, name : String, scale : Int) : Int32
+      def local(options, name : String, scale : Int | Nil) : Int32
         funko = Funko::Funko.from_names([name])[0]
         # Asked about scale
         if funko.image_history.empty?
           Log.error { "Unknown funko #{funko.name}" }
           return 1
         end
-        if !scale
+        if scale.nil?
           Log.info { "Funko #{name} has a scale of #{funko.scale}" }
           return 0
         end
@@ -26,19 +26,21 @@ module Faaso
         0
       end
 
-      def remote(options, name : String, scale : Int) : Int32
+      def remote(options, name : String, scale : Int | Nil) : Int32
         user, password = Config.auth
         Faaso.check_version
-        if !scale
+        if scale.nil?
-          response = Crest.get(
+          Crest.get(
             "#{Config.server}funkos/#{name}/scale/", \
-               user: user, password: password)
+               user: user, password: password) do |response|
-          Log.info { " => " + response.body }
+            IO.copy(response.body_io, STDOUT)
-        else
+          end
-          response = Crest.post(
+          return 0
+        end
+        Crest.post(
           "#{Config.server}funkos/#{name}/scale/",
-            {"scale" => scale}, user: user, password: password)
+          {"scale" => scale}, user: user, password: password) do |response|
-          Log.info { " => " + response.body }
+          IO.copy(response.body_io, STDOUT)
         end
         0
       rescue ex : Crest::InternalServerError
@@ -46,7 +48,8 @@ module Faaso
         1
       end
 
-      def run(options, name : String, scale : Int) : Int32
+      def run(options, name : String, scale) : Int32
+        scale = scale.try &.to_s.to_i
         if options["--local"]
           return local(options, name, scale)
         end

src/commands/status.cr

@@ -31,10 +31,7 @@ module Faaso
         Crest.get(
           "#{Config.server}funkos/#{name}/status/", \
              user: user, password: password) do |response|
-          loop do
+          IO.copy(response.body_io, STDOUT)
-            Log.info { response.body_io.gets }
-            break if response.body_io.closed?
-          end
         end
         0
       rescue ex : Crest::InternalServerError

src/daemon/funko.cr

@@ -134,16 +134,18 @@ module Funko
 
   # Helper to run faaso locally and respond via env
   def run_faaso(args : Array(String), env) : Bool
-    Log.info { "Running faaso [#{args.join(", ")}, -l, 2>&1]" }
+    args << "-l" # Always local in the server
+    Log.info { "Running faaso [#{args}" }
     Process.run(
       command: "faaso",
-      args: args + ["-l", "2>&1"], # Always local in the server
+      args: args,
-      shell: true,
+      env: {"FAASO_SERVER_SIDE" => "true"},
     ) do |process|
       loop do
-        env.response.print process.output.gets(chomp: false)
+        data = process.output.gets(chomp: false)
+        env.response.print data
         env.response.flush
-        Fiber.yield
+        Fiber.yield # Without this the process never ends
         break if process.terminated?
       end
       true

src/funko.cr

@@ -90,7 +90,11 @@ module Funko
       docker_api = Docr::API.new(Docr::Client.new)
       current_scale = self.scale
       result = [] of String
-      return result if current_scale == new_scale
+
+      if current_scale == new_scale
+        Log.info { "Funko #{name} already at scale #{new_scale}" }
+        return result
+      end
 
       Log.info { "Scaling #{name} from #{current_scale} to #{new_scale}" }
       if new_scale > current_scale

src/main.cr

@@ -35,29 +35,28 @@ Options:
 DOC
 
 ans = Docopt.docopt(doc, ARGV)
-Oplog.setup(ans["-v"].to_s.to_i)
+Oplog.setup(ans["-v"].to_s.to_i) unless ENV.fetch("FAASO_SERVER_SIDE", nil)
 Log.debug { ans }
 
-status : Int32 = 0
 case ans
 when .fetch("build", false)
-  status = Faaso::Commands::Build.new.run(ans, ans["FOLDER"].as(Array(String)))
+  exit Faaso::Commands::Build.new.run(ans, ans["FOLDER"].as(Array(String)))
 when .fetch("deploy", false)
-  status = Faaso::Commands::Deploy.new.run(ans, ans["FUNKO"].as(String))
+  exit Faaso::Commands::Deploy.new.run(ans, ans["FUNKO"].as(String))
 when .fetch("export", false)
-  status = Faaso::Commands::Export.new.run(ans, ans["SOURCE"].as(String), ans["DESTINATION"].as(String))
+  exit Faaso::Commands::Export.new.run(ans, ans["SOURCE"].as(String), ans["DESTINATION"].as(String))
 when .fetch("login", false)
-  status = Faaso::Commands::Login.new.run(ans)
+  exit Faaso::Commands::Login.new.run(ans)
 when .fetch("new", false)
-  status = Faaso::Commands::New.new.run(ans, ans["FOLDER"].as(Array(String))[0])
+  exit Faaso::Commands::New.new.run(ans, ans["FOLDER"].as(Array(String))[0])
 when .fetch("scale", false)
-  status = Faaso::Commands::Scale.new.run(ans, ans["FUNKO"].as(String), ans["SCALE"].as(String).to_i)
+  exit Faaso::Commands::Scale.new.run(ans, ans["FUNKO"].as(String), ans["SCALE"])
 when .fetch("secret", false)
-  status = Faaso::Commands::Secret.new.run(ans, ans["FUNKO"].as(String), ans["SECRET"].as(String))
+  exit Faaso::Commands::Secret.new.run(ans, ans["FUNKO"].as(String), ans["SECRET"].as(String))
 when .fetch("status", false)
-  status = Faaso::Commands::Status.new.run(ans, ans["FUNKO"].as(String))
+  exit Faaso::Commands::Status.new.run(ans, ans["FUNKO"].as(String))
 when .fetch("version", false)
   Log.info { "#{version}" }
 end
 
-exit(status)
+exit 0