pg_migrate 0.1.11 → 0.1.12

data/pg_migrate.gemspec

@@ -1,29 +1,29 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/pg_migrate/version', __FILE__)
-lib=File.expand_path('../lib', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Seth Call"]
-  gem.email         = ["sethcall@gmail.com"]
-  gem.description   = %q{Simple migration tool focused on Postgresql}
-  gem.summary       = %q{Create migration scripts in raw SQL that work regardless if they are run from the pg_migrate command-line, psql, or native code integration.  More documentation exists on the project homepage.)}
-  gem.homepage      = "https://github.com/sethcall/pg_migrate"
-
-  gem.files         = `git ls-files`.split($\)
-  gem.files        += ['lib/pg_migrate/templates/bootstrap.erb']
-  gem.files	   += ['lib/pg_migrate/templates/up.erb']
-  gem.files.delete("lib/pg_migrate/templates")
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "pg_migrate"
-  gem.require_paths = ["lib"]
-  gem.version       = PgMigrate::VERSION
-
-  gem.add_dependency('logging', '1.7.2')
-  
-  gem.add_dependency('pg', '0.15.1')
-  gem.add_dependency('thor', '0.15.4')
-  #gem.add_dependency('rubygems', '1.8.24')
-
-end
-
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/pg_migrate/version', __FILE__)
+lib=File.expand_path('../lib', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Seth Call"]
+  gem.email         = ["sethcall@gmail.com"]
+  gem.description   = %q{Simple migration tool focused on Postgresql}
+  gem.summary       = %q{Create migration scripts in raw SQL that work regardless if they are run from the pg_migrate command-line, psql, or native code integration.  More documentation exists on the project homepage.)}
+  gem.homepage      = "https://github.com/sethcall/pg_migrate"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.files        += ['lib/pg_migrate/templates/bootstrap.erb']
+  gem.files	   += ['lib/pg_migrate/templates/up.erb']
+  gem.files.delete("lib/pg_migrate/templates")
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "pg_migrate"
+  gem.require_paths = ["lib"]
+  gem.version       = PgMigrate::VERSION
+
+  gem.add_dependency('logging', '1.7.2')
+  
+  gem.add_dependency('pg', '0.17.1')
+  gem.add_dependency('thor', '0.15.4')
+  #gem.add_dependency('rubygems', '1.8.24')
+
+end
+

data/spec/database.yml

@@ -1,9 +1,9 @@
-test:
-  adapter: postgresql
-  encoding: unicode
-  database: pg_migrate_test
-  pool: 5
-  username: postgres
-  password: postgres
-  host: localhost
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: pg_migrate_test
+  pool: 5
+  username: postgres
+  password: postgres
+  host: localhost
   port: 5432

data/spec/pg_migrate/builder_spec.rb

@@ -1,114 +1,114 @@
-require 'spec_helper'
-
-describe Builder do
-
-  before(:all) do
-    @manifest_reader = ManifestReader.new
-    @sql_reader = SqlReader.new
-    @standard_builder = Builder.new(@manifest_reader, @sql_reader)
-    @dbutil = DbUtility.new
-  end
-
-  it "create bootstrap.sql" do
-    standard_builder = @standard_builder
-    target = Files.create :path => "target/bootstrap_test", :timestamp => false do
-      standard_builder.create_bootstrap_script(Dir.pwd)
-
-      # the .sql file should exist after
-      FileTest::exists?(BOOTSTRAP_FILENAME).should == true
-
-      content = nil
-
-      # dynamic content should be in the file
-      File.open(BOOTSTRAP_FILENAME, 'r') { |reader| content = reader.read }
-
-      content.start_with?('-- pg_migrate bootstrap').should == true
-    end
-
-  end
-
-  it "creates indempotent migrations" do
-
-    def run_bootstrap(output_dir)
-      run_migration(BOOTSTRAP_FILENAME, output_dir)
-    end
-
-    def run_migration(migration_path, output_dir)
-      @dbutil.connect_test_database() do |conn|
-        statements = @sql_reader.load_migration(File.join(output_dir, UP_DIRNAME, migration_path))
-
-        statements.each do |statement|
-          conn.exec(statement)
-        end
-      end
-    end
-
-    def verify_bootstrap()
-      # come back in, and verify that the bootstrap tables are there
-      @dbutil.connect_test_database() do |conn|
-        conn.exec("SELECT table_name FROM information_schema.tables WHERE table_name = $1", [PG_MIGRATE_TABLE]) do |result|
-          result.ntuples.should == 1
-          result.getvalue(0, 0).should == PG_MIGRATE_TABLE
-        end
-
-        conn.exec("SELECT table_name FROM information_schema.tables WHERE table_name = $1", [PG_MIGRATIONS_TABLE]) do |result|
-          result.ntuples.should == 1
-          result.getvalue(0, 0).should == PG_MIGRATIONS_TABLE
-        end
-
-      end
-    end
-
-    single_manifest=File.expand_path('spec/pg_migrate/input_manifests/single_manifest')
-    single_manifest = File.join(single_manifest, '.')
-
-    input_dir = nil
-    target = Files.create :path => "target", :timestamp => false do
-      input_dir = dir "input_single_manifest", :src => single_manifest do
-
-      end
-    end
-
-    output_dir = File.join('target', 'output_single_manifest')
-
-    FileUtils.rm_rf(output_dir)
-
-    @standard_builder.build(input_dir, output_dir)
-
-    @dbutil.create_new_test_database()
-
-    # run bootstrap once, and verify the tables now exist
-    run_bootstrap(output_dir)
-    verify_bootstrap()
-
-    # run bootstrap again, and verify no error (implicitly), and that the tables now exist
-    run_bootstrap(output_dir)
-    verify_bootstrap()
-
-    # now run single1.sql
-    run_migration('single1.sql', output_dir)
-
-    @dbutil.connect_test_database() do |conn|
-      conn.exec("SELECT table_name FROM information_schema.tables WHERE table_name = $1", ["emp"]) do |result|
-        result.ntuples.should == 1
-        result.getvalue(0, 0).should == "emp"
-      end
-    end
-
-    # run it again.  a very certain exception should occur... 'pg_migrate: code=migration_exists'
-    begin
-      run_migration('single1.sql', output_dir)
-      false.should == true
-    rescue Exception => e
-      e.message.index('pg_migrate: code=migration_exists').should_not == nil
-    end
-
-    @dbutil.connect_test_database() do |conn|
-      conn.exec("SELECT table_name FROM information_schema.tables WHERE table_name = $1", ["emp"]) do |result|
-        result.ntuples.should == 1
-        result.getvalue(0, 0).should == "emp"
-      end
-    end
-
-  end
+require 'spec_helper'
+
+describe Builder do
+
+  before(:all) do
+    @manifest_reader = ManifestReader.new
+    @sql_reader = SqlReader.new
+    @standard_builder = Builder.new(@manifest_reader, @sql_reader)
+    @dbutil = DbUtility.new
+  end
+
+  it "create bootstrap.sql" do
+    standard_builder = @standard_builder
+    target = Files.create :path => "target/bootstrap_test", :timestamp => false do
+      standard_builder.create_bootstrap_script(Dir.pwd)
+
+      # the .sql file should exist after
+      FileTest::exists?(BOOTSTRAP_FILENAME).should == true
+
+      content = nil
+
+      # dynamic content should be in the file
+      File.open(BOOTSTRAP_FILENAME, 'r') { |reader| content = reader.read }
+
+      content.start_with?('-- pg_migrate bootstrap').should == true
+    end
+
+  end
+
+  it "creates indempotent migrations" do
+
+    def run_bootstrap(output_dir)
+      run_migration(BOOTSTRAP_FILENAME, output_dir)
+    end
+
+    def run_migration(migration_path, output_dir)
+      @dbutil.connect_test_database() do |conn|
+        statements = @sql_reader.load_migration(File.join(output_dir, UP_DIRNAME, migration_path))
+
+        statements.each do |statement|
+          conn.exec(statement)
+        end
+      end
+    end
+
+    def verify_bootstrap()
+      # come back in, and verify that the bootstrap tables are there
+      @dbutil.connect_test_database() do |conn|
+        conn.exec("SELECT table_name FROM information_schema.tables WHERE table_name = $1", [PG_MIGRATE_TABLE]) do |result|
+          result.ntuples.should == 1
+          result.getvalue(0, 0).should == PG_MIGRATE_TABLE
+        end
+
+        conn.exec("SELECT table_name FROM information_schema.tables WHERE table_name = $1", [PG_MIGRATIONS_TABLE]) do |result|
+          result.ntuples.should == 1
+          result.getvalue(0, 0).should == PG_MIGRATIONS_TABLE
+        end
+
+      end
+    end
+
+    single_manifest=File.expand_path('spec/pg_migrate/input_manifests/single_manifest')
+    single_manifest = File.join(single_manifest, '.')
+
+    input_dir = nil
+    target = Files.create :path => "target", :timestamp => false do
+      input_dir = dir "input_single_manifest", :src => single_manifest do
+
+      end
+    end
+
+    output_dir = File.join('target', 'output_single_manifest')
+
+    FileUtils.rm_rf(output_dir)
+
+    @standard_builder.build(input_dir, output_dir)
+
+    @dbutil.create_new_test_database()
+
+    # run bootstrap once, and verify the tables now exist
+    run_bootstrap(output_dir)
+    verify_bootstrap()
+
+    # run bootstrap again, and verify no error (implicitly), and that the tables now exist
+    run_bootstrap(output_dir)
+    verify_bootstrap()
+
+    # now run single1.sql
+    run_migration('single1.sql', output_dir)
+
+    @dbutil.connect_test_database() do |conn|
+      conn.exec("SELECT table_name FROM information_schema.tables WHERE table_name = $1", ["emp"]) do |result|
+        result.ntuples.should == 1
+        result.getvalue(0, 0).should == "emp"
+      end
+    end
+
+    # run it again.  a very certain exception should occur... 'pg_migrate: code=migration_exists'
+    begin
+      run_migration('single1.sql', output_dir)
+      false.should == true
+    rescue Exception => e
+      e.message.index('pg_migrate: code=migration_exists').should_not == nil
+    end
+
+    @dbutil.connect_test_database() do |conn|
+      conn.exec("SELECT table_name FROM information_schema.tables WHERE table_name = $1", ["emp"]) do |result|
+        result.ntuples.should == 1
+        result.getvalue(0, 0).should == "emp"
+      end
+    end
+
+  end
 end

