Fixing CI issues

Author: dutow

.github/workflows/dev-setup.yml

@@ -20,7 +20,13 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Prepare dev env file
-        run: cp .env.development.example .env.development
+        run: |
+          cp .env.development.example .env.development
+          # Dev env requires Active Record encryption keys for OAuth token storage.
+          for key in RAILS_AR_ENCRYPTION_PRIMARY_KEY RAILS_AR_ENCRYPTION_DETERMINISTIC_KEY RAILS_AR_ENCRYPTION_SALT; do
+            value=$(ruby -rsecurerandom -e 'puts SecureRandom.alphanumeric(32)')
+            sed -i "s|^${key}=.*|${key}=${value}|" .env.development
+          done
 
       - name: Start dev stack
         run: make dev-detach

Containerfile.dev

@@ -12,7 +12,9 @@ RUN apt-get update -qq && \
 WORKDIR /app
 
 COPY Gemfile Gemfile.lock ./
-RUN bundle install --jobs=4 --retry=3
+RUN BUNDLER_VERSION="$(awk '/^BUNDLED WITH/{getline; gsub(/^ +/, ""); print}' Gemfile.lock)" && \
+    gem install bundler -v "$BUNDLER_VERSION" && \
+    bundle install --jobs=4 --retry=3
 
 COPY . .
 

Dockerfile

@@ -15,7 +15,9 @@ RUN apt-get update -qq && \
 WORKDIR /app
 
 COPY Gemfile Gemfile.lock ./
-RUN bundle install --jobs=4 --retry=3
+RUN BUNDLER_VERSION="$(awk '/^BUNDLED WITH/{getline; gsub(/^ +/, ""); print}' Gemfile.lock)" && \
+    gem install bundler -v "$BUNDLER_VERSION" && \
+    bundle install --jobs=4 --retry=3
 
 COPY . .
 

app/controllers/drafts_controller.rb

@@ -10,11 +10,11 @@ def index
     @state = (params[:state].presence_in(%w[all in_progress sent failed]) || "all")
     scope  = current_user.outgoing_drafts
     @drafts = case @state
-              when "in_progress" then scope.where(status: %w[idle sending]).where(last_send_error: nil)
-              when "sent"        then scope.sent
-              when "failed"      then scope.idle.where.not(last_send_error: nil)
-              else                    scope
-              end
+    when "in_progress" then scope.where(status: %w[idle sending]).where(last_send_error: nil)
+    when "sent"        then scope.sent
+    when "failed"      then scope.idle.where.not(last_send_error: nil)
+    else                    scope
+    end
     @drafts = @drafts
                 .includes(:topic, :reply_to_message, :sender_alias, :sent_message)
                 .order(Arel.sql("COALESCE(sent_at, updated_at) DESC"))

app/models/outgoing_draft.rb

@@ -3,7 +3,7 @@ class OutgoingDraft < ApplicationRecord
   STATUS_SENDING = "sending"
   STATUS_SENT    = "sent"
 
-  STATUSES = [STATUS_IDLE, STATUS_SENDING, STATUS_SENT].freeze
+  STATUSES = [ STATUS_IDLE, STATUS_SENDING, STATUS_SENT ].freeze
 
   belongs_to :user
   belongs_to :topic
@@ -18,7 +18,7 @@ class OutgoingDraft < ApplicationRecord
   validates :user_id,
             uniqueness: {
               scope: :reply_to_message_id,
-              conditions: -> { where(status: [STATUS_IDLE, STATUS_SENDING]) }
+              conditions: -> { where(status: [ STATUS_IDLE, STATUS_SENDING ]) }
             },
             if: :active?
 

app/services/outgoing/message_builder.rb

@@ -21,8 +21,8 @@ def self.build(draft)
         message_id msg_id
         body       draft.body
       end
-      mail.content_type 'text/plain; charset=UTF-8'
-      mail.in_reply_to = draft.reply_to_message.message_id.to_s.gsub(/[<>]/, '')
+      mail.content_type "text/plain; charset=UTF-8"
+      mail.in_reply_to = draft.reply_to_message.message_id.to_s.gsub(/[<>]/, "")
       mail.references  = build_references(draft.reply_to_message)
 
       Result.new(encoded: mail.encoded, message_id: msg_id,
@@ -35,7 +35,7 @@ def self.build_references(parent)
       cur   = parent
       while cur && seen.add?(cur.id)
         if cur.message_id.present?
-          chain.unshift(cur.message_id.to_s.gsub(/[<>]/, ''))
+          chain.unshift(cur.message_id.to_s.gsub(/[<>]/, ""))
         end
         cur = cur.reply_to
       end

db/migrate/20260510103205_create_outgoing_drafts.rb

@@ -13,7 +13,7 @@ def change
       t.datetime :sending_started_at
       t.timestamps
     end
-    add_index :outgoing_drafts, [:user_id, :reply_to_message_id], unique: true,
+    add_index :outgoing_drafts, [ :user_id, :reply_to_message_id ], unique: true,
               name: "idx_drafts_user_parent_unique"
   end
 end

db/migrate/20260512120000_create_user_features.rb

@@ -5,6 +5,6 @@ def change
       t.string :feature, null: false
       t.datetime :created_at, null: false
     end
-    add_index :user_features, [:user_id, :feature], unique: true
+    add_index :user_features, [ :user_id, :feature ], unique: true
   end
 end

db/migrate/20260512120001_add_sent_state_to_outgoing_drafts.rb

@@ -5,15 +5,15 @@ def up
     add_column    :outgoing_drafts, :sent_at, :datetime, null: true
 
     remove_index :outgoing_drafts, name: :idx_drafts_user_parent_unique
-    add_index :outgoing_drafts, [:user_id, :reply_to_message_id],
+    add_index :outgoing_drafts, [ :user_id, :reply_to_message_id ],
               unique: true,
               where: "status IN ('idle','sending')",
               name:  :idx_drafts_user_parent_active_unique
   end
 
   def down
     remove_index :outgoing_drafts, name: :idx_drafts_user_parent_active_unique
-    add_index :outgoing_drafts, [:user_id, :reply_to_message_id],
+    add_index :outgoing_drafts, [ :user_id, :reply_to_message_id ],
               unique: true, name: :idx_drafts_user_parent_unique
 
     remove_column    :outgoing_drafts, :sent_at

spec/initializers/omniauth_setup_spec.rb

@@ -15,7 +15,7 @@
       OMNIAUTH_SETUP_PROC.call(env_with_query)
       expect(options[:scope]).to       include('gmail.send')
       expect(options[:access_type]).to eq('offline')
-      expect(options[:prompt]).to       eq('consent')
+      expect(options[:prompt]).to eq('consent')
     end
   end
 
@@ -25,7 +25,7 @@
       OMNIAUTH_SETUP_PROC.call(env_with_query)
       expect(options[:scope]).to       eq('email,profile')
       expect(options[:access_type]).to eq('online')
-      expect(options[:prompt]).to       eq('select_account')
+      expect(options[:prompt]).to eq('select_account')
     end
   end
 end