rubocop_rules 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78af4aa32c9b667e41f57877d593ad1c2e8c2dd21adadb19af2a50f61e59f0c9
-  data.tar.gz: fe40cd13ae9a8db315fd0086d9f285451121067965176948919e69cd51839efe
+  metadata.gz: be00bb5e611c0b6d7c8ef1f1baacf144a7059ff367189f4bd953b656de51448e
+  data.tar.gz: 4c462ddf90cc19d6cab0ec9b3fadd6c66b7cd21fc4f64de246833bbac468b7f9
 SHA512:
-  metadata.gz: f21279594a43abd08e88f97d3448d1cadee341eb88aa0ccc98b4cbb5ef70d705ff9fbca3a344bd5654f6f343941b6e8ab4d7fddb450decb3690038e69892bbec
-  data.tar.gz: 7a089d12a091edd6a2e5cefb884e17e71ced705c05e41ff99678b32f5c154925901c10d63e583e0bd76b14e3c412903ecb8c78166588cf215fc630eb5368152f
+  metadata.gz: 372b60ca0732d7f97f4c6fb1343965b0267279bfe206b6de2eb5a1e839faa685edcee74775aef941e21ea5107088418a6004f49fd295d0282873cf598eeb4455
+  data.tar.gz: 84008f06871c873d1e3fb4a738c30e0521354c3585eda8c60573f34420b6c26de0f454e50ad4c6a72315428cf1c715b5d8012aaa0536cf79d043b4c94bd62c53

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
+  - 2.5.1
 before_install: gem install bundler -v 1.16

data/CHANGELOG.md

@@ -7,6 +7,12 @@ adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [1.1.2] - 2018-10-24
+
+### Fixed
+
+* `.rubocop.yml` is generated correctly on update
+
 ## [1.1.1] - 2018-05-08
 
 ### Changed

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/README.md

@@ -116,4 +116,4 @@ Keep this to a minimum and always consider if it belongs in .rubocop_common.yml
 
 ## Development
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/klarna/rubocop_rules.
+Bug reports and pull requests are welcome on GitHub at https://github.com/klippx/rubocop_rules.

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'rubocop/rules'

data/bin/rubocop-rules

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 

data/lib/rubocop_rules.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubocop_rules/version'
 
 # :nodoc:

data/lib/rubocop_rules/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'open3'
 require 'git'
@@ -21,7 +23,7 @@ module RubocopRules
         puts RubocopRules::VERSION
       end
 
-      desc 'init', 'Initialize RubocopRules in your project'
+      desc 'init', 'Initialize Rubocop Rules in your project'
       def init
         puts 'Copying config... '
         copy_file 'templates/.rubosync.yml', '.rubosync.yml'
@@ -38,7 +40,7 @@ module RubocopRules
         insert_into_file '.rubocop.yml', '  - .rubocop_todo.yml', after: "  - .rubocop_common.yml\n"
       end
 
-      desc 'update', 'Regenerate RubocopRules configuration in your project'
+      desc 'update', 'Regenerate Rubocop Rules configuration in your project'
       def update
         puts 'Recreating configuration...'
         ensure_rubosync_config
@@ -50,10 +52,30 @@ module RubocopRules
         comment_lines '.rubocop.yml', /\.rubocop_todo\.yml/
         generate_todo(silent: true)
         uncomment_lines '.rubocop.yml', /\.rubocop_todo\.yml/
+        clean_up_rubocop_config
       end
 
       private
 
+      def clean_up_rubocop_config
+        gsub_file '.rubocop.yml', all_inherit_lines_rex, ''
+        insert_into_file '.rubocop.yml', todo_string_block, after: "# our violation whitelist.\n"
+        gsub_file '.rubocop.yml', /^  - .rubocop_common.yml\n+/, "  - .rubocop_common.yml\n\n"
+      end
+
+      def all_inherit_lines_rex
+        /(^inherit_from:\n)|(^  - .rubocop_common.yml\n+)|(^  - .rubocop_todo.yml\n+)/
+      end
+
+      def todo_string_block
+        <<~TODO
+          inherit_from:
+            - .rubocop_todo.yml
+            - .rubocop_common.yml
+
+        TODO
+      end
+
       def generate_todo(silent: false)
         run_process(command: 'rubocop -a', silent: silent)
         run_process(command: 'rubocop --auto-gen-config', silent: silent)
@@ -63,6 +85,7 @@ module RubocopRules
         unless File.exist?('.rubosync.yml')
           raise 'Missing configuration file! Please add and configure .rubosync.yml'
         end
+
         @config = YAML.safe_load(ERB.new(File.read('.rubosync.yml')).result, [], [], true)
       end
 
@@ -70,6 +93,7 @@ module RubocopRules
         unless @config && @config['git'] && @config['git']['repo']
           raise 'Missing git repo in configuration! Please configure .rubosync.yml'
         end
+
         repo = @config['git']['repo']
 
         puts "Downloading latest configuration from #{repo}..."

data/lib/rubocop_rules/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubocopRules
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'
 end

data/rubocop-rules.gemspec

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rubocop_rules/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop_rules
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mathias Klippinge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -109,6 +109,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_common.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile