semaph 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b22217dbedbfa234279e494e23d64af812563e6fa8d57e2e2b14f185b3fbe52c
-  data.tar.gz: 36c3a0944ef6408730c18b2f147f734616300023792e9e82b0c5ebc0956bab05
+  metadata.gz: 13271774cf750f1f8eedc2d48de45ceeaa164af2593581cac85fc73e6c371d95
+  data.tar.gz: 3afba979f087aba88acbeeb3a09e46261fda8ba3afae3cf1690ced82d687d420
 SHA512:
-  metadata.gz: 4fdda4999337920b39947b2c2fe09ea2cf62830998f948fed2d835dd74f5436172276dace4d59f0e493f14381aae349aaa0aafaa123b5f452ab4ed6a1fba0db0
-  data.tar.gz: c5f969a3450d98f8a9b7a9eeb66d134856558e0376259070206ad0a8e76d4e3c38e6a12e3b27312aa272a48cc08af50288e99b443983ffc1d374d5401f82eb85
+  metadata.gz: a00c84f6e8e357e0a99f921e316b8a36f8c5cf78a8d9befb33f2e8e25f733801024392401b4329d8faf20a690dace3c7b2fe48a1f31bb71dfa4c25f41987156b
+  data.tar.gz: 8c904c17ba321fb240c4bdc1fa8ecb1beac95d6688da8632dd6e7e26446c2c16bd52bca36757eccc389cb06b64d3e1af4fc874ce817d706d632e28eaad2b56b5

data/.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+*.log
 
 /.bundle/
 /.yardoc
@@ -7,4 +8,4 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+/tmp/

data/Gemfile.lock

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

data/README.md

@@ -1,28 +1,98 @@
 # Semaph
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/semaph`. To experiment with that code, run `bin/console` for an interactive prompt.
+This is command line shell for interacting with [semaphoreci 2.0](http://docs.semaphoreci.com/).
+
+It complements the [sem](https://docs.semaphoreci.com/reference/sem-command-line-tool/) tool with some
+overlap in responsibilities.
 
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
-Add this line to your application's Gemfile:
+    gem install semaph
+
+## Usage
+
+To set up authentication to semaphoreci, you can just follow the instructions to install and setup
+[sem](https://docs.semaphoreci.com/reference/sem-command-line-tool/).  This will result
+in your authentication details being written to `~/.sem.yaml`.
 
-```ruby
-gem 'semaph'
+You should see something like the following in this file:
+
+```yaml
+active-context: foo_semaphoreci_com
+contexts:
+  foo_semaphoreci_com:
+    auth:
+      token: qwerty
+    host: foo.semaphoreci.com
 ```
 
-And then execute:
+Now you can run `semaph` and will be presented with a prompt like one of the following:
 
-    $ bundle install
+     🏗  >
 
-Or install it yourself as:
+or
 
-    $ gem install semaph
+     🏗  foo.semaphoreci.com >
 
-## Usage
+This is the first of a series of nested shells.  Each shell represents a different context
+and has different commands available.  To see the commands available, execute `help` and
+to see the details of a particular command, execute `help <command name>`.  Once you are
+familar with the commands for each context, you can type the first couple of characters
+and then hit tab to complete the rest.  For some commands you can also tab complete the
+parameters. Once you enter a shell, return to the previous shell or exit `semaph`, you can
+press ctrl-d.
+
+### organisations shell
+
+     🏗  >
+
+You will only see this shell if you have multiple sets of credentials in your `~/.sem.yml` file.
+
+From this shell, you can `list-organisations` you are authenticated to and `select-organisation`
+to enter a shell for that organisation.
+
+### organisation shell
+
+     🏗  foo.semaphoreci.com >
+
+If you have only one set of credentials in `~/.sem.yml` then this will be the initial shell.
+
+From here you can `list-projects` and then `select-project` to enter a shell for that project.
+
+If new projects have been added/removed while you are using this shell, you can `reload-projects`.
+
+### project shell
+
+     🏗  foo.semaphoreci.com my-app >
+
+From this shell, you will mostly be interested in `list-workflows <branch>` (where 'branch' is any
+substring of the git branch you want to see workflows for) and then `select-workflow <index>`
+(where 'index' is the number displayed for each workflow `list-workflows` - tab completion on uuids
+seemed a bad idea) to enter a shell for that specific workflow.
+
+You can also `open-github` (opens a web browser for the github project associated with the project), `open-project`
+(opens the semaphoreci project in a browser) and `reload-workflows` (to see any new/changed workflows).
+
+### workflow shell
+
+    🏗  foo.semaphoreci.com my-app workflowuuid >
+
+From this shell, you can `list-pipelines` for the selected workflow.  These are the builds usually starting
+from `semaphore.yml` plus any promotion pipelines that might be executed.  You can `select-pipeline` to monitor
+what's happening with the pipeline.
+
+You can also `open-github-branch`, `open-github-commit` to see the branch/commit in a browser and
+`open-workflow`, `open-branch` to see the semaphore branch/workflow in a browser and `reload-pipelines` to see
+any changes that have happened in semaphore.
+
+### pipeline shell
+
+    🏗  foo.semaphoreci.com my-app workflowuuid semaphore.yml >
+
+From this shell, you can `list-jobs` and `reload-jobs`.
 
-TODO: Write usage instructions here
+Jobs are displayed with a flattened view of blocks and jobs for compactness.
 
 ## Development
 

data/lib/semaph/api.rb

@@ -4,12 +4,14 @@ require "json"
 module Semaph
   # Refer to https://docs.semaphoreci.com/reference/api-v1alpha/
   class Api
-    attr_reader :host
+    attr_reader :host, :name
 
     def initialize(token, host)
       @token = token
       @host = host
-      @base = "https://#{host}/api/v1alpha"
+      @name = host.split(".").first
+      @host_url = "https://#{host}"
+      @base = "#{@host_url}/api/v1alpha"
     end
 
     def projects
@@ -20,6 +22,18 @@ module Semaph
       get "plumber-workflows", { project_id: project_id }
     end
 
+    def workflow(workflow_id)
+      get "plumber-workflows/#{workflow_id}"
+    end
+
+    def stop_workflow(workflow_id)
+      post "plumber-workflows/#{workflow_id}/terminate"
+    end
+
+    def rerun_workflow(workflow_id)
+      post "plumber-workflows/#{workflow_id}/reschedule?request_token=#{workflow_id}"
+    end
+
     def pipelines(options)
       get "pipelines", options
     end
@@ -32,13 +46,32 @@ module Semaph
       get "jobs/#{id}"
     end
 
+    def job_log(id)
+      get_raw "jobs/#{id}/plain_logs.json"
+    end
+
     private
 
+    def get_raw(path, params = {})
+      url = "#{@host_url}/#{path}"
+      puts url if ENV["SEMAPH_DEBUG"]
+      response = Faraday.get(url, params, { "Authorization" => "Token #{@token}" })
+      check_response(response, url)
+    end
+
     def get(path, params = {})
       url = "#{@base}/#{path}"
       puts url if ENV["SEMAPH_DEBUG"]
       response = Faraday.get(url, params, headers)
-      check_response(response, url).tap do |hash|
+      JSON.parse(check_response(response, url)).tap do |hash|
+        pp hash if ENV["SEMAPH_DEBUG"]
+      end
+    end
+
+    def post(path, params = {})
+      url = "#{@base}/#{path}"
+      response = Faraday.post(url, params.to_json, headers)
+      JSON.parse(check_response(response, url)).tap do |hash|
         pp hash if ENV["SEMAPH_DEBUG"]
       end
     end
@@ -52,7 +85,7 @@ module Semaph
     end
 
     def check_response(response, url)
-      return JSON.parse(response.body) if response.status == 200
+      return response.body if response.status == 200
 
       puts "http response #{response.status} received for #{url}:\n#{response.body}"
       exit 1

data/lib/semaph/commands/reload_command.rb

@@ -3,13 +3,14 @@ module Semaph
     class ReloadCommand
       attr_reader :help
 
-      def initialize(entity, help)
-        @entity = entity
-        @help = help
+      def initialize
+        @help = "reload all code"
       end
 
       def execute(_whatever)
-        @entity.reload
+        Dir["lib/**/*.rb"].each do |path|
+          load path
+        end
       end
     end
   end

data/lib/semaph/commands/rerun_workflow_command.rb

@@ -0,0 +1,18 @@
+require "semaph/shells/workflow/workflow_shell"
+
+module Semaph
+  module Commands
+    class RerunWorkflowCommand
+      attr_reader :help
+
+      def initialize(workflow)
+        @workflow = workflow
+        @help = "rerun workflow"
+      end
+
+      def execute(_whatever)
+        ::Semaph::Shells::Workflow::WorkflowShell.new(@workflow.rerun).push
+      end
+    end
+  end
+end

data/lib/semaph/commands/stop_workflow_command.rb

@@ -0,0 +1,18 @@
+require "semaph/shells/workflow/workflow_shell"
+
+module Semaph
+  module Commands
+    class StopWorkflowCommand
+      attr_reader :help
+
+      def initialize(workflow)
+        @workflow = workflow
+        @help = "stop workflow"
+      end
+
+      def execute(_whatever)
+        @workflow.stop
+      end
+    end
+  end
+end

data/lib/semaph/model/job.rb

@@ -20,6 +20,49 @@ module Semaph
         assign_from_block(raw_block)
       end
 
+      def log
+        pipeline.workflow.project.client.job_log(id)
+      end
+
+      def description
+        [
+          block_icon,
+          @block_name,
+          job_icon,
+          @name,
+        ].compact.join(" ")
+      end
+
+      # block_state can be waiting/running/done
+      # block_result can be passed/failed/canceled/stopped
+      def block_icon
+        return "🟠" if @block_state == "waiting"
+
+        return "🔵" if @block_state == "running"
+
+        return "⚪" if @block_result == "canceled"
+
+        return "⛔" if @block_result == "stopped"
+
+        return "🟢" if @block_result == "passed"
+
+        "🔴"
+      end
+
+      # status can be FINISHED/RUNNING
+      # result can be PASSED/FAILED/STOPPED
+      def job_icon
+        return nil unless @status
+
+        return "🔵" unless @status == "FINISHED"
+
+        return "⛔" if @result == "STOPPED"
+
+        return "🟢" if @result == "PASSED"
+
+        "🔴"
+      end
+
       private
 
       def assign_from_job(raw)
@@ -37,4 +80,3 @@ module Semaph
     end
   end
 end
-

data/lib/semaph/model/job_collection.rb

@@ -7,7 +7,6 @@ module Semaph
 
       def initialize(pipeline)
         @pipeline = pipeline
-        reload
       end
 
       def reload
@@ -16,6 +15,14 @@ module Semaph
         @all = build_jobs(project.client.pipeline(@pipeline.id))
       end
 
+      def incomplete
+        @all.reject { |job| job.status == "FINISHED" }
+      end
+
+      def failed
+        @all.select { |job| job.result == "FAILED" }
+      end
+
       private
 
       def build_jobs(content)
@@ -23,12 +30,18 @@ module Semaph
         blocks = content.delete("blocks")
         blocks.each do |block|
           jobs = block.delete("jobs").sort_by { |job| job["index"] }
-          jobs.each do |job|
-            result << Job.new(@pipeline, block, job)
-          end
+          append_jobs(result, block, jobs)
         end
         result
       end
+
+      def append_jobs(result, block, jobs)
+        if jobs.count.positive?
+          jobs.each { |job| result << Job.new(@pipeline, block, job) }
+        else
+          result << Job.new(@pipeline, block, {})
+        end
+      end
     end
   end
 end

data/lib/semaph/model/pipeline.rb

@@ -12,10 +12,36 @@ module Semaph
         @yaml = raw["yaml_file_name"]
         @state = raw["state"]
         @result = raw["result"]
+        %w[created done pending queuing running stopping].each do |name|
+          extract_time(name)
+        end
       end
 
       def job_collection
-        JobCollection.new(self)
+        @job_collection ||= JobCollection.new(self)
+      end
+
+      def description
+        "#{icon} #{yaml}"
+      end
+
+      def icon
+        return "🔵" unless @state == "DONE"
+
+        return "⛔" if @result == "STOPPED"
+
+        return "🟢" if @result == "PASSED"
+
+        "🔴"
+      end
+
+      private
+
+      def extract_time(name)
+        key = "#{name}_at"
+        return if raw[key]["seconds"].zero?
+
+        instance_variable_set("@#{key}", Time.at(raw[key]["seconds"]))
       end
     end
   end

data/lib/semaph/model/pipeline_collection.rb

@@ -7,7 +7,6 @@ module Semaph
 
       def initialize(workflow)
         @workflow = workflow
-        reload
       end
 
       def reload

data/lib/semaph/model/project.rb

@@ -27,7 +27,7 @@ module Semaph
       end
 
       def workflow_collection
-        WorkflowCollection.new(self)
+        @workflow_collection ||= WorkflowCollection.new(self)
       end
     end
   end

data/lib/semaph/model/project_collection.rb

@@ -7,7 +7,6 @@ module Semaph
 
       def initialize(client)
         @client = client
-        reload
       end
 
       def reload

data/lib/semaph/model/workflow.rb

@@ -17,7 +17,17 @@ module Semaph
       end
 
       def pipeline_collection
-        PipelineCollection.new(self)
+        @pipeline_collection ||= PipelineCollection.new(self)
+      end
+
+      def rerun
+        rerun_response = project.client.rerun_workflow(@id)
+        workflow_response = project.client.workflow(rerun_response["wf_id"])
+        Workflow.new(project, workflow_response["workflow"])
+      end
+
+      def stop
+        project.client.stop_workflow(@id)
       end
     end
   end

data/lib/semaph/model/workflow_collection.rb

@@ -7,7 +7,6 @@ module Semaph
 
       def initialize(project)
         @project = project
-        reload
       end
 
       def reload

data/lib/semaph/shells/organisation/organisation_shell.rb

@@ -12,16 +12,20 @@ module Semaph
         include ShellShock::Context
 
         def initialize(organisation)
-          host = organisation["host"]
-          @prompt = "🏗  #{host} > "
-          client = ::Semaph::Api.new(organisation["auth"]["token"], host)
-          project_collection = ::Semaph::Model::ProjectCollection.new(client)
-          add_command ProjectsListCommand.new(project_collection), "list-projects"
+          @client = ::Semaph::Api.new(organisation["auth"]["token"], organisation["host"])
+          @prompt = "🏗  #{@client.name} > "
+          add_commands
+          @project_list_command.execute("")
+        end
+
+        private
+
+        def add_commands
+          project_collection = ::Semaph::Model::ProjectCollection.new(@client)
+          @project_list_command = ProjectsListCommand.new(project_collection)
+          add_command @project_list_command, "list-projects"
           add_command ProjectsSelectCommand.new(project_collection), "select-project"
-          add_command(
-            ::Semaph::Commands::ReloadCommand.new(project_collection, "reload projects"),
-            "reload-projects",
-          )
+          add_command ::Semaph::Commands::ReloadCommand.new, "reload" if ENV["SEMAPH_RELOAD"]
         end
       end
     end

data/lib/semaph/shells/organisation/projects_list_command.rb

@@ -10,6 +10,7 @@ module Semaph
         end
 
         def execute(_whatever)
+          @project_collection.reload
           @project_collection.all.each do |project|
             puts project.name
           end

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

@@ -1,3 +1,4 @@
+require "semaph/commands/reload_command"
 require "semaph/shells/organisations/organisations_list_command"
 require "semaph/shells/organisations/organisations_select_command"
 require "shell_shock/context"
@@ -11,8 +12,11 @@ module Semaph
         def initialize(organisations)
           @organisations = organisations
           @prompt = "🏗  > "
-          add_command OrganisationsListCommand.new(organisations), "list-organisations"
+          organisations_list_command = OrganisationsListCommand.new(organisations)
+          add_command organisations_list_command, "list-organisations"
           add_command OrganisationsSelectCommand.new(organisations), "select-organisation"
+          add_command ::Semaph::Commands::ReloadCommand.new, "reload" if ENV["SEMAPH_RELOAD"]
+          organisations_list_command.execute("")
         end
       end
     end

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

@@ -10,23 +10,11 @@ module Semaph
         end
 
         def execute(_whatever)
-          @job_collection.all.each do |job|
-            puts description(job)
+          @job_collection.reload
+          @job_collection.all.each_with_index do |job, index|
+            puts "#{index + 1} #{job.description}"
           end
         end
-
-        private
-
-        def description(job)
-          [
-            job.block_name,
-            job.block_state,
-            job.block_result,
-            job.name,
-            job.status,
-            job.result,
-          ].join(" ")
-        end
       end
     end
   end

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

