database_patcher 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6f30ae5f966a66d023dedb2e52ec85352fcc2dc
-  data.tar.gz: f2dad5348b3d64fbf9e2655fd8c26bdb93a44db6
+  metadata.gz: 4dd4e79091a8bbff51742008dbe13648634ec1e9
+  data.tar.gz: 0a105b04e9c13b5abe5bff2cd9e8a6e139ed9ddd
 SHA512:
-  metadata.gz: f0262661418ce2071f9518ac20cef05d185f2b378a4a2af4da734cf02f5692088b3e3eed5bd6f4135351c6ba7af94279063066ed42bba86f1fec90979f3c4301
-  data.tar.gz: 7c4999481222febae37e67fa6f0c7b7bea7c2c8b75ed9b53c0931c99a0e0b4b0d3753b2f92653fc8425c8cb0c0e40175158d56423f2e2ddd4b1e0d7baee97336
+  metadata.gz: 79d02146d5dc66f9ce04d29cdeb580fe110dde9946c8e691dbb75494e7d9314c94c0d50960fc2953d8b785f9ff56d743987b7397a4e8cfab315129149834e3e3
+  data.tar.gz: 1ff2bce215c6020902fbb6eab6a33a9a5369f07bee0bc25335596a5387f562ed8d145745593f3efa795994110d8502b13858fe65ee3b144d9a958ce129aac6dc

data/lib/database_patcher.rb

@@ -2,12 +2,11 @@ require 'fileutils'
 module DatabasePatcher
   require 'database_patcher/db'
   require 'database_patcher/cli'
+  require 'database_patcher/action'
   require 'database_patcher/fetcher'
   require 'database_patcher/version'
   require 'database_patcher/command'
+  require 'database_patcher/interface'
   require 'database_patcher/environment'
-  require 'database_patcher/initializer'
   require 'database_patcher/patch_entity'
-  require 'database_patcher/patch_creator'
-  require 'database_patcher/patch_applier'
 end

data/lib/database_patcher/action.rb

@@ -0,0 +1,11 @@
+require 'database_patcher'
+class DatabasePatcher::Action
+  require 'database_patcher/action/initializer'
+  require 'database_patcher/action/patch_applier'
+  require 'database_patcher/action/patch_creator'
+
+  attr_reader :interface
+  def initialize(interface=DatabasePatcher::Interface::Null.new)
+    @interface = interface
+  end
+end

data/lib/database_patcher/action/initializer.rb

@@ -0,0 +1,49 @@
+require 'database_patcher'
+class DatabasePatcher::Action::Initializer < DatabasePatcher::Action
+  def init
+    create_patch_folder
+    check_table_exists
+    check_required_columns
+  rescue Sequel::DatabaseError => explanation
+    connection.create_table(:installed_patches) do
+      Integer :timestamp
+      String :uuid, size: 36
+      String :md5_down, size: 32
+      String :md5_up, size: 32
+      String :comment
+    end
+  end
+
+  protected
+
+  def check_required_columns
+    test_column(:timestamp, Integer)
+    test_column(:uuid, String, size: 36, default: "")
+    test_column(:md5_down, String, size: 32)
+    test_column(:md5_up, String, size: 32)
+    test_column(:md5_up, String, size: 32)
+    test_column(:comment, String)
+  end
+
+  def test_column(name, type, opts = {})
+    connection.transaction do
+      unless connection[:installed_patches].columns.include?(name)
+        connection.alter_table(:installed_patches) do
+          add_column(name, type, opts)
+        end
+      end
+    end
+  end
+
+  def check_table_exists
+    connection[:installed_patches].first
+  end
+
+  def create_patch_folder
+    FileUtils.mkpath(DatabasePatcher::Environment.patch_folder_path)
+  end
+
+  def connection
+    @connection ||= DatabasePatcher::DB.create_connection
+  end
+end

data/lib/database_patcher/{patch_applier.rb → action/patch_applier.rb}

@@ -1,9 +1,9 @@
 require 'database_patcher'
-class DatabasePatcher::PatchApplier
+class DatabasePatcher::Action::PatchApplier < DatabasePatcher::Action
   def up
     connection = DatabasePatcher::DB.create_connection
     connection.transaction do
-      fetcher = DatabasePatcher::Fetcher.new(connection)
+      fetcher = DatabasePatcher::Fetcher.new(connection, interface)
       fetcher.get_pending_patches.each do |pending_patch|
         pending_patch.up(connection)
       end
@@ -11,9 +11,10 @@ class DatabasePatcher::PatchApplier
   end
 
   def down
+    return unless interface.ask('This will execute all the down patches! Are you sure?')
     connection = DatabasePatcher::DB.create_connection
     connection.transaction do
-      fetcher = DatabasePatcher::Fetcher.new(connection)
+      fetcher = DatabasePatcher::Fetcher.new(connection, interface)
       fetcher.get_intalled_patches.each do |installed_patche|
         installed_patche.down(connection)
       end
@@ -21,9 +22,10 @@ class DatabasePatcher::PatchApplier
   end
 
   def rollback
+    return unless interface.ask('This will execute the last patch down part! Are you sure?')
     connection = DatabasePatcher::DB.create_connection
     connection.transaction do
-      fetcher = DatabasePatcher::Fetcher.new(connection)
+      fetcher = DatabasePatcher::Fetcher.new(connection, interface)
       fetcher.get_intalled_patches.each do |patch|
         patch.down(connection)
         break

data/lib/database_patcher/{patch_creator.rb → action/patch_creator.rb}

@@ -1,7 +1,8 @@
 require 'fileutils'
 require 'database_patcher'
-class DatabasePatcher::PatchCreator
-  def initialize(type, idenpotent, file_name_description)
+class DatabasePatcher::Action::PatchCreator < DatabasePatcher::Action
+  def initialize(type, idenpotent, file_name_description, interface = DatabasePatcher::Interface::Null)
+    super(interface)
     @type = type
     @idenpotent = !!idenpotent
     @file_name_description = file_name_description

data/lib/database_patcher/command/create_patch.rb

@@ -15,6 +15,7 @@ class DatabasePatcher::Command::CreatePatch < DatabasePatcher::Command
   end
 
   on_call do |args|
-    DatabasePatcher::PatchCreator.new(options[:type], options[:idempotent],args.join('_')).make
+    std = DatabasePatcher::Interface::STD.new
+    DatabasePatcher::Action::PatchCreator.new(options[:type], options[:idempotent],args.join('_'), std).make
   end
 end

data/lib/database_patcher/command/down.rb

@@ -4,7 +4,8 @@ class DatabasePatcher::Command::Down < DatabasePatcher::Command
   desc 'execute the down patches and remove all db patch'
 
   on_call do |*_|
-    DatabasePatcher::Initializer.new.init
-    DatabasePatcher::PatchApplier.new.down
+    std = DatabasePatcher::Interface::STD.new
+    DatabasePatcher::Action::Initializer.new(std).init
+    DatabasePatcher::Action::PatchApplier.new(std).down
   end
 end

data/lib/database_patcher/command/init.rb

@@ -4,6 +4,7 @@ class DatabasePatcher::Command::Init < DatabasePatcher::Command
   desc 'this will create initial directory and the default installed_patches table in the database'
 
   on_call do |*_|
-    DatabasePatcher::Initializer.new.init
+    std = DatabasePatcher::Interface::STD.new
+    DatabasePatcher::Action::Initializer.new(std).init
   end
 end

data/lib/database_patcher/command/rollback.rb

@@ -4,7 +4,8 @@ class DatabasePatcher::Command::RollBack < DatabasePatcher::Command
   desc 'execute the last patch down part, and remove the db patch registration'
 
   on_call do |*_|
-    DatabasePatcher::Initializer.new.init
-    DatabasePatcher::PatchApplier.new.rollback
+    std = DatabasePatcher::Interface::STD.new
+    DatabasePatcher::Action::Initializer.new(std).init
+    DatabasePatcher::Action::PatchApplier.new(std).rollback
   end
 end

data/lib/database_patcher/command/up.rb

@@ -4,7 +4,8 @@ class DatabasePatcher::Command::Up < DatabasePatcher::Command
   desc 'apply all pending db patch'
 
   on_call do |*_|
-    DatabasePatcher::Initializer.new.init
-    DatabasePatcher::PatchApplier.new.up
+    std = DatabasePatcher::Interface::STD.new
+    DatabasePatcher::Action::Initializer.new(std).init
+    DatabasePatcher::Action::PatchApplier.new(std).up
   end
 end

data/lib/database_patcher/db.rb

@@ -7,14 +7,13 @@ module DatabasePatcher::DB
 
   def create_connection
     new_connection = Sequel.connect(DatabasePatcher::Environment.database_url)
-    new_connection.sql_log_level = :info
     new_connection.loggers << new_logger
     new_connection
   end
 
   def new_logger
     logger = Logger.new($stdout)
-    logger.level = Logger::Severity::ERROR
+    logger.level = Logger::Severity::UNKNOWN
     logger
   end
 

data/lib/database_patcher/fetcher.rb

@@ -1,29 +1,30 @@
 require 'database_patcher'
 class DatabasePatcher::Fetcher
-  def initialize(connection)
+  def initialize(connection, interface)
     @connection = connection
