pg_migrate 0.1.11 → 0.1.12

data/lib/pg_migrate/package.rb

@@ -1,152 +1,152 @@
-require 'erb'
-require 'fileutils'
-require 'rubygems'
-
-begin 
-    # this occurs in rubygems < 2.0.0
-    require 'rubygems/builder'
-rescue LoadError
-    # this occurs in rubygems > 2.0.0
-    require 'rubygems/package'
-end
-
-module PgMigrate
-  class Package
-
-    attr_accessor :manifest_reader
-
-    def initialize(manifest_reader)
-      @log = Logging.logger[self]
-      @manifest_reader = manifest_reader
-      @template_dir = File.join(File.dirname(__FILE__), 'package_templates')
-    end
-
-    def package(built_migration_path, output_dir, name, version, options={:force=>true})
-      gemspec = create_gem(built_migration_path, output_dir, name, version, options[:force])
-      build_gem(gemspec, output_dir)
-    end
-
-    def create_gem (built_migration_path, output_dir, name, version, force)
-      # validate that manifest is valid
-      @log.debug "validating output dir is manifest"
-
-      if !FileTest::exist?(built_migration_path)
-        raise "built manifest path does not exist #{built_migration_path}"
-      end
-
-      if built_migration_path == output_dir
-        raise "source and destination can not be the same path"
-      end
-
-      loaded_manifest = @manifest_reader.load_input_manifest(built_migration_path)
-      @manifest_reader.validate_migration_paths(built_migration_path, loaded_manifest)
-
-      @log.debug "preparing to build gem"
-
-      target = File.join(output_dir, name)
-
-      # stolen almost verbatim from bundler: https://github.com/carlhuda/bundler/blob/master/lib/bundler/cli.rb
-      constant_name = name.split('_').map { |p| p[0..0].upcase + p[1..-1] }.join
-      constant_name = constant_name.split('-').map { |q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
-      constant_array = constant_name.split('::')
-      # end stolen
-
-      author = "pgmigrate"
-      email = "pgmigrate@pgmigrate.io"
-      pg_migrate_version = PgMigrate::VERSION
-      gemfiles = ["Gemfile", "#{name}.gemspec", "lib/#{name}.rb", "lib/#{name}/version.rb", "bin/#{name}"]
-      gemfiles += userfiles(built_migration_path, name)
-      gemspec_path = File.join(output_dir, "#{name}.gemspec")
-
-      @log.debug "building gem"
-
-      output = Pathname.new(output_dir)
-      if !output.exist?
-        if !force
-          raise "Output directory '#{output_dir}' does not exist.  Create it or specify force=true"
-        else
-          output.mkpath
-        end
-      else
-        # verify that it's is a directory
-        if !output.directory?
-          raise "output_dir #{output_dir} is a file; not a directory."
-        else
-          @log.debug("deleting & recreating existing output_dir #{output_dir}")
-          output.rmtree
-          output.mkpath
-        end
-      end
-
-      FileUtils.mkdir_p(output_dir)
-      FileUtils.mkdir_p(File.join(output_dir, "bin"))
-      FileUtils.mkdir_p(File.join(output_dir, "lib", name))
-      run_template("Gemfile.erb", binding, File.join(output_dir, "Gemfile"))
-      run_template("gemspec.erb", binding, gemspec_path)
-      run_template("lib/gem.rb", binding, File.join(output_dir, "lib", "#{name}.rb"))
-      run_template("lib/gem/version.rb", binding, File.join(output_dir, "lib", name, "version.rb"))
-      run_template("bin/migrate.rb", binding, File.join(output_dir, "bin", "#{name}"))
-      copy_schema(built_migration_path, File.join(output_dir, "lib", name, "schemas"))
-
-      return gemspec_path
-    end
-
-    def copy_schema(built_migration_path, output_dir)
-      FileUtils.cp_r(File.join(built_migration_path, '.'), output_dir)
-    end
-    
-    def build_gem(gemspec_path, output_dir)
-      @log.debug "building gem"
-
-      @log.debug "loading gem specification #{gemspec_path}"
-      spec = Gem::Specification.load(gemspec_path)
-
-      if spec.nil?
-        raise 'unable to build gem from specification'
-      end
-      
-      @log.debug "packaging gem"
-      Dir.chdir(output_dir) do
-        if defined?(Gem::Builder)
-          Gem::Builder.new(spec).build
-        else
-          Gem::Package.build(spec)
-        end
-      end
-      #Gem::Package.build spec, false
-    end
-
-    def userfiles(built_migration_path, name)
-
-      gempaths = []
-      Find.find(built_migration_path) do |path|
-        if path == ".."
-          Find.prune
-        else
-          # make relative
-
-          relative = path[built_migration_path.length..-1]
-          gempath = File.join("lib", name, "schemas", relative)
-          gempaths.push(gempath)
-        end
-      end
-
-      return gempaths
-    end
-
-    # given an input template and binding, writes to an output file
-    def run_template(template, opt, output_filepath)
-      bootstrap_template = nil
-      File.open(File.join(@template_dir, template), 'r') do |reader|
-        bootstrap_template   = reader.read
-      end
-
-
-      template = ERB.new(bootstrap_template, 0, "%<>")
-      content = template.result(opt)
-      File.open(output_filepath, 'w') do |writer|
-        writer.syswrite(content)
-      end
-    end
-  end
-end
+require 'erb'
+require 'fileutils'
+require 'rubygems'
+
+begin 
+    # this occurs in rubygems < 2.0.0
+    require 'rubygems/builder'
+rescue LoadError
+    # this occurs in rubygems > 2.0.0
+    require 'rubygems/package'
+end
+
+module PgMigrate
+  class Package
+
+    attr_accessor :manifest_reader
+
+    def initialize(manifest_reader)
+      @log = Logging.logger[self]
+      @manifest_reader = manifest_reader
+      @template_dir = File.join(File.dirname(__FILE__), 'package_templates')
+    end
+
+    def package(built_migration_path, output_dir, name, version, options={:force=>true})
+      gemspec = create_gem(built_migration_path, output_dir, name, version, options[:force])
+      build_gem(gemspec, output_dir)
+    end
+
+    def create_gem (built_migration_path, output_dir, name, version, force)
+      # validate that manifest is valid
+      @log.debug "validating output dir is manifest"
+
+      if !FileTest::exist?(built_migration_path)
+        raise "built manifest path does not exist #{built_migration_path}"
+      end
+
+      if built_migration_path == output_dir
+        raise "source and destination can not be the same path"
+      end
+
+      loaded_manifest = @manifest_reader.load_input_manifest(built_migration_path)
+      @manifest_reader.validate_migration_paths(built_migration_path, loaded_manifest)
+
+      @log.debug "preparing to build gem"
+
+      target = File.join(output_dir, name)
+
+      # stolen almost verbatim from bundler: https://github.com/carlhuda/bundler/blob/master/lib/bundler/cli.rb
+      constant_name = name.split('_').map { |p| p[0..0].upcase + p[1..-1] }.join
+      constant_name = constant_name.split('-').map { |q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
+      constant_array = constant_name.split('::')
+      # end stolen
+
+      author = "pgmigrate"
+      email = "pgmigrate@pgmigrate.io"
+      pg_migrate_version = PgMigrate::VERSION
+      gemfiles = ["Gemfile", "#{name}.gemspec", "lib/#{name}.rb", "lib/#{name}/version.rb", "bin/#{name}"]
+      gemfiles += userfiles(built_migration_path, name)
+      gemspec_path = File.join(output_dir, "#{name}.gemspec")
+
+      @log.debug "building gem"
+
+      output = Pathname.new(output_dir)
+      if !output.exist?
+        if !force
+          raise "Output directory '#{output_dir}' does not exist.  Create it or specify force=true"
+        else
+          output.mkpath
+        end
+      else
+        # verify that it's is a directory
+        if !output.directory?
+          raise "output_dir #{output_dir} is a file; not a directory."
+        else
+          @log.debug("deleting & recreating existing output_dir #{output_dir}")
+          output.rmtree
+          output.mkpath
+        end
+      end
+
+      FileUtils.mkdir_p(output_dir)
+      FileUtils.mkdir_p(File.join(output_dir, "bin"))
+      FileUtils.mkdir_p(File.join(output_dir, "lib", name))
+      run_template("Gemfile.erb", binding, File.join(output_dir, "Gemfile"))
+      run_template("gemspec.erb", binding, gemspec_path)
+      run_template("lib/gem.rb", binding, File.join(output_dir, "lib", "#{name}.rb"))
+      run_template("lib/gem/version.rb", binding, File.join(output_dir, "lib", name, "version.rb"))
+      run_template("bin/migrate.rb", binding, File.join(output_dir, "bin", "#{name}"))
+      copy_schema(built_migration_path, File.join(output_dir, "lib", name, "schemas"))
+
+      return gemspec_path
+    end
+
+    def copy_schema(built_migration_path, output_dir)
+      FileUtils.cp_r(File.join(built_migration_path, '.'), output_dir)
+    end
+    
+    def build_gem(gemspec_path, output_dir)
+      @log.debug "building gem"
+
+      @log.debug "loading gem specification #{gemspec_path}"
+      spec = Gem::Specification.load(gemspec_path)
+
+      if spec.nil?
+        raise 'unable to build gem from specification'
+      end
+      
+      @log.debug "packaging gem"
+      Dir.chdir(output_dir) do
+        if defined?(Gem::Builder)
+          Gem::Builder.new(spec).build
+        else
+          Gem::Package.build(spec)
+        end
+      end
+      #Gem::Package.build spec, false
+    end
+
+    def userfiles(built_migration_path, name)
+
+      gempaths = []
+      Find.find(built_migration_path) do |path|
+        if path == ".."
+          Find.prune
+        else
+          # make relative
+
+          relative = path[built_migration_path.length..-1]
+          gempath = File.join("lib", name, "schemas", relative)
+          gempaths.push(gempath)
+        end
+      end
+
+      return gempaths
+    end
+
+    # given an input template and binding, writes to an output file
+    def run_template(template, opt, output_filepath)
+      bootstrap_template = nil
+      File.open(File.join(@template_dir, template), 'r') do |reader|
+        bootstrap_template   = reader.read
+      end
+
+
+      template = ERB.new(bootstrap_template, 0, "%<>")
+      content = template.result(opt)
+      File.open(output_filepath, 'w') do |writer|
+        writer.syswrite(content)
+      end
+    end
+  end
+end

data/lib/pg_migrate/package_templates/Gemfile.erb

@@ -1,4 +1,4 @@
-# A sample Gemfile
-source "https://rubygems.org"
-
+# A sample Gemfile
+source "https://rubygems.org"
+
 gemspec

data/lib/pg_migrate/package_templates/bin/migrate.rb

@@ -1,10 +1,10 @@
-#!/usr/bin/env ruby
-
-require 'pg_migrate'
-require '<%= name %>'
-
-include PgMigrate
-
-CommandLine.packaged_source = File.expand_path('../../lib/<%= name %>/schemas', __FILE__)
-
+#!/usr/bin/env ruby
+
+require 'pg_migrate'
+require '<%= name %>'
+
+include PgMigrate
+
+CommandLine.packaged_source = File.expand_path('../../lib/<%= name %>/schemas', __FILE__)
+
 CommandLine.start

data/lib/pg_migrate/package_templates/gemspec.erb

@@ -1,21 +1,21 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/<%= name %>/version', __FILE__)
-lib=File.expand_path('../lib', __FILE__)
-
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["<%= author %>"]
-  gem.email         = ["<%= email %> "]
-  gem.description   = %q{A pg_migrate bundle for <%= name %>}
-  gem.summary       = %q{A pg_migrate bundle built by pg_migrate, containing the schemas of <%= name  %>)}
-  gem.homepage      = "https://github.com/sethcall/pg_migrate"
-
-  gem.files         = <%= gemfiles %>
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "<%= name %>"
-  gem.require_paths = ["lib"]
-  gem.version       = <%= constant_name %>::VERSION
-
-  gem.add_dependency('pg_migrate', '<%= pg_migrate_version %>')
-end
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/<%= name %>/version', __FILE__)
+lib=File.expand_path('../lib', __FILE__)
+
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["<%= author %>"]
+  gem.email         = ["<%= email %> "]
+  gem.description   = %q{A pg_migrate bundle for <%= name %>}
+  gem.summary       = %q{A pg_migrate bundle built by pg_migrate, containing the schemas of <%= name  %>)}
+  gem.homepage      = "https://github.com/sethcall/pg_migrate"
+
+  gem.files         = <%= gemfiles %>
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "<%= name %>"
+  gem.require_paths = ["lib"]
+  gem.version       = <%= constant_name %>::VERSION
+
+  gem.add_dependency('pg_migrate', '<%= pg_migrate_version %>')
+end

