semaph 0.2.0 → 0.7.0

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

@@ -1,9 +1,9 @@
+require "semaph/formatting"
+
 module Semaph
   module Shells
     module Project
       class WorkflowsListCommand
-        TIME_FORMAT = "%Y-%m-%d %H:%M:%S".freeze
-
         attr_reader :usage, :help
 
         def initialize(workflow_collection)
@@ -13,25 +13,13 @@ module Semaph
         end
 
         def execute(branch)
+          @workflow_collection.reload
           @workflow_collection.all.each_with_index do |workflow, index|
             next unless workflow.branch.include?(branch)
 
-            puts description(index, workflow)
+            puts [::Semaph::Formatting.index(index + 1), workflow.description].join(" ")
           end
         end
-
-        private
-
-        def description(index, workflow)
-          [
-            index + 1,
-            workflow.created_at.strftime(TIME_FORMAT),
-            "SHA",
-            workflow.sha,
-            "on branch",
-            workflow.branch,
-          ].join(" ")
-        end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+require "semaph/formatting"
+
 module Semaph
   module Shells
     module Workflow
@@ -10,8 +12,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 [::Semaph::Formatting.index(index + 1), pipeline.description].join(" ")
           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,4 @@
-require "semaph/commands/visit_url_command"
-require "semaph/commands/reload_command"
+require "semaph/commands"
 require "semaph/shells/workflow/pipelines_list_command"
 require "semaph/shells/workflow/pipelines_select_command"
 require "shell_shock/context"
@@ -8,55 +7,27 @@ 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"
-          add_command PipelinesSelectCommand.new(pipeline_collection), "select-pipeline"
-          add_command(
-            ::Semaph::Commands::VisitUrlCommand.new(
-              "https://#{project.client.host}/workflows/#{workflow.id}",
-              "browse to workflow",
-            ),
-            "open-workflow",
-          )
-          add_command(
-            ::Semaph::Commands::VisitUrlCommand.new(
-              "https://#{project.client.host}/branches/#{workflow.branch_id}",
-              "browse to branch in semaphore",
-            ),
-            "open-branch",
-          )
-          add_github_commands(workflow)
-          add_command(
-            ::Semaph::Commands::ReloadCommand.new(pipeline_collection, "reload pipelines"),
-            "reload-pipelines",
-          )
+          @prompt = "🏗  #{project.client.name} #{project.name} #{workflow.id} > "
+          add_commands
+          @list_command.execute("")
         end
 
         private
 
-        def add_github_commands(workflow)
-          return unless workflow.project.github_url
-
-          add_command(
-            ::Semaph::Commands::VisitUrlCommand.new(
-              "#{workflow.project.github_url}/tree/#{workflow.branch}",
-              "browse to the branch in github",
-            ),
-            "open-github-branch",
-          )
-          add_command(
-            ::Semaph::Commands::VisitUrlCommand.new(
-              "#{workflow.project.github_url}/commit/#{workflow.sha}",
-              "browse to the commit in github",
-            ),
-            "open-github-commit",
-          )
+        def add_commands
+          pipeline_collection = @workflow.pipeline_collection
+          @list_command = PipelinesListCommand.new(pipeline_collection)
+          add_command @list_command, "list-pipelines", "ls"
+          add_command PipelinesSelectCommand.new(pipeline_collection), "select-pipeline", "cd"
+          add_command ::Semaph::Commands::ReloadCommand.new, "reload" if ENV["SEMAPH_RELOAD"]
+          ::Semaph::Commands.workflow_commands(self, workflow)
         end
       end
     end

data/lib/semaph/version.rb

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

data/semaph.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "shell_shock"
 
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rubocop"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semaph
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mark Ryall
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: api client and shell for api
 email:
 - mark@ryall.name
@@ -89,8 +103,11 @@ files:
 - bin/setup
 - exe/semaph
 - lib/semaph.rb
-- lib/semaph/api.rb
+- lib/semaph/client.rb
+- lib/semaph/commands.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
@@ -99,6 +116,8 @@ files:
 - lib/semaph/model/pipeline_collection.rb
 - lib/semaph/model/project.rb
 - lib/semaph/model/project_collection.rb
+- lib/semaph/model/promotion.rb
+- lib/semaph/model/promotion_collection.rb
 - lib/semaph/model/workflow.rb
 - lib/semaph/model/workflow_collection.rb
 - lib/semaph/shells/organisation/organisation_shell.rb
@@ -107,8 +126,16 @@ 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_debug_command.rb
+- lib/semaph/shells/pipeline/job_log_command.rb
+- lib/semaph/shells/pipeline/job_log_grep_command.rb
+- lib/semaph/shells/pipeline/job_show_command.rb
+- lib/semaph/shells/pipeline/job_stop_command.rb
 - lib/semaph/shells/pipeline/jobs_list_command.rb
+- lib/semaph/shells/pipeline/jobs_poll_command.rb
 - lib/semaph/shells/pipeline/pipeline_shell.rb
+- 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/workflows_list_command.rb
 - lib/semaph/shells/project/workflows_select_command.rb
@@ -124,7 +151,7 @@ metadata:
   homepage_uri: http://github.com/markryall/semaph
   source_code_uri: http://github.com/markryall/semaph
   changelog_uri: http://github.com/markryall/semaph
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: client for semaphore 2
 test_files: []

data/lib/semaph/api.rb

@@ -1,61 +0,0 @@
-require "faraday"
-require "json"
-
-module Semaph
-  # Refer to https://docs.semaphoreci.com/reference/api-v1alpha/
-  class Api
-    attr_reader :host
-
-    def initialize(token, host)
-      @token = token
-      @host = host
-      @base = "https://#{host}/api/v1alpha"
-    end
-
-    def projects
-      get "projects"
-    end
-
-    def workflows(project_id)
-      get "plumber-workflows", { project_id: project_id }
-    end
-
-    def pipelines(options)
-      get "pipelines", options
-    end
-
-    def pipeline(id)
-      get "pipelines/#{id}", { detailed: true }
-    end
-
-    def job(id)
-      get "jobs/#{id}"
-    end
-
-    private
-
-    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|
-        pp hash if ENV["SEMAPH_DEBUG"]
-      end
-    end
-
-    def headers
-      {
-        "Authorization" => "Token #{@token}",
-        "Content-Type" => "application/json",
-        "Accept" => "application/json",
-      }
-    end
-
-    def check_response(response, url)
-      return JSON.parse(response.body) if response.status == 200
-
-      puts "http response #{response.status} received for #{url}:\n#{response.body}"
-      exit 1
-    end
-  end
-end