manageiq-style 1.1.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ac849693fa5f8a978080fceea20375e51f377e1fa3d3d84d20f020e916f4a45
-  data.tar.gz: 4ac69b27c626a34b009b4a286fd65b7f796422a0eca07dc847f1dbe4630caf2d
+  metadata.gz: 9dd177749d0a3bfe9c497b78a33a009e6f9bab38c478cf229fb837a018902f9d
+  data.tar.gz: 55aea3dde29d7c10c360d05229296fd35debde0b1774bef5f2d2ebfdbd5ff4c1
 SHA512:
-  metadata.gz: cc64a1eddc621edbecee991093365eb6c6077f332566823cc86a7973ae4c60db069c49ef97d8be9b23720b49f34b21eb4d3b7ce8443e83db50abab4367a76ea6
-  data.tar.gz: 6f3734f60de0140bf63e485850a74ca793915b785a834622fb589510c7a3dfe8661ec96ebb262a9f089f85ed1a72fb8feacac2e3c1b09956f74b77019c9ecf8e
+  metadata.gz: dc537ec17f3248ea1e3807ec2a5b9c5c11b53b6fe91152a304b5432d2b32d0224fd7c99568d63c18839ff64039fc346e0cd9543f91e36ce0890af5ec178c7264
+  data.tar.gz: 06bab93794830f362d2db32e7ec4245c710bcf930b91226f2686c1a82d103bbec39c1d42d37946d661396d5c0046fe1c35e3e50804fd9c34ba899dc7e2888e7e

data/.codeclimate.yml

@@ -4,8 +4,13 @@ prepare:
     path: ".rubocop_base.yml"
   - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_cc_base.yml
     path: ".rubocop_cc_base.yml"
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/base.yml
+    path: styles/base.yml
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/cc_base.yml
+    path: styles/cc_base.yml
 plugins:
   rubocop:
     enabled: true
     config: ".rubocop_cc.yml"
     channel: rubocop-0-82
+version: '2'

data/.rubocop.yml

@@ -1,4 +1,4 @@
 inherit_from:
-- .rubocop_base.yml
-# put all local rubocop config into .rubocop_local.yml as it will be loaded by .rubocop_cc.yml as well
-- .rubocop_local.yml
+- ".rubocop_local.yml"
+inherit_gem:
+  manageiq-style: ".rubocop_base.yml"

data/lib/manageiq/style/cli.rb

@@ -35,6 +35,7 @@ module ManageIQ
         ensure_rubocop_local_yml_exists
         update_codeclimate_yml
         update_generator
+        update_gem_source
       end
 
       private
@@ -92,7 +93,9 @@ module ManageIQ
         data["prepare"] = {
           "fetch" => [
             {"url" => "https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_base.yml",    "path" => ".rubocop_base.yml"},
-            {"url" => "https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_cc_base.yml", "path" => ".rubocop_cc_base.yml"}
+            {"url" => "https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_cc_base.yml", "path" => ".rubocop_cc_base.yml"},
+            {"url" => "https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/base.yml",      "path" => "styles/base.yml"},
+            {"url" => "https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/cc_base.yml",   "path" => "styles/cc_base.yml"},
           ]
         }
 
@@ -104,10 +107,120 @@ module ManageIQ
           "config"  => ".rubocop_cc.yml",
           "channel" => cc_rubocop_channel,
         }
+        data["engines"]&.each do |engine, config|
+          data["plugins"][engine] = config
+        end
+
+        data.delete("engines") # moved to plugins
+        data.delete("ratings") # deprecated
+
+        exclude_paths = data.delete("exclude_paths") # renamed
+        data["exclude_patterns"] = exclude_paths if exclude_paths
+
+        data["version"] ||= "2"
 
         File.write(".codeclimate.yml", data.to_yaml.sub("---\n", ""))
       end
 
+      def update_gem_source
+        if (gemspec = Dir.glob("*.gemspec").first)
+          update_gemspec(gemspec)
+        elsif File.exist?("Gemfile")
+          update_gemfile
+        end
+      end
+
+      def update_gemspec(gemspec)
+        contents = File.read(gemspec)
+        return if contents.include?("manageiq-style")
+
+        lines = contents.lines
+
+        obj = $1 if lines.detect { |l| l =~ /^\s+(\w+)\.name\s+=/ }
+        raise "couldn't find spec object name" if obj.nil?
+
+        new_line = "#{obj}.add_development_dependency \"manageiq-style\"\n"
+
+        dev_lines = lines.select { |l| l.include?("add_development_dependency") }
+        if dev_lines.any?
+          # Add manageiq-style and remove all direct rubocop references
+          dev_lines << new_line
+          dev_lines.reject! { |l| l.include?("rubocop") }
+
+          # Prepare the lines in a nice format
+          format_gem_source_lines!(dev_lines)
+          dev_lines.sort_by!(&:downcase)
+
+          # Remove the old dev lines and add the new ones
+          insert_at = lines.index { |l| l.include?("add_development_dependency") }
+          lines.delete_if { |l| l.include?("add_development_dependency") }
+          lines.insert(insert_at, dev_lines)
+        else
+          insert_at = -1
+          insert_at -= 1 until lines[insert_at].strip != "end"
+          lines.insert(insert_at, new_line)
+        end
+
+        File.write(gemspec, lines.join)
+      end
+
+      def update_gemfile
+        contents = File.read("Gemfile")
+        return if contents.include?("manageiq-style")
+
+        lines = contents.lines
+
+        new_line = "gem \"manageiq-style\", :require => false\n"
+
+        group_index = lines.index { |l| l.match?(/group\(?\s*:development/) }
+        if group_index
+          # Determine the group range
+          group_index += 1
+          group_end = group_index
+          group_end += 1 until lines[group_end].strip == "end"
+          group_range = (group_index..group_end - 1)
+
+          # Split lines into "gem" units including their preceding comments or blank lines
+          gem_units = lines[group_range].slice_after { |l| l.match?(/^\s*gem/) }.to_a
+
+          # Add manageiq-style and remove all direct rubocop references
+          gem_units << [new_line]
+          gem_units.reject! { |u| u.last.include?("rubocop") }
+
+          # Prepare the lines in a nice format
+          gem_lines = gem_units.map(&:last)
+          format_gem_source_lines!(gem_lines)
+          gem_units.each_with_index { |u, i| u[-1] = gem_lines[i] }
+          gem_units.sort_by! { |u| u.last.downcase }
+          gem_units.flatten!
+
+          # Remove the old group lines and add the new ones
+          lines.slice!(group_range)
+          lines.insert(group_index, gem_units)
+        else
+          lines << <<~RUBY
+
+            group :development do
+              #{new_line}
+            end
+          RUBY
+        end
+
+        File.write("Gemfile", lines.join)
+      end
+
+      def format_gem_source_lines!(lines)
+        indent = lines.first.match(/^\s+/).to_s
+
+        lines.map! { |l| l.strip.gsub(/[()]/, " ").split(" ", 3) }             # Split to [prefix, gem, versions]
+        lines.each { |parts| parts[1].tr!("'", "\"")}                          # Ensure double quoted gem name
+        max_width = lines.map { |parts| parts[1].size }.max                    # Determine the widest gem name
+        lines.each { |parts| parts[1] = parts[1].ljust(max_width, " ") }       # Apply the width
+        lines.map! { |parts| parts.join(" ").strip.insert(0, indent) << "\n" } # Back to strings
+
+        lines
+      end
+
       def update_generator
         plugin_dir = "lib/generators/manageiq/plugin/templates"
 

data/lib/manageiq/style/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Style
-    VERSION = "1.1.1"
+    VERSION = "1.3.1"
   end
 end

data/manageiq-style.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/ManageIQ/manageiq-style"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.0.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "more_core_extensions"
   spec.add_runtime_dependency "optimist"
-  spec.add_runtime_dependency "rubocop",   "~> 0.82.0"
+  spec.add_runtime_dependency "rubocop",   "~> 1.13"
   spec.add_runtime_dependency "rubocop-performance"
   spec.add_runtime_dependency "rubocop-rails"
 

data/styles/base.yml

@@ -3,11 +3,12 @@ require:
   - rubocop-performance
 
 AllCops:
-  NewCops: disable
+  NewCops: enable
   Exclude:
     - spec/manageiq/**/*
     - vendor/**/*
-  TargetRubyVersion: 2.5
+  SuggestExtensions: false
+  TargetRubyVersion: 2.6
 Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
@@ -17,6 +18,8 @@ Layout/EndAlignment:
   AutoCorrect: true
 Layout/ExtraSpacing:
   AutoCorrect: true
+  Exclude:
+    - Gemfile
 Layout/LineLength:
   Enabled: false
 Layout/SpaceAroundMethodCallOperator:
@@ -248,6 +251,10 @@ Style/MethodCallWithArgsParentheses:
     # Rake
     - desc
     - task
+Style/NegatedIf:
+  Enabled: false
+Style/NegatedIfElseCondition:
+  Enabled: false
 Style/NumericLiterals:
   AutoCorrect: false
 Style/NumericPredicate:

data/styles/cc_base.yml

@@ -4,7 +4,7 @@
 #
 ---
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
 Bundler:
   Enabled: true
 Gemspec:
@@ -23,6 +23,8 @@ Security:
   Enabled: true
 Style:
   Enabled: false
+Layout/LineLength:
+  Enabled: false
 Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
@@ -34,8 +36,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Enabled: true
   Max: 11
-Metrics/LineLength:
-  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Metrics/ModuleLength:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-style
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.1
 platform: ruby
 authors:
 - ManageIQ Authors
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: more_core_extensions
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Style and linting configuration for ManageIQ projects.
-email: 
+email:
 executables:
 - manageiq-style
 extensions: []
@@ -145,7 +145,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ManageIQ/manageiq-style
   source_code_uri: https://github.com/ManageIQ/manageiq-style
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -153,15 +153,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: Style and linting configuration for ManageIQ projects.
 test_files: []