ridgepole 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 285b15a3e94f13fc1f92e1dae5007dc652fb05e5
-  data.tar.gz: 8b50b50a5f5a55dd9a5052e84436251c6eb1da35
+  metadata.gz: 05061ff918fcb6b202148dc98f4bf065826dc25f
+  data.tar.gz: 829f395a92d73a5872d72463348be4b95dfb0e20
 SHA512:
-  metadata.gz: a18bbd06c5e3768d7c21b41ba40eea52b4e463b4547971d6b476b45b9b382e2155e7d4e665f24998968661d5859ddbaeadc9ddbe5288bd1ecba1f036032c2e27
-  data.tar.gz: 3c9825f7f58163f3958edd86bd0c67edb2832b86b887d5ee7deffb2d5529bf0ba784d24945601995286ffc8de7ca64a62ee9315de229965fa20934c034948e49
+  metadata.gz: c24eafa825eb9c3a5c74ba28b3e26413afd6b0ddf1e5d336116e4a5298b1e5b10116e10317f2e780b9ef99a0a2e149c245253fd2812d5d2e61e9dfc6e585218a
+  data.tar.gz: ac295ab3f0f6d40343836049e17e51ac83ca380041bba4b348f9b2b500681cd8bef98f8598ebb705c71f2441b0eb3cdf0f562a646ed490dce9ac11e58a36ca5e

data/bin/ridgepole

@@ -30,19 +30,20 @@ end
 
 ARGV.options do |opt|
   begin
-    opt.on('-c', '--config CONF_OR_FILE')    {|v| config = v                               }
-    opt.on('-a', '--apply')                  {    set_mode[:apply]                         }
-    opt.on('-m', '--merge')                  {    set_mode[:apply]; options[:merge] = true }
-    opt.on('-f', '--file FILE')              {|v| file = v                                 }
-    opt.on('',   '--dry-run')                {    options[:dry_run] = true                 }
-    opt.on('-e', '--export')                 {    set_mode[:export]                        }
-    opt.on('',   '--split')                  {|v| split = true                             }
-    opt.on('',   '--split-with-dir')         {|v| split = :with_dir                        }
-    opt.on('-o', '--output FILE')            {|v| output_file = v                          }
-    opt.on('-t', '--tables TABLES', Array)   {|v| options[:tables] = v                     }
-    opt.on('',   '--disable-mysql-unsigned') {    options[:disable_mysql_unsigned] = true  }
-    opt.on(''  , '--verbose')                {    Ridgepole::Logger.verbose = true         }
-    opt.on(''  , '--debug')                  {    options[:debug] = true                   }
+    opt.on('-c', '--config CONF_OR_FILE')         {|v| config = v                                           }
+    opt.on('-a', '--apply')                       {    set_mode[:apply]                                     }
+    opt.on('-m', '--merge')                       {    set_mode[:apply]; options[:merge] = true             }
+    opt.on('-f', '--file FILE')                   {|v| file = v                                             }
+    opt.on('',   '--dry-run')                     {    options[:dry_run] = true                             }
+    opt.on('-e', '--export')                      {    set_mode[:export]                                    }
+    opt.on('',   '--split')                       {|v| split = true                                         }
+    opt.on('',   '--split-with-dir')              {|v| split = :with_dir                                    }
+    opt.on('-o', '--output FILE')                 {|v| output_file = v                                      }
+    opt.on('-t', '--tables TABLES', Array)        {|v| options[:tables] = v                                 }
+    opt.on('',   '--ignore-tables TABLES', Array) {|v| options[:ignore_tables] = v.map {|i| Regexp.new(i) } }
+    opt.on('',   '--disable-mysql-unsigned')      {    options[:disable_mysql_unsigned] = true              }
+    opt.on(''  , '--verbose')                     {    Ridgepole::Logger.verbose = true                     }
+    opt.on(''  , '--debug')                       {    options[:debug] = true                               }
     opt.parse!
 
     unless config and mode

data/lib/ridgepole/diff.rb

@@ -155,7 +155,13 @@ class Ridgepole::Diff
   end
 
   def target?(table_name)
-    not @options[:tables] or @options[:tables].include?(table_name)
+    if @options[:ignore_tables] and @options[:ignore_tables].any? {|i| i =~ table_name }
+      false
+    elsif @options[:tables] and not @options[:tables].include?(table_name)
+      false
+    else
+      true
+    end
   end
 
   def normalize_column_options!(opts)

data/lib/ridgepole/dumper.rb

@@ -7,6 +7,7 @@ class Ridgepole::Dumper
     stream = StringIO.new
     conn = ActiveRecord::Base.connection
     target_tables = @options[:tables]
+    ignore_tables = @options[:ignore_tables]
 
     if target_tables
       conn.tables.each do |tbl|
@@ -15,9 +16,19 @@ class Ridgepole::Dumper
       end
     end
 
+    if ignore_tables
+      conn.tables.each do |tbl|
+        if ignore_tables.any? {|i| i =~ tbl }
+          ActiveRecord::SchemaDumper.ignore_tables << tbl
+        end
+      end
+    end
+
     ActiveRecord::SchemaDumper.dump(conn, stream)
 
-    ActiveRecord::SchemaDumper.ignore_tables.clear if target_tables
+    if target_tables or ignore_tables
+      ActiveRecord::SchemaDumper.ignore_tables.clear
+    end
 
     dsl = stream.string.lines.select {|line|
       line !~ /\A#/ &&

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Genki Sugawara