edgestitch 0.3.0 → 0.5.0

data/gemfiles/rails_7_1.gemfile.lock

@@ -0,0 +1,332 @@
+PATH
+  remote: ../../rubocop-powerhome
+  specs:
+    rubocop-powerhome (0.5.5)
+      rubocop (= 1.74.0)
+      rubocop-performance
+      rubocop-rails
+      rubocop-rake
+      rubocop-rspec
+
+PATH
+  remote: ..
+  specs:
+    edgestitch (0.5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      actionview (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.3.3)
+      actionview (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.3.3)
+      activesupport (= 7.1.3.3)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.3.3)
+      activesupport (= 7.1.3.3)
+      globalid (>= 0.3.6)
+    activemodel (7.1.3.3)
+      activesupport (= 7.1.3.3)
+    activerecord (7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      timeout (>= 0.4.0)
+    activestorage (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      marcel (~> 1.0)
+    activesupport (7.1.3.3)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (3.2.2)
+    builder (3.3.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    crass (1.0.6)
+    csv (3.3.5)
+    date (3.4.1)
+    diff-lcs (1.6.2)
+    docile (1.1.5)
+    drb (2.2.3)
+    erb (5.0.2)
+    erubi (1.13.1)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    io-console (0.8.1)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    license_finder (7.2.1)
+      bundler
+      csv (~> 3.2)
+      rubyzip (>= 1, < 3)
+      thor (~> 1.2)
+      tomlrb (>= 1.3, < 2.1)
+      with_env (= 1.1.0)
+      xml-simple (~> 1.1.9)
+    lint_roller (1.1.0)
+    loofah (2.24.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    mini_mime (1.1.5)
+    minitest (5.25.5)
+    mutex_m (0.3.0)
+    mysql2 (0.5.5)
+    net-imap (0.4.22)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.4)
+    nokogiri (1.18.8-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.8-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.8-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.8-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.8-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-linux-musl)
+      racc (~> 1.4)
+    parallel (1.27.0)
+    parser (3.3.8.0)
+      ast (~> 2.4.1)
+      racc
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    psych (5.2.6)
+      date
+      stringio
+    racc (1.8.1)
+    rack (3.1.16)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails (7.1.3.3)
+      actioncable (= 7.1.3.3)
+      actionmailbox (= 7.1.3.3)
+      actionmailer (= 7.1.3.3)
+      actionpack (= 7.1.3.3)
+      actiontext (= 7.1.3.3)
+      actionview (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      bundler (>= 1.15.0)
+      railties (= 7.1.3.3)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.3.0)
+    rdoc (6.14.2)
+      erb
+      psych (>= 4.0.0)
+    regexp_parser (2.10.0)
+    reline (0.6.1)
+      io-console (~> 0.5)
+    rexml (3.4.1)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-rails (5.1.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.13.4)
+    rubocop (1.74.0)
+      json (~> 2.3)
+      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 (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.24.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.30.3)
+      activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
+      rack (>= 1.1)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    ruby-progressbar (1.13.0)
+    rubyzip (2.4.1)
+    simplecov (0.15.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    stringio (3.1.7)
+    thor (1.3.2)
+    timeout (0.4.3)
+    tomlrb (2.0.3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    websocket-driver (0.8.0)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    with_env (1.1.0)
+    xml-simple (1.1.9)
+      rexml
+    yard (0.9.21)
+    zeitwerk (2.6.18)
+
+PLATFORMS
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
+
+DEPENDENCIES
+  appraisal (~> 2.5.0)
+  bundler (~> 2.1)
+  edgestitch!
+  license_finder (>= 7.0)
+  mysql2 (= 0.5.5)
+  net-imap (< 0.5.0)
+  rails (= 7.1.3.3)
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rspec-rails (~> 5.1.2)
+  rubocop-powerhome!
+  simplecov (= 0.15.1)
+  yard (= 0.9.21)
+  zeitwerk (< 2.7.0)
+
+BUNDLED WITH
+   2.5.23

data/lib/edgestitch/exporter.rb

@@ -52,7 +52,7 @@ module Edgestitch
     attr_reader :database_directory_path, :extra_tables_path, :structure_file_path
 
     def extra_tables
-      @extra_tables ||= extra_tables_path.exist? ? extra_tables_path.readlines.map(&:strip) : []
+      @extra_tables ||= extra_tables_path.exist? ? extra_tables_path.each_line.map(&:strip) : []
     end
 
     def component_tables

data/lib/edgestitch/mysql/dump.rb

@@ -2,7 +2,7 @@
 
 require "open3"
 
-require_relative "./structure_constraint_order_munger"
+require_relative "structure_constraint_order_munger"
 
 module Edgestitch
   module Mysql
@@ -11,6 +11,8 @@ module Edgestitch
     # Wrapper for the mysqldump tool to dump specific tables and migration data
     #
     class Dump
+      # @private
+      #
       # Sanitizes a DDL code with some opinionated preferences:
       # * Constraints starting with `_fk` will start with `fk`
       # * Clear empty lines (with empty spaces even)
@@ -18,7 +20,7 @@ module Edgestitch
       #
       # @param sql [String] the DDL code to sanitize
       # @return String the same DDL sanitized
-      def self.sanitize_sql(sql)
+      def self.sanitize_create_table(sql)
         comment_instructions_regex = %r{^/\*![0-9]{5}\s+[^;]+;\s*$}
 
         cleanups = sql.gsub(/\s+AUTO_INCREMENT=\d+/, "")
@@ -29,6 +31,24 @@ module Edgestitch
         ::Edgestitch::Mysql::StructureConstraintOrderMunger.munge(cleanups)
       end
 
+      # @private
+      #
+      # Sanitizes a DML code to insert migration timestamps with opinionated preferences:
+      # * One timestamp per line
+      # * Except for the first line, they all start with a comma
+      # * Semicolomn is in a separate line from the last one
+      #
+      # The above preferences come from the idea of minimizing merge conflicts, or make
+      # them easily handled by git automatically
+      #
+      # @param sql [String] the DML code to sanitize
+      # @return String the same DML sanitized
+      def self.sanitize_migration_timestamps(sql)
+        sql.gsub("VALUES ", "VALUES\n")
+           .gsub(",", "\n,")
+           .gsub(";", "\n;")
+      end
+
       #
       # @param config [ActiveRecord::DatabaseConfigurations::DatabaseConfig] rails database configuration
       def initialize(config)
@@ -49,7 +69,7 @@ module Edgestitch
       def export_tables(tables)
         return if tables.empty?
 
-        self.class.sanitize_sql(
+        self.class.sanitize_create_table(
           execute("--compact", "--skip-lock-tables", "--no-data", "--set-gtid-purged=OFF",
                   "--column-statistics=0", *tables)
         )
@@ -65,13 +85,13 @@ module Edgestitch
       # @return String the INSERT statements.
       def export_migrations(migrations)
         migrations.in_groups_of(50, false).map do |versions|
-          execute(
+          self.class.sanitize_migration_timestamps execute(
             "--compact", "--skip-lock-tables", "--set-gtid-purged=OFF",
             "--no-create-info", "--column-statistics=0",
             "schema_migrations",
             "-w", "version IN (#{versions.join(',')})"
           )
-        end.join.gsub(/VALUES /, "VALUES\n").gsub(/,/, ",\n")
+        end.join
       end
 
     private

data/lib/edgestitch/railtie.rb

@@ -7,6 +7,9 @@ module Edgestitch
   # require this railtie to automatically install the stitch task for the app,
   # or define it manually adding `::Edgestitch.define_stitch` to your Rakefile.
   class Railtie < ::Rails::Railtie
-    rake_tasks { ::Edgestitch::Tasks.define_stitch }
+    rake_tasks { ::Edgestitch::Tasks.define_stitch(enhance_rails: config.edgestitch.enhance) }
+
+    config.edgestitch = ActiveSupport::OrderedOptions.new
+    config.edgestitch.enhance = true
   end
 end

data/lib/edgestitch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Edgestitch
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: edgestitch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Carlos Palhares
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2025-08-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,34 +58,34 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.8.1
+        version: 6.0.6.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.8.1
+        version: 6.0.6.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -165,12 +179,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rubocop.yml"
+- Appraisals
 - Gemfile
+- Gemfile.lock
 - Rakefile
 - doc/dependency_decisions.yml
 - docs/CHANGELOG.md
 - docs/README.md
 - edgestitch.gemspec
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_0.gemfile.lock
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_6_1.gemfile.lock
+- gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_0.gemfile.lock
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_1.gemfile.lock
 - lib/edgestitch.rb
 - lib/edgestitch/exporter.rb
 - lib/edgestitch/mysql/dump.rb
@@ -189,7 +213,7 @@ metadata:
   homepage_uri: https://github.com/powerhome/power-tools
   source_code_uri: https://github.com/powerhome/power-tools
   changelog_uri: https://github.com/powerhome/power-tools/blob/main/packages/edgestitch/docs/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,15 +221,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Edgestitch allows engines to define partial structure-self.sql files to be
   stitched into a single structure.sql file by the umbrella application.