data/lib/pg_migrate/package_templates/lib/gem/version.rb

@@ -1,3 +1,3 @@
-module <%= constant_name %>
-  VERSION = "<%= version %>"
-end
+module <%= constant_name %>
+  VERSION = "<%= version %>"
+end

data/lib/pg_migrate/package_templates/lib/gem.rb

@@ -1,12 +1,12 @@
-require '<%= name %>/version'
-require 'pg_migrate'
-
-module <%= constant_name %>
-
-  class Migrator
-    def migrate options={}
-      pgMigrator = PgMigrate::Migrator.new(PgMigrate::ManifestReader.new, PgMigrate::SqlReader.new, options)
-      pgMigrator.migrate(File.expand_path('../<%= name %>/schemas', __FILE__))
-    end
-  end
-end
+require '<%= name %>/version'
+require 'pg_migrate'
+
+module <%= constant_name %>
+
+  class Migrator
+    def migrate options={}
+      pgMigrator = PgMigrate::Migrator.new(PgMigrate::ManifestReader.new, PgMigrate::SqlReader.new, options)
+      pgMigrator.migrate(File.expand_path('../<%= name %>/schemas', __FILE__))
+    end
+  end
+end

data/lib/pg_migrate/props.rb

@@ -1,19 +1,19 @@
-# from comment at http://devender.wordpress.com/2006/05/01/reading-and-writing-java-property-files-with-ruby/
-
-module PgMigrate
-  class Properties < Hash
-    def initialize(filename = nil)
-      if (filename) then
-        File.open(filename).select { |line| not line=~/^[ \t]*(#.+)*$/ }.# ignore comments and blank lines
-        each { |line|
-          (k, v) = line.chomp.split('=', 2)
-          self[k.strip] = v.strip
-        }
-      end
-    end
-
-    def to_s
-      self.map { |k, v| " #{k}=#{v}" }.join("\n")
-    end
-  end
-end
+# from comment at http://devender.wordpress.com/2006/05/01/reading-and-writing-java-property-files-with-ruby/
+
+module PgMigrate
+  class Properties < Hash
+    def initialize(filename = nil)
+      if (filename) then
+        File.open(filename).select { |line| not line=~/^[ \t]*(#.+)*$/ }.# ignore comments and blank lines
+        each { |line|
+          (k, v) = line.chomp.split('=', 2)
+          self[k.strip] = v.strip
+        }
+      end
+    end
+
+    def to_s
+      self.map { |k, v| " #{k}=#{v}" }.join("\n")
+    end
+  end
+end

data/lib/pg_migrate/sql_reader.rb

@@ -1,52 +1,52 @@
-module PgMigrate
-
-  class SqlReader
-
-    def initialize
-
-    end
-
-
-    # read in a migration file,
-    # converting lines of text into SQL statements that can be executed with our database connection
-    def load_migration(migration_path)
-      statements = []
-
-      current_statement = ""
-
-      migration_lines = IO.readlines(migration_path)
-      migration_lines.each_with_index do |line, index|
-        line_stripped = line.strip
-
-        if line_stripped.empty? || line_stripped.start_with?('--')
-          # it's a comment; ignore
-        elsif line_stripped.start_with?("\\")
-          # it's a psql command; ignore
-        else
-          current_statement += " " + line_stripped;
-
-          if line_stripped.end_with?(";")
-            if current_statement =~ /^\s*CREATE\s+(OR\s+REPLACE\s+)?FUNCTION/i || current_statement =~ /^\s*DO\s+/i
-              # if we are in a function, a ';' isn't enough to end.  We need to see if the last word was one of
-              # pltcl, plperl, plpgsql, plpythonu, sql
-              # you can extend languages in postgresql; detecting these isn't supported yet.
-
-              # we also detect anonymous functions (DO) and their ending sequence.
-              if current_statement =~ /(plpgsql|plperl|plpythonu|pltcl|sql)\s*;$/i || current_statement =~ /END\s*\$\$\s+(LANGUAGE\s+(plpgsql|plperl|plpythonu|pltcl|sql))?\s*;$/i
-                statements.push(current_statement[0...-1]) # strip off last ;
-                current_statement = ""
-              end
-
-            else
-              statements.push(current_statement[0...-1]) # strip off last ;
-              current_statement = ""
-            end
-          end
-        end
-      end
-
-      return statements
-
-    end
-  end
+module PgMigrate
+
+  class SqlReader
+
+    def initialize
+
+    end
+
+
+    # read in a migration file,
+    # converting lines of text into SQL statements that can be executed with our database connection
+    def load_migration(migration_path)
+      statements = []
+
+      current_statement = ""
+
+      migration_lines = IO.readlines(migration_path)
+      migration_lines.each_with_index do |line, index|
+        line_stripped = line.strip
+
+        if line_stripped.empty? || line_stripped.start_with?('--')
+          # it's a comment; ignore
+        elsif line_stripped.start_with?("\\")
+          # it's a psql command; ignore
+        else
+          current_statement += " " + line_stripped;
+
+          if line_stripped.end_with?(";")
+            if current_statement =~ /^\s*CREATE\s+(OR\s+REPLACE\s+)?FUNCTION/i || current_statement =~ /^\s*DO\s+/i
+              # if we are in a function, a ';' isn't enough to end.  We need to see if the last word was one of
+              # pltcl, plperl, plpgsql, plpythonu, sql
+              # you can extend languages in postgresql; detecting these isn't supported yet.
+
+              # we also detect anonymous functions (DO) and their ending sequence.
+              if current_statement =~ /(plpgsql|plperl|plpythonu|pltcl|sql)\s*;$/i || current_statement =~ /END\s*\$\$\s+(LANGUAGE\s+(plpgsql|plperl|plpythonu|pltcl|sql))?\s*;$/i
+                statements.push(current_statement[0...-1]) # strip off last ;
+                current_statement = ""
+              end
+
+            else
+              statements.push(current_statement[0...-1]) # strip off last ;
+              current_statement = ""
+            end
+          end
+        end
+      end
+
+      return statements
+
+    end
+  end
 end