data/spec/pg_migrate/command_line_spec.rb

@@ -1,54 +1,54 @@
-require 'spec_helper'
-
-describe CommandLine do
-
-  before(:all) do
-    @dbutil = DbUtility.new
-  end
-
-
-  it "build using config file" do
-
-    single_manifest=File.expand_path('spec/pg_migrate/input_manifests/single_manifest')
-    single_manifest=File.join(single_manifest, '.')
-
-    input_dir = nil
-    target = Files.create :path => "target", :timestamp => false do
-      input_dir = dir "input_single_manifest", :src => single_manifest do
-
-      end
-    end
-
-    output_dir = File.join("target", 'output_single_manifest')
-
-    FileUtils.rm_rf(output_dir)
-
-    # make a properties file on the fly, with the out parameter specified
-    props = Properties.new
-    props['build.out'] = output_dir
-    props['build.force'] = "true"
-    props['build.test'] = "false"
-    #props['up.connopts'] = "dbname:pg_migrate_test host:localhost port:5432 user:postgres password:postgres"
-
-    # and put that properties file in the input dir
-    File.open(File.join(input_dir, PG_CONFIG), 'w') { |f| f.write(props) }
-
-    # invoke pg_migrate build, with the hopes that the output dir is honored
-    result = `bundle exec pg_migrate build -s #{input_dir}`
-
-    puts "pg_migrate build output: #{result}"
-
-    $?.exitstatus.should == 0
-
-    FileTest::exist?(output_dir).should == true
-    FileTest::exist?(File.join(output_dir, MANIFEST_FILENAME)).should == true
-    FileTest::exist?(File.join(output_dir, PG_CONFIG)).should == true
-    FileTest::exist?(File.join(output_dir, UP_DIRNAME)).should == true
-    FileTest::exist?(File.join(output_dir, UP_DIRNAME, BOOTSTRAP_FILENAME)).should == true
-    FileTest::exist?(File.join(output_dir, UP_DIRNAME, "single1.sql")).should == true
-
-
-  end
-
-
+require 'spec_helper'
+
+describe CommandLine do
+
+  before(:all) do
+    @dbutil = DbUtility.new
+  end
+
+
+  it "build using config file" do
+
+    single_manifest=File.expand_path('spec/pg_migrate/input_manifests/single_manifest')
+    single_manifest=File.join(single_manifest, '.')
+
+    input_dir = nil
+    target = Files.create :path => "target", :timestamp => false do
+      input_dir = dir "input_single_manifest", :src => single_manifest do
+
+      end
+    end
+
+    output_dir = File.join("target", 'output_single_manifest')
+
+    FileUtils.rm_rf(output_dir)
+
+    # make a properties file on the fly, with the out parameter specified
+    props = Properties.new
+    props['build.out'] = output_dir
+    props['build.force'] = "true"
+    props['build.test'] = "false"
+    #props['up.connopts'] = "dbname:pg_migrate_test host:localhost port:5432 user:postgres password:postgres"
+
+    # and put that properties file in the input dir
+    File.open(File.join(input_dir, PG_CONFIG), 'w') { |f| f.write(props) }
+
+    # invoke pg_migrate build, with the hopes that the output dir is honored
+    result = `bundle exec pg_migrate build -s #{input_dir}`
+
+    puts "pg_migrate build output: #{result}"
+
+    $?.exitstatus.should == 0
+
+    FileTest::exist?(output_dir).should == true
+    FileTest::exist?(File.join(output_dir, MANIFEST_FILENAME)).should == true
+    FileTest::exist?(File.join(output_dir, PG_CONFIG)).should == true
+    FileTest::exist?(File.join(output_dir, UP_DIRNAME)).should == true
+    FileTest::exist?(File.join(output_dir, UP_DIRNAME, BOOTSTRAP_FILENAME)).should == true
+    FileTest::exist?(File.join(output_dir, UP_DIRNAME, "single1.sql")).should == true
+
+
+  end
+
+
 end

data/spec/pg_migrate/config_parser_spec.rb

@@ -1,19 +1,19 @@
-require 'spec_helper'
-
-describe ConfigParser do
-  it "parse my test database.yml file" do
-    config = ConfigParser.rails("spec/database.yml", "test")
-    config.should == {
-            :dbname => "pg_migrate_test",
-            :user => "postgres",
-            :password => "postgres",
-            :host => "localhost",
-            :port => 5432
-    }
-  end
-  
-  it "run single migration" do
-    config = ConfigParser.rails("spec/database.yml", "test")
-  end
-
+require 'spec_helper'
+
+describe ConfigParser do
+  it "parse my test database.yml file" do
+    config = ConfigParser.rails("spec/database.yml", "test")
+    config.should == {
+            :dbname => "pg_migrate_test",
+            :user => "postgres",
+            :password => "postgres",
+            :host => "localhost",
+            :port => 5432
+    }
+  end
+  
+  it "run single migration" do
+    config = ConfigParser.rails("spec/database.yml", "test")
+  end
+
 end

data/spec/pg_migrate/db_utility.rb

@@ -1,73 +1,73 @@
-module PgMigrate
-
-  class DbUtility
-
-    DEFAULT_OPTIONS = {
-            :dbtestname => "pg_migrate_test",
-            :dbsuperuser => "postgres",
-            :dbsuperpass => "postgres",
-            :dbhost => "localhost",
-            :dbport => 5432
-    }
-
-    def initialize(options=DEFAULT_OPTIONS)
-
-      options = DEFAULT_OPTIONS.merge(options)
-
-      @dbtestname = options[:dbtestname]
-      @dbsuperuser = options[:dbsuperuser]
-      @dbsuperpass = options[:dbsuperpass]
-      @dbhost = options[:dbhost]
-      @dbport = options[:dbport]
-    end
-
-    def pg_connection_hasher()
-      return {
-              :port => @dbport,
-              :user => @dbsuperuser,
-              :password => @dbsuperpass,
-              :host => @dbhost
-      }
-    end
-
-
-    def create_new_test_database()
-
-      # this will presumably do the right default thing,
-      # to get us into a 'default' database where we can execute 'create database' from
-      conn_properties = pg_connection_hasher
-
-      conn_properties.delete(:dbname)
-
-      conn = PG::Connection.new(conn_properties)
-
-      conn.exec("DROP DATABASE IF EXISTS #{@dbtestname}").clear
-      conn.exec("CREATE DATABASE #{@dbtestname}").clear
-
-      conn.close
-
-    end
-
-    def connect_test_database(&block)
-      conn = nil
-
-      begin
-        conn_properties = pg_connection_hasher
-
-        conn_properties[:dbname] = @dbtestname
-        conn = PG::Connection.open(conn_properties)
-
-        yield conn
-
-      ensure
-        if !conn.nil?
-          conn.close
-        end
-      end
-
-
-    end
-
-  end
-
-end
+module PgMigrate
+
+  class DbUtility
+
+    DEFAULT_OPTIONS = {
+            :dbtestname => "pg_migrate_test",
+            :dbsuperuser => "postgres",
+            :dbsuperpass => "postgres",
+            :dbhost => "localhost",
+            :dbport => 5432
+    }
+
+    def initialize(options=DEFAULT_OPTIONS)
+
+      options = DEFAULT_OPTIONS.merge(options)
+
+      @dbtestname = options[:dbtestname]
+      @dbsuperuser = options[:dbsuperuser]
+      @dbsuperpass = options[:dbsuperpass]
+      @dbhost = options[:dbhost]
+      @dbport = options[:dbport]
+    end
+
+    def pg_connection_hasher()
+      return {
+              :port => @dbport,
+              :user => @dbsuperuser,
+              :password => @dbsuperpass,
+              :host => @dbhost
+      }
+    end
+
+
+    def create_new_test_database()
+
+      # this will presumably do the right default thing,
+      # to get us into a 'default' database where we can execute 'create database' from
+      conn_properties = pg_connection_hasher
+
+      conn_properties.delete(:dbname)
+
+      conn = PG::Connection.new(conn_properties)
+
+      conn.exec("DROP DATABASE IF EXISTS #{@dbtestname}").clear
+      conn.exec("CREATE DATABASE #{@dbtestname}").clear
+
+      conn.close
+
+    end
+
+    def connect_test_database(&block)
+      conn = nil
+
+      begin
+        conn_properties = pg_connection_hasher
+
+        conn_properties[:dbname] = @dbtestname
+        conn = PG::Connection.open(conn_properties)
+
+        yield conn
+
+      ensure
+        if !conn.nil?
+          conn.close
+        end
+      end
+
+
+    end
+
+  end
+
+end

data/spec/pg_migrate/input_manifests/single_manifest/manifest

@@ -1,4 +1,4 @@
-# name=single
-# this is a comment
-
+# name=single
+# this is a comment
+
 single1.sql

data/spec/pg_migrate/input_manifests/single_manifest/up/single1.sql

@@ -1,29 +1,29 @@
--- this is a SQL comment
-
-select 1;
-
-select 2;
-
-select
-3;
-
-create table emp(id BIGSERIAL PRIMARY KEY, name varchar(255));
-
--- a sql function
-CREATE FUNCTION clean_emp() RETURNS void AS '
-    DELETE FROM emp;
-' LANGUAGE SQL;
-
--- a sql function on one line
-CREATE FUNCTION clean_emp2() RETURNS void AS 'DELETE FROM emp;' LANGUAGE SQL;
-
-CREATE FUNCTION populate() RETURNS integer AS $$
-DECLARE
-    -- declarations
-BEGIN
-    PERFORM clean_emp2();
-END;
-$$ LANGUAGE plpgsql;
-
-
-
+-- this is a SQL comment
+
+select 1;
+
+select 2;
+
+select
+3;
+
+create table emp(id BIGSERIAL PRIMARY KEY, name varchar(255));
+
+-- a sql function
+CREATE FUNCTION clean_emp() RETURNS void AS '
+    DELETE FROM emp;
+' LANGUAGE SQL;
+
+-- a sql function on one line
+CREATE FUNCTION clean_emp2() RETURNS void AS 'DELETE FROM emp;' LANGUAGE SQL;
+
+CREATE FUNCTION populate() RETURNS integer AS $$
+DECLARE
+    -- declarations
+BEGIN
+    PERFORM clean_emp2();
+END;
+$$ LANGUAGE plpgsql;
+
+
+