msgr 1.1.0.1.b306 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 825f7f9063e5ea4ca261b9d330c973b6ec59adbe9da2373c1f6f955a2a037bee
-  data.tar.gz: 2224da2ad3cffe13a2eac046d0b933d185acc5a8448a8bbb887941241356872c
+  metadata.gz: 13657fc492608f204e15feb6dd99b4201ae0de4972c6251970009fecab1f4343
+  data.tar.gz: 99b4dbd131d80b3d1ab7b638b78af8a3ec91d43f3a18f30bc7bec073cdd1c89d
 SHA512:
-  metadata.gz: a61b860974d558e0390a4b8810a280f8db6750dc2974b47cf2a89b8448a8084980ff3843adb62726a1327be697340eae67a0a7f307cd1e78a9b84fbf136bd442
-  data.tar.gz: 02115da727b8540a3d7d1a2bc38a562ab7ea5a7942fed5ee9fa410cc2ded9514e591332406d06db9c0ad0084e181e8df77ae5c1526fd9390b140aa862c11a3b4
+  metadata.gz: 7097dd99d5ce3ebfe81763a9a49775ba8605ceca1695d6b736baa0db6057d1c94b0e7d5d1349d9c7df0783c3a26a858a2ee659766a06846bd914bc0fdd75982b
+  data.tar.gz: 0ddde917911e057af0c55d0adc69e26aa4d76c8086df2aea35b7d519715555a4c06544e9befd835f3d638f40dcd6fa480f3dfbdd5e74d0c04b5c230c9d68c074

data/.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

data/.github/workflows/build.yml

@@ -0,0 +1,52 @@
+name: Build
+on: [push]
+jobs:
+  test:
+    name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }}
+    runs-on: ubuntu-20.04
+
+    strategy:
+      matrix:
+        ruby:
+          - '2.7'
+          - '2.6'
+          - '2.5'
+        gemfile:
+          - rails_5.2.gemfile
+          - rails_6.0.gemfile
+          - rails_6.1.gemfile
+      fail-fast: false
+
+    services:
+      rabbitmq:
+        image: rabbitmq:latest
+        options: --health-cmd "rabbitmqctl node_health_check" --health-interval 10s --health-timeout 5s --health-retries 5
+        ports:
+          - 5672:5672
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          bundler: 1
+        env:
+          BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
+          BUNDLE_WITHOUT: development
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+
+      - name: Run unit tests
+        env:
+          AMQP_SERVER: amqp://localhost:5672
+          BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
+        run: bundle exec rspec -Ispec/unit --color spec/unit
+
+      - name: Run integration tests
+        env:
+          AMQP_SERVER: amqp://localhost:5672
+          BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
+        run: bundle exec rspec -Ispec/integration --color spec/integration

data/.github/workflows/lint.yml

@@ -0,0 +1,20 @@
+name: Lint
+on: [push]
+jobs:
+  rubocop:
+    name: rubocop
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+          bundler-cache: true
+        env:
+          BUNDLE_WITHOUT: development
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+
+      - name: Run rubocop
+        run: bundle exec rubocop --parallel --color

data/.rubocop.yml

@@ -1,52 +1,13 @@
-AllCops:
-  TargetRubyVersion: 2.3
-
+inherit_gem:
+  my-rubocop: default.yml
 
-Metrics/BlockLength:
+AllCops:
+  TargetRubyVersion: 2.5
   Exclude:
-    - 'spec/**/*_spec.rb'
+    - gemfiles/**/*
+    - spec/integration/dummy/**/*
+    - vendor/**/*
 
-Metrics/LineLength:
+Layout/LineLength:
   Exclude:
-    - 'spec/**/*_spec.rb'
-
-
-Layout/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-Layout/CaseIndentation:
-  EnforcedStyle: end
-  SupportedStyles:
-    - case
-    - end
-  IndentOneStep: true
-
-Layout/SpaceInsideBlockBraces:
-  EnforcedStyle: space
-  EnforcedStyleForEmptyBraces: no_space
-  SpaceBeforeBlockParameters: false
-
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/RaiseArgs:
-  EnforcedStyle: compact
-
-Style/SafeNavigation:
-  Enabled: false # not available before 2.3
-
-Style/SignalException:
-  EnforcedStyle: only_raise
-
-Style/TrivialAccessors:
-  AllowPredicates: true
+    - spec/**/*

