ridgepole 0.5.1.beta2 → 0.5.1.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9af86c581c1569a32fe9979ae3ae931da5460d4e
-  data.tar.gz: fd26b890b1d8c15c422cad66a1e30e46548d348a
+  metadata.gz: 72dc76a06336b986b39d1d06245b66f1990b331e
+  data.tar.gz: 6c0efa155b47314e400137233524b902d08ed6bd
 SHA512:
-  metadata.gz: 529d087f92bf40940a7265a3d7a5ede5446b6f2fcad262fbe01263908d51c480af6e768ede05ab251a63fd65433ad95570e86b52c859ea677ab72cb98d3e0365
-  data.tar.gz: c8a2cf8a7748b6c28b0547adf5e856226c5b0b80504b5962e81eb818dab256dea5025098892542144f1bea7c647294fd775db54bba1bcb74d01217d8df42ba4e
+  metadata.gz: 765c85bdff9c195f721ba25505e9b3fa5a481089f40f8e9d4520f1c5568d121872235a4da2df4633fcc4477fafd4b96d376578882efedcd0a6d320bc59910dd4
+  data.tar.gz: 362add68bbbd28c8eda6a304d5cfa12beda6efd2ae36fcc2f8c72915e6ddbaffc4a8e7de755a75053697110be4e16e52abb562ebc25871601fe558c6dd8dee22

data/bin/ridgepole

@@ -199,7 +199,7 @@ begin
         if %w(.yml .yaml).include?(file_ext)
           Ridgepole::Config.load(file, env)
         else
-          File.read(file)
+          File.open(file)
         end
       else
         YAML.load(file)

data/lib/ridgepole/client.rb

@@ -63,9 +63,20 @@ class Ridgepole::Client
     private
 
     def load_definition(dsl_or_config, options = {})
-      dsl_or_config = dump(dsl_or_config, options) if dsl_or_config.kind_of?(Hash)
+      parse_opts = {}
+
+      case dsl_or_config
+      when Hash
+        dsl_or_config = dump(dsl_or_config, options)
+      when File
+        file = dsl_or_config
+        parse_opts[:path] = file.path
+        dsl_or_config = file.read
+        file.close
+      end
+
       parser = Ridgepole::DSLParser.new(options)
-      parser.parse(dsl_or_config)
+      parser.parse(dsl_or_config, parse_opts)
     end
   end # of class methods
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.5.1.beta2'
+  VERSION = '0.5.1.beta3'
 end

data/spec/cli/ridgepole_spec.rb

@@ -377,9 +377,9 @@ describe 'ridgepole' do
 
           expect(status.success?).to be_truthy
 
-          expect(out.strip).to eq <<-'EOS'.strip_heredoc.strip
+          expect(out.strip).to eq <<-EOS.strip_heredoc.strip
             Ridgepole::Client#initialize([{"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
-            Ridgepole::Client.diff(["create_table :table do\nend\n", {"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
+            Ridgepole::Client.diff([#{conf_file.path}, {"adapter"=>"mysql2", "database"=>"ridgepole_test"}, {:dry_run=>false, :debug=>false}])
             Ridgepole::Delta#differ?
           EOS
         end

data/spec/diff/diff2_spec.rb

@@ -0,0 +1,184 @@
+describe 'Ridgepole::Client.diff' do
+  context 'when change column' do
+    let(:tmpdir) { Dir.mktmpdir }
+
+    let(:actual_dsl) {
+      open("#{tmpdir}/file1.required", 'w') do |f|
+        f.puts <<-RUBY
+          create_table "clubs", force: true do |t|
+            t.string "name", default: "", null: false
+          end
+
+          add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+          create_table "departments", primary_key: "dept_no", force: true do |t|
+            t.string "dept_name", limit: 40, null: false
+          end
+
+          add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+          create_table "dept_emp", id: false, force: true do |t|
+            t.integer "emp_no",              null: false
+            t.string  "dept_no",   limit: 4, null: false
+            t.date    "from_date",           null: false
+            t.date    "to_date",             null: false
+          end
+
+          add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+          add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+          create_table "dept_manager", id: false, force: true do |t|
+            t.string  "dept_no",   limit: 4, null: false
+            t.integer "emp_no",              null: false
+            t.date    "from_date",           null: false
+            t.date    "to_date",             null: false
+          end
+
+          add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+          add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+        RUBY
+      end
+
+      f = open("#{tmpdir}/file1", 'w+')
+
+      f.puts <<-RUBY
+        require "file1.required"
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  null: false, unsigned: true
+          t.integer "club_id", null: false, unsigned: true
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        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
+          t.date   "hire_date",             null: false
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+
+      f.flush
+      f.rewind
+      f
+    }
+
+    let(:expected_dsl) {
+      open("#{tmpdir}/file2.required", 'w') do |f|
+        f.puts <<-RUBY
+          create_table "clubs", force: true do |t|
+            t.string "name", default: "", null: false
+          end
+
+          add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+          create_table "departments", primary_key: "dept_no", force: true do |t|
+            t.string "dept_name", limit: 40, null: false
+          end
+
+          add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+          create_table "dept_emp", id: false, force: true do |t|
+            t.integer "emp_no",              null: false
+            t.string  "dept_no",   limit: 4, null: false
+            t.date    "from_date",           null: false
+            t.date    "to_date",             null: false
+          end
+
+          add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+          add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+          create_table "dept_manager", id: false, force: true do |t|
+            t.string  "dept_no",   limit: 4, null: false
+            t.integer "emp_no",              null: false
+            t.date    "from_date",           null: false
+            t.date    "to_date",             null: false
+          end
+
+          add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+          add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+        RUBY
+      end
+
+      f = open("#{tmpdir}/file2", 'w+')
+
+      f.puts <<-RUBY
+        require "file2.required"
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: false, null: true
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        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: 20, default: "XXX", null: false
+          t.string "gender",     limit: 2,                  null: false
+          t.date   "hire_date",                             null: false
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+
+      f.flush
+      f.rewind
+      f
+    }
+
+    subject { Ridgepole::Client }
+
+    it {
+      delta = subject.diff(actual_dsl, expected_dsl, enable_mysql_unsigned: true)
+      expect(delta.differ?).to be_truthy
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+        change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true, :default=>nil})
+
+        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX", :null=>false, :unsigned=>false})
+        change_column("employees", "gender", :string, {:limit=>2, :null=>false, :unsigned=>false})
+      RUBY
+    }
+
+    after do
+      FileUtils.remove_entry_secure(tmpdir)
+    end
+  end
+end

data/spec/migrate/migrate_change_column_float_spec.rb

@@ -0,0 +1,68 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change float column' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.float   "salary",    limit: 24, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date",              null: false
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.float   "salary",               null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date",              null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+    }
+  end
+
+  context 'when change float column (no change)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.float   "salary",    limit: 24, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date",              null: false
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.float   "salary",               null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date",              null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client(normalize_mysql_float: true) }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+end

data/spec/spec_helper.rb

@@ -93,7 +93,7 @@ def default_cli_hook
 
     class Ridgepole::Client
       def initialize(*args)
-        puts "Ridgepole::Client#initialize(\#{args.inspect})"
+        puts "Ridgepole::Client#initialize([\#{args.map {|i| i.kind_of?(File) ? i.path : i.inspect}.join(', ')}])"
       end
       def dump
         puts "Ridgepole::Client#dump"
@@ -104,7 +104,7 @@ def default_cli_hook
       end
       class << self
         def diff(*args)
-          puts "Ridgepole::Client.diff(\#{args.inspect})"
+          puts "Ridgepole::Client.diff([\#{args.map {|i| i.kind_of?(File) ? i.path : i.inspect}.join(', ')}])"
           Ridgepole::Delta.new
         end
         def dump(args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.5.1.beta2
+  version: 0.5.1.beta3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -185,6 +185,7 @@ files:
 - spec/cli/config_spec.rb
 - spec/cli/ridgepole_spec.rb
 - spec/comment/comment_spec.rb
+- spec/diff/diff2_spec.rb
 - spec/diff/diff_spec.rb
 - spec/dump/dump_class_method_spec.rb
 - spec/dump/dump_some_tables_spec.rb
@@ -194,6 +195,7 @@ files:
 - spec/migrate/migrate_add_column_spec.rb
 - spec/migrate/migrate_change_column2_spec.rb
 - spec/migrate/migrate_change_column3_spec.rb
+- spec/migrate/migrate_change_column_float_spec.rb
 - spec/migrate/migrate_change_column_spec.rb
 - spec/migrate/migrate_change_index2_spec.rb
 - spec/migrate/migrate_change_index3_spec.rb
@@ -262,6 +264,7 @@ test_files:
 - spec/cli/config_spec.rb
 - spec/cli/ridgepole_spec.rb
 - spec/comment/comment_spec.rb
+- spec/diff/diff2_spec.rb
 - spec/diff/diff_spec.rb
 - spec/dump/dump_class_method_spec.rb
 - spec/dump/dump_some_tables_spec.rb
@@ -271,6 +274,7 @@ test_files:
 - spec/migrate/migrate_add_column_spec.rb
 - spec/migrate/migrate_change_column2_spec.rb
 - spec/migrate/migrate_change_column3_spec.rb
+- spec/migrate/migrate_change_column_float_spec.rb
 - spec/migrate/migrate_change_column_spec.rb
 - spec/migrate/migrate_change_index2_spec.rb
 - spec/migrate/migrate_change_index3_spec.rb