semaph 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7db37cbca829e1b13372c7a8687b86080b1e4a579bbb7707e6cc207ebdcb4ba1
-  data.tar.gz: 4b5015379f62ad0382991f26b525583d2a6e077889071e5bde58dc1399d69ada
+  metadata.gz: c17a30876e3fab18baefc8d5055a1c079f58711f03f70fbd9bc29ad45fc2733e
+  data.tar.gz: a30b3f23dc8d7f1111add796133b2d72bff6d3dbd7369f4a2923fc98f38a317f
 SHA512:
-  metadata.gz: 243de9cc3425299a5d7a5a11d3a6e06a89e56ad22e0bab59fe4568544fc8e05f0a6e902363497d493811a00c30f84a95456a0679417fb7d4d39b10ad35ece692
-  data.tar.gz: f1fd8d22e22885357f0b5c1ba962ac1edb91b61b6ab3b9e03cfec9aeda88197a40bfcfe2b047417d3d2629e5eb8f9fa3e32b9dde40e8feefeb09bae8e7e5527d
+  metadata.gz: 88d9f42701e59b2b93f004c6a51eed5ebed4b047556ddc0eb959075522afeeb499fcd0da29348b61a56359c167418bdf225af7bcf0a2e38425b91146a7df9fce
+  data.tar.gz: 8671942b1efd8e43106aaebc50bc096ae073961c21bd2b86287bb588bb22b5e82ca1c049e84fdd1cace3e713cd7cdfdd9024138ec3f491274ee62736ae2f94eb

data/.semaph

@@ -0,0 +1,9 @@
+---
+:host: markryall.semaphoreci.com
+:project:
+  spec:
+    repository:
+      url: git@github.com:markryall/semaph.git
+  metadata:
+    name: semaph
+    id: e75c6c57-2665-4e45-9cab-560508eb0b22

data/Gemfile.lock

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

data/lib/semaph.rb

@@ -1,22 +1,57 @@
+require "semaph/client"
+require "semaph/model/project"
 require "semaph/version"
 require "semaph/shells/organisations/organisations_shell"
 require "semaph/shells/organisation/organisation_shell"
+require "semaph/shells/project/project_shell"
 require "yaml"
 
 module Semaph
   class Error < StandardError; end
 
   def self.console
-    yaml_path = File.join(File.expand_path("~"), ".sem.yaml")
-    raise "Please install the sem tool and authenticate to semaphoreci.com" unless File.exist?(yaml_path)
-
-    sem_config = YAML.load_file(yaml_path)
-    contexts = sem_config["contexts"]
+    organisations = load_organisations
+    config = load_config
 
-    if contexts.count == 1
-      Shells::Organisation::OrganisationShell.new(contexts.values.first).push
+    if config
+      console_with_config(organisations, config)
+    elsif organisations.count == 1
+      Shells::Organisation::OrganisationShell.new(organisations.first).push
     else
-      Shells::Organisations::OrganisationsShell.new(contexts).push
+      Shells::Organisations::OrganisationsShell.new(organisations).push
+    end
+  end
+
+  def self.console_with_config(organisations, config)
+    organisation = organisations.find { |o| o["host"] == config[:host] }
+
+    Shells::Project::ProjectShell.new(
+      Model::Project.new(
+        ::Semaph::Client.new(
+          organisation["auth"]["token"],
+          organisation["host"],
+        ),
+        config[:project],
+      ),
+    ).push
+  end
+
+  def self.load_organisations
+    yaml_path = File.join(File.expand_path("~"), ".sem.yaml")
+
+    unless File.exist?(yaml_path)
+      unless organisations
+        puts "Please install the sem tool and authenticate to semaphoreci.com"
+        exit 1
+      end
     end
+
+    YAML.load_file(yaml_path)["contexts"].values
+  end
+
+  def self.load_config
+    return nil unless File.exist?(".semaph")
+
+    YAML.load_file(".semaph")
   end
 end

data/lib/semaph/model/job_collection.rb

@@ -1,9 +1,10 @@
+require "date"
 require "semaph/model/job"
 
 module Semaph
   module Model
     class JobCollection
-      attr_reader :all, :pipeline
+      attr_reader :all, :pipeline, :stopping_at, :running_at, :queuing_at, :pending_at, :done_at, :created_at
 
       def initialize(pipeline)
         @pipeline = pipeline
@@ -12,7 +13,7 @@ module Semaph
       def reload
         workflow = @pipeline.workflow
         project = workflow.project
-        @all = build_jobs(project.client.pipeline(@pipeline.id))
+        @all = parse_content(project.client.pipeline(@pipeline.id))
       end
 
       def incomplete
@@ -25,7 +26,8 @@ module Semaph
 
       private
 
-      def build_jobs(content)
+      def parse_content(content)
+        parse_pipeline(content["pipeline"])
         result = []
         blocks = content.delete("blocks")
         blocks.each do |block|
@@ -35,6 +37,15 @@ module Semaph
         result
       end
 
+      def parse_pipeline(pipeline_content)
+        with_time(pipeline_content["stopping_at"]) { |time| @stopping_at = time }
+        with_time(pipeline_content["running_at"]) { |time| @running_at = time }
+        with_time(pipeline_content["queuing_at"]) { |time| @queuing_at = time }
+        with_time(pipeline_content["pending_at"]) { |time| @pending_at = time }
+        with_time(pipeline_content["done_at"]) { |time| @done_at = time }
+        with_time(pipeline_content["created_at"]) { |time| @created_at = time }
+      end
+
       def append_jobs(result, block, jobs)
         if jobs.count.positive?
           jobs.each { |job| result << Job.new(@pipeline, block, job) }
@@ -42,6 +53,11 @@ module Semaph
           result << Job.new(@pipeline, block, {})
         end
       end
+
+      def with_time(string)
+        time = DateTime.parse(string).to_time
+        yield time unless time.to_i.zero?
+      end
     end
   end
 end

data/lib/semaph/shells/organisations/organisations_list_command.rb

@@ -10,8 +10,8 @@ module Semaph
         end
 
         def execute(_whatever)
-          @organisations.each_key do |name|
-            puts "#{name} (#{@organisations[name]['host']})"
+          @organisations.each do |organisation|
+            puts organisation["host"].split(".").first
           end
         end
       end

data/lib/semaph/shells/organisations/organisations_select_command.rb

@@ -13,11 +13,13 @@ module Semaph
         end
 
         def completion(text)
-          @organisations.keys.grep(/^#{text}/).sort
+          @organisations.map { |org| org["host"].split(".").first }.grep(/^#{text}/).sort
         end
 
         def execute(name)
-          organisation = @organisations[name]
+          organisation = @organisations.find do |org|
+            org["host"].split(".").first == name
+          end
 
           unless organisation
             puts "There is no organisation called #{name}"

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

@@ -4,7 +4,7 @@ module Semaph
   module Shells
     module Pipeline
       class JobLogCommand
-        attr_reader :usage, :help
+        attr_reader :usage, :help, :job_collection
 
         def initialize(job_collection)
           @job_collection = job_collection
@@ -13,23 +13,23 @@ module Semaph
         end
 
         def execute(index_string)
-          base = "tmp/logs/pipeline/#{@job_collection.pipeline.id}"
-          with_job(index_string) do |job|
-            unless job.finished?
-              puts "This job has not finished yet"
-              return
-            end
-
-            system("less #{job.write_log(base)}")
-          end
+          with_job(index_string) { |job| system(command(job)) }
         end
 
         private
 
+        def command(job)
+          base = "tmp/logs/pipeline/#{job_collection.pipeline.id}"
+
+          return "less #{job.write_log(base)}" if job.finished?
+
+          "open https://#{job_collection.pipeline.workflow.project.client.host}/jobs/#{job.id}"
+        end
+
         def with_job(index_string)
           index = index_string.to_i - 1
 
-          job = @job_collection.all[index]
+          job = job_collection.all[index]
 
           unless job
             puts "There is no job at position #{index}"

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

@@ -21,8 +21,7 @@ module Semaph
         private
 
         def report_and_reload(period)
-          report_incomplete(job_collection.incomplete)
-          sleep period
+          period.times { report_incomplete }
           job_collection.reload
         end
 
@@ -36,10 +35,28 @@ module Semaph
           )
         end
 
-        def report_incomplete(incomplete_jobs)
-          puts "polling #{job_collection.pipeline.workflow.description}"
-          puts "#{incomplete_jobs.count} incomplete jobs remaining:"
-          incomplete_jobs.each { |job| puts job.description }
+        def report_incomplete
+          base = [nil, elapsed, report_ratio, job_collection.pipeline.workflow.description].join(" ")
+          erase base
+        end
+
+        def report_ratio
+          [
+            job_collection.incomplete.count.to_s.rjust(2, "0"),
+            job_collection.all.count.to_s.rjust(2, "0"),
+          ].join("/")
+        end
+
+        def elapsed
+          duration = Time.now.to_i - job_collection.created_at.to_i
+          mins = duration / 60
+          secs = duration % 60
+          [mins.to_s.rjust(2, "0"), secs.to_s.rjust(2, "0")].join(":")
+        end
+
+        def erase(string)
+          print string
+          print "\b" * string.length
         end
 
         def notify(title, message, failed)

data/lib/semaph/shells/project/project_shell.rb

@@ -1,5 +1,6 @@
 require "semaph/commands/reload_command"
 require "semaph/commands/visit_url_command"
+require "semaph/shells/project/save_command"
 require "semaph/shells/project/workflows_list_command"
 require "semaph/shells/project/workflows_select_command"
 require "shell_shock/context"
@@ -28,6 +29,7 @@ module Semaph
         def add_commands
           add_github_command
           add_open_project_command
+          add_command SaveCommand.new(project), "save"
           @workflows_list_command = WorkflowsListCommand.new(workflow_collection)
           add_command @workflows_list_command, "list-workflows", "ls"
           add_command WorkflowsSelectCommand.new(workflow_collection), "select-workflow", "cd"

data/lib/semaph/shells/project/save_command.rb

@@ -0,0 +1,26 @@
+require "yaml"
+
+module Semaph
+  module Shells
+    module Project
+      class SaveCommand
+        attr_reader :help, :project
+
+        def initialize(project)
+          @project = project
+          @help = "save current project as default for this folder"
+        end
+
+        def execute(_ignored)
+          config = {
+            host: project.client.host,
+            project: project.raw,
+          }
+          File.open(".semaph", "w") do |file|
+            file.puts config.to_yaml
+          end
+        end
+      end
+    end
+  end
+end

data/lib/semaph/version.rb

@@ -1,3 +1,3 @@
 module Semaph
-  VERSION = "0.7.0".freeze
+  VERSION = "0.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semaph
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Mark Ryall
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -90,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".semaph"
 - ".semaphore/semaphore.yml"
 - ".tool-versions"
 - ".travis.yml"
@@ -137,6 +138,7 @@ files:
 - lib/semaph/shells/pipeline/promote_command.rb
 - lib/semaph/shells/pipeline/promotions_list_command.rb
 - lib/semaph/shells/project/project_shell.rb
+- lib/semaph/shells/project/save_command.rb
 - lib/semaph/shells/project/workflows_list_command.rb
 - lib/semaph/shells/project/workflows_select_command.rb
 - lib/semaph/shells/workflow/pipelines_list_command.rb