ridgepole 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f20d24b4955d4b21970f0795d9202541c64387b
-  data.tar.gz: ca0f973959d8c8a4580282240938ff40b0c8f064
+  metadata.gz: 763e47fb7ab7afd94ee8e5533bce0b33b9e40f30
+  data.tar.gz: a576e85765eecba93d42c4502dc84bfaee29807e
 SHA512:
-  metadata.gz: a1956f2233beaf59f6d664fba626b79faa3594ef1fbc565e9f3ecd33c538a5801976bca703f8c5c8c50c94894e07073269a1e477ba1aaf084d0e0a90aeac2edd
-  data.tar.gz: bfbd7ec8f1edd90ff24ce5f3c8cee7860b60a262f020c2b98ee1dfc4eba6bb98743fbd8397b73706b087d11dbcfdfe964ed3bced3772bfb20b0ba0d95f73d4fc
+  metadata.gz: c1fac2ed18393ceddc641861b744ab3d081daa790c26f7de85e81948118bd7aec7a613d121d420de1655c81887994a63724ee5614c00dfc54ec2c7835ed87728
+  data.tar.gz: b1f2d4ad9dafc8ea3e0febb7f3f5914156230e0034b0e90a431b1eabb52d11a61705c0b82824e45eea76f694259b0bf8863f2f23530e428713807943b2c94da5

data/README.md

@@ -30,6 +30,7 @@ Usage: ridgepole [options]
     -m, --merge
     -f, --file FILE
         --dry-run
+        --table-options
     -e, --export
         --split
         --split-with-dir

data/bin/ridgepole

@@ -32,11 +32,11 @@ set_mode = proc do |m|
 end
 
 def noop_migrate(delta)
-  puts <<-EOS
-#{delta.script}
+  puts delta.script + "\n\n"
 
-#{delta.migrate(:noop => true).each_line.map {|i| "# #{i}"}.join}
-  EOS
+  delta.migrate(:noop => true).each_line do |line|
+    puts line.strip.gsub(/([^\d])([(),])([^\d])/) { "#{$1}#{$2}\n#{$3}" }.each_line.map {|i| "# #{i.gsub(/^\s+/, '')}"}.join + "\n\n"
+  end
 end
 
 ARGV.options do |opt|
@@ -46,6 +46,7 @@ ARGV.options do |opt|
     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('',   '--table-options')               {|v| options[:table_options] = v                          }
     opt.on('-e', '--export')                      {    set_mode[:export]                                    }
     opt.on('',   '--split')                       {|v| split = true                                         }
     opt.on('',   '--split-with-dir')              {|v| split = :with_dir                                    }

data/lib/ridgepole/delta.rb

@@ -115,6 +115,7 @@ class Ridgepole::Delta
 
   def append_create_table(table_name, attrs, buf)
     options = attrs[:options] || {}
+    options[:options] ||= @options[:table_options] if @options[:table_options]
     definition = attrs[:definition] || {}
     indices = attrs[:indices] || {}
 

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/migrate/migrate_create_table_with_options_spec.rb

@@ -0,0 +1,29 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when create table' do
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+      RUBY
+    }
+
+    subject { client(table_options: 'ENGINE=MyISAM CHARSET=utf8') }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+        create_table("employee_clubs", {:options=>"ENGINE=MyISAM CHARSET=utf8"}) do |t|
+          t.integer("emp_no", {:unsigned=>true, :null=>false})
+          t.integer("club_id", {:unsigned=>true, :null=>false})
+        end
+        add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
+      RUBY
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -134,6 +134,7 @@ files:
 - spec/migrate/migrate_change_table_option_spec.rb
 - spec/migrate/migrate_create_index_spec.rb
 - spec/migrate/migrate_create_table_spec.rb
+- spec/migrate/migrate_create_table_with_options_spec.rb
 - spec/migrate/migrate_drop_column_and_index_2_spec.rb
 - spec/migrate/migrate_drop_column_and_index_spec.rb
 - spec/migrate/migrate_drop_column_spec.rb
@@ -194,6 +195,7 @@ test_files:
 - spec/migrate/migrate_change_table_option_spec.rb
 - spec/migrate/migrate_create_index_spec.rb
 - spec/migrate/migrate_create_table_spec.rb
+- spec/migrate/migrate_create_table_with_options_spec.rb
 - spec/migrate/migrate_drop_column_and_index_2_spec.rb
 - spec/migrate/migrate_drop_column_and_index_spec.rb
 - spec/migrate/migrate_drop_column_spec.rb