ridgepole 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b78450efbe8c650197b9515c90abced3f6a6575
-  data.tar.gz: 4e78c9e6a877414d75d58735ad8ebd2c0b2d090f
+  metadata.gz: 2e09733c0324e6f1e7aac45b4b27b1dbf8492114
+  data.tar.gz: ee817aee1eabf4f66821585b4e114daad6b1a41b
 SHA512:
-  metadata.gz: 8be2793d3f8bc2f8083c5c50805dc180cec3e0ce451203d74f678f601aa2f24c5225d0fe0b81d142ba87bf40d879f9c54cbe7547c2af14612ec9ea4d451a3459
-  data.tar.gz: f8e0160bb8ade13201edf404c30278705ec9d8fad1b2d3cbd6390b8739db82b6754ef6eda4ca281da7a6196b847d931299961f1a2b972754f736c8b1ec1f36b4
+  metadata.gz: 12cb083697c48bcd3b799f6686a32f91bdd62852d69fa235e9afabc790bf1b10e72b13357debd2a8d6b04d38fdaa1c850b407c04a7f622d75d3f282a747059a3
+  data.tar.gz: be9c09c97c28b2ee4614230c37e81cb63f5323e1f9f50d68ab0e3d6f2806df15287432ebe4e05d458f8a0a40047e6116ca17029716d26f73ac66cdf9e21943cd

data/bin/ridgepole

@@ -42,6 +42,7 @@ ARGV.options do |opt|
     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(''  , '--log-file LOG_FILE')           {|v| options[:log_file] = v                               }
     opt.on(''  , '--verbose')                     {    Ridgepole::Logger.verbose = true                     }
     opt.on(''  , '--debug')                       {    options[:debug] = true                               }
     opt.parse!

data/lib/ridgepole/delta.rb

@@ -5,7 +5,15 @@ class Ridgepole::Delta
   end
 
   def migrate
-    ActiveRecord::Schema.new.instance_eval(script)
+    if log_file = @options[:log_file]
+      result = ActiveRecord::Migration.record_time do
+        migrate0
+      end
+
+      open(log_file, 'wb') {|f| f.puts JSON.pretty_generate(result) }
+    else
+      migrate0
+    end
   end
 
   def script
@@ -36,6 +44,10 @@ class Ridgepole::Delta
 
   private
 
+  def migrate0
+    ActiveRecord::Schema.new.instance_eval(script)
+  end
+
   def append_create_table(table_name, attrs, buf)
     options = attrs[:options] || {}
     definition = attrs[:definition] || {}

data/lib/ridgepole/diff.rb

@@ -12,7 +12,10 @@ class Ridgepole::Diff
       next unless target?(table_name)
 
       if (from_table_name = (to_attrs[:options] || {}).delete(:rename_from))
-        next unless from.has_key?(from_table_name)
+        unless from.has_key?(from_table_name)
+          raise "Table `#{from_table_name}` not found"
+        end
+
         delta[:rename] ||= {}
         delta[:rename][table_name] = from_table_name
         from.delete(from_table_name)
@@ -50,7 +53,7 @@ class Ridgepole::Diff
     to = (to || {}).dup
     table_delta = {}
 
-    scan_options_change(from[:options], to[:options], table_delta)
+    scan_options_change(table_name, from[:options], to[:options], table_delta)
     scan_definition_change(from[:definition], to[:definition], table_delta)
     scan_indices_change(from[:indices], to[:indices], table_delta)
 
@@ -60,8 +63,10 @@ class Ridgepole::Diff
     end
   end
 
-  def scan_options_change(from, to, table_delta)
-    Ridgepole::Logger.instance.warn('[WARNING] Table options cannot be changed')
+  def scan_options_change(table_name, from, to, table_delta)
+    unless from == to
+      Ridgepole::Logger.instance.warn("[WARNING] Table `#{table_name}` options cannot be changed")
+    end
   end
 
   def scan_definition_change(from, to, table_delta)
@@ -71,7 +76,10 @@ class Ridgepole::Diff
 
     to.dup.each do |column_name, to_attrs|
       if (from_column_name = (to_attrs[:options] || {}).delete(:rename_from))
-        next unless from.has_key?(from_column_name)
+        unless from.has_key?(from_column_name)
+          raise "Column `#{from_column_name}` not found"
+        end
+
         definition_delta[:rename] ||= {}
         definition_delta[:rename][column_name] = from_column_name
         from.delete(from_column_name)

data/lib/ridgepole/migration_ext.rb

@@ -1,9 +1,57 @@
 require 'active_record/migration'
 
 class ActiveRecord::Migration
+  cattr_accessor :time_recorder
+
   def write_with_logging(text = '')
     logger = Ridgepole::Logger.instance
     logger.info(text)
+    parse_text(text)
   end
   alias_method_chain :write, :logging
+
+  def parse_text(text)
+    return unless self.time_recorder
+
+    case text
+    when /\A--\s+(.+)\Z/
+      self.time_recorder.add_key($1)
+    when /\A\s+->\s+(\d+\.\d+)s\Z/
+      self.time_recorder.add_value($1.to_f)
+    end
+  end
+
+  def self.record_time
+    result = nil
+
+    begin
+      self.time_recorder = TimeRecorder.new
+      yield
+      result = self.time_recorder.result
+    ensure
+      self.time_recorder = nil
+    end
+
+    return result
+  end
+
+  class TimeRecorder
+    attr_reader :result
+
+    def initialize
+      @result = {}
+    end
+
+    def add_key(key)
+      @key = key
+    end
+
+    def add_value(value)
+      if @key
+        @result[@key] = value
+      end
+
+      @key = nil
+    end
+  end
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/migrate/migrate_change_table_option_spec.rb

@@ -29,7 +29,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with('[WARNING] Table options cannot be changed')
+      expect(Ridgepole::Logger.instance).to receive(:warn).with('[WARNING] Table `employees` options cannot be changed')
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_false
       expect(subject.dump).to eq actual_dsl.undent.strip

data/spec/migrate/migrate_rename_column_spec.rb

@@ -149,4 +149,27 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/\s*,\s*rename_from:.*$/, '')
     }
   end
+
+  context 'when rename column (not found)' do
+    before { restore_tables }
+    subject { client }
+
+    let(:dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false, rename_from: 'age'
+          t.date   "hire_date",             null: false
+        end
+      RUBY
+    }
+
+    it {
+      expect {
+        subject.diff(dsl)
+      }.to raise_error('Column `age` not found')
+    }
+  end
 end

data/spec/migrate/migrate_rename_table_spec.rb

@@ -149,4 +149,27 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/, rename_from: 'employees'/, '')
     }
   end
+
+  context 'when rename table (not found)' do
+    before { restore_tables }
+    subject { client }
+
+    let(:dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: true, rename_from: 'not_employees' do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      RUBY
+    }
+
+    it {
+      expect {
+        subject.diff(dsl)
+      }.to raise_error('Table `not_employees` not found')
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord