semaph 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13271774cf750f1f8eedc2d48de45ceeaa164af2593581cac85fc73e6c371d95
-  data.tar.gz: 3afba979f087aba88acbeeb3a09e46261fda8ba3afae3cf1690ced82d687d420
+  metadata.gz: c0677122d6857a85e92dc0a74346b4f130f1f715ad9cfede85ffab143540867e
+  data.tar.gz: c6165a0966dd6cd3088fcece1d56d304188c79552c03a0d48cb3addbe1e4649f
 SHA512:
-  metadata.gz: a00c84f6e8e357e0a99f921e316b8a36f8c5cf78a8d9befb33f2e8e25f733801024392401b4329d8faf20a690dace3c7b2fe48a1f31bb71dfa4c25f41987156b
-  data.tar.gz: 8c904c17ba321fb240c4bdc1fa8ecb1beac95d6688da8632dd6e7e26446c2c16bd52bca36757eccc389cb06b64d3e1af4fc874ce817d706d632e28eaad2b56b5
+  metadata.gz: d2ea65f9d5fdaf2b4b0597dc3fd0205eaa7fad89b596dff1fcf6619c6d39d11c80c9b5f9acd4e375049c6e16a91bcc4df5708cfd6e1725e834c80576d1442dbf
+  data.tar.gz: 2505c4088ef17b9efdaa9c9d2dfc80159e459dfcc5f097d4761b69b2e390cb3371b611d9a913783812b5b1dd7435063ac8db3de2fb58f90168822068bcdc2ebf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    semaph (0.3.0)
+    semaph (0.4.0)
       faraday
       rainbow
       shell_shock

data/lib/semaph/model/job.rb

@@ -33,6 +33,14 @@ module Semaph
         ].compact.join(" ")
       end
 
+      def finished?
+        @status == "FINISHED"
+      end
+
+      def failed?
+        @result == "FAILED"
+      end
+
       # block_state can be waiting/running/done
       # block_result can be passed/failed/canceled/stopped
       def block_icon

data/lib/semaph/model/job_collection.rb

@@ -3,7 +3,7 @@ require "semaph/model/job"
 module Semaph
   module Model
     class JobCollection
-      attr_reader :all
+      attr_reader :all, :pipeline
 
       def initialize(pipeline)
         @pipeline = pipeline
@@ -16,11 +16,11 @@ module Semaph
       end
 
       def incomplete
-        @all.reject { |job| job.status == "FINISHED" }
+        @all.reject(&:finished?)
       end
 
       def failed
-        @all.select { |job| job.result == "FAILED" }
+        @all.select(&:failed?)
       end
 
       private

data/lib/semaph/shells/pipeline/{jobs_logs_command.rb → job_log_command.rb}

@@ -1,7 +1,9 @@
+require "fileutils"
+
 module Semaph
   module Shells
     module Pipeline
-      class JobsLogsCommand
+      class JobLogCommand
         attr_reader :usage, :help
 
         def initialize(job_collection)
@@ -20,8 +22,18 @@ module Semaph
             return
           end
 
-          filename = "#{job.id}.log"
-          File.open(filename, "w") { |file| file.puts job.log } unless File.exist?(filename)
+          unless job.finished?
+            puts "This job has not finished yet"
+            return
+          end
+
+          base = "tmp/logs/pipeline/#{job.pipeline.id}"
+          FileUtils.mkdir_p(base)
+          filename = "#{base}/#{job.id}.log"
+          unless File.exist?(filename)
+            puts "retrieving log for job #{job.id}"
+            File.open(filename, "w") { |file| file.puts job.log }
+          end
           system("less #{filename}")
         end
       end

data/lib/semaph/shells/pipeline/job_log_grep_command.rb

@@ -0,0 +1,34 @@
+require "fileutils"
+
+module Semaph
+  module Shells
+    module Pipeline
+      class JobLogGrepCommand
+        attr_reader :usage, :help, :job_collection
+
+        def initialize(job_collection)
+          @job_collection = job_collection
+          @usage = "<expression>"
+          @help = "retrieve all logs and grep for text"
+        end
+
+        def execute(expression)
+          base = "tmp/logs/pipeline/#{job_collection.pipeline.id}"
+          FileUtils.mkdir_p(base)
+          @job_collection.all.each do |job|
+            unless job.finished?
+              puts "skipping incomplete job #{job.id}"
+              next
+            end
+            filename = "#{base}/#{job.id}.log"
+            unless File.exist?(filename)
+              puts "retrieving log for job #{job.id}"
+              File.open(filename, "w") { |file| file.puts job.log }
+            end
+          end
+          system("ag #{expression} #{base} | less")
+        end
+      end
+    end
+  end
+end

data/lib/semaph/shells/pipeline/pipeline_shell.rb

@@ -1,7 +1,8 @@
 require "semaph/commands/reload_command"
 require "semaph/commands/rerun_workflow_command"
 require "semaph/shells/pipeline/jobs_list_command"
-require "semaph/shells/pipeline/jobs_logs_command"
+require "semaph/shells/pipeline/job_log_command"
+require "semaph/shells/pipeline/job_log_grep_command"
 require "semaph/shells/pipeline/jobs_poll_command"
 require "shell_shock/context"
 
@@ -38,7 +39,8 @@ module Semaph
           @jobs_list_command = JobsListCommand.new(job_collection)
           add_command @jobs_list_command, "list-jobs"
           add_command JobsPollCommand.new(job_collection), "poll-jobs"
-          add_command JobsLogsCommand.new(job_collection), "jobs-logs"
+          add_command JobLogCommand.new(job_collection), "job-log"
+          add_command JobLogGrepCommand.new(job_collection), "grep-logs"
           add_command ::Semaph::Commands::RerunWorkflowCommand.new(workflow), "rerun"
           add_open_branch_command
           add_open_workflow_command

data/lib/semaph/version.rb

@@ -1,3 +1,3 @@
 module Semaph
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semaph
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Ryall
@@ -109,8 +109,9 @@ files:
 - lib/semaph/shells/organisations/organisations_list_command.rb
 - lib/semaph/shells/organisations/organisations_select_command.rb
 - lib/semaph/shells/organisations/organisations_shell.rb
+- lib/semaph/shells/pipeline/job_log_command.rb
+- lib/semaph/shells/pipeline/job_log_grep_command.rb
 - lib/semaph/shells/pipeline/jobs_list_command.rb
-- lib/semaph/shells/pipeline/jobs_logs_command.rb
 - lib/semaph/shells/pipeline/jobs_poll_command.rb
 - lib/semaph/shells/pipeline/pipeline_shell.rb
 - lib/semaph/shells/project/project_shell.rb