shipit-engine 0.31.0 → 0.32.0

data/lib/shipit/cast_value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module CastValue
     def to_boolean(value)

data/lib/shipit/command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pty'
 require 'shellwords'
 require 'fileutils'
@@ -27,7 +28,7 @@ module Shipit
 
     def initialize(*args, default_timeout: Shipit.default_inactivity_timeout, env: {}, chdir:)
       @args, options = parse_arguments(args)
-      @timeout = options['timeout'.freeze] || options[:timeout] || default_timeout
+      @timeout = options['timeout'] || options[:timeout] || default_timeout
       @env = env
       @chdir = chdir.to_s
       @timed_out = false
@@ -146,16 +147,16 @@ module Shipit
     def read_stream(io)
       touch_last_output_at
       loop do
-          yield_control
-          yield io.read_nonblock(MAX_READ)
-          touch_last_output_at
+        yield_control
+        yield io.read_nonblock(MAX_READ)
+        touch_last_output_at
       rescue IO::WaitReadable
-          if output_timed_out?
-            @timed_out = true
-            raise TimedOut
-          end
-          IO.select([io], nil, nil, 1)
-          retry
+        if output_timed_out?
+          @timed_out = true
+          raise TimedOut
+        end
+        IO.select([io], nil, nil, 1)
+        retry
       end
     rescue EOFError
     end
@@ -191,7 +192,7 @@ module Shipit
         # If we let the child a little bit of time, it solves it.
         retry_count -= 1
         if retry_count > 0
-          sleep 0.05
+          sleep(0.05)
           retry
         end
       end
@@ -215,7 +216,7 @@ module Shipit
           argument
         end
       end
-      return args, options
+      [args, options]
     end
 
     def running?

data/lib/shipit/commands.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class Commands
     class << self
@@ -6,13 +7,13 @@ module Shipit
       end
 
       def git_version
-        @git_version ||= parse_git_version(`git --version`)
+        @git_version ||= parse_git_version(%x(git --version))
       end
 
       def parse_git_version(raw_git_version)
-        raw_git_version =~ /(\d+\.\d+\.\d+)/
-        raise 'git command not found' unless $1
-        Gem::Version.new($1)
+        match_info = raw_git_version.match(/(\d+\.\d+\.\d+)/)
+        raise 'git command not found' unless match_info
+        Gem::Version.new(match_info[1])
       end
     end
 

data/lib/shipit/csv_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module CSVSerializer
     extend self

data/lib/shipit/deploy_commands.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class DeployCommands < TaskCommands
     def steps

data/lib/shipit/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class Engine < ::Rails::Engine
     isolate_namespace Shipit
@@ -32,12 +33,16 @@ module Shipit
       ActiveModel::Serializer.include(Engine.routes.url_helpers)
 
       if Shipit.github.oauth?
-        OmniAuth::Strategies::GitHub.configure path_prefix: '/github/auth'
-        app.middleware.use OmniAuth::Builder do
+        OmniAuth::Strategies::GitHub.configure(path_prefix: '/github/auth')
+        app.middleware.use(OmniAuth::Builder) do
           provider(:github, *Shipit.github.oauth_config)
         end
       end
 
+      if Shipit.enable_samesite_middleware?
+        app.config.middleware.insert_after(::Rack::Runtime, Shipit::SameSiteCookieMiddleware)
+      end
+
       app.config.after_initialize do
         ActionController::Base.include(Shipit::ActiveModelSerializersPatch)
       end

data/lib/shipit/environment_variables.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class EnvironmentVariables
     NotPermitted = Class.new(StandardError)
@@ -35,7 +36,7 @@ module Shipit
       allowed, disallowed = @env.partition { |k, _| allowed_variables.include?(k) }.map(&:to_h)
 
       error_message = "Variables #{disallowed.keys.to_sentence} have not been whitelisted"
-      raise NotPermitted.new(error_message) unless disallowed.empty?
+      raise NotPermitted, error_message unless disallowed.empty?
 
       allowed
     end

data/lib/shipit/first_parent_commits_iterator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class FirstParentCommitsIterator < OctokitIterator
     def each

data/lib/shipit/flock.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'English'
 require 'timeout'
 require 'pathname'

data/lib/shipit/github_app.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class GitHubApp
     include Mutex_m
@@ -31,9 +32,9 @@ module Shipit
       end
     end
 
-    DOMAIN = 'github.com'.freeze
+    DOMAIN = 'github.com'
     AuthenticationFailed = Class.new(StandardError)
-    API_STATUS_ID = 'brv1bkgrwx7q'.freeze
+    API_STATUS_ID = 'brv1bkgrwx7q'
 
     GITHUB_EXPECTED_TOKEN_LIFETIME = 60.minutes
     GITHUB_TOKEN_RAILS_CACHE_LIFETIME = 50.minutes
@@ -132,7 +133,7 @@ module Shipit
     end
 
     def url(*path)
-      @url ||= "https://#{domain}".freeze
+      @url ||= "https://#{domain}"
       path.empty? ? @url : File.join(@url, *path.map(&:to_s))
     end
 
@@ -173,9 +174,9 @@ module Shipit
           logger: Rails.logger,
           serializer: NullSerializer,
         )
-        builder.use GitHubHTTPCacheMiddleware
-        builder.use Octokit::Response::RaiseError
-        builder.adapter Faraday.default_adapter
+        builder.use(GitHubHTTPCacheMiddleware)
+        builder.use(Octokit::Response::RaiseError)
+        builder.adapter(Faraday.default_adapter)
       end
     end
 

data/lib/shipit/github_http_cache_middleware.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class GitHubHTTPCacheMiddleware < Faraday::Middleware
     def call(request_env)

data/lib/shipit/null_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module NullSerializer
     extend self

data/lib/shipit/octokit_check_runs.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module OctokitCheckRuns
   def check_runs(repo, sha, options = {})
-    paginate "#{Octokit::Repository.path repo}/commits/#{sha}/check-runs", options.reverse_merge(
+    paginate("#{Octokit::Repository.path(repo)}/commits/#{sha}/check-runs", options.reverse_merge(
       accept: 'application/vnd.github.antiope-preview+json',
-    )
+    ))
   end
 end
 

data/lib/shipit/octokit_iterator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class OctokitIterator
     include Enumerable
@@ -6,8 +7,8 @@ module Shipit
       if relation
         @response = relation.get(per_page: 100)
       else
-        yield Shipit.github.api
-        @response = Shipit.github.api.last_response
+        data = yield Shipit.github.api
+        @response = Shipit.github.api.last_response if data.present?
       end
     end
 

data/lib/shipit/paginator.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Shipit
   class Paginator
-    def initialize(resources, controller, order: {id: :desc}, max_page_size: 100, default_page_size: 30)
+    def initialize(resources, controller, order: { id: :desc }, max_page_size: 100, default_page_size: 30)
       @order = order
       @controller = controller
       @since = controller.params[:since].presence
@@ -15,7 +16,7 @@ module Shipit
     end
 
     def links
-      links = {first: link_to(since: nil, page_size: (page_size if page_size != @default_page_size))}
+      links = { first: link_to(since: nil, page_size: (page_size if page_size != @default_page_size)) }
       links[:next] = link_to(since: to_a.last.id) unless last_page?
       links
     end

data/lib/shipit/rollback_commands.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class RollbackCommands < DeployCommands
     def steps

data/lib/shipit/same_site_cookie_middleware.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module Shipit
+  class SameSiteCookieMiddleware
+    COOKIE_SEPARATOR = "\n"
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+
+      if headers && headers['Set-Cookie'] &&
+         Rack::Request.new(env).ssl?
+
+        set_cookies = headers['Set-Cookie'].split(COOKIE_SEPARATOR).compact
+        set_cookies.map! do |cookie|
+          cookie << '; Secure' if cookie !~ /;\s*secure/i
+          cookie << '; SameSite=None' unless cookie.match?(/;\s*samesite=/i)
+          cookie
+        end
+
+        headers['Set-Cookie'] = set_cookies.join(COOKIE_SEPARATOR)
+      end
+
+      [status, headers, body]
+    end
+  end
+end

data/lib/shipit/simple_message_verifier.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class SimpleMessageVerifier < ActiveSupport::MessageVerifier
     def initialize(secret, options = {})

data/lib/shipit/stack_commands.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'fileutils'
 
@@ -26,7 +27,7 @@ module Shipit
     end
 
     def fetch_deployed_revision
-      with_temporary_working_directory(commit: @stack.commits.last) do |dir|
+      with_temporary_working_directory(commit: @stack.commits.reachable.last) do |dir|
         spec = DeploySpec::FileSystem.new(dir, @stack.environment)
         outputs = spec.fetch_deployed_revision_steps!.map do |command_line|
           Command.new(command_line, env: env, chdir: dir).run
@@ -42,7 +43,7 @@ module Shipit
     end
 
     def with_temporary_working_directory(commit: nil)
-      commit ||= @stack.last_deployed_commit.presence || @stack.commits.last
+      commit ||= @stack.last_deployed_commit.presence || @stack.commits.reachable.last
 
       if !commit || !fetched?(commit).tap(&:run).success?
         @stack.acquire_git_cache_lock do