data/.travis.yml

@@ -1,43 +1,29 @@
-dist: xenial
+dist: bionic
 language: ruby
+cache: bundler
 rvm:
-- 2.6.3
-- 2.5.5
-- 2.4.6
-- 2.3.8
+  - 2.7.0
+  - 2.6.5
+  - 2.5.7
 gemfile:
-- gemfiles/Gemfile.rails-5-2
-- gemfiles/Gemfile.rails-5-1
-- gemfiles/Gemfile.rails-5-0
-- gemfiles/Gemfile.rails-4-2
-- gemfiles/Gemfile.rails-master
+  - gemfiles/rails_42.gemfile
+  - gemfiles/rails_50.gemfile
+  - gemfiles/rails_51.gemfile
+  - gemfiles/rails_52.gemfile
+  - gemfiles/rails_60.gemfile
+  - gemfiles/rails_master.gemfile
 before_install:
-- sudo apt-get install -qy rabbitmq-server
-- echo yes | rvm gemset delete global
-- gem install bundler -v'~>1.0'
+  - sudo apt-get install -qy rabbitmq-server
+  - echo yes | rvm gemset delete global
+  - gem install bundler --version '~> 1.0'
 script:
-- bundle exec rake spec:msgr
-- bundle exec rake spec:integration
+  - bundle exec rake spec:unit
+  - bundle exec rake spec:integration
 jobs:
   allow_failures:
-    - gemfile: gemfiles/Gemfile.rails-master
+    - gemfile: gemfiles/rails_master.gemfile
   exclude:
-  - rvm: 2.6.3
-    gemfile: gemfiles/Gemfile.rails-4-2
-  - rvm: 2.4.6
-    gemfile: gemfiles/Gemfile.rails-master
-  - rvm: 2.3.8
-    gemfile: gemfiles/Gemfile.rails-master
-  include:
-    - stage: Beta release
-      rvm: 2.6.3
-      script: echo "Deploy to rubygems.org..."
-      deploy:
-        provider: rubygems
-        api_key:
-          secure: g8icPMdxEmbpBzSRCDmR3uB+1Zhu7tGq3h0cVbGUka2Ni1NiEiQo3LCDzbMp+L7AXH5RhdsG9FTViIAyCy9YENqZ1+jzrQGeADx0KnJZb6F81/SyumeUld0zdkzDbe1aUCJWz2WnEk12aLMPLNPRmDE7wub+od7gJEEv2SsKObo=
-        gem: msgr
-        on:
-          branch: master
-          repo: jgraichen/msgr
-
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_42.gemfile
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails_42.gemfile

data/Appraisals

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+# -*- mode: ruby -*-
+
+appraise 'rails-5.2' do
+  gem 'rails', '~> 5.2.0'
+end
+
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0'
+end
+
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.1.0'
+end
+
+appraise 'rails-master' do
+  gem 'rails', git: 'https://github.com/rails/rails', require: 'rails'
+end

data/CHANGELOG.md

@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [1.3.2] - 2021-09-21
+### Fixed
+- Rake task `msgr:drain` ran before all routes were initialized (#44)
+
+## [1.3.1] - 2020-12-16
+### Fixed
+- Delay setting default options for correct relative routing file path
+
+## [1.3.0] - 2020-12-16
+### Added
+- Support and testing for Rails 6.1
+- Rake task for purging all known queues (#43)
+
+### Changed
+- High-risk feature to autostart client in-process has been removed without replacement
+- Parsing config is more relaxed now but directly based on YAML boolean values
+
+## [1.2.0] - 2019-06-27
 ### Added
 - Test support of Rails 5.2
 
@@ -59,7 +78,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 - Loose dependency on bunny to allow `~> 1.4` for stone-age old RabbitMQ servers.
 
-## [0.11.0.rc3] - 2014-04-11
+## [0.11.0-rc3] - 2014-04-11
 ### Added
 - Add checkcredentials config option to disable initial connect to rabbitmq
   server to check the credentials
@@ -67,18 +86,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 - Define pool_class by string to make it useable with rails
 
-## [0.11.0.rc2] - 2014-03-29
+## [0.11.0-rc2] - 2014-03-29
 ### Added
 - Add nack for messages when an error is rescued by dispatcher
 
-## [0.11.0.rc1] - 2014-03-29
+## [0.11.0-rc1] - 2014-03-29
 ### Added
 - Add pool_class config to override pool classes used by dispatcher
 
-## 0.4 - 0.10
-### Changed
-- Some lost history due to several crises
-
 ## [0.4.1] - 2014-03-18
 ### Fixed
 - Fix bug with empty routes on client start
@@ -87,6 +102,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 - Improve railtie and autostart code
 
+## 0.4.0 - 0.10.0
+### Changed
+- Some lost history due to several crises
+
 ## [0.3.0] - 2014-03-03
 ### Added
 - Support for forking web servers like unicorn
@@ -99,7 +118,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 - Improve rails initializer code
 
-[Unreleased]: https://github.com/jgraichen/msgr/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/jgraichen/msgr/compare/v1.3.2...HEAD
+[1.3.2]: https://github.com/jgraichen/msgr/compare/v1.3.1...v1.3.2
+[1.3.1]: https://github.com/jgraichen/msgr/compare/v1.3.0...v1.3.1
+[1.3.0]: https://github.com/jgraichen/msgr/compare/v1.2.0...v1.3.0
+[1.2.0]: https://github.com/jgraichen/msgr/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/jgraichen/msgr/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/jgraichen/msgr/compare/v0.15.2...v1.0.0
 [0.15.2]: https://github.com/jgraichen/msgr/compare/v0.15.1...v0.15.2
@@ -110,9 +133,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 [0.13.0]: https://github.com/jgraichen/msgr/compare/v0.12.3...v0.13.0
 [0.12.2]: https://github.com/jgraichen/msgr/compare/v0.12.1...v0.12.2
 [0.12.1]: https://github.com/jgraichen/msgr/compare/v0.12.0...v0.12.1
-[0.11.0.rc3]: https://github.com/jgraichen/msgr/compare/v0.11.0.rc2...v0.11.0.rc3
-[0.11.0.rc2]: https://github.com/jgraichen/msgr/compare/v0.11.0.rc1...v0.11.0.rc2
-[0.11.0.rc1]: https://github.com/jgraichen/msgr/compare/v0.10.2...v0.11.0.rc1
+[0.11.0-rc3]: https://github.com/jgraichen/msgr/compare/v0.11.0.rc2...v0.11.0.rc3
+[0.11.0-rc2]: https://github.com/jgraichen/msgr/compare/v0.11.0.rc1...v0.11.0.rc2
+[0.11.0-rc1]: https://github.com/jgraichen/msgr/compare/v0.10.2...v0.11.0.rc1
 [0.4.1]: https://github.com/jgraichen/msgr/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/jgraichen/msgr/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/jgraichen/msgr/compare/v0.2.1...v0.3.0

data/Gemfile

@@ -2,22 +2,16 @@
 
 source 'https://rubygems.org'
 
-group :development, :test do
-  gem 'coveralls'
-  gem 'fuubar'
-  gem 'rake'
-  gem 'rspec', '~> 3.0'
-  gem 'rubocop', '~> 0.72.0'
-end
+gem 'appraisal'
+gem 'coveralls'
+gem 'my-rubocop', github: 'jgraichen/my-rubocop'
+gem 'rake'
+gem 'rake-release', '~> 1.1'
+gem 'rspec', '~> 3.0'
+gem 'rspec-rails'
 
-group :rails do
-  unless defined?(NO_RAILS_GEM)
-    gem 'rails', '>= 4.2'
-    gem 'sqlite3', '~> 1.3.6'
-  end
-
-  gem 'rspec-rails', require: false
-end
+gem 'rails'
+gem 'sqlite3'
 
 # Specify your gem's dependencies in acfs.gemspec
 gemspec

data/README.md

@@ -2,9 +2,8 @@
 
 
 [![Gem Version](https://badge.fury.io/rb/msgr.svg)](http://badge.fury.io/rb/msgr)
-[![Build Status](http://img.shields.io/travis/jgraichen/msgr/master.svg)](https://travis-ci.org/jgraichen/msgr)
-[![Coverage Status](http://img.shields.io/coveralls/jgraichen/msgr/master.svg)](https://coveralls.io/r/jgraichen/msgr)
-[![Code Climate](http://img.shields.io/codeclimate/github/jgraichen/msgr.svg)](https://codeclimate.com/github/jgraichen/msgr)
+[![Build Status](https://travis-ci.org/jgraichen/msgr.svg?branch=master)](https://travis-ci.org/jgraichen/msgr)
+[![Build Status](https://github.com/jgraichen/msgr/workflows/Build/badge.svg?branch=master)](https://github.com/jgraichen/msgr/actions?query=workflow%3ABuild+branch%3Amaster)
 [![RubyDoc Documentation](http://img.shields.io/badge/rubydoc-here-blue.svg)](http://rubydoc.info/github/jgraichen/msgr/master/frames)
 
 You know it and you like it. Using Rails you can just declare your routes and
@@ -82,16 +81,19 @@ class TestController < ApplicationController
 end
 ```
 
+Run client daemon with `bundle exec msgr`.
+
+
 ## Advanced configuration
 
-### Manual message acknowledgement
+### Manual message acknowledgments
 
-Per default messages are automatically acknowledged, if no (n)ack is sent explicitly by the consumer. This can be disabled by setting the `auto_ack` attribute to `false`. 
+Per default messages are automatically acknowledged, if no (n)ack is sent explicitly by the consumer. This can be disabled by setting the `auto_ack` attribute to `false`.
 
 ```ruby
 class TestConsumer < Msgr::Consumer
   self.auto_ack = false
-  
+
   def index
     data = { fuubar: 'abc' }
 
@@ -100,7 +102,6 @@ class TestConsumer < Msgr::Consumer
 end
 ```
 
-
 ### Prefetch count
 
 Per default each message queue has a prefetch count of 1. This value can be changed when specifying the messaging routes:
@@ -109,19 +110,6 @@ Per default each message queue has a prefetch count of 1. This value can be chan
  route 'local.test.index', to: 'test#index', prefetch: 42
  ```
 
-### Msgr and fork web server like unicorn
-
-Per default msgr opens the rabbitmq connect when rails is loaded. If you use a multi-process web server that preloads the application (like unicorn) will lead to unexpected behavior. In this case adjust `config/rabbitmq.yml` and adjust `autostart = false`:
-
-
-```yaml
-common: &common
-  uri: amqp://localhost/
-  autostart: false
-```
-
-And call inside each worker `Msgr.start` - e.g. in an after-fork block
-
 
 ## Testing
 

data/Rakefile

@@ -7,26 +7,30 @@ rescue LoadError
 end
 
 require 'rake'
-require 'bundler/gem_tasks'
+require 'rake/release/task'
 require 'rspec/core/rake_task'
 
+Rake::Release::Task.new do |spec|
+  spec.sign_tag = true
+end
+
 # Delegate spec task task to spec:all to run all specs.
 task spec: 'spec:all'
 
 desc 'Run all specs'
 namespace :spec do
   desc 'Run all msgr specs and all integration specs.'
-  task all: %i[msgr integration]
+  task all: %i[unit integration]
 
   desc 'Run all unit specs.'
-  RSpec::Core::RakeTask.new(:msgr) do |t|
-    t.ruby_opts = '-Ispec/support -rsetup -Ispec/msgr'
-    t.pattern = 'spec/msgr/**/*_spec.rb'
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.ruby_opts = '-Ispec/unit'
+    t.pattern = 'spec/unit/**/*_spec.rb'
   end
 
   desc 'Run all integration specs.'
   RSpec::Core::RakeTask.new(:integration) do |t|
-    t.ruby_opts = '-Ispec/support -rsetup -Ispec/integration'
+    t.ruby_opts = '-Ispec/integration'
     t.pattern = 'spec/integration/**/*_spec.rb'
   end
 end

data/bin/msgr

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'msgr/cli'
 

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "coveralls"
+gem "my-rubocop", github: "jgraichen/my-rubocop"
+gem "rake"
+gem "rspec", "~> 3.0"
+gem "rspec-rails"
+gem "rails", "~> 5.2.0"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "coveralls"
+gem "my-rubocop", github: "jgraichen/my-rubocop"
+gem "rake"
+gem "rspec", "~> 3.0"
+gem "rspec-rails"
+gem "rails", "~> 6.0.0"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "coveralls"
+gem "my-rubocop", github: "jgraichen/my-rubocop"
+gem "rake"
+gem "rspec", "~> 3.0"
+gem "rspec-rails"
+gem "rails", "~> 6.1.0"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/rails_master.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "coveralls"
+gem "my-rubocop", github: "jgraichen/my-rubocop"
+gem "rake"
+gem "rspec", "~> 3.0"
+gem "rspec-rails"
+gem "rails", git: "https://github.com/rails/rails", require: "rails"
+gem "sqlite3"
+
+gemspec path: "../"

data/lib/msgr/binding.rb

@@ -4,7 +4,14 @@ module Msgr
   class Binding
     include Logging
 
-    attr_reader :queue, :subscription, :connection, :channel, :route, :dispatcher
+    attr_reader(
+      :channel,
+      :connection,
+      :dispatcher,
+      :queue,
+      :route,
+      :subscription
+    )
 
     def initialize(connection, route, dispatcher)
       @connection = connection
@@ -43,13 +50,11 @@ module Msgr
 
     def subscribe
       @subscription = queue.subscribe(manual_ack: true) do |*args|
-        begin
-          dispatcher.call Message.new(channel, *args, route)
-        rescue => err
-          log(:error) do
-            "Rescued error from subscribe: #{err.class.name}: " \
-            "#{err}\n#{err.backtrace.join("\n")}"
-          end
+        dispatcher.call Message.new(channel, *args, route)
+      rescue StandardError => e
+        log(:error) do
+          "Rescued error from subscribe: #{e.class.name}: " \
+          "#{e}\n#{e.backtrace.join("\n")}"
         end
       end
     end

data/lib/msgr/channel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Msgr
   class Channel
     include Logging
@@ -26,8 +28,8 @@ module Msgr
       end
     end
 
-    def queue(name)
-      @channel.queue(prefix(name), durable: true).tap do |queue|
+    def queue(name, **opts)
+      @channel.queue(prefix(name), durable: true, **opts).tap do |queue|
         log(:debug) do
           "Create queue #{queue.name} (durable: #{queue.durable?}, " \
           "auto_delete: #{queue.auto_delete?})"
@@ -62,4 +64,4 @@ module Msgr
       @channel.close if @channel.open?
     end
   end
-end
+end

data/lib/msgr/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optionparser'
 
 module Msgr
@@ -8,7 +10,8 @@ module Msgr
       @options = options
 
       if !File.exist?(options[:require]) ||
-          (File.directory?(options[:require]) && !File.exist?("#{options[:require]}/config/application.rb"))
+         (File.directory?(options[:require]) &&
+         !File.exist?("#{options[:require]}/config/application.rb"))
         raise <<~ERR
           Rails application or required ruby file not found: #{options[:require]}
         ERR
@@ -22,15 +25,13 @@ module Msgr
         require 'rails'
         if ::Rails::VERSION::MAJOR == 4
           require File.expand_path("#{options[:require]}/config/application.rb")
-          ::Rails::Application.initializer "msgr.eager_load" do
+          ::Rails::Application.initializer 'msgr.eager_load' do
             ::Rails.application.config.eager_load = true
           end
-          require 'msgr/railtie'
-          require File.expand_path("#{options[:require]}/config/environment.rb")
-        else
-          require 'msgr/railtie'
-          require File.expand_path("#{options[:require]}/config/environment.rb")
         end
+
+        require 'msgr/railtie'
+        require File.expand_path("#{options[:require]}/config/environment.rb")
       else
         require(options[:require])
       end
@@ -43,7 +44,7 @@ module Msgr
       Msgr.logger = Logger.new(STDOUT)
       Msgr.client.start
 
-      while readable = IO.select([r])
+      while (readable = IO.select([r]))
         case readable.first[0].gets.strip
           when 'INT', 'TERM'
             Msgr.client.stop
@@ -61,18 +62,24 @@ module Msgr
 
       private
 
-      def parse(argv)
+      def parse(_argv)
         options = {
           require: Dir.pwd,
           environment: 'development'
         }
 
         OptionParser.new do |o|
-          o.on '-r', '--require [PATH|DIR]', 'Location of Rails application (default to current directory)' do |arg|
+          o.on(
+            '-r', '--require [PATH|DIR]',
+            'Location of Rails application (default to current directory)'
+          ) do |arg|
             options[:require] = arg
           end
 
-          o.on '-e', '--environment [env]', 'Rails environment (default to development)' do |arg|
+          o.on(
+            '-e', '--environment [env]',
+            'Rails environment (default to development)'
+          ) do |arg|
             options[:environment] = arg
           end
         end.parse!