caramelize 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 949bb3270455131310d65fd3e8e7f7dae80c9012aa4497efb479c8d77a0f8be8
-  data.tar.gz: 3ba47fd373b387b1935e9c56315784f89d00f71a35e34a33816578098e1219eb
+  metadata.gz: d9e5e9161ca684e44ce2385309d05bc46083ab2fb690eee7dfd660bee88809b0
+  data.tar.gz: 9b50bf2e5f0317db47769e855d70a82aedd0147c8b3d87e63a6ebce9642c652b
 SHA512:
-  metadata.gz: 36b60fb485ca76922faa32e6c91c8e69f3e639cbcd009abd47eb555bf9f9e3d4a02cfff0f6fd29452321c65231a87e0169b5cea853543489654b44cf8399c888
-  data.tar.gz: f6bf9599cdff4c248e2393e63e476ce9adbb2a7de9ec9fd07bc180a19e8d4bd64265649c6ada7721902bbd5906c24d4628f8e766efa4006bfa9f5fc8931636ab
+  metadata.gz: e16b9a6cc698c2dbc03ef1012a191b9a220cad2ed4222bb4f67c5d4fc2983f939c0c4db643c845e0861198fa0eb79692e24453f015e574b536b968c8f1489f35
+  data.tar.gz: a7c246cdbe61b5547819945c31be6a9e3d38919c5ec979bd59d5632eb012a330f5943dd65ef55a95a493e66515a99668eaa2075d2d11f48c7570ac751cf6dbca

data/.editorconfig