@@ -0,0 +1,30 @@
+module Semaph
+  module Shells
+    module Pipeline
+      class JobsLogsCommand
+        attr_reader :usage, :help
+
+        def initialize(job_collection)
+          @job_collection = job_collection
+          @usage = "<job index>"
+          @help = "retrieve log for job"
+        end
+
+        def execute(index_string)
+          index = index_string.to_i - 1
+
+          job = @job_collection.all[index]
+
+          unless job
+            puts "There is no job at position #{index}"
+            return
+          end
+
+          filename = "#{job.id}.log"
+          File.open(filename, "w") { |file| file.puts job.log } unless File.exist?(filename)
+          system("less #{filename}")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Semaph
+  module Shells
+    module Pipeline
+      class JobsPollCommand
+        attr_reader :usage, :help
+
+        def initialize(job_collection)
+          @job_collection = job_collection
+          @help = "poll jobs"
+          @can_notify = !`which terminal-notifier`.chomp.empty?
+        end
+
+        def execute(_whatever)
+          incomplete_jobs = @job_collection.incomplete
+          while incomplete_jobs.count.positive?
+            puts "#{incomplete_jobs.count} incomplete jobs remaining:"
+            incomplete_jobs.each { |job| puts job.description }
+            failed_jobs = @job_collection.failed
+            if failed_jobs.count.positive?
+              puts "Some jobs have already failed:"
+              failed_jobs.each { |job| puts job.description }
+              `terminal-notifier -group semaph -message "#{failed_jobs.count} jobs have failed" -title "Job failures"` if @can_notify
+              return
+            end
+            sleep 20
+            @job_collection.reload
+            incomplete_jobs = @job_collection.incomplete
+          end
+          @job_collection.all.each_with_index do |job, index|
+            puts "#{index + 1} #{job.description}"
+          end
+          `terminal-notifier -group semaph -message "All jobs have completed" -title "Workflow completed"` if @can_notify
+        end
+      end
+    end
+  end
+end

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

@@ -1,23 +1,96 @@
+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/jobs_poll_command"
 require "shell_shock/context"
 
 module Semaph
   module Shells
     module Pipeline
       class PipelineShell
+        attr_reader :pipeline
+
         include ShellShock::Context
 
         def initialize(pipeline)
           @pipeline = pipeline
-          workflow = pipeline.workflow
-          project = workflow.project
-          @prompt = "🏗  #{project.client.host} #{project.name} #{workflow.id} #{pipeline.yaml} > "
-          job_collection = pipeline.job_collection
+          @prompt = "🏗  #{project.client.name} #{project.name} #{workflow.id} #{pipeline.yaml} > "
+          add_commands
+          @jobs_list_command.execute("")
+        end
+
+        private
+
+        def project
+          workflow.project
+        end
+
+        def workflow
+          pipeline.workflow
+        end
+
+        def job_collection
+          pipeline.job_collection
+        end
+
+        def add_commands
+          @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 ::Semaph::Commands::RerunWorkflowCommand.new(workflow), "rerun"
+          add_open_branch_command
+          add_open_workflow_command
+          add_github_commands
+          add_command ::Semaph::Commands::ReloadCommand.new, "reload" if ENV["SEMAPH_RELOAD"]
+        end
+
+        def add_open_workflow_command
+          add_command(
+            ::Semaph::Commands::VisitUrlCommand.new(
+              "https://#{project.client.host}/workflows/#{workflow.id}",
+              "browse to workflow",
+            ),
+            "open-workflow",
+          )
+        end
+
+        def add_open_branch_command
+          add_command(
+            ::Semaph::Commands::VisitUrlCommand.new(
+              "https://#{project.client.host}/branches/#{workflow.branch_id}",
+              "browse to branch in semaphore",
+            ),
+            "open-branch",
+          )
+        end
+
+        def add_github_commands
+          return unless workflow.project.github_url
+
+          add_github_branch
+          add_github_commit
+        end
+
+        def add_github_branch
+          add_command(
+            ::Semaph::Commands::VisitUrlCommand.new(
+              "#{workflow.project.github_url}/tree/#{workflow.branch}",
+              "browse to the branch in github",
+            ),
+            "open-github-branch",
+          )
+        end
+
+        def add_github_commit
           add_command(
-            ::Semaph::Commands::ReloadCommand.new(job_collection, "reload jobs"),
-            "reload-jobs",
+            ::Semaph::Commands::VisitUrlCommand.new(
+              "#{workflow.project.github_url}/commit/#{workflow.sha}",
+              "browse to the commit in github",
+            ),
+            "open-github-commit",
           )
