db-migrate 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 116ab5a81c362901cdd816c8dfce0052a8b988c0
-  data.tar.gz: e91ded66c26efca89c6f53bb7fc11a0a79c18d65
+  metadata.gz: 7c9d9e26ef60000e8df08e69c64785f48916b3cf
+  data.tar.gz: d0ee951a80e3c977887261eeaa309893b6613e7a
 SHA512:
-  metadata.gz: 4cb51474c633de2e333bb25d586136b0ccc6428f7bcd0edb4e9132fd94a353d6f7f4f7c9e09811913aaace1de8af80b06547b1c61bcb0117996eda36df78ba53
-  data.tar.gz: 56a5bf6ba365179d7b86298874dffbe9f3a28e512313ab69b23d1dbc4f740de52143f52a4ca9821c6afdc25c735c93350546674b092fc0c72219dc74d830ce1c
+  metadata.gz: ff194194be430978206223312659d01aec0d1f0e9edac2936e56119992f4cb49bab9c82e016c2979610f71bdf215196748d0cd418174c5388ec0b2153264550d
+  data.tar.gz: 717dfe6e6efa4f7f8c604447b4cd585bd37d4351de73efef85a96f232aa194f81e9e169883240022a71f116eddea57f15e95dd8c9102b909946bf9e276cf952e

data/.travis.yml

@@ -7,6 +7,9 @@ rvm:
 
 script: "bundle exec rspec"
 
+addons:
+  postgresql: "9.4"
+
 services:
   - mysql
   - postgresql
@@ -14,3 +17,5 @@ services:
 before_script:
   - mysql -e 'create database migrate_test;'
   - psql -c 'create database migrate_test;' -U postgres
+  - psql -c 'CREATE SCHEMA IF NOT EXISTS public;' -U postgres
+  - psql -c 'SET search_path = public;' -U postgres

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    db-migrate (0.1.3)
+    db-migrate (0.2.0)
       colorize (= 0.7.7)
       highline (= 1.7.8)
       json (= 1.8.3)

data/README.md

@@ -9,6 +9,8 @@ Tool for managing and executing your database migrations.
 gem install db-migrate
 ```
 
+If you are going to use for example Postgres with **migrate**, make sure that you have Postgresql server running.
+
 ## Demo
 ![img](http://i.giphy.com/26tPaeasgQYU2mCoE.gif)
 
@@ -36,7 +38,7 @@ It supports multiple databases and multiple languages for executing migrations.
 ##### --help
 ```
 Commands:
-  migrate init               # make configuration file
+  migrate init               # initialize tables and create config file if necessary
   migrate new [DESCRIPTION]  # generate files for new migration
   migrate up                 # Upgrade database schema
   migrate down               # Downgrade database schema
@@ -81,7 +83,9 @@ version_number=version_number_table_name
 If configuration file does not exist, it will run interactive configuration file creation process. You will answer few questions about your database, and **migrate** will create configuration file for you.
 
 #### new
-After that you can start generating migrations by using **migrate new** command. This will generate migration script for you based on your prefered language.
+After that you can start generating migrations by using **migrate new** command. This will generate migration scripts for you based on your prefered language.
+
+You will get new directory in format `vXXX-YYYY`, where `XXX` is version number, and `YYY` is short description you provide. Inside generated directory there will be two files. `up.LANG` and `down.LANG`, where `LANG` is language you use for writing migration scripts. 
 
 #### up
 When you are done with writing your `up` and `down` migration script, you can execute **migrate up** to run up migration script for new version. You can also execute multiple migrations in single call by providing `--to n` argument, where `n` is highest version where you want to navigate.

data/bin/migrate

@@ -114,6 +114,7 @@ class CLI < Thor
     end
 
     @migrator.init
+    @migrator.recover
   rescue Exception => e
     Log.error("Error while initialization.", e)
     if generated_config
@@ -123,7 +124,7 @@ class CLI < Thor
   end
 
   desc "new [DESCRIPTION]", "generate files for new migration"
-  def new(description="")
+  def new(description="migration")
     @migrator.new(description)
   end
 

data/db-migrate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'db-migrate'
-  s.version     = '0.1.3'
+  s.version     = '0.2.0'
   s.licenses    = ['MIT']
   s.summary     = "Tool for managing and executing your database migrations."
   s.description = "#{s.summary} It supports multiple databases and multiple languages for writing migration scripts."

data/lib/migrate/migrator.rb

@@ -17,23 +17,55 @@ module Migrate
 
     def init
       @db.tx do
-        @db.create_tables
+        if @db.tables_exists?
+          Log.info("Version tables already exist.")
+        else
+          @db.create_tables
+        end
+
+        self.recover
       end
     end
 
+    def recover
+      @db.tx do
+        directory = @config.root
+        migrations = Dir.entries(directory).select { |file| File.directory? File.join(directory, file)}
+        migrations.each do |migration|
+          match = migration.match(/v(\d*)-(.*)/i)
+          if match != nil
+            v, desc = match.captures
+            unless @db.version_exists?(v)
+              self.new(desc, v)
+            end
+          end
+        end
+      end
+    end
+
+
     def migration_dir(migration)
       date = DateTime.parse(migration["created_date"].to_s)
-      "#{@config.root}/v#{migration["version"]}-#{date.strftime("%Y-%m-%d")}"
+      "#{@config.root}/v#{migration["version"]}-#{migration["description"]}"
     end
 
-    def new(desc)
+    def new(desc, version=nil)
       @db.tx do
         Log.info("Creating new migration...")
 
-        migration = @db.new_migration(desc)
+        if version == nil
+          version = @db.highest_version.to_i + 1
+        end
+
+        migration = @db.new_migration(version, desc)
         migration_dir = self.migration_dir(migration)
-        Dir.mkdir migration_dir
-        @lang.create_migration(migration_dir)
+
+        if Dir.exists? migration_dir
+          Log.info("Migration directory '#{migration_dir}' already exists.")
+        else
+          Dir.mkdir migration_dir
+          @lang.create_migration(migration_dir)
+        end
 
         Log.success("Migration for version #{migration["version"]} created.")
         migration_dir

data/lib/migrate/storage/db.rb

@@ -13,10 +13,10 @@ module Migrate
         @config.storage
       end
 
-      def new_migration(description="")
+      def new_migration(version=0, description="")
         self.exec_sql <<-eos
-          INSERT INTO #{@config.version_info} (description, created_date) 
-          VALUES('#{description}', now())
+          INSERT INTO #{@config.version_info} (version, description, created_date)
+          VALUES(#{version}, '#{description}', now())
         eos
 
         res = self.exec_sql <<-eos
@@ -26,7 +26,7 @@ module Migrate
       end
 
       def list_migrations(selects, limit)
-        self.exec_sql <<-eos 
+        self.exec_sql <<-eos
           SELECT #{(selects == nil ? "*" : selects)} FROM #{@config.version_info}
           ORDER BY last_up, version
           #{limit != nil ? "LIMIT #{limit}" : ""}
@@ -57,9 +57,19 @@ module Migrate
         eos
       end
 
+      def highest_version
+        self.extract_version self.exec_sql <<-eos
+          SELECT version FROM #{@config.version_info}
+            ORDER BY version DESC
+          LIMIT 1
+        eos
+      rescue VersionNotFound => e
+        0
+      end
+
       def next_version
         self.extract_version self.exec_sql <<-eos
-          SELECT version FROM #{@config.version_info} 
+          SELECT version FROM #{@config.version_info}
             WHERE version > (SELECT version FROM #{@config.version_number} LIMIT 1)
           ORDER BY version
           LIMIT 1
@@ -75,8 +85,8 @@ module Migrate
 
       def prev_version
         self.extract_version self.exec_sql <<-eos
-          SELECT version FROM #{@config.version_info} 
-            WHERE version < (SELECT version FROM #{@config.version_number} LIMIT 1) 
+          SELECT version FROM #{@config.version_info}
+            WHERE version < (SELECT version FROM #{@config.version_number} LIMIT 1)
           ORDER BY version DESC
           LIMIT 1
         eos
@@ -89,7 +99,7 @@ module Migrate
 
       def log_down(version)
         self.exec_sql "UPDATE #{@config.version_info} SET last_down=now() WHERE version=#{version}"
-        
+
         lowest_version = self.lowest_version
         version_to_save = lowest_version.to_i < version.to_i ? self.prev_version().to_i : 0
         self.exec_sql "UPDATE #{@config.version_number} SET version=#{version_to_save}"
@@ -104,6 +114,13 @@ module Migrate
         end
       end
 
+      def version_exists?(version)
+        self.get_migration(version)
+        true
+      rescue VersionNotFound
+        false
+      end
+
       def delete(version)
         self.exec_sql "DELETE FROM #{@config.version_info} WHERE version=#{version}"
       end
@@ -136,6 +153,10 @@ module Migrate
         raise "Implementation for creating tables not found"
       end
 
+      def tables_exists?
+        raise "Implementation for checking if version tables already exists not found"
+      end
+
       # Executes SQL
       def exec_sql(sql)
         raise "Implementation for executing SQL script not found"

data/lib/migrate/storage/mysql.rb

@@ -40,6 +40,13 @@ module Migrate
         Log.success("Version table created")
       end
 
+      def tables_exists?
+        vi = self.exec_sql("SHOW TABLES LIKE '#{@config.version_info}'")
+        vn = self.exec_sql("SHOW TABLES LIKE '#{@config.version_number}'")
+
+        vi.length > 0 && vn.length > 0
+      end
+
       def exec_sql(sql)
         results = []
         result = @tx.query sql

data/lib/migrate/storage/postgres.rb

@@ -1,4 +1,5 @@
 require "pg"
+require 'wannabe_bool'
 
 module Migrate
   module Storage
@@ -13,6 +14,26 @@ module Migrate
         })
       end
 
+      def tables_exists?
+        vi = self.exec_sql <<-eos
+          SELECT EXISTS (
+            SELECT 1
+            FROM information_schema.tables
+            WHERE table_name = '#{@config.version_info}'
+          );
+        eos
+
+        vn = self.exec_sql <<-eos
+          SELECT EXISTS (
+            SELECT 1
+            FROM information_schema.tables
+            WHERE table_name = '#{@config.version_number}'
+          );
+        eos
+
+        vi[0]["exists"].to_b && vn[0]["exists"].to_b
+      end
+
       def create_tables
         Log.info("Creating version table")
         self.exec_sql <<-eos

data/spec/lib/storage/db_spec.rb

@@ -1,6 +1,5 @@
 describe "Storage" do
   $dbs.each do |db|
-
     around(:each) do |test|
       db.tx do
         test.run
@@ -9,7 +8,8 @@ describe "Storage" do
 
     context db.type do
       it "should create new migration" do
-        created = db.new_migration("this is description")
+        created = db.new_migration(200, "this is description")
+        expect(created["version"].to_i).to eq(200)
         expect(created).not_to eq(nil)
         expect(db.exec_sql(
           "SELECT * FROM #{$version_info} WHERE version=#{created["version"]}")[0])
@@ -53,6 +53,11 @@ describe "Storage" do
         end
       end
 
+      it "should be able to check if version table already exists" do
+        exists = db.tables_exists?
+        expect(exists).to be true
+      end
+
       it "should get lowest version" do
         version = db.lowest_version
         expect(version.to_s).to eq("1")

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ $pg_config_hash = $config_base.merge({
   :password => ""
 })
 
-def load_pg_config  
+def load_pg_config
   config = Conf.new("spec/lib/fixtures", "example_pg.config")
   config.init($pg_config_hash)
   config.load!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-migrate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Ivan Pusic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor