Merge branch 'develop'

.rubocop.yml

-inherit_from: ./.rubocop_todo.yml
+inherit_from:
+  - .rubocop_todo.yml
 
 AllCops:
   Exclude:

.rubocop_todo.yml

 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-03-07 18:25:02 -0800 using RuboCop version 0.65.0.
+# on 2019-06-16 12:01:03 -0700 using RuboCop version 0.68.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -51,7 +51,7 @@ Layout/AlignArray:
   Exclude:
     - 'spec/annotate/annotate_models_spec.rb'
 
-# Offense count: 103
+# Offense count: 104
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -149,7 +149,7 @@ Layout/EmptyLinesAroundExceptionHandlingKeywords:
 
 # Offense count: 24
 # Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
   Exclude:
     - 'Guardfile'
@@ -170,7 +170,7 @@ Layout/ExtraSpacing:
 # Cop supports --auto-correct.
 # Configuration parameters: IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   EnforcedStyle: consistent
 
 # Offense count: 54
@@ -247,7 +247,7 @@ Layout/SpaceAroundKeyword:
     - 'spec/integration/rails_4.2.0/Gemfile'
     - 'spec/integration/standalone/Gemfile'
 
-# Offense count: 4
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
 Layout/SpaceAroundOperators:
@@ -419,15 +419,15 @@ Lint/UnusedBlockArgument:
   Exclude:
     - 'bin/annotate'
 
-# Offense count: 18
+# Offense count: 19
 Metrics/AbcSize:
-  Max: 139
+  Max: 138
 
-# Offense count: 29
+# Offense count: 27
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 1140
+  Max: 244
 
 # Offense count: 1
 # Configuration parameters: CountBlocks.
@@ -475,14 +475,6 @@ Naming/UncommunicativeMethodParamName:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-Performance/RegexpMatch:
-  Exclude:
-    - 'lib/annotate/annotate_models.rb'
-    - 'lib/annotate/annotate_routes.rb'
-    - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
-
 # Offense count: 1
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: inline, group
@@ -688,7 +680,7 @@ Style/NestedParenthesizedCalls:
 Style/NumericLiterals:
   MinDigits: 15
 
-# Offense count: 2
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -809,7 +801,7 @@ Style/StderrPuts:
     - 'lib/annotate/annotate_models.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 240
+# Offense count: 243
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -867,8 +859,9 @@ Style/UnneededPercentQ:
     - 'annotate.gemspec'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 424
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 431
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 276

.travis.yml

 sudo: false
 language: ruby
 rvm:
-- 2.2.7
-- 2.3.4
-- 2.4.1
+- 2.2.10
+- 2.3.8
+- 2.4.6
+- 2.5.5
 - 2.6.0
+- 2.6.1
+- 2.6.2
+- 2.6.3
 - ruby-head
+
 matrix:
   allow_failures:
   - rvm: ruby-head
+
 before_install:
-- gem update --system
+- gem update --system || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems)
 - gem update bundler
+
 script:
 - bundle exec rubocop && bundle exec rspec
-deploy:
+
+jobs:
+  include:
+    - stage: gem release
+      if: tag =~ ^v
+      rvm: 2.6.0
+      script: echo "Deploying to rubygems.org ..."   
+      deploy:
         provider: rubygems
-  api_key:
-    secure: Y7DUitak26kcRAAkgph/7m6Y1wHeObD0BelSSJbmCfjkRd/qaVy7fz9VvHL9zxlRJtLGVHInyCnwcfzinibY6OFd3MoMYHKv8GFa2LxLJNEVSY46KQYFxfH5JTg1ejh6ldoJRRBoeOx9dcWS80pRNjYMKPGnpSz7yDBl1azibFs=
+        api_key: $RUBYGEMS_API_KEY
         gem: annotate
         on:
           tags: true

Gemfile

@@ -19,7 +19,7 @@ group :development, :test do
   gem 'guard-rspec', require: false
   gem 'rspec', require: false
 
-  gem 'rubocop', '~> 0.67.2', require: false unless RUBY_VERSION =~ /^1.8/
+  gem 'rubocop', '~> 0.68.1', require: false unless RUBY_VERSION =~ /^1.8/
   gem 'simplecov', require: false
   gem 'terminal-notifier-guard', require: false
 
@@ -27,7 +27,7 @@ group :development, :test do
   gem 'coveralls'
 
   gem 'overcommit'
-  gem 'ruby_dep', '1.3.1'
+  gem 'ruby_dep', '1.5.0'
 
   platforms :mri, :mingw do
     gem 'pry', require: false

lib/annotate/annotate_models.rb

@@ -910,7 +910,11 @@ module AnnotateModels
     def mb_chars_ljust(string, length)
       string = string.to_s
       padding = length - width(string)
+      if padding > 0
         string + (' ' * padding)
+      else
+        string[0..length-1]
+      end
     end
   end
 

spec/annotate/annotate_models_spec.rb

@@ -943,7 +943,8 @@ EOS
         [:active,     :boolean, { limit: 1,  comment: 'ＡＣＴＩＶＥ' }],
         [:name,       :string,  { limit: 50, comment: 'ＮＡＭＥ' }],
         [:notes,      :text,    { limit: 55, comment: 'ＮＯＴＥＳ' }],
-        [:no_comment, :text,    { limit: 20, comment: nil }]
+        [:no_comment, :text,    { limit: 20, comment: nil }],
+        [:location,   :geometry_collection, { limit: nil, comment: nil }]
       ]
 
       when_called_with with_comment: 'yes',
@@ -958,6 +959,7 @@ EOS
         #  name(ＮＡＭＥ)       :string(50)       not null
         #  notes(ＮＯＴＥＳ)    :text(55)         not null
         #  no_comment           :text(20)         not null
+        #  location             :geometry_collect not null
         #
       EOS