caramelize 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 033fa149f2fd6a1823143125c966ea4ce7ea45b4106dec98762f4764db0b3c09
-  data.tar.gz: 80c47ef70453d79d01979f9fada6987d4f91cc4101aae488d4b5cba21841016e
+  metadata.gz: cb93f32560a4999584cc9e883655f867ed7f02bdffc4ef9a7088a5c44e68b29b
+  data.tar.gz: a3ae3187dc3a45c831daa833e991692f7c7108c8967da53efcafb2a4330dbadc
 SHA512:
-  metadata.gz: aed7b973e815bc6680210aef38f3519e6d46d45c10efd095126cce67edcd6d64cbd46bfd31b03cc68abf0f60bd8be57bf948d687f874a78fc8e37cb9a4a812a1
-  data.tar.gz: f9e3d0d1c1ba24c73d7f13699f71fb9d1abfb0022c9b42a5ed94a241bd88a09aab93f43bb69ba622f8e03a0ba1d85b92b97c7be1a7545a50886ce06536891203
+  metadata.gz: 0da855d0680a06673e8ad2b98734ee8fe4d04063ebd40e5b5a3b37cd1f7446fd4ea10502e349dfc1e27787b8f395b976f870595e7622e1524a2504f9676000a4
+  data.tar.gz: 886e63abc962ee8e830d12efc632bd832000ca70951081e9cfb185fabba1f40711db6574ef2df40b2c8c946f5ae61ef06f51877a66288eef9f9ef431c4237937

data/.rubocop.yml

@@ -0,0 +1,29 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
+AllCops:
+  NewCops: enable
+  Exclude:
+    - 'vendor/**/*'
+    - 'spec/fixtures/**/*'
+    - 'tmp/**/*'
+    - '.git/**/*'
+    - 'bin/*'
+    - '*.cmlz'
+  TargetRubyVersion: 3.1
+  SuggestExtensions: false
+
+
+Style/Documentation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledocumentation
+
+Metrics/BlockLength:
+  Enabled: false
+
+Layout/LineLength:
+  Enabled: false
+
+RSpec/NestedGroups:
+  Enabled: false

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in testgem.gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    caramelize (1.1.0)
+    caramelize (1.2.0)
       commander
       gollum-lib
       mysql2
@@ -10,37 +10,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.2)
     byebug (11.1.3)
-    coderay (1.1.2)
-    commander (4.5.2)
-      highline (~> 2.0.0)
+    coderay (1.1.3)
+    commander (5.0.0)
+      highline (~> 3.0.0)
     crass (1.0.6)
-    diff-lcs (1.3)
-    ffi (1.12.2)
-    formatador (0.2.5)
+    diff-lcs (1.5.1)
+    ffi (1.16.3)
+    formatador (1.1.0)
     gemojione (4.3.3)
       json
-    github-markup (3.0.5)
-    gollum-lib (5.0.6)
+    github-markup (4.0.2)
+    gollum-lib (6.0)
       gemojione (~> 4.1)
-      github-markup (~> 3.0)
-      gollum-rugged_adapter (~> 1.0)
+      github-markup (~> 4.0)
+      gollum-rugged_adapter (~> 3.0)
       loofah (~> 2.3)
       nokogiri (~> 1.8)
-      octicons (~> 8.5)
       rouge (~> 3.1)
       twitter-text (= 1.14.7)
-    gollum-rugged_adapter (1.0)
-      mime-types (>= 1.15)
-      rugged (~> 0.99)
-    guard (2.16.2)
+    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.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -48,93 +47,106 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    highline (2.0.3)
-    io-console (0.5.6)
-    irb (1.2.7)
-      reline (>= 0.1.5)
-    jaro_winkler (1.5.4)
-    json (2.3.1)
-    listen (3.2.1)
+    highline (3.0.1)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.8.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    lumberjack (1.2.4)
+      nokogiri (>= 1.12.0)
+    lumberjack (1.2.10)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
-    mini_portile2 (2.4.0)
-    mysql2 (0.5.3)
+    mime-types-data (3.2023.1205)
+    mini_portile2 (2.8.5)
+    mysql2 (0.5.5)
     nenv (0.3.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.16.0)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octicons (8.5.0)
-      nokogiri (>= 1.6.3.1)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
-    pry (0.13.1)
+    parallel (1.24.0)
+    parser (3.3.0.5)
+      ast (~> 2.4.1)
+      racc
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.3)
+    racc (1.7.3)
+    rainbow (3.1.1)
+    rake (13.1.0)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    reline (0.1.9)
-      io-console (~> 0.5)
-    rexml (3.2.4)
-    rouge (3.26.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rouge (3.30.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.60.2)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    ruby-progressbar (1.10.1)
-    rugged (0.99.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    rugged (1.7.1)
     shellany (0.0.1)
-    thor (1.0.1)
+    thor (1.3.0)
     twitter-text (1.14.7)
       unf (~> 0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.9.1)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.6)
+  bundler (~> 2)
   byebug
   caramelize!
   guard
   guard-rspec
-  irb
   rake
   rspec
   rubocop
+  rubocop-rake
+  rubocop-rspec
 
 BUNDLED WITH
-   1.17.3
+   2.5.5

data/README.md

@@ -1,6 +1,6 @@
 # Caramelize
 
-[![Build Status](https://travis-ci.org/dahie/caramelize.svg?branch=master)](https://travis-ci.org/dahie/caramelize) [![Maintainability](https://api.codeclimate.com/v1/badges/7fe3ef34e09ba8133424/maintainability)](https://codeclimate.com/github/Dahie/caramelize/maintainability)
+[![Maintainability](https://api.codeclimate.com/v1/badges/7fe3ef34e09ba8133424/maintainability)](https://codeclimate.com/github/Dahie/caramelize/maintainability)
 
 Caramelize is a compact and flexible wiki content migration tool. It is intended for easily transfering content from otherwise rare supported legacy wikis. With caramelize you can create your own export configurations and migrate your data into a git-based [gollum](https://github.com/github/gollum)-wiki retaining all your history and gaining the most flexible access to your wiki content.
 
@@ -107,8 +107,7 @@ Once the object is established we need to hook in a method that defines how revi
                             latest:  row["latest"] == "Y",
                             time:    row["time"],
                             message: row["note"],
-                            author:  author,
-                            author_name: row["user"]})
+                            author:  author})
        		 revisions << page
       	end
       # titles is the list of all unique page titles contained in the wiki

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec/core/rake_task'
 require 'bundler/gem_tasks'
 
@@ -7,4 +9,4 @@ RSpec::Core::RakeTask.new(:spec) do |task|
   task.rspec_opts = ['--color', '--format', 'documentation']
 end
 
-task :default => :spec
+task default: :spec

data/bin/caramelize

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'caramelize'
 require 'commander/import'
@@ -20,10 +21,10 @@ command :new do |c|
   c.option '--config STRING', String, 'The config file (default: caramel.rb)'
   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')
+  c.action do |_args, options|
+    target_file || options.config || 'caramel.rb'
     options.default({ config: 'caramel.rb' })
-    FileUtils.cp(File.dirname(__FILE__) + '/../lib/caramelize/caramel.rb',
+    FileUtils.cp("#{File.dirname(__FILE__)}/../lib/caramelize/#{target_file}",
                  options.config)
     say "Created new configuration file: #{options.config}"
   end
@@ -37,7 +38,7 @@ command :run do |c|
   c.option '--config STRING', String, 'The config file (default: caramel.rb)'
   c.example 'Run transfer for "caramel.rb"', 'caramelize run'
   c.example 'Run transfer for "config.rb"', 'caramelize run --config config.rb'
-  c.action do |args, options|
+  c.action do |_args, options|
     time_start = Time.now
     options.default({ config: 'caramel.rb', target: 'wiki-export' })
 
@@ -45,7 +46,7 @@ command :run do |c|
 
     target = options.target
 
-    if File.exists?(target)
+    if File.exist?(target)
       answer = agree("#{target} already exists. Overwrite with fresh repository?")
       FileUtils.rm_rf(target) if answer
     end
@@ -63,10 +64,10 @@ command :doctor do |c|
   c.description = 'Run health-check'
   c.option '--target STRING', String, 'The target path to Gollum git repository (default: wiki-export)'
   c.example 'Run transfer for "caramel.rb"', 'caramelize doctor'
-  c.action do |args, options|
+  c.action do |_args, options|
     options.default(target: 'wiki-export')
 
-    if File.exists?(options.target)
+    if File.exist?(options.target)
       Caramelize::HealthCheck.new(options.target).execute
     else
       say("No wiki repositry found in directory #{options.target}")

data/caramelize.gemspec

@@ -1,33 +1,37 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+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.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     = %q{Flexible and modular wiki conversion tool}
-  spec.description = %q{With Caramelize you can migrate any wiki to git-based Gollum wiki repositories.}
+  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.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency('commander')
   spec.add_dependency('gollum-lib')
   spec.add_dependency('mysql2')
   spec.add_dependency('ruby-progressbar')
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "byebug"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency 'bundler', '~> 2'
+  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/caramelize/caramel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'caramelize/input_wiki/wikkawiki'
 require 'caramelize/input_wiki/redmine_wiki'
 
@@ -8,31 +10,29 @@ require 'caramelize/input_wiki/redmine_wiki'
 
 # Note, if you want to activate this, you need to uncomment the line below.
 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",
+  options = { host: 'localhost',
+              username: 'user',
+              database: 'database_name',
               password: 'Picard-Delta-5',
-              markup: :wikka}
+              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: author,
-                    author_name: row["user"]}
+        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
@@ -44,35 +44,31 @@ def customized_wiki
   wiki
 end
 
-
 # if you want to use one of the preset Wiki-Connectors uncomment the connector
 # and edit the database logins accordingly.
 def predefined_wiki
-
   # For connection to a WikkaWiki-Database use this Connector
-  #options = { host: "localhost",
+  # options = { host: "localhost",
   #      username: "root",
   #      password: "root",
   #      database: "wikka" }
-  #return Caramelize::InputWiki::WikkaWiki.new(options)
-
+  # return Caramelize::InputWiki::WikkaWiki.new(options)
 
   # 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" }
-  return Caramelize::InputWiki::RedmineWiki.new(options)
+  options = { host: 'localhost',
+              username: 'root',
+              password: 'root',
+              database: 'redmine_development' }
+  Caramelize::InputWiki::RedmineWiki.new(options)
 end
 
-
 def input_wiki
   # comment and uncomment to easily switch between predefined and
   # costumized Wiki-connectors.
 
-  #return customized_wiki
+  # return customized_wiki
 
-  return predefined_wiki
+  predefined_wiki
 end

data/lib/caramelize/content_transferer.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'ruby-progressbar'
 
 module Caramelize
-
   require 'caramelize/page'
   require 'caramelize/content_transferer'
   require 'caramelize/database_connector'
@@ -12,37 +13,37 @@ module Caramelize
   class ContentTransferer
     attr_reader :input_wiki, :options
 
-    DEFAULT_GOLLUM_HOME_TITLE = 'Home'.freeze
+    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
 
     def execute
       input_wiki.read_authors
-
       commit_history
-
-      if verbose?
-        puts "From markup: #{input_wiki.markup.to_s}"
-        puts "To markup: #{target_markup.to_s}"
-        puts "Convert latest revisions:"
-      end
+      print_meta_data if verbose?
 
       migrate_markup_of_latest_revisions
 
-      puts 'Create Namespace Overview' if verbose?
       create_overview_page_of_namespaces if options[:create_namespace_overview]
 
-      rename_home_page
+      rename_home_page if options[:home_page_title]
     end
 
     private
 
+    def print_meta_data
+      puts "From markup: #{input_wiki.markup}"
+      puts "To markup: #{target_markup}"
+    end
+
     def target_markup
       @target_markup ||=
         needs_conversion_to_target_markup? ? input_wiki.markup : :markdown
@@ -77,29 +78,47 @@ module Caramelize
     end
 
     def create_overview_page_of_namespaces
+      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",
+        ProgressBar.create(title: 'Markup filters',
                            total: latest_revisions_count)
     end
 
     def commit_history_progress_bar
       @commit_history_progress_bar ||=
-        ProgressBar.create(title: "Revisions",
+        ProgressBar.create(title: 'Revisions',
                            total: revisions_count)
     end
 
     def migrate_markup_of_latest_revisions
+      puts 'Convert latest revisions:' if verbose?
       input_wiki.latest_revisions.each do |revision|
+        if input_wiki.excluded_pages.include?(revision.title)
+          puts "Exclude Page: #{revision.title}" if verbose?
+          next
+        end
+
+        if verbose?
+          puts "Filter source: #{revision.title} #{revision.time}"
+        else
+          migrate_markup_progress_bar.increment
+        end
+
         migrate_markup_of_revision(revision)
       end
     end
 
     def commit_history
       output_wiki.commit_history(revisions, options) do |page, index|
+        if input_wiki.excluded_pages.include?(page.title)
+          puts "Exclude Page: #{page.title}" if verbose?
+          next
+        end
+
         if verbose?
           puts "(#{index + 1}/#{revisions_count}) #{page.time} #{page.title}"
         else
@@ -109,27 +128,27 @@ module Caramelize
     end
 
     def migrate_markup_of_revision(revision)
-      if verbose?
-        puts "Filter source: #{revision.title} #{revision.time}"
-      else
-        migrate_markup_progress_bar.increment
-      end
-
       body_new = filter_processor.run(revision.body)
 
-      unless body_new == revision.body
-        revision.body = body_new
-        revision.author_name = 'Caramelize'
-        revision.time = Time.now
-        revision.author = nil
-        revision.message = "Markup of '#{revision.title}' converted to #{target_markup}"
+      return if body_new == revision.body
 
-        # commit as latest page revision
-        output_wiki.commit_revision(revision, options[:markup])
-      end
+      message = "Markup of '#{revision.title}' converted to #{target_markup}"
+
+      # commit as latest page revision
+      output_wiki.commit_revision(build_revision_metadata(revision, body_new, message), options[:markup])
+    end
+
+    def build_revision_metadata(revision, body_new, message)
+      revision.body = body_new
+      revision.author = { name: DEFAULT_AUTHOR_NAME, email: DEFAULT_AUTHOR_EMAIL }
+      revision.time = Time.now
+      revision.message = message
+
+      revision
     end
 
     def rename_home_page
+      puts "Rename page #{options[:home_page_title]} to #{DEFAULT_GOLLUM_HOME_TITLE}" if verbose?
       output_wiki.rename_page(options[:home_page_title], DEFAULT_GOLLUM_HOME_TITLE)
     end
   end