manageiq-style 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb8ff9f981225899057f8a511f60c117540819d36aac865bf49819588d2489f
-  data.tar.gz: 9d926d19f291ccb28e5f1a1cc0fd73b090544a049613244340470b672268ca29
+  metadata.gz: 8840f6c593105a9a76b6b2f765e2789a9448d623c5cf67737fa0bb032ba7106f
+  data.tar.gz: b593378d58deaf202a70bad993bf9316b671d7eda9519400eeb2ad0f86158591
 SHA512:
-  metadata.gz: 2ced6243a6718309e99fd31ab36ec6d331458d171a1e83f2aeeae37b7e1638f6529a8ddc040d389c67a7b0b67b6e84e78cd39d5265a8a84fccdb5bdd7d5a64f7
-  data.tar.gz: 2151ebe77138ecc1cb35169265ae88fdda3ad6ea700e57496b172a56f12fcb38c74b836a459b0c70ab6ab4332f315d23b835d0706d9a9c218fb6478a0ec2acce
+  metadata.gz: f7fbd6bbbc966d1caf340007040012503dcfa83ae4ee4b4394d6ad589953cb4bff8f7639506b5473227897e0ff4ed7018eafa0eaf0f6fbe6bfc131e5eb1909df
+  data.tar.gz: 7d13f41a40b884feca8310d68ffc735f037ccf0cda87d9d752ca85f9b02e6cddf204cf8f77fbb2852ebceddeebd6bb6f556eed9a95589063e964f3366e404cce

data/.codeclimate.yml

@@ -4,6 +4,10 @@ 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

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
@@ -121,6 +122,105 @@ module ManageIQ
         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.3"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-style
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: more_core_extensions