neetodeploy 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518719f22d6967ef7bc0acde463bad118be36bb2b4e0e8de6b28cb7f91110dd6
-  data.tar.gz: a08a4c651fde80dc3a348c517d3f43c415c985340395338fc878ee0704a14e62
+  metadata.gz: b449b4f69647cfff5f812dfa30c273b1add6b8dfdeb60ca419d96be75a768d37
+  data.tar.gz: dcebc5fdb56c81f76973f502a0491ddd640b4813a8c969f5fbb07db3df596264
 SHA512:
-  metadata.gz: a7280eab15a0a7495a4ff364df2cc4647f340f4232488fe3231c6bda2b8ada04eed3e9a2050e90740e3495ff6e7ae124ec34abcbaa6a755fb16f32652d7da063
-  data.tar.gz: 84600455e6d2cc3aa9e4205399f62b10a26fe58b7a49d94ccc6e7f18a6185639acd88484d8c6aca65f65d4044b5335d5f62cf01d57cb5d16807dccbe30179b37
+  metadata.gz: 90f7a087123601f9dabffb8c3113e04049d9fe15e60d0439979bc66aea8481397c8e0d0e59bcd79089d300d98e5f5d99204ea600137431ffcfce4a4fb6b23d5c
+  data.tar.gz: 8f765320a00cbc9b3e264e1d903a5b6b4a2c2849197a1965deba8fc60df1972ca0674a7519d05a4104aad283d73373e2c70ee1ae30c1c0576212edab71077633

data/lib/neeto_deploy/cli/logs/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
+require "time"
 require "colorize"
 
 require_relative "../session"
@@ -16,44 +17,148 @@ module NeetoDeploy
         POLL_INTERVAL_SECONDS = 2
         INITIAL_LIMIT = 100
         POLL_LIMIT = 1000
+        HISTORIC_DEFAULT_LIMIT = 500
 
-        attr_reader :app_slug, :process_type
+        RELATIVE_TIME_PATTERN = /\A(\d+)(m|h|d)\z/
 
-        def initialize(app_slug, process_type = nil)
+        attr_reader :app_slug, :process_type, :options
+
+        def initialize(options)
           super()
-          @app_slug = app_slug
-          @process_type = process_type
+          @options = options
+          @app_slug = options[:app]
+          @process_type = options[:process_type]
           @last_timestamp_ms = nil
         end
 
         def process!
-          start_spinner
-          print_github_repo_name
-          response = fetch_logs
-          @spinner.stop
-
-          unless response.success?
-            ui.error(response["error"] || response.message)
-            return
+          if historic_mode?
+            process_historic!
+          else
+            process_live!
           end
+        end
 
-          data = JSON.parse(response.body)
+        private
 
-          unless data["configured"]
-            ui.error("Logs are not configured for this app.")
-            return
+          def historic_mode?
+            options[:from] && !options[:from].empty?
           end
 
-          # Initial batch returned DESC — reverse for chronological display
-          logs = data["logs"].reverse
-          logs.each { |log| print_log(log) }
-          # Subtract 10s buffer to account for potential client/server clock skew
-          @last_timestamp_ms = logs.any? ? logs.last["timestamp"] : ((Time.now.to_f - 10) * 1000).to_i
+          # --- Historic mode ---
 
-          poll_for_logs
-        end
+          def process_historic!
+            from_time = parse_time_option(options[:from])
+            unless from_time
+              ui.error("Invalid --from time: #{options[:from]}")
+              return
+            end
 
-        private
+            to_time = options[:to] ? parse_time_option(options[:to]) : nil
+            if options[:to] && !to_time
+              ui.error("Invalid --to time: #{options[:to]}")
+              return
+            end
+
+            start_spinner("Fetching historic logs")
+            print_github_repo_name
+
+            total_count = 0
+            limit = options[:limit] || HISTORIC_DEFAULT_LIMIT
+            before_timestamp = nil
+
+            loop do
+              params = build_historic_params(from_time, to_time, before_timestamp, limit)
+              response = send_get_request(logs_v2_url, params)
+              @spinner.stop if @spinner
+
+              unless response.success?
+                ui.error(response["error"] || response.message)
+                return
+              end
+
+              data = JSON.parse(response.body)
+
+              unless data["configured"]
+                ui.error("Logs are not configured for this app.")
+                return
+              end
+
+              logs = data["logs"]
+              if logs.empty?
+                ui.info("No logs found for the given time range.") if total_count == 0
+                break
+              end
+
+              # Backward pagination returns DESC — reverse for chronological display
+              logs.reverse.each { |log| print_log(log) }
+              total_count += logs.size
+
+              break if total_count >= limit
+              break unless data["has_more"]
+
+              before_timestamp = ms_to_iso8601(logs.last["timestamp"])
+            end
+
+            ui.info("Fetched #{total_count} log entries.") if total_count > 0
+          end
+
+          def build_historic_params(from_time, to_time, before_timestamp, limit)
+            params = { app_slug:, process_type:, from_time: from_time.utc.iso8601(3), limit: }
+            params[:to_time] = to_time.utc.iso8601(3) if to_time
+            params[:before_timestamp] = before_timestamp if before_timestamp
+            params[:search] = options[:search] if options[:search]
+            params[:match_type] = "regex" if options[:regex]
+            params
+          end
+
+          def parse_time_option(value)
+            return nil if value.nil?
+
+            if (match = value.match(RELATIVE_TIME_PATTERN))
+              amount = match[1].to_i
+              unit = match[2]
+              seconds = case unit
+                when "m" then amount * 60
+                when "h" then amount * 3600
+                when "d" then amount * 86400
+              end
+              Time.now - seconds
+            else
+              Time.parse(value)
+            end
+          rescue ArgumentError
+            nil
+          end
+
+          # --- Live streaming mode ---
+
+          def process_live!
+            start_spinner("Starting live stream session")
+            print_github_repo_name
+            response = fetch_logs
+            @spinner.stop
+
+            unless response.success?
+              ui.error(response["error"] || response.message)
+              return
+            end
+
+            data = JSON.parse(response.body)
+
+            unless data["configured"]
+              ui.error("Logs are not configured for this app.")
+              return
+            end
+
+            # Initial batch returned DESC — reverse for chronological display
+            logs = data["logs"].reverse
+            logs.each { |log| print_log(log) }
+            # Subtract 10s buffer to account for potential client/server clock skew
+            @last_timestamp_ms = logs.any? ? logs.last["timestamp"] : ((Time.now.to_f - 10) * 1000).to_i
+
+            poll_for_logs
+          end
 
           def fetch_logs(after_timestamp_ms: nil)
             params = { app_slug:, process_type:, limit: INITIAL_LIMIT }
@@ -112,8 +217,8 @@ module NeetoDeploy
             Time.at(ms / 1000.0).utc.iso8601(3)
           end
 
-          def start_spinner
-            @spinner = TTY::Spinner.new("Starting live stream session [:spinner]", format: :classic)
+          def start_spinner(message = "Loading")
+            @spinner = TTY::Spinner.new("#{message} [:spinner]", format: :classic)
             @spinner.auto_spin
           end
       end

data/lib/neeto_deploy/cli.rb

@@ -50,11 +50,16 @@ module NeetoDeploy
       CLI::Exec::Base.new(options[:app]).process!
     end
 
-    desc "logs", "Show logs"
+    desc "logs", "Show logs (live stream or historic)"
     option :app, type: :string, aliases: "-a", required: true, desc: "App slug"
     option :process_type, type: :string, aliases: "-p", desc: "Process type (optional)"
+    option :from, type: :string, desc: "Start time for historic logs (e.g. '2024-01-15T10:30:00Z' or '2h' for 2 hours ago)"
+    option :to, type: :string, desc: "End time for historic logs (e.g. '2024-01-15T12:30:00Z', defaults to now)"
+    option :search, type: :string, aliases: "-s", desc: "Search filter for log messages"
+    option :regex, type: :boolean, default: false, desc: "Treat search as regex pattern"
+    option :limit, type: :numeric, aliases: "-n", desc: "Max number of logs to fetch (default: 500, max: 2000)"
     def logs
-      CLI::Logs::Base.new(options[:app], options[:process_type]).process!
+      CLI::Logs::Base.new(options).process!
     end
 
     desc "apps", "Show app details"

data/lib/neeto_deploy/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NeetoDeploy
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
   CLI_API_VERSION = "v1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Subin Siby
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: CLI for neetoDeploy
 test_files: []