pg_migrate 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_migrate (0.1.0)
+    pg_migrate (0.1.1)
       logging (= 1.7.2)
       pg (= 0.14.0)
       thor (= 0.15.4)

data/lib/pg_migrate/builder.rb

@@ -8,7 +8,7 @@ module PgMigrate
   # takes a unprocessed manifest directory, and adds before/after headers to each file
   class Builder
 
-    attr_accessor :manifest_reader, :sql_reader
+    attr_accessor :manifest_reader, :sql_reader, :loaded_manifest
 
     def initialize(manifest_reader, sql_reader)
       @log = Logging.logger[self]
@@ -21,7 +21,8 @@ module PgMigrate
     # input_dir is root path, contains file 'manifest' and 'migrations'
     # output_dir will have a manifest and migrations folder, but processed
     # force will create the output dir if needed, and *delete an existing directory* if it's in the way
-    def build(input_dir, output_dir, options={:force=>true})
+    # test will run tests
+    def build(input_dir, output_dir, options={:force=>true, :test=>false})
       input_dir = File.expand_path(input_dir)
       output_dir = File.expand_path(output_dir)
 
@@ -75,13 +76,18 @@ module PgMigrate
       end
 
       # in order array of manifest declarations
-      loaded_manifest = @manifest_reader.load_input_manifest(input_dir)
+      @loaded_manifest = @manifest_reader.load_input_manifest(input_dir)
       # hashed on migration name hash of manifest
 
       loaded_manifest_hash = @manifest_reader.hash_loaded_manifest(loaded_manifest)
       @manifest_reader.validate_migration_paths(input_dir, loaded_manifest)
 
       build_up(input_dir, output_dir, loaded_manifest_hash, loaded_manifest)
+    
+      # ok we are done. time to test!
+      if options[:test]
+        test(output_dir, options)
+      end
     end
 
     def build_up(input_dir, output_dir, loaded_manifest_hash, loaded_manifest)
@@ -118,10 +124,13 @@ module PgMigrate
 
     # creates the 'pg_migrations table'
     def create_bootstrap_script(migration_out_path)
+      @log.debug "creating bootstrap script #{migration_out_path}"
       run_template("bootstrap.erb", binding, File.join(migration_out_path, BOOTSTRAP_FILENAME))
     end
 
     def create_wrapped_up_migration(migration_in_filepath, migration_out_filepath, migration_def, loaded_manifest)
+      @log.debug "securing migration #{migration_def.name}"
+      
       builder_version="pg_migrate_ruby-#{PgMigrate::VERSION}"
       manifest_version=loaded_manifest[-1].ordinal
       migration_content = nil
@@ -164,10 +173,40 @@ module PgMigrate
 
           create_wrapped_up_migration(migration_in_path, migration_out_path, migration_def, loaded_manifest)
         else
+          @log.debug "copying non-sql file #{migration_in_path}"
           # if not a .sql file, just copy it over
           FileUtils.cp(migration_in_path, migration_out_path)
         end
       end
     end
+
+    def recreate_test_database(conn, test_db_name)
+        @log.debug "recreate test database #{test_db_name}"
+
+        conn.exec("drop database if exists #{test_db_name}")
+        conn.exec("create database #{test_db_name}")
+      end
+
+      def test(output_dir, test_options)
+
+        @log.info "testing..."
+        
+        oobconn = Util::get_oob_conn(test_options)
+        target_dbname = Util::get_db_name(test_options)
+
+        run_manifests = []
+
+
+        recreate_test_database(oobconn, target_dbname)
+
+        conn = Util::get_conn(test_options)
+
+        migrator = Migrator.new(manifest_reader, sql_reader, :pgconn => conn)
+        migrator.migrate(output_dir)
+        conn.close
+
+        @log.info "test success"
+
+      end
   end
 end

data/lib/pg_migrate/command_line.rb

@@ -78,6 +78,9 @@ module PgMigrate
     method_option :out, :aliases => "-o", :banner => "output directory", :desc => "where the processed migrations will be placed"
     method_option :force, :aliases => "-f", :type => :boolean, :banner => "overwrite out", :desc => "if specified, the out directory will be created before processing occurs, replacing any existing directory"
     method_option :verbose, :aliases => "-v", :type => :boolean, :banner => "verbose", :desc=> "set to raise verbosity"
+    method_option :test, :aliases => "-t", :default => false, :type => :boolean, :banner => "run tests", :desc => "run tests by creating a test database and executing migrations"
+    method_option :oob_connopts, :aliases => "-b",:default=> nil,  :type => :hash, :banner => "out-of-band connection options", :desc => "this is a 'landing pad' database from which pg_migrate can execute 'create/drop' against the database specified by the connopts argument. database connection options used by gem 'pg': dbname|host|hostaddr|port|user|password|connection_timeout|options|sslmode|krbsrvname|gsslib|service"
+    method_option :connopts, :aliases => "-c", :default => nil, :type => :hash, :banner => "connection options", :desc => "database connection options used by gem 'pg': dbname|host|hostaddr|port|user|password|connection_timeout|options|sslmode|krbsrvname|gsslib|service"
 
     def build
       source = options[:source]
@@ -86,7 +89,7 @@ module PgMigrate
         source = @@packaged_source
       end
 
-      method_defaults = {"force" => false, "verbose" => false}
+      method_defaults = {"force" => false, "verbose" => false, "test" => false}
       local_options = set_defaults_from_file(method_defaults, "build", source)
       local_options = local_options.merge(options)
 
@@ -97,10 +100,41 @@ module PgMigrate
         exit 1
       end
 
+      if local_options["test"].to_s == "true"
+        if !local_options["oob_connopts"]
+          puts "error: --oob_connopts not specified when test = true"
+          exit 1
+        else
+          # type safety; if string is found, convert to hash
+          local_options["oob_connopts"] = parse_to_hash(local_options["oob_connopts"])
+        end
+
+
+        if !local_options["connopts"]
+          puts "error: --connopts not specified when test = true"
+          exit 1
+        else
+          # type safety; if string is found, convert to hash
+          local_options["connopts"] = parse_to_hash(local_options["connopts"])
+        end
+
+      end
+
       manifest_reader = ManifestReader.new
       sql_reader = SqlReader.new
       builder = Builder.new(manifest_reader, sql_reader)
-      builder.build(source, local_options["out"], :force => local_options["force"])
+
+      begin
+      builder.build(source, local_options["out"],
+                    :force => local_options["force"],
+                    :test => local_options["test"],
+                    :oob_connopts => local_options["oob_connopts"],
+                    :connopts => local_options["connopts"])
+      rescue PG::Error => pge
+        puts "test failure"
+        puts pge
+      end
+
     end
 
 
@@ -132,7 +166,7 @@ module PgMigrate
         exit 1
       end
       if !local_options["version"]
-        puts "error: --version not specified"
+        puts "error: --version not specified"   
         exit 1
       end
 
@@ -186,6 +220,18 @@ module PgMigrate
         return map
 
       end
+
+      def parse_to_hash(value)
+        hash = {}
+
+        bits = value.split()
+        bits.each do |bit|
+          key, value = bit.split(':',2)
+          hash[key] = value
+        end
+
+        return hash
+      end
     end
 
 

data/lib/pg_migrate/migrator.rb

@@ -18,17 +18,10 @@ module PgMigrate
     # The manifest_path argument should point to your manifest
     # manifest_path = the directory containing your 'manifest' file, 'up' directory, 'down' directory, 'test' directory
     # this method will throw an exception if anything goes wrong (such as bad SQL in the migrations themselves)
-
     def migrate(manifest_path)
       @manifest_path = manifest_path
 
-      if !@connection_hash[:pgconn].nil?
-        @conn = @connection_hash[:pgconn]
-      elsif !@connection_hash[:connstring].nil?
-        @conn = PG::Connection.open(@connection_hash[:connstring])
-      else
-        @conn = PG::Connection.open(@connection_hash)
-      end
+      @conn = Util::get_conn(@connection_hash)
 
       # this is used to record the version of the 'migrator' in the pg_migrate table
       @conn.exec("SET application_name = 'pg_migrate_ruby-#{PgMigrate::VERSION}'")
@@ -37,7 +30,7 @@ module PgMigrate
       process_manifest()
 
       # execute the migrations
-      run_migrations()
+      run_migrations(@manifest)
     end
 
 
@@ -48,7 +41,7 @@ module PgMigrate
     end
 
     # run all necessary migrations
-    def run_migrations
+    def run_migrations(manifest)
 
       # run bootstrap before user migrations to prepare database
       run_bootstrap
@@ -68,7 +61,7 @@ module PgMigrate
 
     # execute a single migration by loading it's statements from file, and then executing each
     def execute_migration(name, filepath)
-      @log.debug "executing migration #{filepath}"
+      @log.info "executing migration #{filepath}"
 
       statements = @sql_reader.load_migration(filepath)
       if statements.length == 0

data/lib/pg_migrate/version.rb

@@ -1,3 +1,3 @@
 module PgMigrate
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/pg_migrate.rb

@@ -11,6 +11,7 @@ require "pg_migrate/config_parser"
 require "pg_migrate/builder"
 require "pg_migrate/package"
 require "pg_migrate/command_line"
+require "pg_migrate/util"
 
 # name of the manifest file
 MANIFEST_FILENAME = 'manifest'

data/spec/pg_migrate/command_line_spec.rb

@@ -27,6 +27,7 @@ describe CommandLine do
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_migrate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging