ledmon 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d8ffe0ead1e717e352208beb5aa485ee599706a309b9c3bfa9cff8bd1d0f80
-  data.tar.gz: ceed8911440e5a6e40794795cb44ae2ed6a5849454ceef77bcbc740fe984843e
+  metadata.gz: f21693c2c076399ef05501077615eeb624f9888202b131c3a1b19dc0b0d231fe
+  data.tar.gz: 452693d925de81c17b7fa29a895939b30f0d18e1e2ad1ac679528d5eaad4e3c1
 SHA512:
-  metadata.gz: 31d987be6bc84c40a1efd86f9a98a8e5dcd297d2ebfb81985a3630c9a3a9c66694ecde74f415dcd53abcaa5d38a6e3d224893e6cb680961f6e7c316e61229668
-  data.tar.gz: dd42d0252a1c670d246ce95b8decc7dc1fdad314c1afef09a962503824d39705ccf900886c793ba487c4b03add1347c8e04ac65c7fe25c89f6a926c9aefaec08
+  metadata.gz: cf93fddaa169169c2093021f1fb0232b1194ac193ce95582c3e841fda1190f5bc643da5d988b0385aaa37db62133af5c04e5268dd9656e2742867f0746c9c1a9
+  data.tar.gz: 779225ceb84e6bc9f5af58ad572f827cdb32c7319a1dd9bddb5e53dd1afa3429a055a4edf149ac2891eeb4dc7bb06850e85291cca49809d5d23c025abb1582b4

data/lib/ledmon/cli/config.rb

@@ -14,6 +14,14 @@ module Ledmon::CLI
     config_value :host
     config_value :grpc_port
     config_value :http_port
+    config_value :http_proto
+
+    desc "http_base_url", "Get the base URL for HTTP requests"
+
+    def http_base_url
+      puts Ledmon::Config.http_base_url
+    end
+
     config_value :auth
     config_value :mode
     config_value :log_level

data/lib/ledmon/cli/monster.rb

@@ -19,10 +19,10 @@ module Ledmon::CLI
     def deploy
       packer = Ledmon::Monster::Packer.new(path: Dir.pwd)
       packer.pack! do |bundle_path|
-        deployer = Ledmon::Monster::Deployer.new(bundle_path:)
+        deployer = Ledmon::Monster::Deployer.new
         say "Uploading packed file ...", :yellow
 
-        deployer.deploy! do |json_data|
+        deployer.deploy!(bundle_path:) do |json_data|
           if json_data['message']
             say json_data['message'], :cyan
           elsif json_data['error']
@@ -38,5 +38,27 @@ module Ledmon::CLI
       say_error e.message, :red
       exit 1
     end
+
+    desc 'logs', 'Fetch logs from the deployed monster'
+
+    def logs
+      say "Fetching logs from the deployed monster ...", :yellow
+
+      deployer = Ledmon::Monster::Deployer.new
+      deployer.logs do |json_data|
+        case json_data['stream']
+        when 'stdout'
+          say json_data['chunk'], :white
+        when 'stderr'
+          say_error json_data['chunk'], :red
+        else
+          if json_data.has_key?('chunk')
+            say json_data['chunk'], :white
+          else
+            say_error "Unknown log format: #{json_data.inspect}", :red
+          end
+        end
+      end
+    end
   end
 end

data/lib/ledmon/configurator.rb

@@ -23,14 +23,26 @@ module Ledmon
       end
     end
 
-    config_value :host, default: 'localhost'
+    config_value :host, default: 'ledmon.lstme.sk'
     config_value :grpc_port, default: 50051
-    config_value :http_port, default: 4000
+    config_value :http_port, default: 443
+    config_value :http_proto, default: 'https'
     config_value :auth
 
     config_value :mode, default: 'client'
     config_value :log_level, default: 'info'
 
+    def http_base_url
+      port = if http_proto == 'https' && http_port != 443
+        ":#{http_port}"
+      elsif http_proto == 'http' && http_port != 80
+        ":#{http_port}"
+      else
+        ''
+      end
+      "#{http_proto}://#{host}#{port}"
+    end
+
     private
 
     def read_value(keys, default: nil)
@@ -39,10 +51,15 @@ module Ledmon
     end
 
     def write_value(keys, value:)
-      config.set(*keys, value:)
+      if value.to_s.size == 0
+        config.delete(*keys)
+      else
+        config.set(*keys, value:)
+      end
+
       config.write(create: true, force: true)
 
       value
     end
   end
-end
+end

data/lib/ledmon/monster/deployer.rb

@@ -2,22 +2,11 @@
 
 module Ledmon::Monster
   class Deployer
-    attr_reader :bundle_path
-
-    def initialize(bundle_path:)
-      @bundle_path = bundle_path
-    end
-
-    def deploy!(&block)
+    def deploy!(bundle_path:, &block)
       require 'http'
       require 'json'
 
-      url = build_upload_url
-      headers = {
-        'Authorization' => "Bearer #{Ledmon::Config.auth}",
-      }
-
-      response = HTTP.headers(headers).post(url, form: { file: HTTP::FormData::File.new(bundle_path) })
+      response = HTTP.headers(build_headers).post(build_upload_url, form: { file: HTTP::FormData::File.new(bundle_path) })
 
       unless response.status.success?
         raise Ledmon::Error, "Deploy failed with status: #{response.status}"
@@ -29,17 +18,56 @@ module Ledmon::Monster
 
         while buffer.include?("\n")
           line, buffer = buffer.split("\n", 2)
-          process_json_line(line, &block)
+          process_deploy_line(line, &block)
         end
       end
 
       # Process any remaining data in buffer
-      process_json_line(buffer, &block) unless buffer.strip.empty?
+      process_deploy_line(buffer, &block) unless buffer.strip.empty?
+    end
+
+    def logs(&block)
+      response = HTTP.headers(build_headers).get(build_logs_url)
+
+      unless response.status.success?
+        raise Ledmon::Error, "Logs failed with status: #{response.status}"
+      end
+
+      buffer = ""
+      response.body.each do |chunk|
+        buffer += chunk
+
+        while buffer.include?("\n")
+          line, buffer = buffer.split("\n", 2)
+          process_log_line(line, &block)
+        end
+      end
+
+      # Process any remaining data in buffer
+      process_log_line(buffer, &block) unless buffer.strip.empty?
     end
 
     private
 
-    def process_json_line(line, &block)
+    def build_headers
+      {
+        'Authorization' => "Bearer #{Ledmon::Config.auth}",
+      }
+    end
+
+    def process_log_line(line, &block)
+      line = line.strip
+      return if line.empty?
+
+      begin
+        json_data = JSON.parse(line)
+        block&.call(json_data)
+      rescue JSON::ParserError
+        # Skip invalid JSON lines
+      end
+    end
+
+    def process_deploy_line(line, &block)
       line = line.strip
       return if line.empty?
 
@@ -52,7 +80,11 @@ module Ledmon::Monster
     end
 
     def build_upload_url
-      "http://#{Ledmon::Config.host}:#{Ledmon::Config.http_port}/deploys"
+      "#{Ledmon::Config.http_base_url}/deploys"
+    end
+
+    def build_logs_url
+      "#{Ledmon::Config.http_base_url}/deploys/logs"
     end
   end
 end

data/lib/ledmon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ledmon
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ledmon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ahmed Al Hafoudh