fluent-migrator-command-runner 0.0.3 → 0.0.4

data/lib/fluent-migrator-command-runner.rb

@@ -1,4 +1,8 @@
 require 'fluent-migrator-command-runner/runner'
+require 'fluent-migrator-command-runner/command_builder'
+require 'fluent-migrator-command-runner/oracle_migration_command'
+require 'fluent-migrator-command-runner/task'
+
 require 'fig_newton'
 
 module FluentMigratorCommandRunner

data/lib/fluent-migrator-command-runner/command_builder.rb

@@ -1,21 +1,11 @@
-
 module FluentMigratorCommandRunner
 
   class CommandBuilder
 
-    def self.build (configuration, task, profile = nil, tag=nil)
-      connection_string = build_connection_string(configuration[:connection_information])
-      command = "#{configuration[:path_to_migrator]} --conn \"#{connection_string}\" /provider oracle --assembly \"#{configuration[:path_to_migration_assembly]}\" /task #{task}"
-      command += " --tag #{tag}" if tag
-      command += " --profile=#{profile}" if profile
-      command
-    end
-
-    private
-
-    def self.build_connection_string(configuration)
-      "DATA SOURCE=#{configuration['database']};user id=#{configuration['username']};password=#{configuration['password']}"
-    end
+   def self.build(migration_options = {})
+   	command = OracleMigrationCommand.new(migration_options)
+   	command.build
+   end
 
   end
 end

data/lib/fluent-migrator-command-runner/oracle_migration_command.rb

@@ -0,0 +1,42 @@
+module FluentMigratorCommandRunner
+	class OracleMigrationCommand
+		attr_accessor 	:path_to_migrator, 
+						:path_to_migration_assembly, 
+						:connection_information,
+						:profile,
+						:tag
+
+		def initialize(options = {})
+			@profile = options[:profile] unless options[:profile].nil?
+			@tag = options[:tag] unless options[:tag].nil?
+			@path_to_migrator = FigNewton.path_to_migrator_exe
+			@path_to_migration_assembly = FigNewton.path_to_migration_assembly
+			@connection_information = FigNewton.database.to_hash
+			@connection_information['password'] = options[:db_password] unless options[:db_password].nil?
+		end
+
+		def build
+			connection_string = build_connection_string(@connection_information)
+
+			command_sections = []
+			command_sections.push(@path_to_migrator)
+			command_sections.push("--conn \"#{connection_string}\"")
+			command_sections.push("/provider oracle --assembly \"#{@path_to_migration_assembly}\"")
+			command_sections.push("/task migrate")
+			command_sections.push("--tag #{@tag}") if @tag
+			command_sections.push("--profile=#{@profile}") if @profile
+			command_sections.join(' ')
+		end
+
+		private
+
+		def build_connection_string(connection_information)
+			connection = []
+			connection.push("DATA SOURCE=#{connection_information['database']};")
+			connection.push("user id=#{connection_information['username']};")
+			connection.push("password=#{connection_information['password']}")
+			return connection.join('')
+		end
+
+	end
+end

data/lib/fluent-migrator-command-runner/runner.rb

@@ -1,21 +1,15 @@
-require_relative 'command_builder'
-
 module FluentMigratorCommandRunner
   class Runner
 
-    def initialize(overrides = {})
-      defaults = {
-          :path_to_migrator => FigNewton.path_to_migrator_exe,
-          :path_to_migration_assembly => FigNewton.path_to_migration_assembly,
-          :connection_information => FigNewton.database.to_hash
-      }
-      @configuration = defaults.merge(overrides)
+    def self.execute(command)
+      fluent_migrator_result = Kernel.system(command)
+      raise 'Fluent Migrator Failed' if fluent_migrator_run_failed?(fluent_migrator_result)
     end
 
-    def migrate_database(profile = nil, tag = nil)
-      command = CommandBuilder.build(@configuration, 'migrate', profile, tag)
-      val = Kernel.system command
-      raise 'Fluent Migrator Failed' if val == false
+    private
+
+    def self.fluent_migrator_run_failed?(fluent_migrator_result)
+      fluent_migrator_result == false
     end
 
   end

data/lib/fluent-migrator-command-runner/task.rb

@@ -0,0 +1,44 @@
+require 'fig_newton'
+require 'rake'
+
+require File.dirname(__FILE__) + "/runner"
+require File.dirname(__FILE__) + "/command_builder"
+
+
+module FluentMigratorCommandRunner
+	module Rake
+		class Task
+			include ::Rake::DSL
+
+			attr_accessor :fig_newton_file
+			attr_accessor :profile
+			attr_accessor :tag
+
+			def initialize(task_name)
+				@task_name = task_name
+
+				yield self if block_given?
+
+				define_task
+			end
+
+			def define_task
+				task @task_name, [:password] do |t, params|
+					FigNewton.load(@fig_newton_file) unless @fig_newton_file.nil?
+					options = migration_options
+					options[:db_password] = params[:password] unless params[:password].nil?
+					command = CommandBuilder.build(options)
+					Runner.execute(command)
+				end
+			end
+
+			def migration_options
+				options = {}
+				options[:profile] = profile unless profile.nil?
+				options[:tag] = tag unless tag.nil?
+				return options
+			end
+
+		end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-migrator-command-runner
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -36,6 +36,8 @@ files:
 - lib/fluent-migrator-command-runner.rb
 - lib/fluent-migrator-command-runner/runner.rb
 - lib/fluent-migrator-command-runner/command_builder.rb
+- lib/fluent-migrator-command-runner/task.rb
+- lib/fluent-migrator-command-runner/oracle_migration_command.rb
 homepage: ''
 licenses:
 - MIT
@@ -62,4 +64,3 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files: []
-has_rdoc: