shipit-engine 0.39.0 → 0.40.0

data/app/models/shipit/deploy_spec/lerna_discovery.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'json'
 
 module Shipit
@@ -23,23 +24,23 @@ module Shipit
       end
 
       def discover_lerna_checklist
-        if lerna?
-          command = if lerna_lerna >= LATEST_MAJOR_VERSION
-            'lerna version'
-          else
-            %(
+        return unless lerna?
+
+        command = if lerna_lerna >= LATEST_MAJOR_VERSION
+                    'lerna version'
+                  else
+                    %(
               lerna publish --skip-npm
               && git add -A
               && git push --follow-tags
             )
-          end
+                  end
 
-          [%(
+        [%(
             <strong>Don't forget version and tag before publishing!</strong>
             You can do this with:<br/>
             <pre>#{command}</pre>
            )]
-        end
       end
 
       def lerna?
@@ -72,47 +73,47 @@ module Shipit
 
       def publish_lerna_packages
         return publish_independent_packages if lerna_version == 'independent'
+
         publish_fixed_version_packages
       end
 
       def publish_independent_packages
-        command = if lerna_lerna >= LATEST_MAJOR_VERSION
+        if lerna_lerna >= LATEST_MAJOR_VERSION
           [
             'assert-lerna-independent-version-tags',
-            'publish-lerna-independent-packages',
+            'publish-lerna-independent-packages'
           ]
         else
           [
             'assert-lerna-independent-version-tags',
-            'publish-lerna-independent-packages-legacy',
+            'publish-lerna-independent-packages-legacy'
           ]
         end
-        command
       end
 
       def publish_fixed_version_packages
         check_tags = 'assert-lerna-fixed-version-tag'
         version = lerna_version
         publish = if lerna_lerna >= LATEST_MAJOR_VERSION
-          %W(
-            node_modules/.bin/lerna publish
-            from-git
-            --yes
-            --dist-tag #{dist_tag(version)}
-          ).join(" ")
-        else
-          # `yarn publish` requires user input, so always use npm.
-          %W(
-            node_modules/.bin/lerna publish
-            --yes
-            --skip-git
-            --repo-version #{version}
-            --force-publish=*
-            --npm-tag #{dist_tag(version)}
-            --npm-client=npm
-            --skip-npm=false
-          ).join(" ")
-        end
+                    %W[
+                      node_modules/.bin/lerna publish
+                      from-git
+                      --yes
+                      --dist-tag #{dist_tag(version)}
+                    ].join(" ")
+                  else
+                    # `yarn publish` requires user input, so always use npm.
+                    %W[
+                      node_modules/.bin/lerna publish
+                      --yes
+                      --skip-git
+                      --repo-version #{version}
+                      --force-publish=*
+                      --npm-tag #{dist_tag(version)}
+                      --npm-client=npm
+                      --skip-npm=false
+                    ].join(" ")
+                  end
 
         [check_tags, publish]
       end

data/app/models/shipit/deploy_spec/npm_discovery.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'json'
 
 module Shipit
@@ -27,19 +28,19 @@ module Shipit
       end
 
       def discover_yarn_checklist
-        if yarn?
-          [%(<strong>Don't forget version and tag before publishing!</strong> You can do this with:<br/>
+        return unless yarn?
+
+        [%(<strong>Don't forget version and tag before publishing!</strong> You can do this with:<br/>
             yarn version --new-version <strong>&lt;major|minor|patch&gt;</strong>
             && git push --follow-tags</pre>)]
-        end
       end
 
       def discover_npm_checklist
-        if npm?
-          [%(<strong>Don't forget version and tag before publishing!</strong> You can do this with:<br/>
+        return unless npm?
+
+        [%(<strong>Don't forget version and tag before publishing!</strong> You can do this with:<br/>
             npm version <strong>&lt;major|minor|patch&gt;</strong>
             && git push --follow-tags</pre>)]
-        end
       end
 
       def npm?
@@ -59,6 +60,7 @@ module Shipit
         # An 1.0.0-beta.1 would be installable using both:
         # `yarn add package@1.0.0-beta.1` and `yarn add package@next`
         return 'next' if ['-beta', '-alpha', '-rc', '-next'].any? { |tag| version.include?(tag) }
+
         'latest'
       end
 
@@ -104,21 +106,25 @@ module Shipit
         # default to private deploy when we enforce a publishConfig
         if enforce_publish_config?
           return PRIVATE if config.blank?
+
           config['access'] || PRIVATE
         end
 
         return PUBLIC if config.blank?
+
         config['access'] || PUBLIC
       end
 
       def scoped_package?
         return false if Shipit.npm_org_scope.nil?
+
         package_name.start_with?(Shipit.npm_org_scope)
       end
 
       def enforce_publish_config?
         enforce = Shipit.enforce_publish_config
         return false if enforce.nil? || enforce.to_s == "0"
+
         true
       end
 
@@ -148,9 +154,7 @@ module Shipit
         scope = Shipit.npm_org_scope
         prefix = scoped_package? ? "#{scope}:registry" : "registry"
 
-        if publish_config_access == PUBLIC
-          return "#{prefix}=#{NPM_REGISTRY}"
-        end
+        return "#{prefix}=#{NPM_REGISTRY}" if publish_config_access == PUBLIC
 
         "#{prefix}=#{Shipit.private_npm_registry}"
       end
@@ -164,15 +168,16 @@ module Shipit
         publish = "npm publish --tag #{dist_tag(package_version)} --access #{publish_config_access}"
 
         return [check_tags, generate_npmrc, publish] if enforce_publish_config?
+
         [check_tags, publish]
       end
 
       def js_command(command_args)
         runner = if yarn?
-          'yarn'
-        else
-          'npm'
-        end
+                   'yarn'
+                 else
+                   'npm'
+                 end
 
         "#{runner} #{command_args}"
       end

data/app/models/shipit/deploy_spec/pypi_discovery.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Shipit
   class DeploySpec
     module PypiDiscovery
@@ -15,10 +16,10 @@ module Shipit
       end
 
       def discover_pypi_checklist
-        if egg?
-          [%(<strong>Don't forget to add a tag before deploying!</strong> You can do this with:
+        return unless egg?
+
+        [%(<strong>Don't forget to add a tag before deploying!</strong> You can do this with:
             git tag -a -m "Version <strong>x.y.z</strong>" v<strong>x.y.z</strong> && git push --tags)]
-        end
       end
 
       def egg?
@@ -33,7 +34,7 @@ module Shipit
         [
           "assert-egg-version-tag #{setup_dot_py}",
           'python setup.py register sdist',
-          'twine upload dist/*',
+          'twine upload dist/*'
         ]
       end
     end

data/app/models/shipit/deploy_spec/rubygems_discovery.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Shipit
   class DeploySpec
     module RubygemsDiscovery

data/app/models/shipit/deploy_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'pathname'
 
 module Shipit
@@ -47,11 +48,9 @@ module Shipit
     def config(*keys, &default)
       default ||= -> { nil }
       keys.flatten.reduce(@config) do |hash, key|
-        if hash.is_a?(Hash)
-          hash.fetch(key) { return default.call }
-        else
-          return default.call
-        end
+        return default.call unless hash.is_a?(Hash)
+
+        hash.fetch(key) { return default.call }
       end
     end
 
@@ -80,7 +79,7 @@ module Shipit
         config('dependencies', 'override') { discover_dependencies_steps || [] }
       end
     end
-    alias_method :dependencies_steps!, :dependencies_steps
+    alias dependencies_steps! dependencies_steps
 
     def maximum_commits_per_deploy
       config('deploy', 'max_commits') { 8 }
@@ -95,9 +94,9 @@ module Shipit
     end
 
     def release_status_delay
-      if delay = config('status', 'delay') { config('deploy', 'interval') { 0 } }
-        Duration.parse(delay)
-      end
+      return unless delay = config('status', 'delay') { config('deploy', 'interval') { 0 } }
+
+      Duration.parse(delay)
     end
 
     def pause_between_deploys
@@ -193,7 +192,7 @@ module Shipit
 
     def merge_request_merge_method
       method = config('merge', 'method')
-      method if %w(merge rebase squash).include?(method)
+      method if %w[merge rebase squash].include?(method)
     end
 
     def merge_request_required_statuses
@@ -213,11 +212,11 @@ module Shipit
     end
 
     def revalidate_merge_requests_after
-      if timeout = config('merge', 'revalidate_after')
-        begin
-          Duration.parse(timeout)
-        rescue Duration::ParseError
-        end
+      return unless timeout = config('merge', 'revalidate_after')
+
+      begin
+        Duration.parse(timeout)
+      rescue Duration::ParseError
       end
     end
 
@@ -226,11 +225,11 @@ module Shipit
     end
 
     def max_divergence_age
-      if timeout = config('merge', 'max_divergence', 'age')
-        begin
-          Duration.parse(timeout)
-        rescue Duration::ParseError
-        end
+      return unless timeout = config('merge', 'max_divergence', 'age')
+
+      begin
+        Duration.parse(timeout)
+      rescue Duration::ParseError
       end
     end
 
@@ -255,6 +254,7 @@ module Shipit
     def around_steps(section)
       steps = yield
       return unless steps
+
       config(section, 'pre') { [] } + steps + config(section, 'post') { [] }
     end
 
@@ -262,24 +262,19 @@ module Shipit
       config
     end
 
-    def discover_review_checklist
-    end
+    def discover_review_checklist; end
 
     def discover_task_definitions
       config('tasks') || {}
     end
 
-    def discover_dependencies_steps
-    end
+    def discover_dependencies_steps; end
 
-    def discover_deploy_steps
-    end
+    def discover_deploy_steps; end
 
-    def discover_rollback_steps
-    end
+    def discover_rollback_steps; end
 
-    def discover_fetch_deployed_revision_steps
-    end
+    def discover_fetch_deployed_revision_steps; end
 
     def discover_machine_env
       {}

data/app/models/shipit/deploy_stats.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Shipit
   class DeployStats
     delegate :empty?, to: :@deploys
@@ -14,6 +15,7 @@ module Shipit
 
     def average_duration
       return if empty?
+
       @durations.sum / @durations.length.to_f
     end
 
@@ -27,11 +29,13 @@ module Shipit
 
     def median_duration
       return if @durations.empty?
+
       (sorted_durations[(@durations.length - 1) / 2] + sorted_durations[@durations.length / 2]) / 2.0
     end
 
     def success_rate
       return if empty?
+
       (@deploys.count(&:success?) / @deploys.length.to_f) * 100
     end
 
@@ -39,7 +43,7 @@ module Shipit
       {
         count: percent_change(compare_stats.count, count),
         average_duration: percent_change(compare_stats.average_duration, average_duration),
-        median_duration: percent_change(compare_stats.median_duration, median_duration),
+        median_duration: percent_change(compare_stats.median_duration, median_duration)
       }
     end
 
@@ -52,6 +56,7 @@ module Shipit
     def percent_change(from, to)
       return if to.nil? || from.nil?
       return to * 100 if from.zero?
+
       ((to - from) / from.to_f) * 100
     end
   end

data/app/models/shipit/duration.rb

@@ -1,21 +1,22 @@
 # frozen_string_literal: true
+
 module Shipit
   class Duration < ActiveSupport::Duration
     ParseError = Class.new(ArgumentError)
 
-    FORMAT = %r{
+    FORMAT = /
       \A
       (?<days>\d+d)?
       (?<hours>\d+h)?
       (?<minutes>\d+m)?
       (?<seconds>\d+s?)?
       \z
-    }x
+    /x
     UNITS = {
       's' => :seconds,
       'm' => :minutes,
       'h' => :hours,
-      'd' => :days,
+      'd' => :days
     }.freeze
 
     class << self
@@ -25,6 +26,7 @@ module Shipit
         unless match = FORMAT.match(value.to_s)
           raise ParseError, "not a duration: #{value.inspect}"
         end
+
         parts = []
         UNITS.each_value do |unit|
           if value = match[unit]

data/app/models/shipit/ephemeral_commit_checks.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 module Shipit
   class EphemeralCommitChecks
-    FINAL_STATUSES = %w(failed error success).freeze
+    FINAL_STATUSES = %w[failed error success].freeze
 
     def initialize(commit)
       @commit = commit
@@ -13,8 +14,8 @@ module Shipit
     def run
       self.status = 'running'
       commands = StackCommands.new(stack)
-      commands.with_temporary_working_directory(commit: commit) do |directory|
-        deploy_spec = DeploySpec::FileSystem.new(directory, stack.environment)
+      commands.with_temporary_working_directory(commit:) do |directory|
+        deploy_spec = DeploySpec::FileSystem.new(directory, stack)
         capture_all(build_commands(deploy_spec.dependencies_steps, chdir: directory))
         capture_all(build_commands(deploy_spec.review_checks, chdir: directory))
       end
@@ -22,7 +23,7 @@ module Shipit
     rescue Command::Error
       self.status = 'failed'
       self
-    rescue
+    rescue StandardError
       self.status = 'error'
       raise
     else
@@ -46,7 +47,7 @@ module Shipit
     private
 
     def build_commands(commands, chdir:)
-      commands.map { |c| Command.new(c, env: Shipit.env, chdir: chdir) }
+      commands.map { |c| Command.new(c, env: Shipit.env, chdir:) }
     end
 
     def capture_all(commands)
@@ -59,8 +60,8 @@ module Shipit
       command.stream! do |line|
         write(line)
       end
-    rescue Command::Error => error
-      write(error.message)
+    rescue Command::Error => e
+      write(e.message)
       raise
     ensure
       write("\n")

data/app/models/shipit/github_hook.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Shipit
   class GithubHook < Record
     # TODO: app-migration, delete class

data/app/models/shipit/github_status.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Shipit
   module GithubStatus
     CACHE_KEY = 'github::status'

data/app/models/shipit/hook.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Shipit
   class Hook < Record
     class DeliverySigner
@@ -46,7 +47,7 @@ module Shipit
           'Content-Type' => content_type,
           'X-Shipit-Event' => event,
           'X-Shipit-Signature' => signature,
-          'Accept' => '*/*',
+          'Accept' => '*/*'
         }
       end
 
@@ -63,10 +64,10 @@ module Shipit
 
     CONTENT_TYPES = {
       'json' => 'application/json',
-      'form' => 'application/x-www-form-urlencoded',
+      'form' => 'application/x-www-form-urlencoded'
     }.freeze
 
-    EVENTS = %w(
+    EVENTS = %w[
       stack
       review_stack
       task
@@ -78,7 +79,7 @@ module Shipit
       merge_status
       merge
       pull_request
-    ).freeze
+    ].freeze
 
     belongs_to :stack, required: false
     has_many :deliveries
@@ -96,10 +97,11 @@ module Shipit
     class << self
       def emit(event, stack, payload)
         raise "#{event} is not declared in Shipit::Hook::EVENTS" unless EVENTS.include?(event.to_s)
+
         Shipit::EmitEventJob.perform_later(
           event: event.to_s,
           stack_id: stack&.id,
-          payload: coerce_payload(payload),
+          payload: coerce_payload(payload)
         )
         deliver_internal_hooks(event, stack, payload)
       end
@@ -142,7 +144,7 @@ module Shipit
         url: delivery_url,
         content_type: CONTENT_TYPES[content_type],
         payload: serialize_payload(payload),
-        secret: secret,
+        secret:
       )
     end
 

data/app/models/shipit/membership.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Shipit
   class Membership < Record
     belongs_to :team, required: true