@@ -0,0 +1,30 @@
+root = true
+
+[*]
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+tab_width = 4
+trim_trailing_whitespace = true
+
+[*.bat]
+end_of_line = crlf
+
+[*.gemspec]
+indent_size = 2
+
+[*.rb]
+indent_size = 2
+
+[*.yml]
+indent_size = 2
+
+[{*[Mm]akefile*,*.mak,*.mk,depend}]
+indent_style = tab
+
+[enc/*]
+indent_size = 2
+
+[reg*.[ch]]
+indent_size = 2

data/.github/dependabot.yml

@@ -8,4 +8,4 @@ updates:
   - package-ecosystem: "bundler" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "monthly"

data/.github/workflows/main.yml

@@ -15,7 +15,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
-        ruby-version: 3.1.3
+        ruby-version: 3.4.1
     
     - name: Configure sysctl limits
       run: |
@@ -36,13 +36,13 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          ruby-version: 3.1.3
+          ruby-version: 3.4.1
       # - name: Security audit dependencies
       #  uses: andrewmcodes/bundler-audit-action@main
       # - name: Security audit application code
       #   uses: devmasx/brakeman-linter-action@v1.0.0
       #   env:
       #     GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      - name: Lint Ruby files
-        run: bundle exec rubocop --parallel
+      - name: Standard Ruby
+        uses: standardrb/standard-ruby-action@v1
       

data/.ruby-version

@@ -0,0 +1 @@
+3.4.1

data/Gemfile

@@ -1,17 +1,12 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in testgem.gemspec
 gemspec
 
-gem 'bundler', '~> 2'
-gem 'byebug'
-gem 'guard'
-gem 'guard-rspec'
-gem 'rake'
-gem 'rspec'
-gem 'rubocop'
-gem 'rubocop-performance'
-gem 'rubocop-rake'
-gem 'rubocop-rspec'
+gem "bundler", "~> 2.1"
+gem "rake"
+gem "rspec"
+gem "standard"
+gem "ruby-lsp"

data/Gemfile.lock

@@ -1,25 +1,30 @@
 PATH
   remote: .
   specs:
-    caramelize (1.3.0)
+    caramelize (1.3.2)
+      base64
+      bigdecimal
       commander
       gollum-lib
       mysql2
+      ostruct
       paru
+      rdoc
       ruby-progressbar
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    byebug (11.1.3)
-    coderay (1.1.3)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (3.2.2)
     commander (5.0.0)
       highline (~> 3.0.0)
     crass (1.0.6)
-    diff-lcs (1.5.1)
-    ffi (1.16.3)
-    formatador (1.1.0)
+    csv (3.3.5)
+    date (3.4.1)
+    diff-lcs (1.6.2)
+    erb (5.0.1)
     gemojione (4.3.3)
       json
     github-markup (4.0.2)
@@ -34,125 +39,115 @@ GEM
     gollum-rugged_adapter (3.0)
       mime-types (~> 3.4)
       rugged (~> 1.5)
-    guard (2.18.1)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.13.0)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
     highline (3.0.1)
-    json (2.7.1)
-    language_server-protocol (3.17.0.3)
-    listen (3.9.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.22.0)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lumberjack (1.2.10)
-    method_source (1.0.0)
-    mime-types (3.5.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0206)
-    mini_portile2 (2.8.5)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0617)
+    mini_portile2 (2.8.9)
     mysql2 (0.5.6)
-    nenv (0.3.0)
-    nokogiri (1.16.2)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    ostruct (0.6.2)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    paru (1.2.0)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.7.3)
+    paru (1.4.2)
+      csv (~> 3.3)
+    prism (1.4.0)
+    psych (5.2.6)
+      date
+      stringio
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.1.0)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
+    rake (13.3.0)
+    rbs (3.9.4)
+      logger
+    rdoc (6.14.0)
+      erb
+      psych (>= 4.0.0)
+    regexp_parser (2.10.0)
     rouge (3.30.0)
-    rspec (3.13.0)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.4)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.61.0)
+    rspec-support (3.13.4)
+    rubocop (1.75.8)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.1)
-      parser (>= 3.3.0.4)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-performance (1.18.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.27.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    ruby-lsp (0.24.1)
+      language_server-protocol (~> 3.17.0)
+      prism (>= 1.2, < 2.0)
+      rbs (>= 3, < 5)
+      sorbet-runtime (>= 0.5.10782)
     ruby-progressbar (1.13.0)
-    rugged (1.7.2)
-    shellany (0.0.1)
-    thor (1.3.1)
+    rugged (1.9.0)
+    sorbet-runtime (0.5.12189)
+    standard (1.50.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.75.5)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.8)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.8.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.25.0)
+    stringio (3.1.7)
     twitter-text (1.14.7)
       unf (~> 0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.9.1)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2)
-  byebug
+  bundler (~> 2.1)
   caramelize!
-  guard
-  guard-rspec
   rake
   rspec
-  rubocop
-  rubocop-performance
-  rubocop-rake
-  rubocop-rspec
+  ruby-lsp
+  standard
 
 BUNDLED WITH
-   2.5.5
+   2.5.23

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Daniel Senff
+Copyright (c) 2015-2024 Daniel Senff
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/Rakefile

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'rspec/core/rake_task'
-require 'bundler/gem_tasks'
+require "rspec/core/rake_task"
+require "bundler/gem_tasks"
 
 # Default directory to look in is `/specs`
 # Run with `rake spec`
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.rspec_opts = ['--color', '--format', 'documentation']
+  task.rspec_opts = ["--color", "--format", "documentation"]
 end
 
 task default: :spec

data/bin/caramelize

@@ -22,10 +22,9 @@ command :new do |c|
   c.example 'Create a fresh config file as "caramel.rb"', 'caramelize create'
   c.example 'Create a fresh config file as "config.rb"', 'caramelize create --config config.rb'
   c.action do |_args, options|
-    target_file || options.config || 'caramel.rb'
     options.default({ config: 'caramel.rb' })
-    FileUtils.cp("#{File.dirname(__FILE__)}/../lib/caramelize/#{target_file}",
-                 options.config)
+    FileUtils.cp("#{File.dirname(__FILE__)}/../lib/caramelize/caramel.rb",
+                  options.config)
     say "Created new configuration file: #{options.config}"
   end
 end

data/caramelize.gemspec

@@ -1,29 +1,33 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'caramelize/version'
+require "caramelize/version"
 
 Gem::Specification.new do |spec|
-  spec.name        = 'caramelize'
-  spec.version     = Caramelize::VERSION
-  spec.license = 'MIT'
-  spec.authors     = ['Daniel Senff']
-  spec.email       = ['mail@danielsenff.de']
-  spec.homepage    = 'http://github.com/Dahie/caramelize'
-  spec.summary     = 'Flexible and modular wiki conversion tool'
-  spec.description = 'With Caramelize you can migrate any wiki to git-based Gollum wiki repositories.'
+  spec.name = "caramelize"
+  spec.version = Caramelize::VERSION
+  spec.license = "MIT"
+  spec.authors = ["Daniel Senff"]
+  spec.email = ["mail@danielsenff.de"]
+  spec.homepage = "http://github.com/Dahie/caramelize"
+  spec.summary = "Flexible and modular wiki conversion tool"
+  spec.description = "With Caramelize you can migrate any wiki to git-based Gollum wiki repositories."
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 3.1'
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 3"
 
-  spec.add_dependency('commander')
-  spec.add_dependency('gollum-lib')
-  spec.add_dependency('mysql2')
-  spec.add_dependency('paru')
-  spec.add_dependency('ruby-progressbar')
+  spec.add_dependency("base64")
+  spec.add_dependency("bigdecimal")
+  spec.add_dependency("commander")
+  spec.add_dependency("gollum-lib")
+  spec.add_dependency("mysql2")
+  spec.add_dependency("ostruct")
+  spec.add_dependency("paru")
+  spec.add_dependency("rdoc")
+  spec.add_dependency("ruby-progressbar")
 
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/caramelize/caramel.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'caramelize/input_wiki/media_wiki'
-require 'caramelize/input_wiki/redmine_wiki'
-require 'caramelize/input_wiki/wikka_wiki'
+require "caramelize/input_wiki/media_wiki"
+require "caramelize/input_wiki/redmine_wiki"
+require "caramelize/input_wiki/wikka_wiki"
 
 ## Example caramelize configuration file
 
@@ -13,27 +13,27 @@ require 'caramelize/input_wiki/wikka_wiki'
 def customized_wiki
   # This example is a reimplementation of the WikkaWiki-Connector.
   # To connect to WikkaWiki, I suggest to use the predefined Connector below.
-  options = { host: 'localhost',
-              username: 'user',
-              database: 'database_name',
-              password: 'Picard-Delta-5',
-              markup: :wikka }
+  options = {host: "localhost",
+             username: "user",
+             database: "database_name",
+             password: "Picard-Delta-5",
+             markup: :wikka}
   wiki = Caramelize::InputWiki::Wiki.new(options)
   wiki.instance_eval do
     def read_pages
-      sql = 'SELECT id, tag, body, time, latest, user, note FROM wikka_pages ORDER BY time;'
+      sql = "SELECT id, tag, body, time, latest, user, note FROM wikka_pages ORDER BY time;"
       results = database.query(sql)
       results.each do |row|
-        titles << row['tag']
-        author = @authors[row['user']]
-        properties = { id: row['id'],
-                       title: row['tag'],
-                       body: row['body'],
-                       markup: 'wikka',
-                       latest: row['latest'] == 'Y',
-                       time: row['time'],
-                       message: row['note'],
-                       author: }
+        titles << row["tag"]
+        author = @authors[row["user"]]
+        properties = {id: row["id"],
+                      title: row["tag"],
+                      body: row["body"],
+                      markup: "wikka",
+                      latest: row["latest"] == "Y",
+                      time: row["time"],
+                      message: row["note"],
+                      author:}
         page = Page.new(properties)
         revisions << page
       end
@@ -66,10 +66,10 @@ def predefined_wiki
   # For connection to a Redmine-Database use this Connector
   # Additional options:
   # :create_namespace_overview => true/false (Default: true)  -  Creates a new wikipage at /home as root page for Gollum wiki
-  options = { host: 'localhost',
-              username: 'root',
-              password: 'root',
-              database: 'redmine_development' }
+  options = {host: "localhost",
+             username: "root",
+             password: "root",
+             database: "redmine_development"}
   Caramelize::InputWiki::RedmineWiki.new(options)
 end
 

data/lib/caramelize/content_transferer.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-require 'ruby-progressbar'
+require "ruby-progressbar"
 
 module Caramelize
-  require 'caramelize/page'
-  require 'caramelize/content_transferer'
-  require 'caramelize/output_wiki/gollum'
-  require 'caramelize/input_wiki/media_wiki'
-  require 'caramelize/input_wiki/redmine_wiki'
-  require 'caramelize/input_wiki/wikka_wiki'
+  require "caramelize/page"
+  require "caramelize/content_transferer"
+  require "caramelize/output_wiki/gollum"
+  require "caramelize/input_wiki/media_wiki"
+  require "caramelize/input_wiki/redmine_wiki"
+  require "caramelize/input_wiki/wikka_wiki"
 
   class ContentTransferer
     attr_reader :input_wiki, :options
 
-    DEFAULT_GOLLUM_HOME_TITLE = 'Home'
-    DEFAULT_AUTHOR_NAME = 'Caramelize'
-    DEFAULT_AUTHOR_EMAIL = 'caramelize@example.com'
+    DEFAULT_GOLLUM_HOME_TITLE = "Home"
+    DEFAULT_AUTHOR_NAME = "Caramelize"
+    DEFAULT_AUTHOR_EMAIL = "caramelize@example.com"
 
     def initialize(input_wiki, options)
       @input_wiki = input_wiki
       @options = options
 
-      options[:default_author] = options.fetch(:default_author, 'Caramelize')
+      options[:default_author] = options.fetch(:default_author, "Caramelize")
       options[:markup] = target_markup
     end
 
@@ -78,24 +78,24 @@ module Caramelize
     end
 
     def create_overview_page_of_namespaces
-      puts 'Create Namespace Overview' if verbose?
+      puts "Create Namespace Overview" if verbose?
       output_wiki.commit_namespace_overview(input_wiki.namespaces)
     end
 
     def migrate_markup_progress_bar
       @migrate_markup_progress_bar ||=
-        ProgressBar.create(title: 'Markup filters',
-                           total: latest_revisions_count)
+        ProgressBar.create(title: "Markup filters",
+          total: latest_revisions_count)
     end
 
     def commit_history_progress_bar
       @commit_history_progress_bar ||=
-        ProgressBar.create(title: 'Revisions',
-                           total: revisions_count)
+        ProgressBar.create(title: "Revisions",
+          total: revisions_count)
     end
 
     def migrate_markup_of_latest_revisions
-      puts 'Convert latest revisions:' if verbose?
+      puts "Convert latest revisions:" if verbose?
       input_wiki.latest_revisions.each do |revision|
         convert_markup_of_revision(revision)
       end
@@ -151,7 +151,7 @@ module Caramelize
 
     def build_revision_metadata(revision, body_new)
       revision.body = body_new
-      revision.author = { name: DEFAULT_AUTHOR_NAME, email: DEFAULT_AUTHOR_EMAIL }
+      revision.author = {name: DEFAULT_AUTHOR_NAME, email: DEFAULT_AUTHOR_EMAIL}
       revision.time = Time.zone.now
 
       revision

data/lib/caramelize/database_connector.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'mysql2'
+require "mysql2"
 
 module Caramelize
   module DatabaseConnector
     def database
-      @options[:socket] = ['/tmp/mysqld.sock',
-                           '/tmp/mysql.sock',
-                           '/var/run/mysqld/mysqld.sock',
-                           '/opt/local/var/run/mysql5/mysqld.sock',
-                           '/var/lib/mysql/mysql.sock'].detect { |socket| File.exist?(socket) }
+      @options[:socket] = ["/tmp/mysqld.sock",
+        "/tmp/mysql.sock",
+        "/var/run/mysqld/mysqld.sock",
+        "/opt/local/var/run/mysql5/mysqld.sock",
+        "/var/lib/mysql/mysql.sock"].detect { |socket| File.exist?(socket) }
       @client ||= Mysql2::Client.new(@options)
       @client
     end

data/lib/caramelize/filters/camel_case_to_wiki_links.rb

@@ -18,8 +18,8 @@ module Caramelize
     private
 
     def format_link(link)
-      link.tr!(' ', '_')
-      link.delete!('.')
+      link.tr!(" ", "_")
+      link.delete!(".")
       "[[#{link}]]"
     end
   end

data/lib/caramelize/filters/mediawiki_to_markdown.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'paru/pandoc'
+require "paru/pandoc"
 
 module Caramelize
   class MediawikiToMarkdown
@@ -12,9 +12,9 @@ module Caramelize
 
     def run
       Paru::Pandoc.new do
-        from 'mediawiki'
-        to 'markdown'
-        markdown_headings 'atx'
+        from "mediawiki"
+        to "markdown"
+        markdown_headings "atx"
       end << source_body.dup
     end
   end

data/lib/caramelize/filters/swap_wiki_links.rb

@@ -20,8 +20,8 @@ module Caramelize
 
     def format_link(label, link)
       link.downcase!
-      link.tr!(' ', '_')
-      link.delete!('.')
+      link.tr!(" ", "_")
+      link.delete!(".")
       "[[#{label}|#{link}]]"
     end
   end