+    @interface = interface
   end
 
   def get_intalled_patches
-    patches = get_patches.reverse
+    patches = get_patches
     installed_patches = []
-    already_applied_patch_timestamps = get_already_applied_patch_timestamps
+    uniq_indentifiers = get_already_applied_patch_uniq_indentifiers
 
     patches.each do |patch|
-      break unless already_applied_patch_timestamps.include?(patch.timestamp)
+      break unless uniq_indentifiers.include?(patch.uniq_indentifier)
       installed_patches.push(patch)
     end
 
-    installed_patches
+    installed_patches.reverse
   end
 
   def get_pending_patches
     patches = get_patches
     pending_patches = []
-    already_applied_patch_timestamps = get_already_applied_patch_timestamps
+    uniq_indentifiers = get_already_applied_patch_uniq_indentifiers
 
     patches.each do |patch|
-      break if already_applied_patch_timestamps.include?(patch.timestamp)
+      break if uniq_indentifiers.include?(patch.uniq_indentifier)
       pending_patches.push(patch)
     end
 
@@ -36,7 +37,7 @@ class DatabasePatcher::Fetcher
 
   def get_patches
     Dir.glob(File.join(DatabasePatcher::Environment.patch_folder_path, '*')).reduce([]) do |patches, current_path|
-      patches << DatabasePatcher::PatchEntity.factory(current_path)
+      patches << DatabasePatcher::PatchEntity.factory(current_path, @interface)
       patches
     end.sort_by(&:timestamp)
   end
@@ -45,7 +46,12 @@ class DatabasePatcher::Fetcher
     connection[:installed_patches].all
   end
 
-  def get_already_applied_patch_timestamps
-    installed_patches.map { |record| record[:timestamp] }
+  def get_already_applied_patch_uniq_indentifiers
+    installed_patches.map do |record|
+      {
+        timestamp: record[:timestamp],
+        uuid: record[:uuid]
+      }
+    end.sort_by{|r| r[:timestamp].to_i }
   end
 end

data/lib/database_patcher/interface.rb

@@ -0,0 +1,9 @@
+require 'database_patcher'
+class DatabasePatcher::Interface
+  require 'database_patcher/interface/null'
+  require 'database_patcher/interface/std'
+
+  def ask(_question)
+    raise(NotImplementedError)
+  end
+end

data/lib/database_patcher/interface/null.rb

@@ -0,0 +1,6 @@
+require 'database_patcher'
+class DatabasePatcher::Interface::Null < DatabasePatcher::Interface
+  def ask(_q)
+    true
+  end
+end

data/lib/database_patcher/interface/std.rb

@@ -0,0 +1,24 @@
+require 'timeout'
+require 'database_patcher'
+class DatabasePatcher::Interface::STD < DatabasePatcher::Interface
+  def initialize(options = {})
+    @force = !!options[:force]
+  end
+
+  def ask(question)
+    return true if @force
+    Timeout.timeout(15) do
+      loop do
+        $stdout.puts(question.to_s + ' ([y]es/[n]o)')
+        case $stdin.gets.chomp.strip.downcase 
+        when 'y', 'yes'
+          return true
+        when 'n', 'no'
+          return false
+        else
+          $stdout.puts('invalid answer, please try again')
+        end
+      end
+    end
+  end
+end

data/lib/database_patcher/patch_entity.rb

@@ -4,23 +4,30 @@ class DatabasePatcher::PatchEntity
   require 'database_patcher/patch_entity/file'
   require 'database_patcher/patch_entity/folder'
 
-  def self.factory(path)
+  def self.factory(path, interface)
     if ::File.directory?(path)
-      self::Folder.new(path)
+      self::Folder.new(path, interface)
     else
-      self::File.new(path)
+      self::File.new(path, interface)
     end
   end
 
-  def initialize(path)
+  attr_reader :path, :interface
+  def initialize(path, interface)
     @path = path
+    @interface = interface
   end
 
   def timestamp
-    basename = ::File.basename(@path, '.*')
     basename.scan(/^\d+/).flatten.first.to_i
   end
 
+  UUID_MATCHER = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'.freeze
+  def uuid
+    basename = ::File.basename(@path, '.*')
+    basename.scan(/^\d+_(#{UUID_MATCHER})_/).flatten.first.to_s
+  end
+
   def up(_connection)
     raise
   end
@@ -29,6 +36,15 @@ class DatabasePatcher::PatchEntity
     raise
   end
 
+  def uniq_indentifier
+    {
+      timestamp: timestamp,
+      uuid: uuid
+    }
+  end
+
+  protected
+
   def execute_file(connection, path)
     case ::File.extname(path)
 
@@ -54,16 +70,12 @@ class DatabasePatcher::PatchEntity
     $stdout.puts("Patch removed: #{uniq_indentifier[:timestamp]}")
   end
 
-  def uniq_indentifier
+  def patch_record
     {
-      timestamp: timestamp,
       md5_down: md5_down,
-      md5_up: md5_up
-    }
-  end
-
-  def patch_record
-    uniq_indentifier.merge(comment: comment)
+      md5_up: md5_up,
+      comment: comment
+    }.merge(uniq_indentifier)
   end
 
   def md5(string)
@@ -95,4 +107,8 @@ class DatabasePatcher::PatchEntity
   def raise_unknown_extension_for(path)
     raise("unknown patch file extension: #{::File.extname(path)} (#{path})")
   end
+
+  def basename
+    ::File.basename(@path, '.*')
+  end
 end

data/lib/database_patcher/rake_task.rb

@@ -1,31 +1,29 @@
 require "database_patcher"
-namespace :db do
+std = DatabasePatcher::Interface::STD.new
+namespace :dp do
 
   desc 'apply pending schema migrations'
-  task :apply_pending_patches do
-    DatabasePatcher::Initializer.new.init
-    DatabasePatcher::PatchApplier.new.up
+  task :up do
+    DatabasePatcher::Action::Initializer.new(std).init
+    DatabasePatcher::Action::PatchApplier.new(std).up
   end
 
-  desc "Alias task for apply_pending_patches"
-  task :migrate => :apply_pending_patches
-
   desc 'apply pending schema migrations'
-  task :revert_installed_patches do
-    DatabasePatcher::Initializer.new.init
-    DatabasePatcher::PatchApplier.new.down
+  task :down do
+    DatabasePatcher::Action::Initializer.new(std).init
+    DatabasePatcher::Action::PatchApplier.new(std).down
   end
 
   desc 'rollback one patch'
   task :rollback do
-    DatabasePatcher::Initializer.new.init
-    DatabasePatcher::PatchApplier.new.rollback
+    DatabasePatcher::Action::Initializer.new(std).init
+    DatabasePatcher::Action::PatchApplier.new(std).rollback
   end
 
   desc 'create a new migration patch'
-  task :create_patch, :type, :idempotent, :description do |t, args|
+  task :add, :type, :idempotent, :description do |t, args|
     args.with_defaults(:type => 'ruby', :idempotent => false, :description => '')
-    DatabasePatcher::PatchCreator.new(args[:type], args[:idempotent],args[:description]).make
+    DatabasePatcher::Action::PatchCreator.new(args[:type], args[:idempotent],args[:description],std).make
   end
 
 end

data/lib/database_patcher/version.rb

@@ -1,3 +1,3 @@
 module DatabasePatcher
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_patcher
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,6 @@ extra_rdoc_files: []
 files:
 - ".env"
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -115,6 +114,10 @@ files:
 - database_patcher.gemspec
 - exe/database_patcher
 - lib/database_patcher.rb
+- lib/database_patcher/action.rb
+- lib/database_patcher/action/initializer.rb
+- lib/database_patcher/action/patch_applier.rb
+- lib/database_patcher/action/patch_creator.rb
 - lib/database_patcher/cli.rb
 - lib/database_patcher/command.rb
 - lib/database_patcher/command/create_patch.rb
@@ -126,9 +129,9 @@ files:
 - lib/database_patcher/db.rb
 - lib/database_patcher/environment.rb
 - lib/database_patcher/fetcher.rb
-- lib/database_patcher/initializer.rb
-- lib/database_patcher/patch_applier.rb
-- lib/database_patcher/patch_creator.rb
+- lib/database_patcher/interface.rb
+- lib/database_patcher/interface/null.rb
+- lib/database_patcher/interface/std.rb
 - lib/database_patcher/patch_entity.rb
 - lib/database_patcher/patch_entity/file.rb
 - lib/database_patcher/patch_entity/folder.rb

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/lib/database_patcher/initializer.rb

@@ -1,28 +0,0 @@
-require 'database_patcher'
-class DatabasePatcher::Initializer
-  def init
-    create_patch_folder
-    check_table_exists
-  rescue Sequel::DatabaseError
-    connection.create_table(:installed_patches) do
-      Integer :timestamp
-      String :md5_down, size: 32
-      String :md5_up, size: 32
-      String :comment
-    end
-  end
-
-  protected
-
-  def check_table_exists
-    connection[:installed_patches].first
-  end
-
-  def create_patch_folder
-    FileUtils.mkpath(DatabasePatcher::Environment.patch_folder_path)
-  end
-
-  def connection
-    @connection ||= DatabasePatcher::DB.create_connection
-  end
-end