fluent-migrator-command-runner 0.6 → 0.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGRkZWNiZDk2YjAwYjhjZWJkMzBmODE4NTMxZGVjOGI1MzUyNmExMA==
-  data.tar.gz: !binary |-
-    ODhjODg1NzhiMzc4MDg5MDAyYTVhNmZhNWQyYTAwNWJlYWFlNTI5OA==
+SHA256:
+  metadata.gz: 1120833152bd2339e2fd3eb88b4c8bff2033a9c7ad52853f28d8c9d1d3b25f1c
+  data.tar.gz: 0ebe5e145df2af646fe8b763ceb995665fccacc090000da1f67fcc01726512d4
 SHA512:
-  metadata.gz: !binary |-
-    MzU0MmFiYzdmYjMxYmQxYThlOWQ3ZDFkNjIzMzlmOWY1YTU0YzNiYWYwYTY3
-    YWM0NzMyYzcyNmRmZmIyYTIwOWM0MzZjOWEyZDRmNzNkMGQwZTdiYzI3ZDg1
-    Zjk3MDk5NDJmNzc1MGExNGQ2NTVjNDY0NjJjZDJmMTZlZWIyZDE=
-  data.tar.gz: !binary |-
-    ZmM3OTZlNGIwMDE3ZmQwMTg1NTFkM2Y5N2ZkOGVhZjQyODhlMWZhNTAyMzIw
-    NjYwOGIxZTNjNGQ0NzdiNGJkNDc0ZTBjZmRlM2Y2ZTIwZDQyYmZkZDdiN2E1
-    MmYzMDM5OTUwMmVhM2FkZTRhNDdhMDU5Y2NlNWM4YTNmZTFkNDQ=
+  metadata.gz: 877f043fcc0648d79e2d16e2f6c2378a0412e44a20a53d624e50312b0a5ca164272dcc65612bb402e5b4bc5498429e000089930da1097a44eaf04cb353f11517
+  data.tar.gz: 4ba5084b4d3727aa0307e448ac789596084f8b47154333cd35fb7c2505f8ffe02a9fe0acf25b64ec75d8b246272f32bf0ab9ae2908550b399d6199ff1e5411d7

data/Gemfile.lock

@@ -1,29 +1,39 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    fig_newton (0.10)
-      yml_reader (>= 0.3)
-    rake (10.3.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.4)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.1)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
-    yml_reader (0.4)
-
-PLATFORMS
-  x86-mingw32
-
-DEPENDENCIES
-  fig_newton
-  rake
-  rspec
-  rspec-mocks
+PATH
+  remote: .
+  specs:
+    fluent-migrator-command-runner (0.7)
+      fig_newton
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    fig_newton (1.0)
+      yml_reader (>= 0.7)
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.4)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
+    yml_reader (0.7)
+
+PLATFORMS
+  x64-mingw32
+  x86-mingw32
+
+DEPENDENCIES
+  fluent-migrator-command-runner!
+  rake
+  rspec
+  rspec-mocks
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -24,6 +24,16 @@ database:
   password: "p4ssw0rd"
 ````
 
+#Optional Overrides
+
+##Oracle Data Provider
+
+Defaults to use the unmanaged oracle client
+
+````
+migration_provider: oraclemanaged
+````
+
 #Using exposed rake task
 
 Migrate with no tags or profiles
@@ -46,4 +56,3 @@ FluentMigratorCommandRunner::Rake::Task.new(:migrate) do |t|
 	- be able to run with multiple tags
 
 #Notes
-	Has only been tested with FluentMigrator.Tools.1.1.2.1

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

@@ -1,7 +1,9 @@
 require 'fluent-migrator-command-runner/version'
 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/commands/migration_command'
+require 'fluent-migrator-command-runner/commands/oracle_migration_command'
+require 'fluent-migrator-command-runner/commands/sql_server_migration_command'
 require 'fluent-migrator-command-runner/task'
 require 'fig_newton'
 

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

@@ -3,7 +3,11 @@ module FluentMigratorCommandRunner
   class CommandBuilder
 
    def self.build(migration_options = {})
-   	command = OracleMigrationCommand.new(migration_options)
+    if FigNewton.migration_provider == 'sqlserver' 
+      command = SqlServerMigrationCommand.new(migration_options)
+    else
+      command = OracleMigrationCommand.new(migration_options)
+    end
    	command.build
    end
 

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

@@ -0,0 +1,40 @@
+module FluentMigratorCommandRunner
+    class MigrationCommand
+        attr_reader 	:path_to_migrator,
+						:path_to_migration_assembly,
+						:connection_information,
+						:profile,
+						:tag,
+			 			:provider
+
+		PARAMETER_PREFIX = '--'
+		SPACE_CHAR = "\s"
+
+		MIGRATOR_DELIMITER = "#{SPACE_CHAR + PARAMETER_PREFIX}"
+        CONNECTION_STRING_DELIMITER = ';'
+        
+        def initialize(options = {})
+			@profile = options[:profile] unless options[:profile].nil?
+			@tag = options[:tag] unless options[:tag].nil?
+			@provider = FigNewton.migration_provider('oracle')
+			@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("provider #{@provider}")
+			command_sections.push("conn \"#{connection_string}\"")
+			command_sections.push('task migrate')
+			command_sections.push("assembly \"#{@path_to_migration_assembly}\"")
+			command_sections.push("tag #{@tag}") if @tag
+			command_sections.push("profile=#{@profile}") if @profile
+			command_sections.join(MIGRATOR_DELIMITER)
+		end
+    end
+end

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

@@ -0,0 +1,15 @@
+module FluentMigratorCommandRunner
+	class OracleMigrationCommand < MigrationCommand
+
+		protected 
+
+		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']}")
+			connection.join(CONNECTION_STRING_DELIMITER)
+		end
+
+	end
+end

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

@@ -0,0 +1,15 @@
+module FluentMigratorCommandRunner
+	class SqlServerMigrationCommand < MigrationCommand
+
+		protected
+		
+		def build_connection_string(connection_information)
+			connection = []
+			connection.push("Server=#{connection_information['host']}")
+			connection.push("Database=#{connection_information['database']}")
+			connection.push("user id=#{connection_information['username']}")
+			connection.push("password=#{connection_information['password']}")
+			connection.join(CONNECTION_STRING_DELIMITER)
+		end
+	end
+end

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

@@ -1,3 +1,3 @@
 module FluentMigratorCommandRunner
-  VERSION = "0.6"
+  VERSION = "0.7"
 end

data/spec/fluent-migrator-command-runner/command_builder_spec.rb

@@ -9,6 +9,7 @@ describe FluentMigratorCommandRunner::CommandBuilder do
 
 	before { allow(oracle_command).to receive(:new).and_return(command_stub)}
 	before { allow(command_stub).to receive(:build)}
+	before { allow(FigNewton).to receive(:migration_provider).and_return('')}
 
 	it 'should create new oracle migration command with options' do
 		expected_options = {}

data/spec/fluent-migrator-command-runner/runner_spec.rb

@@ -20,7 +20,7 @@ describe FluentMigratorCommandRunner::CommandBuilder do
 			allow(kernel).to receive(:system)
 			allow(system_error).to receive(:exitstatus).and_return(1)
 
-			expect{runner.execute('')}.to raise_error()
+			expect{runner.execute('')}.to raise_error
 		end
 
 		it "should raise exception when command is invalid" do

data/spec/fluent-migrator-command-runner/sql_server_migration_command_spec.rb

@@ -0,0 +1,117 @@
+require 'spec_helper'
+require 'socket'
+
+describe FluentMigratorCommandRunner::SqlServerMigrationCommand do
+
+  before do
+    @connection_information = {
+        'database' => '',
+        'host' => '',
+        'username' => '',
+        'password' => ''
+    }
+    allow(FigNewton).to receive(:database).and_return(@connection_information)
+    allow(FigNewton).to receive(:path_to_migration_assembly)
+    allow(FigNewton).to receive(:path_to_migrator_exe)
+    allow(FigNewton).to receive(:migration_provider)
+  end
+
+  describe 'initialize' do
+
+    it "should include profile when provided" do
+      expected_profile = "--profile=TestData"
+      command = FluentMigratorCommandRunner::SqlServerMigrationCommand.new({:profile => 'TestData'}).build
+      expect(command).to include(expected_profile)
+    end
+
+    it "should not include profile when not provided" do
+      command = FluentMigratorCommandRunner::SqlServerMigrationCommand.new.build
+      expect(command).to_not include('--profile')
+    end
+
+    it "should include tag when provided" do
+      expected_tag = "--tag Data"
+      command = FluentMigratorCommandRunner::SqlServerMigrationCommand.new({:tag => 'Data'}).build
+      expect(command).to include(expected_tag)
+    end
+
+    it "should not include tag when not provided" do
+      command = FluentMigratorCommandRunner::SqlServerMigrationCommand.new.build
+      expect(command).to_not include('--tag')
+    end
+
+    it 'should override password' do
+      expected_password = 'my_new_password'
+      command = FluentMigratorCommandRunner::SqlServerMigrationCommand.new({:db_password => expected_password}).build
+      expect(command).to include(expected_password)
+    end
+
+    it "should allow overriding of default provider" do
+      expected_provider = 'mynewprovider'
+      allow(FigNewton).to receive(:migration_provider).and_return(expected_provider)
+      command = FluentMigratorCommandRunner::SqlServerMigrationCommand.new.build
+      expect(command).to include("--provider #{expected_provider}")
+    end
+  end
+
+  describe "build" do
+    let(:oracle_command) { FluentMigratorCommandRunner::SqlServerMigrationCommand.new }
+
+    it "should include path to migrator" do
+      expected = "/My/Path/To/Migrator"
+      allow(FigNewton).to receive(:path_to_migrator_exe).and_return(expected)
+
+      command = oracle_command.build
+      expect(command).to include(expected)
+    end
+
+    it "should include default provider" do
+      oracle_command.build
+      expect(FigNewton).to have_received(:migration_provider).with('oracle')
+    end
+
+    it "should include path to assembly" do
+      expected = "--assembly \"/My/Path/To/Assembly\""
+      allow(FigNewton).to receive(:path_to_migration_assembly).and_return('/My/Path/To/Assembly')
+
+      command = oracle_command.build
+      expect(command).to include(expected)
+    end
+
+    it "should include task" do
+      expected_task = "--task migrate"
+      command = oracle_command.build
+      expect(command).to include(expected_task)
+    end
+
+    it "should include connection string" do
+      command = oracle_command.build()
+      expect(command).to include('--conn ')
+    end
+
+    describe "database connection string" do
+
+      it "should include DATA SOURCE in connection string" do
+        expected = 'localhost'
+        @connection_information['host'] = expected
+        command = oracle_command.build
+        expect(command).to include "Server=#{expected}"
+      end
+
+      it "should include user name in connection string" do
+        expected = 'user'
+        @connection_information['username'] = expected
+        command = oracle_command.build
+        expect(command).to include "user id=#{expected}"
+      end
+
+      it "should include password in connection string" do
+        expected = 'MyPassword'
+        @connection_information['password'] = expected
+        command = oracle_command.build
+        expect(command).to include "password=#{expected}"
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -4,4 +4,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rspec/mocks'
 require 'rspec'
 require 'fluent-migrator-command-runner'
-require 'rake'
+require 'rake'
+
+# Supress Command Line Warnings
+# TODO: Remove need for these
+RSpec::Mocks.configuration.allow_message_expectations_on_nil = true
+RSpec::Expectations.configuration.on_potential_false_positives = :nothing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-migrator-command-runner
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Mosaic
@@ -14,14 +14,14 @@ dependencies:
   name: fig_newton
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Build and Execute Fluent Migrator Commands
@@ -30,7 +30,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -38,7 +38,9 @@ files:
 - fluent-migrator-command-runner.gemspec
 - lib/fluent-migrator-command-runner.rb
 - lib/fluent-migrator-command-runner/command_builder.rb
-- lib/fluent-migrator-command-runner/oracle_migration_command.rb
+- lib/fluent-migrator-command-runner/commands/migration_command.rb
+- lib/fluent-migrator-command-runner/commands/oracle_migration_command.rb
+- lib/fluent-migrator-command-runner/commands/sql_server_migration_command.rb
 - lib/fluent-migrator-command-runner/runner.rb
 - lib/fluent-migrator-command-runner/task.rb
 - lib/fluent-migrator-command-runner/version.rb
@@ -46,6 +48,7 @@ files:
 - spec/fluent-migrator-command-runner/oracle_migration_command_spec.rb
 - spec/fluent-migrator-command-runner/rake_task_spec.rb
 - spec/fluent-migrator-command-runner/runner_spec.rb
+- spec/fluent-migrator-command-runner/sql_server_migration_command_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -57,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rake Tasks For Fluent Migrator

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

@@ -1,51 +0,0 @@
-module FluentMigratorCommandRunner
-	class OracleMigrationCommand
-		attr_reader 	:path_to_migrator,
-						:path_to_migration_assembly,
-						:connection_information,
-						:profile,
-						:tag,
-            :provider
-
-    PARAMETER_PREFIX = '--'
-    SPACE_CHAR = "\s"
-
-    MIGRATOR_DELIMITER = "#{SPACE_CHAR + PARAMETER_PREFIX}"
-    CONNECTION_STRING_DELIMITER = ';'
-
-		def initialize(options = {})
-			@profile = options[:profile] unless options[:profile].nil?
-			@tag = options[:tag] unless options[:tag].nil?
-      @provider = FigNewton.migration_provider('oracle')
-      @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("provider #{@provider}")
-      command_sections.push("conn \"#{connection_string}\"")
-			command_sections.push('task migrate')
-      command_sections.push("assembly \"#{@path_to_migration_assembly}\"")
-      command_sections.push("tag #{@tag}") if @tag
-			command_sections.push("profile=#{@profile}") if @profile
-			command_sections.join(MIGRATOR_DELIMITER)
-		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']}")
-			connection.join(CONNECTION_STRING_DELIMITER)
-		end
-
-	end
-end