data/lib/shipit/stat.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   module Stat
     extend self

data/lib/shipit/task_commands.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
   class TaskCommands < Commands
     delegate :fetch, :fetched?, to: :stack_commands
@@ -52,6 +53,7 @@ module Shipit
       [
         git(
           'clone',
+          '--quiet',
           '--local',
           '--origin', 'cache',
           @stack.git_path,

data/lib/shipit/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Shipit
-  VERSION = '0.31.0'.freeze
+  VERSION = '0.32.0'
 end

data/lib/snippets/release-gem

@@ -50,8 +50,12 @@ spec = Gem::Specification.load(spec_path)
 if RubygemsAPI.published?(spec.name, spec.version)
   puts "#{spec.name} version #{spec.version} is already published."
   exit 0
+elsif !spec.metadata['allowed_push_host']
+  puts "Can't release the gem: spec.metadata['allowed_push_host'] must be defined."
+  exit 1
 else
-  Git.tag_and_push(spec.version) do
+  is_successful = Git.tag_and_push(spec.version) do
     system(*release_command)
   end
+  is_successful ? exit(0) : exit(1)
 end

data/lib/tasks/cron.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 namespace :cron do
   desc "Updates deployed revisions"
   task minutely: :environment do
@@ -5,6 +6,7 @@ namespace :cron do
     Shipit::Stack.schedule_continuous_delivery
     Shipit::GithubStatus.refresh_status
     Shipit::PullRequest.schedule_merges
+    Shipit::ReapDeadTasksJob.perform_later
   end
 
   task hourly: %i(rollup refresh_users)

data/lib/tasks/dev.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 namespace :dev do
   desc "Appends chunks to the last deploy, or specify with DEPLOY=id"
   task stream: :environment do
@@ -11,7 +12,7 @@ namespace :dev do
 
     deploy.update_attribute(:output, nil)
 
-    logger.info "Starting to stream data to deploy ##{deploy.id}"
+    logger.info("Starting to stream data to deploy ##{deploy.id}")
 
     loop do
       sentence = Faker::Lorem.sentence.split.map do |word|
@@ -22,7 +23,7 @@ namespace :dev do
         end
       end.join(' ')
 
-      logger.error sentence
+      logger.error(sentence)
 
       deploy.chunks.create(text: sentence + "\n")
       sleep 1

data/lib/tasks/shipit.rake

@@ -1,25 +1,26 @@
+# frozen_string_literal: true
 namespace :shipit do
   desc "Deploy from a running instance. "
   task deploy: :environment do
-      stack = ENV['stack']
-      revision = ENV['revision']
+    stack = ENV['stack']
+    revision = ENV['revision']
 
-      raise ArgumentError.new('The first argument has to be a stack, e.g. shopify/shipit/production') if stack.nil?
-      raise ArgumentError.new('The second argument has to be a revision') if revision.nil?
+    raise ArgumentError, 'The first argument has to be a stack, e.g. shopify/shipit/production' if stack.nil?
+    raise ArgumentError, 'The second argument has to be a revision' if revision.nil?
 
-      module Shipit
-        class Task
-          def write(text)
-            p text
-            chunks.create!(text: text)
-          end
+    module Shipit
+      class Task
+        def write(text)
+          p(text)
+          chunks.create!(text: text)
         end
       end
+    end
 
-      Shipit::Stack.run_deploy_in_foreground(stack: stack, revision: revision)
+    Shipit::Stack.run_deploy_in_foreground(stack: stack, revision: revision)
   rescue ArgumentError
-      p "Use this command as follows:"
-      p "bundle exec rake shipit:deploy stack='shopify/shipit/production' revision='$SHA'"
-      raise
+    p("Use this command as follows:")
+    p("bundle exec rake shipit:deploy stack='shopify/shipit/production' revision='$SHA'")
+    raise
   end
 end

data/lib/tasks/teams.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 namespace :teams do
   desc "Import the members of each team configured through the github.oauth.teams config"
   task fetch: :environment do

data/test/controllers/api/base_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -6,7 +7,7 @@ module Shipit
       test "authentication is required" do
         get :index
         assert_response :unauthorized
-        assert_equal({message: 'Bad credentials'}.to_json, response.body)
+        assert_equal({ message: 'Bad credentials' }.to_json, response.body)
       end
 
       test "with proper credentials the request is processed" do
@@ -17,7 +18,7 @@ module Shipit
       test "#index respond with a list of endpoints" do
         authenticate!
         get :index, format: :json
-        assert_equal({stacks_url: api_stacks_url}.to_json, response.body)
+        assert_equal({ stacks_url: api_stacks_url }.to_json, response.body)
       end
     end
   end