migreazy 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/bin/migreazy

@@ -7,182 +7,6 @@ end
 
 require 'config/boot'
 require 'config/environment'
-require 'grit'
-
-module Migreazy
-  @@db_connected = false
-  
-  def self.ensure_db_connection
-    unless @@db_connected
-      db_config = YAML::load(IO.read("./config/database.yml"))
-      ActiveRecord::Base.establish_connection db_config['development']
-      @@db_connected = true
-    end
-  end
-
-  class Action
-    def initialize(args)
-      @args = args
-      if args.empty?
-        @migration_source1 = MigrationSource::Database.new
-        @migration_source2 = MigrationSource::WorkingCopy.new
-      elsif args.size == 1
-        @migration_source1 = MigrationSource::Database.new
-        @migration_source2 = MigrationSource.new_from_command_line_arg(
-          args.first
-        )
-      elsif args.size == 2
-        @migration_source1 = MigrationSource.new_from_command_line_arg(
-          args.first
-        )
-        @migration_source2 = MigrationSource.new_from_command_line_arg(
-          args.last
-        )
-      end
-    end
-  
-    class Diff < Action
-      def run
-        missing_in_db =
-            @migration_source2.migrations - @migration_source1.migrations
-        puts "Missing in #{@migration_source1.description}:"
-        if missing_in_db.empty?
-          puts "  (none)"
-        else
-          puts "  #{missing_in_db.join(', ')}"
-        end
-        puts
-        missing_in_branch =
-            @migration_source1.migrations - @migration_source2.migrations
-        puts "Missing in #{@migration_source2.description}:"
-        if missing_in_branch.empty?
-          puts "  (none)"
-        else
-          puts "  #{missing_in_branch.join(', ')}"
-        end
-      end
-    end
-    
-    class Down < Action
-      def run
-        successful_downs = []
-        missing_in_branch =
-            @migration_source1.migrations - @migration_source2.migrations
-        if missing_in_branch.empty?
-          puts "No down migrations to run"
-        else
-          past_migration_failed = false
-          missing_in_branch.sort.reverse.each do |migration|
-            if past_migration_failed
-              puts "Skipping down for #{migration} due to error in a previous migration"
-            else
-              output = `rake db:migrate:down VERSION=#{migration}`
-              puts output
-              if output =~ /^==  .*: reverted \(\d*\.\d*s\)/
-                successful_downs << migration
-              else
-                unless past_migration_failed
-                  puts "Skipping down for #{migration} due to error"
-                end
-                past_migration_failed = true
-              end
-            end
-          end
-        end
-      end
-    end
-    
-    class Find < Action
-      def initialize(args)
-        @args = args
-        @migration_number = args.first
-      end
-      
-      def run
-        repo = Grit::Repo.new '.'
-        branches = repo.heads.select { |head|
-          (head.commit.tree / "db/migrate").contents.any? { |blob|
-            blob.name =~ /^0*#{@migration_number}/
-          }
-        }
-        puts "Migration #{@migration_number} found in " +
-             branches.map(&:name).join(', ')
-      end
-    end
-  end
-  
-  class MigrationSource
-    def self.new_from_command_line_arg(arg)
-      if File.exist?(File.expand_path(arg))
-        TextFile.new arg
-      else
-        GitBranch.new arg
-      end
-    end
-    
-    attr_reader :migrations
-  
-    class Database < MigrationSource
-      def initialize
-        Migreazy.ensure_db_connection
-        @migrations = ActiveRecord::Base.connection.select_all(
-          "select version from schema_migrations"
-        ).map { |hash| hash['version'] }
-      end
-      
-      def description
-        "development DB"
-      end
-    end
-    
-    class GitBranch < MigrationSource
-      def initialize(git_branch_name)
-        @git_branch_name = git_branch_name
-        repo = Grit::Repo.new '.'
-        head = repo.heads.detect { |h| h.name == @git_branch_name }
-        all_migrations = (head.commit.tree / "db/migrate").contents
-        @migrations = all_migrations.map { |blob|
-          blob.name.gsub(/^0*(\d+)_.*/, '\1')
-        }
-      end
-      
-      def description
-        "branch #{@git_branch_name}"
-      end
-    end
-    
-    class TextFile < MigrationSource
-      def initialize(file)
-        @file = File.expand_path(file)
-        @migrations = []
-        File.read(@file).each_line do |line|
-          line.chomp!
-          if line.to_i.to_s == line
-            @migrations << line
-          end
-        end
-      end
-      
-      def description
-        "file #{@file}"
-      end
-    end
-    
-    class WorkingCopy < MigrationSource
-      def initialize
-        @migrations = Dir.entries("./db/migrate").select { |entry|
-          entry =~ /^\d+.*\.rb$/
-        }.map { |entry|
-          entry.gsub(/^0*(\d+)_.*/, '\1')
-        }
-      end
-      
-      def description
-        "working copy"
-      end
-    end
-  end
-end
 
 action = ARGV.first
 action_class = begin

data/lib/migreazy.rb

@@ -0,0 +1,177 @@
+require 'grit'
+
+module Migreazy
+  @@db_connected = false
+  
+  def self.ensure_db_connection
+    unless @@db_connected
+      db_config = YAML::load(IO.read("./config/database.yml"))
+      ActiveRecord::Base.establish_connection db_config['development']
+      @@db_connected = true
+    end
+  end
+
+  class Action
+    def initialize(args)
+      @args = args
+      if args.empty?
+        @source1 = Source::Database.new
+        @source2 = Source::WorkingCopy.new
+      elsif args.size == 1
+        @source1 = Source::Database.new
+        @source2 = Source.new_from_command_line_arg(args.first)
+      elsif args.size == 2
+        @source1 = Source.new_from_command_line_arg(args.first)
+        @source2 = Source.new_from_command_line_arg(args.last)
+      end
+    end
+  
+    class Diff < Action
+      def run
+        left_only = (@source1.migrations - @source2.migrations).sort.reverse
+        right_only = (@source2.migrations - @source1.migrations).sort.reverse
+        unless left_only.empty? && right_only.empty?
+          puts(
+            sprintf("%-39s  %-39s", @source1.description, @source2.description)
+          )
+          puts(
+            sprintf(
+              "%-39s  %-39s", ("=" * @source1.description.length),
+              ("=" * @source2.description.length)
+            )
+          )
+          until (left_only.empty? && right_only.empty?)
+            side = if right_only.empty?
+              :left
+            elsif left_only.empty?
+              :right
+            elsif left_only.first > right_only.first
+              :left
+            else
+              :right
+            end
+            if side == :left
+              puts sprintf("%-39s", left_only.first.to_s)
+              left_only.shift
+            else
+              puts((" " * 39) + sprintf("  %-39s", right_only.first.to_s))
+              right_only.shift
+            end
+          end
+        end
+      end
+    end
+    
+    class Down < Action
+      def run
+        successful_downs = []
+        missing_in_branch = @source1.migrations - @source2.migrations
+        if missing_in_branch.empty?
+          puts "No down migrations to run"
+        else
+          missing_in_branch.sort.reverse.each do |version|
+            file = Dir.entries("./db/migrate/").detect { |entry|
+              entry =~ /^#{version}.*\.rb$/
+            }
+            require "./db/migrate/#{file}"
+            file =~ /^#{version}_([_a-z0-9]*).rb/
+            $1.camelize.constantize.down
+            ActiveRecord::Base.connection.execute(
+              "delete from schema_migrations where version = '#{version}'"
+            )
+          end
+        end
+      end
+    end
+    
+    class Find < Action
+      def initialize(args)
+        @args = args
+        @migration_number = args.first
+      end
+      
+      def run
+        repo = Grit::Repo.new '.'
+        branches = repo.heads.select { |head|
+          (head.commit.tree / "db/migrate").contents.any? { |blob|
+            blob.name =~ /^0*#{@migration_number}/
+          }
+        }
+        puts "Migration #{@migration_number} found in " +
+             branches.map(&:name).join(', ')
+      end
+    end
+  end
+  
+  class Source
+    def self.new_from_command_line_arg(arg)
+      if File.exist?(File.expand_path(arg))
+        TextFile.new arg
+      else
+        GitBranch.new arg
+      end
+    end
+    
+    attr_reader :migrations
+  
+    class Database < Source
+      def initialize
+        Migreazy.ensure_db_connection
+        @migrations = ActiveRecord::Base.connection.select_all(
+          "select version from schema_migrations"
+        ).map { |hash| hash['version'] }
+      end
+      
+      def description
+        "Development DB"
+      end
+    end
+    
+    class GitBranch < Source
+      def initialize(git_branch_name)
+        @git_branch_name = git_branch_name
+        repo = Grit::Repo.new '.'
+        head = repo.heads.detect { |h| h.name == @git_branch_name }
+        all_migrations = (head.commit.tree / "db/migrate").contents
+        @migrations = all_migrations.map { |blob|
+          blob.name.gsub(/^0*(\d+)_.*/, '\1')
+        }
+      end
+      
+      def description
+        "Branch #{@git_branch_name}"
+      end
+    end
+    
+    class TextFile < Source
+      def initialize(file)
+        @file = File.expand_path(file)
+        @migrations = []
+        File.read(@file).each_line do |line|
+          line.chomp!
+          if line.to_i.to_s == line
+            @migrations << line
+          end
+        end
+      end
+      
+      def description
+        "File #{@file}"
+      end
+    end
+    
+    class WorkingCopy < Source
+      def initialize
+        @migrations = Dir.entries("./db/migrate").select { |entry|
+          entry =~ /^\d+.*\.rb$/
+        }.map { |entry|
+          entry.gsub(/^0*(\d+)_.*/, '\1')
+        }
+      end
+      
+      def description
+        "Working copy"
+      end
+    end
+  end
+end

data/migreazy.gemspec

@@ -0,0 +1,46 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{migreazy}
+  s.version = "1.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Francis Hwang"]
+  s.date = %q{2011-08-20}
+  s.default_executable = %q{migreazy}
+  s.description = %q{migreazy helps manage Rails migrations across git branches.}
+  s.email = %q{sera@fhwang.net}
+  s.executables = ["migreazy"]
+  s.extra_rdoc_files = [
+    "README"
+  ]
+  s.files = [
+    "MIT-LICENSE",
+    "README",
+    "Rakefile",
+    "VERSION",
+    "bin/migreazy",
+    "lib/migreazy.rb",
+    "migreazy.gemspec"
+  ]
+  s.homepage = %q{http://github.com/fhwang/migreazy}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{migreazy helps manage Rails migrations across git branches.}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<grit>, [">= 0"])
+    else
+      s.add_dependency(%q<grit>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<grit>, [">= 0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: migreazy
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Francis Hwang
@@ -46,6 +46,8 @@ files:
 - Rakefile
 - VERSION
 - bin/migreazy
+- lib/migreazy.rb
+- migreazy.gemspec
 has_rdoc: true
 homepage: http://github.com/fhwang/migreazy
 licenses: []