themigrator 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 085e22641bbbe62e08c1e198162675d47b6db9c5
-  data.tar.gz: 538f05195800115aa28338cc4896378bc57df811
+  metadata.gz: c604771ae4c4bbad1daef23d7053daee6690200c
+  data.tar.gz: 5511873c95b27ffcd87ab7d86d616d62b9bde47e
 SHA512:
-  metadata.gz: ee81f2adb4f68ccb702a32931fbabb4a6030edc2732bc87e1b6ad12d54c803ee4a8f34c6e8a620d6db08fb53ade3618a67d8d7fb2080550f2fc3965518e2d0ad
-  data.tar.gz: 1e0483923ba73473f685f91cda9a9f132fbb2df7bf67a958ede16f825d5082ee8f3cab1725d1f9a5636236477fc09fcec1898f998c15c95ad58af0aaa0a34dd5
+  metadata.gz: 17ded8f0c8343627df08fe6cbe770734d1bf47ba8866d29042a35d65bfe4b6a4b911e9d009022eb4caf7c1b0bf18aa7eb9639bd7b12bcd45cd413111e93667b1
+  data.tar.gz: a08b65371dd25033a64ac9c9e27830de346bef3c20d23a204a8585ebd02e8ec770a4f92157b3795e692b1bda143501e32b6a3eee4df68aa29cd80a638d76248d

data/lib/themigrator/cli.rb

@@ -8,7 +8,13 @@ module Themigrator
     desc "migrate", "Migrate the current project"
     def migrate
       migrator = Themigrator::Migrator.new(Dir.pwd)
-      migrator.migrate!
+      pid = fork do 
+	exit migrator.migrate! ? 0 : -1
+      end
+      Process.detach(pid)
+      log_file = migrator.main_log_path(Dir.pwd, migrator.run_id)
+      sleep 0.1
+      Process.exec("tail --pid=#{pid} --lines=+0 --follow #{log_file}")
     end
 
     desc "roles", "show the list of roles"

data/lib/themigrator/logger.rb

@@ -19,6 +19,10 @@ module Themigrator
       end
     end
 
+    def close_logger
+      @logger.close if @logger
+    end
+
     def logger
       @logger || ::Logger.new(STDOUT)
     end

data/lib/themigrator/migration.rb

@@ -1,11 +1,11 @@
-
+require 'set'
 
 module Themigrator
   
   # Holds the plan of the migration
   class Migration
 
-    ACTIONS = %w(setup pre-migrate migrate cleanup rollback)
+    ACTIONS = %w(setup pre-migrate migrate cleanup)
     SCRIPTS = ACTIONS | %w(rollback)
 
     attr_reader :roles, :actions

data/lib/themigrator/migrator.rb

@@ -7,10 +7,12 @@ module Themigrator
   class Migrator
     include Logger
 
+    attr_reader :run_id
 
     def initialize(dir)
       @dir = dir
       @runned_roles = []
+      @run_id = Time.now.strftime("%Y-%m-%d-%H:%M:%S")
     end
 
     def migrate!
@@ -19,19 +21,18 @@ module Themigrator
 
       init_logger(main_log_path(@dir, run_id))
       
-      log "* [starting]"
-      catch(:rollback) do
-	each_action do |action|
-	  log "[step #{action}]"
-	  run_action_and_wait(action)
+      log "start PID=#{$$}"
+      log "roles: #{@migration.roles.join(" ")}"
+      did_it_work = true
+      each_action do |action|
+	if !run_action_and_wait(action) 
+	  did_it_work = false
+	  run_rollback_and_wait("rollback")
+	  return -1
 	end
-	return true
       end
-      run_rollback_and_wait
-    end
-
-    def run_id
-      @run_id ||= Time.now.strftime("%Y-%m-%d-%H:%M:%S")
+      close_logger
+      did_it_work
     end
 
     private
@@ -50,34 +51,29 @@ module Themigrator
       @runned_roles.uniq!
     end
 
-    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)
+      log "#{action} => start"
       script_pool = ScriptPool.new
 
       each_role(action) do |role|
+	next if role == "rollback" && !@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)
+	log "#{action} | #{role} => start"
+	script_pool.add_script(script_path,log_path, role: role, action: action) do |s|
+	  action = s.attr[:action]
+	  role = s.attr[:role]
+	  log "#{action} | #{role} => exited with #{s.exitcode} (#{s.run_time * 1000} ms)"
+	end
       end
 
-      script_pool.run_and_wait or throw :rollback
-      
+      ok = script_pool.run_and_wait
+      log("#{action} => #{ok ? "done" : "fail"} (#{script_pool.run_time*1000} ms)")
+      ok
     end
 
     def find_script(role, action)

data/lib/themigrator/script.rb

@@ -2,22 +2,44 @@
 
 module Themigrator
   class Script
-    def initialize(script, log_file)
+    attr_reader :script, :log_file, :attr
+
+    # new creates a new script but doesn't start until called run
+    # Arguments: 
+    # *  script : Fullpath of the file to execute
+    # * log_file: Fullpath of the file to save the log
+    # * attr: Extra attributes that could be handy (not used
+    #   internally by Script)
+    # * finish_cbk: A block that will receive the following arguments
+    #    1 The script itself
+    def initialize(script, log_file, attr = {}, &finish_cbk)
+      require 'byebug'
+      @attr = attr
       @script = script
-      @log_file = File.open(log_file, "w", 0600)
+      @log_file = log_file
+      @log_fd = File.open(@log_file, "w", 0600)
       @wd_dir = File.dirname(script)
       @pid = nil
       @thread = nil
+      @start_time = Time.now
+      @end_time = nil
+      @finish_cbk = finish_cbk
+    end
+
+    def run_time
+      @end_time - @start_time if @end_time
     end
 
     def run
       @thread = Thread.new do
 	@pid = Process.spawn(@script, 
-			     err: @log_file, 
-			     out: @log_file, 
+			     err: @log_fd, 
+			     out: @log_fd, 
 			     chdir: @wd_dir)
 	pid, status = Process.wait2(@pid)
-	if status.signaled?
+	@end_time = Time.now
+	close
+	return_code = if status.signaled?
 	  signal = Signal.list.find{|k,v|
 	    v == status.termsig
 	  }
@@ -25,10 +47,18 @@ module Themigrator
 	else
 	  status.exitstatus
 	end
+
+	Thread.new { invoke_cbks } if @finish_cbk
+
+	return_code
       end
       sleep 0
     end
 
+    def invoke_cbks
+      @finish_cbk.call(self)  
+    end
+
     # Waits for the process to be over
     def wait(seconds = nil)
       @thread.join(seconds) 
@@ -71,7 +101,7 @@ module Themigrator
     end
 
     def close
-      @log_file.close
+      @log_fd.close
     end
 
   end

data/lib/themigrator/script_pool.rb

@@ -3,14 +3,15 @@ require 'themigrator/script'
 
 module Themigrator
   class ScriptPool
+    attr_reader :scripts, :run_time
     def initialize
       @queue = Queue.new
       @lock = Mutex.new
       @scripts = []
     end
 
-    def add_script(script,log_file)
-      s = Script.new(script, log_file)
+    def add_script(script,log_file, attr = {},&block)
+      s = Script.new(script, log_file, attr, &block)
       @lock.synchronize do
 	@scripts << s
       end
@@ -22,10 +23,13 @@ module Themigrator
     #    * true: All scripts returned 0
     #    * false: Some of the scripts fail
     def run_and_wait
+      start = Time.now
       @lock.synchronize do
 	start_scripts
 	collect_result
       end
+    ensure
+      @run_time = start - Time.now
     end
 
     private

data/lib/themigrator/ui.rb

@@ -2,6 +2,11 @@ require 'curses'
 
 module Themigrator
   module UI
+    include Curses
+
+    def init_ui
+      init_screen
+    end
 
     def render
       puts "hello"

data/lib/themigrator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: themigrator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Guillermo Álvarez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler