themigrator 0.1.19 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 037276a79c8e530f35121ac5044b764925916174
-  data.tar.gz: bb32712e03e6fc00f69aa3849f8ec04e145d66e2
+  metadata.gz: 3f5530e5706123be2d5d7f06a9f9c65d9f03ecc1
+  data.tar.gz: 0ae9b1e49e998f577a40278839143f1d4a45aca9
 SHA512:
-  metadata.gz: 7ad6a4d4fb0033c566895ca924195161a12f6b395b0473ae42e92fa6aa0a428326dd2bf63156733b3923d9665437a8bb18d638060e410b6ff977f9ee4fa8afd5
-  data.tar.gz: a008aa31d72219f7ad578daa20ee467d883ba76ea2d616a14fcb14b3028e3baca33e40ec16a9f25f80978acb59f78355bf09c8b7bafebb01b3c00a3017148527
+  metadata.gz: 166ac6e07b90e24984336abaeaac1259bf7aff61dca598dd804f7bb4c1840433062da829a9ef5c9c0db93dd06161e3bd170ab12c7cfe3b815ab5351255bd3922
+  data.tar.gz: fa0c27907ef9de30c452d3b2f269413271015392abbb245fadfad98d9d0ddf78fe4eef30c15643e24221b7e5ff6cd4df92945c508a9af735bb4201bf811c84d3

data/lib/themigrator/migration.rb

@@ -4,7 +4,7 @@ module Themigrator
   # Holds the plan of the migration
   class Migration
     ACTIONS = %w(setup pre-migrate migrate post-migrate cleanup).freeze
-    SCRIPTS = ACTIONS | %w(rollback)
+    SCRIPTS = (ACTIONS | %w(rollback)).freeze
 
     attr_reader :roles, :actions
 

data/lib/themigrator/migration_progress.rb

@@ -90,6 +90,7 @@ module Themigrator
       case line
       when /start PID=(\d+)/
         @pid = Regexp.last_match(1).to_i
+	@status = "running"
       when /roles: (.+)/
         @roles = Regexp.last_match(1).strip.split.sort
         call_cbk(:has_roles, @roles)
@@ -97,6 +98,7 @@ module Themigrator
         action = Regexp.last_match(1)
         @current_action = action
         @actions[action][:start_time] = time
+        @actions[action][:status] = "running"
         call_cbk(:start_action, action)
 
       when /(#{scripts}) => (done|fail) \(([0-9\.]+) ms\)/
@@ -104,31 +106,38 @@ module Themigrator
         success = to_success(Regexp.last_match(2))
         run_time = Regexp.last_match(3).to_f
 
+	@status = "fail" if !success
         @actions[action][:end_time] = time
         @actions[action][:run_time] = run_time
         @actions[action][:success] = success
+        @actions[action][:status] = Regexp.last_match(2)
         @current_action = nil
 
       when /(#{scripts}) \| (.*) => start/
         action = Regexp.last_match(1)
         role = Regexp.last_match(2)
         @actions[action][:roles][role][:start_time] = time
+        @actions[action][:roles][role][:status] = "running"
         call_cbk(:start_role_action, role, action)
-      when /(#{scripts}) \| (.*) => exited with (\d+) \(([0-9\.]+) ms\)/
+      when /(#{scripts}) \| ([^ ]+) => exited with (\d+) \(([0-9\.]+) ms\)/
         action = Regexp.last_match(1)
         role = Regexp.last_match(2)
         exitcode = Regexp.last_match(3).to_i
         success = exitcode.zero?
         run_time = Regexp.last_match(4).to_f
+	status = exitcode == 0 ? "done" : "Exited with #{exitcode}"
+	@status = "fail" if !success
         @actions[action][:roles][role][:end_time] = time
         @actions[action][:roles][role][:exitcode] = exitcode
         @actions[action][:roles][role][:success] = success
         @actions[action][:roles][role][:run_time] = run_time
+        @actions[action][:roles][role][:status] = status
       when /end => (done|fail) \(([0-9.]+) ms\)/
+	@status = "fail" if $1 == "fail"
         @current_action = nil
         @run_time = Regexp.last_match(3).to_f
       else
-        raise line.inspect
+        raise line.inspect + " #{scripts} "
       end
     end
 

data/lib/themigrator/migrator.rb

@@ -56,6 +56,7 @@ module Themigrator
     end
 
     def run_action_and_wait(action)
+      sleep 0.5
       log "#{action} => start"
       script_pool = ScriptPool.new
 
@@ -75,6 +76,7 @@ module Themigrator
 
       ok = script_pool.run_and_wait
       log("#{action} => #{ok ? 'done' : 'fail'} (#{script_pool.run_time * 1000} ms)")
+      sleep 0.5
       ok
     end
 

data/lib/themigrator/ui.rb

@@ -80,8 +80,14 @@ module Themigrator
       end
     end
 
+      def progress_window_status
+        status = Themigrator::Migration::ACTIONS.dup
+	status[-1] = "rollback" if @pm.status == "fail"
+	status.map(&:dup)
+      end
+
     def next_action
-      scripts = Themigrator::Migration::SCRIPTS
+      scripts = progress_window_status
       current_index = scripts.index(@current_action)
       if current_index.nil?
         switch_action(scripts.first)
@@ -94,7 +100,7 @@ module Themigrator
     end
 
     def previous_action
-      scripts = Themigrator::Migration::SCRIPTS
+      scripts = progress_window_status
       current_index = scripts.index(@current_action)
       if current_index.nil?
         switch_action(scripts.first)
@@ -118,7 +124,7 @@ module Themigrator
 
     def has_roles(roles)
       @roles = roles.sort
-      initialize_log_area(@roles)
+      initialize_log_area(@roles, @pm)
     end
 
     def start_role_action(role, action)
@@ -146,7 +152,6 @@ module Themigrator
       return if @current_action == action
       UILOG.debug("switch action from #{@current_index} to #{action}")
       la_switch_action(action)
-      pg_set_action(action)
       @current_action = action
     rescue => e
       ui_log_exception(e)

data/lib/themigrator/ui/log_area.rb

@@ -7,7 +7,7 @@ module Themigrator
       include Curses
 
       class LogWindow < Window
-        attr_accessor :role, :action
+        attr_accessor :role, :action, :progress_monitor
         def initialize(height, width, top, left)
           @height = height
           @width = width
@@ -24,14 +24,22 @@ module Themigrator
         def redraw
           clear
           @inner_win.clear
-          setpos(0, 0)
-          box('|', '-')
-          addstr(name)
-          log('redraw')
-          refresh
           render(true)
         end
 
+	def render_title(force = false)
+	  n = name
+	  return if !force && @previous_title == n
+	  @previous_title = n
+	  start = (@width - n.size ) / 2
+	  start = 1 if start < 1
+          setpos(0,start)
+          box(?|, ?-)
+          addstr(n)
+          log('redraw')
+          refresh
+	end
+
         def nextpage
           @scroll += 5
           @scroll = -1 if @scroll > -1
@@ -49,15 +57,22 @@ module Themigrator
         end
 
         def name
-          '%-13s/%-10s' % [action, role]
+	  "#{role} (#{status})"
         end
 
+	def status
+	  info = self.progress_monitor.actions[action][:roles][role][:status]
+	rescue => e
+	  e.inspect
+	end
+
         def append(msg)
           @buffer << msg
         end
 
         def render(force = false)
           # refresh
+	  render_title(force)
           render_inner_win(force)
         end
 
@@ -95,7 +110,8 @@ module Themigrator
         end
       end
 
-      def initialize_log_area(roles)
+      def initialize_log_area(roles, progress_monitor)
+	@la_pm = progress_monitor
         @la_roles = roles
         @la_scripts = Themigrator::Migration::SCRIPTS
         @la_actions = Themigrator::Migration::ACTIONS
@@ -116,6 +132,7 @@ module Themigrator
             w = LogWindow.new(column_height, column_width - 1, top, left)
             w.role = role
             w.action = action
+	    w.progress_monitor = @la_pm
             role_windows[role] = w
           end
           h[action] = role_windows

data/lib/themigrator/ui/progress_window.rb

@@ -11,10 +11,6 @@ module Themigrator
         progress_window.refresh
       end
 
-      def pg_set_action(action)
-        @pg_action = action
-      end
-
       def progress_window
         @progress_widnow ||= Window.new(@lines - 2, @cols, @lines - 2, 0).tap do |w|
           w.attrset(A_DIM)
@@ -25,26 +21,50 @@ module Themigrator
         @pw_status = msg.map(&:to_s).join(' ')
       end
 
+
+
+#      def build_status_line
+#        scripts = progress_window_status
+#        width = scripts.map(&:size).inject(&:+)
+#        free_space = @cols - width
+#        sep_space = scripts.size - 1
+#        inline_space = ((free_space - sep_space) / scripts.size - 1) / 2
+#
+#        action_msg = []
+#        scripts.map do |script|
+#          a = ''
+#          inline_space.times { a << ' ' }
+#          a << if defined?(@pg_action) && @pg_action.to_s == script.to_s
+#                 script.upcase
+#               else
+#                 script.downcase
+#               end
+#          inline_space.times { a << ' ' }
+#          action_msg << a
+#        end
+#        action_msg.join('>')
+#      end
+
       def build_status_line
-        scripts = Themigrator::Migration::SCRIPTS
-        width = scripts.map(&:size).inject(&:+)
-        free_space = @cols - width
-        sep_space = scripts.size - 1
-        inline_space = ((free_space - sep_space) / scripts.size - 1) / 2
-
-        action_msg = []
-        scripts.map do |script|
-          a = ''
-          inline_space.times { a << ' ' }
-          a << if defined?(@pg_action) && @pg_action.to_s == script.to_s
-                 script.upcase
-               else
-                 script.downcase
-               end
-          inline_space.times { a << ' ' }
-          action_msg << a
-        end
-        action_msg.join('>')
+	width = @cols
+	ncols = progress_window_status.size
+	col_width = (width / ncols) - 1
+	cols = []
+	ncols.times do |i|
+	  cols[i] = build_status_line_column(index: i,width: col_width)
+	end
+	cols.join(?>)
+      rescue => e
+	e.inspect
+      end
+
+      def build_status_line_column(index:, width:)
+	title = progress_window_status[index]
+	title.upcase!  if title == @current_action
+
+	padding = (width - title.size) / 2
+	padding = 0 if padding < 0 
+	"%#{padding}s%-#{width - padding}s" % [ "", title ]
       end
     end
   end

data/lib/themigrator/version.rb

@@ -1,3 +1,3 @@
 module Themigrator
-  VERSION = '0.1.19'.freeze
+  VERSION = '0.1.22'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: themigrator
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.22
 platform: ruby
 authors:
 - Guillermo Álvarez