migsql 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dce65cec7f13004fde63a68b7b963d0378ef6ce
-  data.tar.gz: 314daeaf69aaeafc08238b5253efa6213ee0aba3
+  metadata.gz: 0a4290a355bd2a6c5a68be7f11db3ae46f48f877
+  data.tar.gz: 87ff7d1ca701dab1570acb45c443d05b32565ad4
 SHA512:
-  metadata.gz: 0470c77ea747a8aa646afec4ff314ecdc2c9f859bccc1c89821276a8101c65f73993dfb0ba1ebfc033f98abef24848b057319a0d02713243d9d9bae77b0e91d3
-  data.tar.gz: 5e441b168abd9ad87ea51124dfe3bd51fb5a6a573acee0c2a866b127507c264e7405219f35ea5e974e63196b314ef4044f4ce7b11572381208ef1aef436ed0e8
+  metadata.gz: 501d32de6a8ed95adaf753f920d735f6c92d7c6c125a1e61bfc51206ba8af012128fc2eb8bab0459d8d442553f02424f38e519ef7f585d4859d906179bf6798d
+  data.tar.gz: 69cde86f82c4552a81a8ff1337f93ed7b0c03b4fe0ed751478f814125e7edc6a2c8846385f830f37abf586dd845a97da597bc634057d2bc1b23cc95a6248325d

data/bin/migsql

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

data/lib/migsql/app.rb

@@ -1,6 +1,5 @@
 require 'colorize'
 class MigSql
-
   def initialize
     @migration = Migration.new './db/config.yml'
     @migration.load
@@ -9,15 +8,15 @@ class MigSql
   def handle_argv(argv)
     if argv.length == 0
       puts 'Usage: migsql {init|create-migration|migrate}'.white
-    else 
+    else
       case argv[0]
-        when 'init'
-          handle_init
-        when 'create-migration'
-          handle_create_migration argv
-        when 'migrate'
-          handle_migrate argv
-      end  
+      when 'init'
+        handle_init
+      when 'create-migration'
+        handle_create_migration argv
+      when 'migrate'
+        handle_migrate argv
+      end
     end
   end
 
@@ -25,22 +24,27 @@ class MigSql
     if File.directory?('./db')
       puts 'Error: the ./db directory already exists'.red
     else
-      @migration.create_server 'example_database', '127.0.0.1', 'dbname', 'username', 'password'
+      @migration.create_server(
+       'example_database',
+       '127.0.0.1',
+       'dbname',
+       'username',
+       'password'
+      )
       @migration.save
       puts 'Default configuration created in ./db/config.yml'.green
     end
-  end 
+  end
 
   def handle_create_migration(argv)
     migration_name = argv[1]
     migration_server = get_migration_server(argv[2])
-    if !migration_server.nil?
-      @migration.create_migration migration_server, migration_name
-    end
+    @migration.create_migration migration_server, migration_name\
+      unless migration_server.nil?
   end
 
   def handle_migrate(argv)
-    if argv[1] == 'to' 
+    if argv[1] == 'to'
       migration_server = @migration.get_first_server_name
       migration_target = argv[2]
     else
@@ -48,37 +52,47 @@ class MigSql
       migration_target = argv[3]
     end
     o_target = migration_target
-    if !migration_server.nil? 
-      if migration_target.nil? 
-        migration_target = @migration.get_latest_migration(migration_server)
-      else
-        migration_target = @migration.get_migration_by_name(migration_server, migration_target)
-      end
-      if !migration_target.nil? 
-        from = @migration.get_migration_status(migration_server)
-        plan = @migration.get_migration_plan(migration_server, migration_target, from) 
-        if !plan.nil?
-          @migration.apply_migration_plan(migration_server, plan, migration_target)
-        end
-      else
-        puts "Error:  No migration found with name: #{o_target}".red
-      end
+    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
+  end
+
+  def calculate_migration_plan(migration_server, to, from)
+    @migration.get_migration_plan(
+      migration_server,
+      to,
+      from
+    )
+  end
+
+  def get_migration_target(migration_server, migration_target)
+    if migration_target.nil?
+      @migration.get_latest_migration(migration_server)
+    else
+      @migration.get_migration_by_name(migration_server, migration_target)
     end
   end
 
   def get_migration_server(server_name)
     if @migration.count_servers == 0
       puts 'Error: Please run migsql init first'.red
