fix RuboCop (#545)

Merge pull request 545
jekyll · Jul 17, 2024 · 5ba1121 · 5ba1121
1 parent 3a949b9
commit 5ba1121
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/exe/jekyll-import b/exe/jekyll-import
@@ -21,7 +21,7 @@ Mercenary.program(:jekyll_import) do |p|
   p.action do |args, _|
     if args.empty?
       Jekyll.logger.error "An importer subcommand is required."
-      puts p
+      Jekyll.logger.info p
       abort
     else
       subcommand = args.first

diff --git a/lib/jekyll-import/importers/pebble.rb b/lib/jekyll-import/importers/pebble.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 module JekyllImport
   module Importers
     class Pebble < Importer
@@ -8,34 +10,32 @@ def self.require_deps
         ))
       end
 
-      def self.specify_options(c) 
+      def self.specify_options(c)
         c.option "directory", "--directory PATH", "Pebble source directory"
       end
 
       def self.process(opts)
-        options = {
-          directory: opts.fetch("directory", "")
-        }
+        options = { directory => opts.fetch("directory", "") }
 
         FileUtils.mkdir_p("_posts")
         FileUtils.mkdir_p("_drafts")
 
         traverse_posts_within(options[:directory]) do |file|
-          next if file.end_with?('categories.xml')
+          next if file.end_with?("categories.xml")
+
           process_file(file)
         end
       end
 
-      def self.traverse_posts_within(directory, &block) 
+      def self.traverse_posts_within(directory, &block)
         Dir.foreach(directory) do |fd|
           path = File.join(directory, fd)
-          if fd == '.' || fd == '..'
+          if fd.include?(".") || fd.include?("..")
             next
-          elsif File.directory?(path) 
+          elsif File.directory?(path)
             traverse_posts_within(path, &block)
-          elsif path.end_with?('xml')
+          elsif path.end_with?("xml")
             yield(path) if block_given?
-          else
           end
         end
       end
@@ -46,17 +46,17 @@ def self.process_file(file)
 
         doc = xml.xpath("blogEntry")
 
-        title = kebabize(doc.xpath('title').text).gsub('_', '-')
-        date = Date.parse(doc.xpath('date').text)
+        title = kebabize(doc.xpath("title").text).tr("_", "-")
+        date = Date.parse(doc.xpath("date").text)
 
         directory = "_posts"
-        name = "#{date.strftime('%Y-%m-%d')}-#{title}"
+        name = "#{date.strftime("%Y-%m-%d")}-#{title}"
 
         header = {
-          "layout" => 'post',
-          "title"  => doc.xpath("title").text,
-          "tags"   => doc.xpath("tags").text.split(", "),
-          "categories" => doc.xpath('category').text.split(', ')
+          "layout"     => "post",
+          "title"      => doc.xpath("title").text,
+          "tags"       => doc.xpath("tags").text.split(", "),
+          "categories" => doc.xpath("category").text.split(", "),
         }
         header["render_with_liquid"] = false
 
@@ -71,17 +71,17 @@ def self.process_file(file)
       end
 
       def self.kebabize(string)
-        kebab = '-'.freeze
-        string.gsub!(/[^\w\-_]+/, kebab)
+        kebab = "-".freeze
+        string.gsub!(%r![^\w\-_]+!, kebab)
 
         unless kebab.nil? || kebab.empty?
           if kebab == "-".freeze
-            re_duplicate_kebab        = /-{2,}/
-            re_leading_trailing_kebab = /^-|-$/
+            re_duplicate_kebab        = %r!-{2,}!
+            re_leading_trailing_kebab = %r!^-|-$!
           else
             re_sep = Regexp.escape(kebab)
-            re_duplicate_kebab        = /#{re_sep}{2,}/
-            re_leading_trailing_kebab = /^#{re_sep}|#{re_sep}$/
+            re_duplicate_kebab = %r!#{re_sep}{2,}!
+            re_leading_trailing_kebab = %r!^#{re_sep}|#{re_sep}$!
           end
           # No more than one of the kebab in a row.
           string.gsub!(re_duplicate_kebab, kebab)