rubocop_method_order 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def792f4f78a2a78d2cffad454cfd738ac29c51930fa4b7514120f43b36ca2d3
-  data.tar.gz: 417d5b458152c7110bd0a391f58b9637d387509e25d629ad9398a467984ead49
+  metadata.gz: 87a880d6efbf8d23a8105cf4f7bbc78f0008e4db5294231840fc33f47eb9ce7a
+  data.tar.gz: a0333f54dcf6441ff7d23e5917092a2b700ae208e7147c4a34c5d4e61a8546f1
 SHA512:
-  metadata.gz: 3aef9fedf03c3cfc070234056250960ea06f119b65a09bee868e6c894cfcd3d8d301454c4732a9f5221ff3418507e7b127a2fa56cf6bfbef1dd25837c2606d92
-  data.tar.gz: 678b55a3dddd9da59c469dd0de80f21fbf8d03c6ad85f9b3885a0e6782cb6aec9adcb086becbed5c731a8881d467f74c2523d0dc1ee0a5193c60c74edd578676
+  metadata.gz: adf8186dfbf0214f75b85dffee0502b6afc950d63b05bc000ea3875f621687499807ffe433388f274657ac6020676062b24faede60f275e0800312c19c9a69ab
+  data.tar.gz: 4d1fc6c2cd011597fb5488c87604c43a092f9bac8a3dae1b3d11b7cb6fbefc8705aaf2afa24a5daad59b52da0f985417bcff7cea0a6a1c543c102cadac92f7c2

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
+Gemfile.lock
 /.yardoc
 /_yardoc/
 /coverage/

data/.travis.yml

@@ -1,5 +1,17 @@
 sudo: false
 language: ruby
 rvm:
+  - jruby-head
+  - 2.4.3
   - 2.5.0
-before_install: gem install bundler -v 1.16.1
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+  fast_finish: true
+before_install:
+  - gem update --system
+  - gem update --remote bundler
+install:
+  - bundle install --retry=3

data/CHANGELOG.md

@@ -5,6 +5,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [unreleased]
 
+## [0.3.0] - 2018-04-20
+
+### Added
+
+* Tie in Travis-CI for testing.
+* New `bin/release` script to make sure tests are ran before release.
+
+### Fixed
+
+* Include comments immediately following a method definition when auto-correcting.
+* Correct source range calculation if looping over start or end of file.
+
 ## [0.2.1] - 2018-03-22
 
 ### Fixed
@@ -25,7 +37,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * Initial version of the extension.
 
-[unreleased]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.2.1...HEAD
+[unreleased]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.3.0...HEAD
+[0.3.0]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/CoffeeAndCode/rubocop_method_order/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/CoffeeAndCode/rubocop_method_order/releases/tag/v0.1.0

data/README.md

@@ -144,9 +144,17 @@ To install this gem onto your local machine, run `bundle exec rake install`.
 Make sure that the project has no errors when running `bundle exec rake` which
 will run `rubocop` on the project source and `bundle exec rake test`.
 
-To release a new version, update the version number in `lib/rubocop_method_order/version.rb` and run `bundle exec rake release`, which will create a git tag for the version, push
-git commits and tags, and push the `.gem` file to [rubygems.org][2].
-Afterwards, a new checksum will be generated for the gem which should
+To release a new version, update the version number in `lib/rubocop_method_order/version.rb` and run `bin/release`, which will do
+the following:
+
+* run tests
+* run linters
+* create a git tag for the version
+* push git commits and tags
+* push the `.gem` file to [rubygems.org][2]
+* create checksums of new version
+
+New checksum will be generated for the latest gem version which should
 be added to the `master` branch.
 
 ## Contributing

data/Rakefile

@@ -11,7 +11,10 @@ Rake::TestTask.new(:test) do |t|
 end
 RuboCop::RakeTask.new
 
-Rake::Task['release'].enhance do
+task default: %i[test rubocop]
+
+desc 'Generate checksum files for current gem version.'
+task :checksum do |_task|
   require 'digest/sha2'
   require_relative './lib/rubocop_method_order/version'
 
@@ -25,5 +28,3 @@ Rake::Task['release'].enhance do
   checksum_path = "checksums/rubocop_method_order-#{RuboCopMethodOrder.gem_version}.gem.sha512"
   File.open(checksum_path, 'w') { |file| file.write(checksum) }
 end
-
-task default: %i[test rubocop]

data/bin/release

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle exec rake
+bundle exec rake release
+bundle exec rake checksum

data/lib/rubocop/cop/style/method_order.rb

@@ -100,7 +100,7 @@ module RuboCop
       #
       #   def foo
       #   end
-      class MethodOrder < Cop
+      class MethodOrder < Cop # rubocop:disable Metrics/ClassLength
         include RangeHelp
 
         MSG = 'Methods should be sorted in alphabetical order within their section' \
@@ -172,6 +172,7 @@ module RuboCop
 
         private
 
+        # rubocop:disable Metrics/MethodLength
         def begin_pos_with_comments(node)
           range = node.source_range
           begin_of_first_line = range.begin_pos - range.column
@@ -179,13 +180,15 @@ module RuboCop
 
           loop do
             line_number -= 1
+            break if line_number <= 0
             source_line = @processed_source.buffer.source_line(line_number)
             break unless source_line.match?(/\s*#/)
 
-            begin_of_first_line -= source_line.length + 1 # account for \n char
+            begin_of_first_line -= (source_line.length + 1) # account for \n char
           end
           begin_of_first_line
         end
+        # rubocop:enable Metrics/MethodLength
 
         def check_nodes
           @method_collector.nodes_by_scope.values.each do |method_collection|
@@ -202,17 +205,33 @@ module RuboCop
           processed_source.comment_config.cop_enabled_at_line?(self, node.first_line)
         end
 
-        def end_pos_with_comments(node) # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        def end_pos_with_comments(node)
           range = node.source_range
           last_line = @processed_source.buffer.source_line(range.last_line)
-          end_position = range.end_pos + last_line.length - range.last_column
+          end_of_last_line = range.end_pos + last_line.length - range.last_column
+          line_number = node.source_range.last_line
 
-          if node.source_range.last_line == @processed_source.lines.count
-            end_position
-          else
-            end_position + 1
+          if line_number != @processed_source.lines.count
+            end_of_last_line += 1 # account for newline
           end
+
+          loop do
+            line_number += 1
+            break if line_number > @processed_source.lines.count
+            source_line = @processed_source.buffer.source_line(line_number)
+            break unless source_line.match?(/\s*#/)
+
+            adjustment = 0
+            if line_number != @processed_source.lines.count
+              adjustment = 1 # account for newline
+            end
+
+            end_of_last_line += source_line.length + adjustment
+          end
+          end_of_last_line
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
         def message(method_name, following_method_name)
           format(MSG,

data/lib/rubocop_method_order/version.rb

@@ -10,8 +10,8 @@ module RuboCopMethodOrder
   # Contains individual version parts for this gem.
   module VERSION
     MAJOR = 0
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/rubocop_method_order.gemspec

@@ -3,7 +3,7 @@
 
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rubocop_method_order'
+require 'rubocop_method_order/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'rubocop_method_order'
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
     spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
   end
 
-  spec.add_dependency 'rubocop', '~> 0.53'
+  spec.add_runtime_dependency 'rubocop', '~> 0.53'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'minitest', '~> 5.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop_method_order
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jonathan Knapp
@@ -34,7 +34,7 @@ cert_chain:
   XxvXYAfIUSbb6/CHtemZT4zsEprRuk8eADIYUTMyAt9d2roTcsRKgq20m+PZO+b+
   DVnSbPSTRxaM+9Hds4CAzdoo5hIiLyvSXSqSRGgQEMT0yiFdK+6kRw==
   -----END CERTIFICATE-----
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -103,11 +103,11 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/console
+- bin/release
 - bin/setup
 - certs/coffeeandcode.pem
 - lib/rubocop/cop/style/method_order.rb

data/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rubocop_method_order (0.2.1)
-      rubocop (~> 0.53)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    minitest (5.11.3)
-    parallel (1.12.1)
-    parser (2.5.0.4)
-      ast (~> 2.4.0)
-    powerpack (0.1.1)
-    rainbow (3.0.0)
-    rake (12.3.0)
-    rubocop (0.54.0)
-      parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    unicode-display_width (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  minitest (~> 5.0)
-  rake (~> 12.3)
-  rubocop_method_order!
-
-BUNDLED WITH
-   1.16.1