-          add_command JobsListCommand.new(job_collection), "list-jobs"
         end
       end
     end

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

@@ -1,5 +1,5 @@
-require "semaph/commands/visit_url_command"
 require "semaph/commands/reload_command"
+require "semaph/commands/visit_url_command"
 require "semaph/shells/project/workflows_list_command"
 require "semaph/shells/project/workflows_select_command"
 require "shell_shock/context"
@@ -8,30 +8,33 @@ module Semaph
   module Shells
     module Project
       class ProjectShell
+        attr_reader :project
+
         include ShellShock::Context
 
         def initialize(project)
-          @prompt = "🏗  #{project.client.host} #{project.name} > "
-          workflow_collection = project.workflow_collection
-          add_github_command(project)
-          add_command(
-            ::Semaph::Commands::ReloadCommand.new(workflow_collection, "reload workflows"),
-            "reload-workflows",
-          )
-          add_command(
-            ::Semaph::Commands::VisitUrlCommand.new(
-              "https://#{project.client.host}/projects/#{project.name}",
-              "browse to project",
-            ),
-            "open-project",
-          )
-          add_command WorkflowsListCommand.new(workflow_collection), "list-workflows"
-          add_command WorkflowsSelectCommand.new(workflow_collection), "select-workflow"
+          @project = project
+          @prompt = "🏗  #{project.client.name} #{project.name} > "
+          add_commands
+          @workflows_list_command.execute("")
         end
 
         private
 
-        def add_github_command(project)
+        def workflow_collection
+          project.workflow_collection
+        end
+
+        def add_commands
+          add_github_command
+          add_open_project_command
+          @workflows_list_command = WorkflowsListCommand.new(workflow_collection)
+          add_command @workflows_list_command, "list-workflows"
+          add_command WorkflowsSelectCommand.new(workflow_collection), "select-workflow"
+          add_command ::Semaph::Commands::ReloadCommand.new, "reload" if ENV["SEMAPH_RELOAD"]
+        end
+
+        def add_github_command
           return unless project.github_url
 
           add_command(
@@ -42,6 +45,16 @@ module Semaph
             "open-github",
           )
         end
+
+        def add_open_project_command
+          add_command(
+            ::Semaph::Commands::VisitUrlCommand.new(
+              "https://#{project.client.host}/projects/#{project.name}",
+              "browse to project",
+            ),
+            "open-project",
+          )
+        end
       end
     end
   end

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

@@ -13,6 +13,7 @@ module Semaph
         end
 
         def execute(branch)
+          @workflow_collection.reload
           @workflow_collection.all.each_with_index do |workflow, index|
             next unless workflow.branch.include?(branch)
 

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

@@ -1,4 +1,5 @@
 require "semaph/shells/workflow/workflow_shell"
+require "semaph/shells/pipeline/pipeline_shell"
 
 module Semaph
   module Shells
@@ -14,9 +15,15 @@ module Semaph
 
         def execute(index_string)
           index = index_string.to_i - 1
-          ::Semaph::Shells::Workflow::WorkflowShell.new(
-            @workflow_collection.all[index],
-          ).push
+
+          workflow = @workflow_collection.all[index]
+
+          unless workflow
+            puts "There is no workflow at position #{index}"
+            return
+          end
+
+          ::Semaph::Shells::Workflow::WorkflowShell.new(workflow).push
         end
       end
     end

data/lib/semaph/shells/workflow/pipelines_list_command.rb

@@ -10,8 +10,9 @@ module Semaph
         end
 
         def execute(_whatever)
+          @pipeline_collection.reload
           @pipeline_collection.all.each_with_index do |pipeline, index|
-            puts "#{index + 1} #{pipeline.yaml} #{pipeline.state} #{pipeline.result}"
+            puts "#{index + 1} #{pipeline.description}"
           end
         end
       end

data/lib/semaph/shells/workflow/pipelines_select_command.rb

@@ -14,9 +14,15 @@ module Semaph
 
         def execute(index_string)
           index = index_string.to_i - 1
-          ::Semaph::Shells::Pipeline::PipelineShell.new(
-            @pipeline_collection.all[index],
-          ).push
+
+          pipeline = @pipeline_collection.all[index]
+
+          unless pipeline
+            puts "There is no pipeline at position #{index}"
+            return
+          end
+
+          ::Semaph::Shells::Pipeline::PipelineShell.new(pipeline).push
         end
       end
     end

data/lib/semaph/shells/workflow/workflow_shell.rb

@@ -1,5 +1,7 @@
-require "semaph/commands/visit_url_command"
 require "semaph/commands/reload_command"
+require "semaph/commands/rerun_workflow_command"
+require "semaph/commands/stop_workflow_command"
+require "semaph/commands/visit_url_command"
 require "semaph/shells/workflow/pipelines_list_command"
 require "semaph/shells/workflow/pipelines_select_command"
 require "shell_shock/context"
@@ -8,15 +10,40 @@ module Semaph
   module Shells
     module Workflow
       class WorkflowShell
+        attr_reader :workflow
+
         include ShellShock::Context
 
         def initialize(workflow)
           @workflow = workflow
-          project = @workflow.project
-          @prompt = "🏗  #{project.client.host} #{project.name} #{workflow.id} > "
-          pipeline_collection = workflow.pipeline_collection
-          add_command PipelinesListCommand.new(pipeline_collection), "list-pipelines"
+          @prompt = "🏗  #{project.client.name} #{project.name} #{workflow.id} > "
+          add_commands
+          @list_command.execute("")
+        end
+
+        private
+
+        def project
+          @workflow.project
+        end
+
+        def pipeline_collection
+          @workflow.pipeline_collection
+        end
+
+        def add_commands
+          @list_command = PipelinesListCommand.new(pipeline_collection)
+          add_command @list_command, "list-pipelines"
           add_command PipelinesSelectCommand.new(pipeline_collection), "select-pipeline"
+          add_command ::Semaph::Commands::RerunWorkflowCommand.new(workflow), "rerun"
+          add_command ::Semaph::Commands::StopWorkflowCommand.new(workflow), "stop"
+          add_open_branch_command
+          add_open_workflow_command
+          add_github_commands
+          add_command ::Semaph::Commands::ReloadCommand.new, "reload" if ENV["SEMAPH_RELOAD"]
+        end
+
+        def add_open_workflow_command
           add_command(
             ::Semaph::Commands::VisitUrlCommand.new(
               "https://#{project.client.host}/workflows/#{workflow.id}",
@@ -24,6 +51,9 @@ module Semaph
             ),
             "open-workflow",
           )
+        end
+
+        def add_open_branch_command
           add_command(
             ::Semaph::Commands::VisitUrlCommand.new(
               "https://#{project.client.host}/branches/#{workflow.branch_id}",
@@ -31,18 +61,16 @@ module Semaph
             ),
             "open-branch",
           )
-          add_github_commands(workflow)
-          add_command(
-            ::Semaph::Commands::ReloadCommand.new(pipeline_collection, "reload pipelines"),
-            "reload-pipelines",
-          )
         end
 
-        private
-
-        def add_github_commands(workflow)
+        def add_github_commands
           return unless workflow.project.github_url
 
+          add_github_branch
+          add_github_commit
+        end
+
+        def add_github_branch
           add_command(
             ::Semaph::Commands::VisitUrlCommand.new(
               "#{workflow.project.github_url}/tree/#{workflow.branch}",
@@ -50,6 +78,9 @@ module Semaph
             ),
             "open-github-branch",
           )
+        end
+
+        def add_github_commit
           add_command(
             ::Semaph::Commands::VisitUrlCommand.new(
               "#{workflow.project.github_url}/commit/#{workflow.sha}",

data/lib/semaph/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semaph
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mark Ryall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -91,6 +91,8 @@ files:
 - lib/semaph.rb
 - lib/semaph/api.rb
 - lib/semaph/commands/reload_command.rb
+- lib/semaph/commands/rerun_workflow_command.rb
+- lib/semaph/commands/stop_workflow_command.rb
 - lib/semaph/commands/visit_url_command.rb
 - lib/semaph/formatting.rb
 - lib/semaph/model/job.rb
@@ -108,6 +110,8 @@ files:
 - lib/semaph/shells/organisations/organisations_select_command.rb
 - lib/semaph/shells/organisations/organisations_shell.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
 - lib/semaph/shells/project/workflows_list_command.rb