themigrator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7b0bd4c2f45a3da0af9c48c3b6cba896b0fab28
-  data.tar.gz: 9590ad4e9ac568a4aeb884c6eeca181cac4df735
+  metadata.gz: 085e22641bbbe62e08c1e198162675d47b6db9c5
+  data.tar.gz: 538f05195800115aa28338cc4896378bc57df811
 SHA512:
-  metadata.gz: 7b04dc8e517f01daf72e181782ddafd2b2d944db7dbdc5db269bbb445c8f2db7775eb328f93c5dd070e806ab2ec9d364a36e74d6bbf87f4f653f217f33a39f92
-  data.tar.gz: 69a04b5e51d35ce5329569bc68568ae83e61e77b0f0434769a72458f355ec27297247678f52603c2a409c23b12fd424fe7ff044e19addecc14dbaa6d76709a98
+  metadata.gz: ee81f2adb4f68ccb702a32931fbabb4a6030edc2732bc87e1b6ad12d54c803ee4a8f34c6e8a620d6db08fb53ade3618a67d8d7fb2080550f2fc3965518e2d0ad
+  data.tar.gz: 1e0483923ba73473f685f91cda9a9f132fbb2df7bf67a958ede16f825d5082ee8f3cab1725d1f9a5636236477fc09fcec1898f998c15c95ad58af0aaa0a34dd5

data/lib/themigrator/logger.rb

@@ -1,9 +1,33 @@
 require 'fileutils'
+require 'logger'
 
 module Themigrator
   module Logger
+
+    MAINLOGFILE = "themigrator.log"
     include FileUtils
 
+    def log(msg)
+      logger.info msg
+    end
+
+    def init_logger(log_file)
+      @logger = ::Logger.new(log_file)
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+	t = datetime.strftime('%Y-%m-%d %H:%M:%S')
+	  "#{t}: #{msg}\n"
+      end
+    end
+
+    def logger
+      @logger || ::Logger.new(STDOUT)
+    end
+
+    def main_log_path(base_dir, run_id)
+      filename = MAINLOGFILE
+      directory = log_dir(base_dir, run_id)
+      File.join(directory,filename)
+    end
 
     def log_path(base_dir, run_id, role, action)
       filename = "#{role}-#{action}.log"

data/lib/themigrator/migration_progress.rb

@@ -0,0 +1,30 @@
+
+
+module Themigrator
+  class MigrationProgress
+    include Logger
+    
+    
+    def initialize(dir, run_id)
+      @dir, @run_id = dir, run_id
+      @log_file_path = main_log_path(dir, run_id)
+      start_log_parser
+    end
+
+    private
+
+    def start_log_parser
+
+      File.open(@log_file_path, "r") do |f|
+f.readline
+raise	File.read(@log_file_path)
+
+
+      end
+
+    rescue EOFError
+
+    end
+
+  end
+end

data/lib/themigrator/migrator.rb

@@ -1,11 +1,10 @@
-require 'themigrator/runner'
 require 'themigrator/logger'
 require 'themigrator/migration'
+require 'themigrator/script_pool'
 
 
 module Themigrator
   class Migrator
-    include Runner
     include Logger
 
 
@@ -17,51 +16,68 @@ module Themigrator
     def migrate!
       @migration = Migration.new(@dir)
       @migration.analyze_project!
+
+      init_logger(main_log_path(@dir, run_id))
       
-      Migration::ACTIONS.each do |action|
-	run_action_and_wait(action)
+      log "* [starting]"
+      catch(:rollback) do
+	each_action do |action|
+	  log "[step #{action}]"
+	  run_action_and_wait(action)
+	end
+	return true
       end
-
-    rescue ActionFailedException
       run_rollback_and_wait
     end
 
-    private
-
-    def run_rollback_and_wait
-      rollbacks = @migration.roles_for_action("rollback") & @runned_roles
-      rollbacks .each do |role|
-	start_role_action(role, "rollback")
-      end
-
-      wait
-    end
-
     def run_id
       @run_id ||= Time.now.strftime("%Y-%m-%d-%H:%M:%S")
     end
 
-    def run_action_and_wait(action)
-      run_action(action)
-      wait
+    private
+
+    def each_action
+      Migration::ACTIONS.each do |action|
+	yield action
+      end
     end
 
-    def run_action(action)
+    def each_role(action)
       @migration.roles_for_action(action).each do |role|
 	@runned_roles << role # To prevent calling rollback on roles that
-	                      # have not being executed
-
-	start_role_action(role, action)
-	
+	yield role
       end
       @runned_roles.uniq!
     end
 
-    def start_role_action(role, action)
-      script_path = find_script(role, action)
-      log_path    = log_path(@dir,run_id,role, action)
+    def run_rollback_and_wait
+      script_pool = ScriptPool.new
+      each_role("rollback") do |role|
+	next unless @runned_roles.include?(role)
+	script_path = find_script(role, action)
+	log_path    = log_path(@dir,run_id,role, action)
+
+	log("[running #{action} for #{role}]")
+
+	script_pool.add_script(script_path,log_path)
+      end
+      script_pool.run_and_wait
+    end
+
+    def run_action_and_wait(action)
+      script_pool = ScriptPool.new
+
+      each_role(action) do |role|
+	script_path = find_script(role, action)
+	log_path    = log_path(@dir,run_id,role, action)
+
+	log("[running #{action} for #{role}]")
 
-      run(script_path,log_path)
+	script_pool.add_script(script_path,log_path)
+      end
+
+      script_pool.run_and_wait or throw :rollback
+      
     end
 
     def find_script(role, action)

data/lib/themigrator/script.rb

@@ -0,0 +1,78 @@
+
+
+module Themigrator
+  class Script
+    def initialize(script, log_file)
+      @script = script
+      @log_file = File.open(log_file, "w", 0600)
+      @wd_dir = File.dirname(script)
+      @pid = nil
+      @thread = nil
+    end
+
+    def run
+      @thread = Thread.new do
+	@pid = Process.spawn(@script, 
+			     err: @log_file, 
+			     out: @log_file, 
+			     chdir: @wd_dir)
+	pid, status = Process.wait2(@pid)
+	if status.signaled?
+	  signal = Signal.list.find{|k,v|
+	    v == status.termsig
+	  }
+	  signal.nil? ? :unknown_signal : signal[0].downcase.to_sym
+	else
+	  status.exitstatus
+	end
+      end
+      sleep 0
+    end
+
+    # Waits for the process to be over
+    def wait(seconds = nil)
+      @thread.join(seconds) 
+    end
+
+    def exitcode
+      @thread.value
+    end
+
+    def stop
+      if running?
+	send_int
+	if wait(5) == nil
+	  send_kill
+	end
+	wait
+      end
+    end
+
+    def success?
+      exitcode == 0
+    end
+
+    private
+
+    def running?
+      @thread and @thread.alive?
+    end
+
+    def send_signal(signal)
+      Process.kill(signal.to_s.upcase,@pid)
+    end
+
+    def send_int
+      send_signal(:int)
+    end
+
+    def send_kill
+      send_signal(:kill)
+    end
+
+    def close
+      @log_file.close
+    end
+
+  end
+end

data/lib/themigrator/script_pool.rb

@@ -0,0 +1,64 @@
+require 'themigrator/script'
+
+
+module Themigrator
+  class ScriptPool
+    def initialize
+      @queue = Queue.new
+      @lock = Mutex.new
+      @scripts = []
+    end
+
+    def add_script(script,log_file)
+      s = Script.new(script, log_file)
+      @lock.synchronize do
+	@scripts << s
+      end
+      s
+    end
+
+    # Run the scripts
+    # returns:
+    #    * true: All scripts returned 0
+    #    * false: Some of the scripts fail
+    def run_and_wait
+      @lock.synchronize do
+	start_scripts
+	collect_result
+      end
+    end
+
+    private
+
+    def start_scripts
+      @scripts.each do |s|
+	Thread.new {
+	  s.run
+	  s.wait
+	  @queue << s
+	}
+      end
+    end
+
+    def  collect_result
+      running_scripts = @scripts.size
+      success = true
+      while running_scripts != 0
+	s = @queue.pop
+	if !s.success?
+	  stop_and_kill
+	  success = false
+	end
+	running_scripts -= 1
+      end
+      success
+    end
+
+    def stop_and_kill
+      @scripts.each {|s|
+	s.stop
+      }
+    end
+
+  end
+end

data/lib/themigrator/ui.rb

@@ -0,0 +1,12 @@
+require 'curses'
+
+module Themigrator
+  module UI
+
+    def render
+      puts "hello"
+
+    end 
+
+  end
+end

data/lib/themigrator/version.rb

@@ -1,3 +1,3 @@
 module Themigrator
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/themigrator.rb

@@ -1,7 +1,10 @@
 require "themigrator/version"
 require "themigrator/logger"
-require "themigrator/runner"
 require "themigrator/migration"
+require "themigrator/migrator"
+require "themigrator/script_pool"
+require "themigrator/script"
+require "themigrator/migration_progress"
 
 module Themigrator
 

data/themigrator.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
 
   spec.add_dependency "thor", "~> 0.19"
+  spec.add_dependency "curses", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: themigrator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Guillermo Álvarez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: curses
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: The migrator is a program that eases and automates data migrations.
 email:
 - guillermo@cientifico.net
@@ -88,8 +102,11 @@ files:
 - lib/themigrator/helper.rb
 - lib/themigrator/logger.rb
 - lib/themigrator/migration.rb
+- lib/themigrator/migration_progress.rb
 - lib/themigrator/migrator.rb
-- lib/themigrator/runner.rb
+- lib/themigrator/script.rb
+- lib/themigrator/script_pool.rb
+- lib/themigrator/ui.rb
 - lib/themigrator/version.rb
 - test.sh
 - themigrator.gemspec

data/lib/themigrator/runner.rb

@@ -1,58 +0,0 @@
-require 'themigrator/logger'
-
-
-module Themigrator
-  module Runner
-    include Logger
-
-    class ActionFailedException < Exception; end
-
-
-    class Script
-      def initialize(script, log_file)
-	@script = script
-	@log_file = File.open(log_file, "w", 0600)
-      end
-
-      def close
-	@log_file.close
-      end
-    end
-
-
-    def run(script, log_file)
-      wd_dir = File.dirname(script)
-      log_fd = File.open(log_file, "w", 0600)
-      pid = Process.spawn(script, err: log_fd, out: log_fd, chdir: wd_dir)
-      add_pid(pid)
-    end
-
-    def wait
-      processes.each do |pid|
-	pid, status = Process.wait2(pid)
-	return_code = status.exitstatus
-	remove_pid(pid)
-
-	if return_code != 0
-	  raise ActionFailedException.new(pid)
-	end
-      end
-    end
-
-    private
-
-    def processes
-      @processes || []
-    end
-
-    def add_pid(pid)
-      @processes ||= []
-      @processes << pid 
-    end
-    
-    def remove_pid(pid)
-      @processes.delete(pid)
-    end
-
-  end
-end