migsql 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a4290a355bd2a6c5a68be7f11db3ae46f48f877
-  data.tar.gz: 87ff7d1ca701dab1570acb45c443d05b32565ad4
+  metadata.gz: f64099740e799ae5f22f6892a9db6d9d7c36fd78
+  data.tar.gz: e5cd9d2217805ad0a5c640f54c6b69c86ffb3bb7
 SHA512:
-  metadata.gz: 501d32de6a8ed95adaf753f920d735f6c92d7c6c125a1e61bfc51206ba8af012128fc2eb8bab0459d8d442553f02424f38e519ef7f585d4859d906179bf6798d
-  data.tar.gz: 69cde86f82c4552a81a8ff1337f93ed7b0c03b4fe0ed751478f814125e7edc6a2c8846385f830f37abf586dd845a97da597bc634057d2bc1b23cc95a6248325d
+  metadata.gz: a2143353fc0b516eab6bbb9f60952f6afc020749ed6f1f1f857e47cb1d28fad1ca09bc743ba8b53808bf06d5770147501545d521dd2f83dac4daf6b68b74f382
+  data.tar.gz: d59ca627f647052f066329f510be15dae3a6d1d63323c3669a36a11b154e57b953e0644bb8a7eaaee10da8aa1c97b6b43d4e3b239ef6c74361440fe742c18d75

data/bin/migsql

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require_relative '../lib/migsql'
-@app = MigSql.new
+@app = MigSql.new(nil)
 @app.handle_argv(ARGV)

data/lib/migsql/app.rb

@@ -1,7 +1,7 @@
 require 'colorize'
 class MigSql
-  def initialize
-    @migration = Migration.new './db/config.yml'
+  def initialize(migration)
+    @migration = migration || Migration.new('./db/config.yml')
     @migration.load
   end
 
@@ -16,10 +16,31 @@ class MigSql
         handle_create_migration argv
       when 'migrate'
         handle_migrate argv
+      when 'apply'
+        handle_apply argv
       end
     end
   end
 
+  def enforce_arg(value, name)
+    if value.nil?
+      puts "Error: You must specify a value for #{name}".red
+      return true
+    end
+    false
+  end
+
+  def handle_apply(argv)
+    return if enforce_arg(argv[1], 'migration name')
+    return if enforce_arg(argv[2], 'up/down')
+    migration_server = get_migration_server(argv[4])
+    migration_name = get_migration_target(migration_server, argv[1])
+    return if migration_name.nil?
+    migration_name = "#{migration_name}_#{argv[2]}.sql"
+    @migration.apply_migration(migration_server, migration_name)\
+      unless migration_server.nil? || migration_name.nil?
+  end
+
   def handle_init
     if File.directory?('./db')
       puts 'Error: the ./db directory already exists'.red
@@ -51,17 +72,13 @@ class MigSql
       migration_server = get_migration_server(argv[1])
       migration_target = argv[3]
     end
-    o_target = migration_target
     return if migration_server.nil?
     migration_target = get_migration_target(migration_server, migration_target)
-    if !migration_target.nil?
-      from = @migration.get_migration_status(migration_server)
-      plan = calculate_migration_plan(migration_server, migration_target, from)
-      @migration.apply_migration_plan(migration_server, plan, migration_target)\
-        unless plan.nil?
-    else
-      puts "Error:  No migration found with name: #{o_target}".red
-    end
+    return if migration_target.nil?
+    from = @migration.get_migration_status(migration_server)
+    plan = calculate_migration_plan(migration_server, migration_target, from)
+    @migration.apply_migration_plan(migration_server, plan, migration_target)\
+      unless plan.nil?
   end
 
   def calculate_migration_plan(migration_server, to, from)
@@ -74,10 +91,12 @@ class MigSql
 
   def get_migration_target(migration_server, migration_target)
     if migration_target.nil?
-      @migration.get_latest_migration(migration_server)
+      migration = @migration.get_latest_migration(migration_server)
     else
-      @migration.get_migration_by_name(migration_server, migration_target)
+      migration = @migration.get_migration_by_name(migration_server, migration_target)
+      puts "Error: No migration found with name: #{migration_target}".red if migration.nil?
     end
+    migration
   end
 
   def get_migration_server(server_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: migsql
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Karl Stoney