+      server_name = nil
     elsif @migration.count_servers > 1 && server_name.nil?
-      puts 'Error: Your config has multiple servers, please specify which server to create the migration on'.red
+      puts 'Error: Your config has multiple servers,
+            please specify which server to create the migration on'.red
     elsif !server_name.nil? && @migration.get_server(server_name).nil?
       puts "Error: No server named #{server_name} found in your config".red
-      nil
+      server_name = nil
     elsif @migration.count_servers == 1
-      @migration.get_first_server_name
-    else
-      server_name
+      server_name = @migration.get_first_server_name
     end
+    server_name
   end
-
 end

data/lib/migsql/migration.rb

@@ -1,4 +1,3 @@
-require 'rake'
 require 'fileutils'
 require 'yaml'
 require 'tiny_tds'
@@ -6,14 +5,14 @@ require 'colorize'
 require_relative 'sqlserver'
 
 class Migration
-  def initialize(path) 
+  def initialize(path)
     @path = path
     @root = File.dirname(@path)
-    @servers = Hash.new
-  end  
+    @servers = {}
+  end
 
   def create_server(name, address, database, username, password)
-     @servers[name] = SqlServer.new name, address, database, username, password
+    @servers[name] = SqlServer.new name, address, database, username, password
   end
 
   def get_server(name)
@@ -23,19 +22,17 @@ class Migration
   def get_first_server_name
     @servers.keys.first
   end
-   
+
   def save
-    FileUtils::mkdir_p @root
+    FileUtils.mkdir_p @root
     File.open(@path, 'w') { |f| f.write @servers.to_yaml }
   end
 
   def load
-    if File.file?(@path) 
-      @servers = YAML.load_file(@path)
-    end
+    @servers = YAML.load_file(@path) if File.file?(@path)
   end
 
-  def count_servers 
+  def count_servers
     @servers.length
   end
 
@@ -45,10 +42,9 @@ class Migration
       server_root    = "#{@root}/#{server_name}"
       up 	     = "#{server_root}/#{migration_name}_up.sql"
       down           = "#{server_root}/#{migration_name}_down.sql"
-      FileUtils::mkdir_p server_root
-      FileUtils::touch up
-      FileUtils::touch down 
-
+      FileUtils.mkdir_p server_root
+      FileUtils.touch up
+      FileUtils.touch down
       puts "Migration '#{migration_name}' created.".green
       puts "Up:   #{up}".white
       puts "Down: #{down}".white
@@ -66,59 +62,55 @@ class Migration
   end
 
   def get_migration_plan(server_name, to, from)
-    to = to || get_latest_migration(server_name)
+    to ||= get_latest_migration(server_name)
     to_i  = /([0-9]+)_?.*/.match(to).captures[0]
-  
     from_i = /([0-9]+)_?.*/.match(from).captures[0]
-
-    if to_i > from_i 
+    if to_i > from_i
       plan = get_up_plan server_name, to_i, from_i
     elsif to_i < from_i
       plan = get_down_plan server_name, to_i, from_i
     else
       puts 'No migration needed, database already at current level'.green
     end
-    return plan
+    plan
   end
 
-  def get_up_plan(server_name, to, from)
-    plan = Array.new
+  def get_migration_files(server_name, direction)
     server_root = "#{@root}/#{server_name}"
-    Dir["#{server_root}/*_up.sql"].sort.each {|migration| 
+    Dir["#{server_root}/*_#{direction}.sql"].sort
+  end
+
+  def get_up_plan(server_name, to, from)
+    plan = []
+    get_migration_files(server_name, 'up').each do |migration|
       current_item = /([0-9]+)_?.*/.match(migration).captures[0]
-      if current_item > from && current_item <= to
-        plan.push(migration)
-      end
-    }
+      plan.push(migration) if current_item > from && current_item <= to
+    end
     plan
   end
 
   def get_down_plan(server_name, to, from)
-    plan = Array.new
-    server_root = "#{@root}/#{server_name}"
-    Dir["#{server_root}/*_down.sql"].sort.reverse.each {|migration| 
+    plan = []
+    get_migration_files(server_name, 'down').reverse.each do |migration|
       current_item = /([0-9]+)_?.*/.match(migration).captures[0]
-      if current_item > to && current_item <= from
-        plan.push(migration)
-      end
-    }
+      plan.push(migration) if current_item > to && current_item <= from
+    end
     plan
   end
 
   def get_migration_by_name(server_name, name)
-    server_root = "#{@root}/#{server_name}"  
+    server_root = "#{@root}/#{server_name}"
     migration = Dir["#{server_root}/*#{name}_up.sql"][0]
-    if !migration.nil?
-      migration = /([0-9]+_.*)(_up|_down)\.sql/.match(migration).captures[0]
-    end
-    return migration
+    migration = /([0-9]+_.*)(_up|_down)\.sql/.match(migration).captures[0]\
+      unless migration.nil?
+    migration
   end
 
   def apply_migration_plan(server_name, migration_plan, final_state)
     puts "Applying migration to: #{server_name}".yellow
-    migration_plan.each {|migration| 
+    migration_plan.each do |migration|
       apply_migration server_name, migration
-    }
+    end
     server = get_server(server_name)
     server.set_migration_status(final_state)
     puts "Migration Complete, current state: #{final_state}".green
@@ -130,11 +122,8 @@ class Migration
     server = get_server(server_name)
     server.apply_migration(migration)
   end
- 
-  def get_migration_status(server_name) 
+
+  def get_migration_status(server_name)
     get_server(server_name).get_migration_status
   end
-
 end
-
-

data/lib/migsql/sqlserver.rb

@@ -5,7 +5,7 @@ require 'tiny_tds'
 require 'colorize'
 
 class SqlServer
-  def initialize(name, address, database, username, password) 
+  def initialize(name, address, database, username, password)
     @name     = name
     @address  = address
     @database = database
@@ -13,21 +13,7 @@ class SqlServer
     @password = password
   end
 
-  def name 
-    return @name
-  end
-  def address
-    return @address
-  end
-  def database
-    return @database
-  end
-  def username 
-    return @username
-  end
-  def password
-    return @password
-  end
+  attr_reader :name, :address, :database, :username, :password
 
   def get_sql(name)
     File.read("#{File.dirname(__FILE__)}/../../sql/#{name}.sql")
@@ -35,8 +21,8 @@ class SqlServer
 
   def get_client
     TinyTds::Client.new(
-      :username => username, 
-      :password => password, 
+      :username => username,
+      :password => password,
       :host     => address,
       :database => database
     )
@@ -45,37 +31,32 @@ class SqlServer
   def get_migration_status
     client = get_client
     begin
-      results = client.execute("SELECT migration FROM _migration")
+      results = client.execute('SELECT migration FROM _migration')
       result = results.each(:first => true)[0]['migration']
-      if result.length == 0 
-        return '0'
-      else
-        return result
-      end
-    rescue Exception => ex
-      return '0'
+      result = '0' if result.length == 0
+    rescue
+      result = '0'
     end
+    result
   end
- 
+
   def set_migration_status(to)
     client = get_client
     sql = [
       get_sql('create_migration_table'),
       "UPDATE _migration SET migration = '#{to}'"
-    ].join(' ')  
+    ].join(' ')
     client.execute(sql).each
   end
- 
+
   def remove_migration
     client = get_client
     client.execute('DROP TABLE _migration')
   end
 
-  def apply_migration(path) 
+  def apply_migration(path)
     client = get_client
     sql    = File.read(path)
     client.execute(sql)
   end
-
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: migsql
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Karl Stoney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tiny_tds