ridgepole 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a10d9b0607e25c59ff80c62aad7a6994d3b84d
-  data.tar.gz: 56933fbf7941579d0e83d56a10a8703a555baff6
+  metadata.gz: 540a3e7012616c467934600e8bf44d720cf33f77
+  data.tar.gz: eaebf6d806fb23a6d6cd82b6af8415d64286d0d1
 SHA512:
-  metadata.gz: f353e4f59e6188b7851eb14a90ee7ece7484f994f6a80258c1453e1ef0aeb74edf11d5257a71d4330aa8cebc98c5cf946f5238f3b803010deedefcdf44f76ffd
-  data.tar.gz: 70a90fa4e5a3acb0b23746871f6bec0a4adcffbe4b7d50891264f9aaf9657c0eccc23dc0868753e506a44805559037c4f7db560bd3be46ef14abaca336e8039a
+  metadata.gz: b3f0ffa78c0fb82ff822e02230c9d2997823bc5090dd2e21e41f918b1436793f1f731852237843dcae2bb13ea93a48f8693127207446bc32962f90b0a069814f
+  data.tar.gz: 7e4cc137e218c8028a03b8b4c222b477dc037cc4cd99dea39e98721778354ddafa959010354ee8fc14116939b8aaa7306abde4667c4f056ee60170ab05854072

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 .DS_Store
 test.rb
 Schemafile
+*.schema

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--require spec_helper

data/README.md

@@ -6,6 +6,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 (like Chef/Puppet)
 
 [![Gem Version](https://badge.fury.io/rb/ridgepole.png)](http://badge.fury.io/rb/ridgepole)
+[![Build Status](https://drone.io/bitbucket.org/winebarrel/ridgepole/status.png)](https://drone.io/bitbucket.org/winebarrel/ridgepole/latest)
 
 ## Installation
 

data/Rakefile

@@ -1 +1,5 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')
+task :default => :spec

data/bin/ridgepole

@@ -12,21 +12,31 @@ config = nil
 mode = nil
 file = DEFAULT_FILENAME
 output_file = '-'
+split = false
 
 options = {
   :dry_run => false,
   :debug   => false,
 }
 
+set_mode = proc do |m|
+  raise 'More than one mode is specified' if mode
+  mode = m
+end
+
 ARGV.options do |opt|
   begin
-    opt.on('-c', '--config CONF_OR_FILE') {|v| config            = v       }
-    opt.on('-a', '--apply')               {    mode              = :apply  }
-    opt.on('-f', '--file FILE')           {|v| file              = v       }
-    opt.on('',   '--dry-run')             {    options[:dry_run] = true    }
-    opt.on('-e', '--export')              {    mode              = :export }
-    opt.on('-o', '--output FILE')         {|v| output_file       = v       }
-    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('-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(''  , '--debug')                  {    options[:debug] = true                   }
     opt.parse!
 
     unless config and mode
@@ -49,24 +59,49 @@ begin
 
   case mode
   when :export
-    if output_file == '-'
-      logger.info('# Export Schema')
-      puts client.dump
+    if split
+      logger.info('Export Schema')
+
+      output_file = DEFAULT_FILENAME if output_file == '-'
+      requires = []
+
+      client.dump do |name, definition|
+        schema_file = File.join(File.dirname(output_file), "#{name}.schema")
+        requires << schema_file
+        logger.info("  write `#{schema_file}`")
+
+        open(schema_file, 'wb') do |f|
+          f.puts definition
+        end
+      end
+
+      logger.info("  write `#{output_file}`")
+
+      open(output_file, 'wb') do |f|
+        requires.each do |schema_file|
+          f.puts "require '#{File.basename schema_file}'"
+        end
+      end
     else
-      logger.info("Export Schema to `#{output_file}`")
-      open(output_file, 'wb') {|f| f.puts client.dump }
+      if output_file == '-'
+        logger.info('# Export Schema')
+        puts client.dump
+      else
+        logger.info("Export Schema to `#{output_file}`")
+        open(output_file, 'wb') {|f| f.puts client.dump }
+      end
     end
   when :apply
     unless File.exist?(file)
       raise "No Schemafile found (looking for: #{file})"
     end
 
-    msg = "Apply `#{file}`"
+    msg = (options[:merge] ? 'Merge' : 'Apply') + " `#{file}`"
     msg << ' (dry-run)' if options[:dry_run]
     logger.info(msg)
 
     dsl = open(file) {|f| f.read }
-    delta = client.diff(dsl)
+    delta = client.diff(dsl, :path => file)
 
     if options[:dry_run]
       puts delta.script if delta.differ?

data/lib/ridgepole/client.rb

@@ -6,14 +6,18 @@ class Ridgepole::Client
     @dumper = Ridgepole::Dumper.new(@options)
     @parser = Ridgepole::DSLParser.new(@options)
     @diff = Ridgepole::Diff.new(@options)
+
+    unless @options[:disable_mysql_unsigned]
+      require 'activerecord-mysql-unsigned'
+    end
   end
 
-  def dump
-    @dumper.dump
+  def dump(&block)
+    @dumper.dump(&block)
   end
 
-  def diff(dsl)
-    expected_definition = @parser.parse(dsl)
+  def diff(dsl, opts = {})
+    expected_definition = @parser.parse(dsl, opts)
     current_definition = @parser.parse(@dumper.dump)
     @diff.diff(current_definition, expected_definition)
   end

data/lib/ridgepole/diff.rb

@@ -9,7 +9,9 @@ class Ridgepole::Diff
     delta = {}
 
     to.dup.each do |table_name, to_attrs|
-      if (from_table_name = (to_attrs[:options] || {}).delete(:from))
+      next unless target?(table_name)
+
+      if (from_table_name = (to_attrs[:options] || {}).delete(:rename_from))
         next unless from.has_key?(from_table_name)
         delta[:rename] ||= {}
         delta[:rename][table_name] = from_table_name
@@ -19,6 +21,8 @@ class Ridgepole::Diff
     end
 
     to.each do |table_name, to_attrs|
+      next unless target?(table_name)
+
       if (from_attrs = from.delete(table_name))
         scan_change(table_name, from_attrs, to_attrs, delta)
       else
@@ -27,9 +31,13 @@ class Ridgepole::Diff
       end
     end
 
-    from.each do |table_name, from_attrs|
-      delta[:delete] ||= {}
-      delta[:delete][table_name] = from_attrs
+    unless @options[:merge]
+      from.each do |table_name, from_attrs|
+        next unless target?(table_name)
+
+        delta[:delete] ||= {}
+        delta[:delete][table_name] = from_attrs
+      end
     end
 
     Ridgepole::Delta.new(delta, @options)
@@ -62,7 +70,7 @@ class Ridgepole::Diff
     definition_delta = {}
 
     to.dup.each do |column_name, to_attrs|
-      if (from_column_name = (to_attrs[:options] || {}).delete(:from))
+      if (from_column_name = (to_attrs[:options] || {}).delete(:rename_from))
         next unless from.has_key?(from_column_name)
         definition_delta[:rename] ||= {}
         definition_delta[:rename][column_name] = from_column_name
@@ -95,9 +103,11 @@ class Ridgepole::Diff
       priv_column_name = column_name
     end
 
-    from.each do |column_name, from_attrs|
-      definition_delta[:delete] ||= {}
-      definition_delta[:delete][column_name] = from_attrs
+    unless @options[:merge]
+      from.each do |column_name, from_attrs|
+        definition_delta[:delete] ||= {}
+        definition_delta[:delete][column_name] = from_attrs
+      end
     end
 
     unless definition_delta.empty?
@@ -114,9 +124,12 @@ class Ridgepole::Diff
       if (from_attrs = from.delete(index_name))
         if from_attrs != to_attrs
           indices_delta[:add] ||= {}
-          indices_delta[:delete] ||= {}
           indices_delta[:add][index_name] = to_attrs
-          indices_delta[:delete][index_name] = from_attrs
+
+          unless @options[:merge]
+            indices_delta[:delete] ||= {}
+            indices_delta[:delete][index_name] = from_attrs
+          end
         end
       else
         indices_delta[:add] ||= {}
@@ -124,13 +137,19 @@ class Ridgepole::Diff
       end
     end
 
-    from.each do |index_name, from_attrs|
-      indices_delta[:delete] ||= {}
-      indices_delta[:delete][index_name] = from_attrs
+    unless @options[:merge]
+      from.each do |index_name, from_attrs|
+        indices_delta[:delete] ||= {}
+        indices_delta[:delete][index_name] = from_attrs
+      end
     end
 
     unless indices_delta.empty?
       table_delta[:indices] = indices_delta
     end
   end
+
+  def target?(table_name)
+    not @options[:tables] or @options[:tables].include?(table_name)
+  end
 end

data/lib/ridgepole/dsl_parser.rb

@@ -39,12 +39,13 @@ class Ridgepole::DSLParser
 
     attr_reader :__definition
 
-    def initialize
+    def initialize(opts = {})
+      @__working_dir = File.expand_path(opts[:path] ? File.dirname(opts[:path]) : Dir.pwd)
       @__definition = {}
     end
 
-    def self.eval(dsl)
-      ctx = self.new
+    def self.eval(dsl, opts = {})
+      ctx = self.new(opts)
       ctx.instance_eval(dsl)
       ctx.__definition
     end
@@ -69,13 +70,25 @@ class Ridgepole::DSLParser
         :options => options,
       }
     end
+
+    def require(file)
+      schemafile = File.join(@__working_dir, file)
+
+      if File.exist?(schemafile)
+        instance_eval(File.read(schemafile))
+      elsif File.exist?(schemafile + '.rb')
+        instance_eval(File.read(schemafile + '.rb'))
+      else
+        Kernel.require(file)
+      end
+    end
   end
 
   def initialize(options = {})
     @options = options
   end
 
-  def parse(dsl)
-    Context.eval(dsl)
+  def parse(dsl, opts = {})
+    Context.eval(dsl, opts)
   end
 end

data/lib/ridgepole/dumper.rb

@@ -7,10 +7,52 @@ class Ridgepole::Dumper
     stream = StringIO.new
     ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
 
-    stream.string.lines.select {|line|
+    dsl = stream.string.lines.select {|line|
       line !~ /\A#/ &&
       line !~ /\AActiveRecord::Schema\.define/ &&
       line !~ /\Aend/
     }.join.undent.strip
+
+    definitions = []
+
+    each_table(dsl) do |name, definition|
+      if target?(name)
+        definitions << definition
+        yield(name, definition) if block_given?
+      end
+    end
+
+    definitions.join("\n\n")
+  end
+
+  private
+
+  def each_table(dsl)
+    name = nil
+    definition = []
+
+    pass = proc do
+      if name
+        yield(name, definition.join.strip)
+        name = nil
+        definition = []
+      end
+    end
+
+    dsl.lines.each do |line|
+      if line =~ /\Acreate_table/
+        pass.call
+        name = line.split(/[\s,'"]+/)[1]
+        definition << line
+      elsif name
+        definition << line
+      end
+    end
+
+    pass.call
+  end
+
+  def target?(table_name)
+    not @options[:tables] or @options[:tables].include?(table_name)
   end
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/ridgepole.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord'
+  spec.add_dependency 'activerecord-mysql-unsigned'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>= 2.14.1'
+  spec.add_development_dependency 'rspec', '~> 2.14.1'
   spec.add_development_dependency 'mysql2'
 end

data/spec/dump/dump_spec.rb

@@ -0,0 +1,75 @@
+describe 'Ridgepole::Client#dump' do
+  context 'when there is a tables' do
+    before { restore_tables }
+    subject { client }
+
+    it {
+      expect(subject.dump).to eq (<<-RUBY).undent.strip
+        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
+
+        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
+
+        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
+    }
+  end
+end