themigrator 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a23e1a028bd190e0c95beb0d3e3c8ff35dd1facd
-  data.tar.gz: 0b68ce8a6ad7d4b0fa5c80edb0da03eff18a341f
+  metadata.gz: c881ca29c75388a9cb240c301e340245c1d9ae6f
+  data.tar.gz: b6d56b409c7e265b6cc5f425c1bdccb3cb2fdccd
 SHA512:
-  metadata.gz: 542c8dc643d5a900528854bc85efa0a86f48aa6378b9d4fd54ec358fda01f809b247dca4db21040d47bebf33ba2ff72a0806370d90719649d589062cc4bbada9
-  data.tar.gz: 4c9983b5338abea4be75ab3b1063a5f44e16fffd51704c5e8bbb241c33f77b537eb111732e8936c74905d989dc2026938672310762e6bb35cfd8a12c7a60ec62
+  metadata.gz: e2a3ecfcefedd3315e8b81624a5004c5989c468e94986350036292b14e80097ec93ea56d512ee5ae19d58b863add06d4f5547da3f6779776303c7223ce09b83f
+  data.tar.gz: 71d2296919a8e7d1b07f17666fd9cbbbc62442247ff161a8a67ea51637fe1ef4cc5ad4e44b425c7f027c3a8280e1bc98938cfc56c750031166988f4c4e71b384

data/lib/themigrator/cli.rb

@@ -1,5 +1,5 @@
 require 'thor'
-require 'themigrator/migrator'
+require 'themigrator'
 
 
 module Themigrator
@@ -26,6 +26,7 @@ module Themigrator
       log_file = migrator.main_log_path(Dir.pwd, migrator.run_id)
       sleep 0.1
       system("tail --pid=#{pid} --lines=+0 --follow #{log_file}")
+      #system("#{$0} visualize #{migrator.run_id}")
     end
 
     desc "roles", "show the list of roles"
@@ -34,5 +35,12 @@ module Themigrator
       migration.analyze_project!
       puts migration.roles.join("\n")
     end
+
+    desc "visualize RUNID", "visualize a migration"
+    def visualize(run_id)
+      mp = Themigrator::MigrationProgress.new(Dir.pwd, run_id)
+      ui = Themigrator::UI.new(mp)
+      ui.start
+    end
   end
 end

data/lib/themigrator/migration.rb

@@ -5,7 +5,7 @@ module Themigrator
   # Holds the plan of the migration
   class Migration
 
-    ACTIONS = %w(setup pre-migrate migrate cleanup)
+    ACTIONS = %w(setup pre-migrate migrate post-migrate cleanup)
     SCRIPTS = ACTIONS | %w(rollback)
 
     attr_reader :roles, :actions
@@ -28,7 +28,7 @@ module Themigrator
 	  File.executable?(f)
 	}.each {|f|
 	  role = File.basename(File.dirname(f))
-	  if @user_roles.any? && @user_roles.include?(role)
+	  if @user_roles.none? || @user_roles.include?(role)
 	    roles.add(role)
 	    used_actions << action
 	    @action_and_roles[action] << role

data/lib/themigrator/migration_progress.rb

@@ -7,6 +7,21 @@ module Themigrator
     include Logger
 
     attr_reader :roles, :run_id, :start_time, :pid, :status, :current_action, :actions
+
+    def cbks=(a)
+      @cbks=a
+    end
+
+    # cbks
+    #
+    # :has_roles
+    # :start_action
+    # :start_role_action
+    # :end_action
+    # :end_role_action
+    # :start_migration
+    # :end_migration
+    #
     
     
     def initialize(dir, run_id) 
@@ -14,10 +29,7 @@ module Themigrator
       @log_file_path = main_log_path(dir, run_id)
       @roles = []
       @current_action = nil
-      @cbks = {
-	has_roles: has_roles_cbk,
-	start_action: start_action_cbk
-      }
+      @cbks = {}
       @actions = Hash.new do |h,k| 
 	h[k] = {
 	  start_time: nil,
@@ -25,6 +37,13 @@ module Themigrator
 	  end_time: nil}
       end
 
+    end
+
+    def log_file(role,action)
+      log_path(@dir,@run_id,role,action)
+    end
+
+    def start
       start_log_parser
     end
 
@@ -40,7 +59,7 @@ module Themigrator
 
     def call_cbk(name, *args)
       cbk = @cbks[name]
-      cbk.call(self) if cbk
+      cbk.call(*args) if cbk
     end
 
 
@@ -63,10 +82,13 @@ module Themigrator
 	@pid = $1.to_i
       when /roles: (.+)/
 	@roles = $1.strip.split.sort
+	call_cbk(:has_roles, @roles)
       when /(#{scripts}) => start/
 	action = $1.to_sym
 	@current_action = action
 	@actions[action][:start_time] = time
+	call_cbk(:start_action, action)
+
       when /(#{scripts}) => (done|fail) \(([0-9\.]+) ms\)/
 	action = $1.to_sym
 	success = to_success($2)
@@ -91,8 +113,11 @@ module Themigrator
 	@actions[action][:roles][role][:exitcode] = exitcode
 	@actions[action][:roles][role][:success] = success
 	@actions[action][:roles][role][:run_time] = run_time
+      when /end => (done|fail) \(([0-9.]+) ms\)/
+	@current_action = nil
+	@run_time = $3.to_f
       else 
-	raise line
+	raise line.inspect
       end
     end
 

data/lib/themigrator/ui.rb

@@ -3,27 +3,70 @@ require 'curses'
 module Themigrator
   class UI
     include Curses
+    include Logger
 
     def initialize(progress_monitor)
-      @progress_monitor = progress_monitor
+      @pm = progress_monitor
+      @roles = []
+    end
+
+    def start
+      init_progress_monitor
       init_screen
-      crmode()
-      curs_set(0)
-      ObjectSpace.define_finalizer(self, proc { 
-	close_screen
-      })
+      Thread.new {@pm.start}
+      Thread.new {render_loop}
+      input_loop 
     end
 
+    private
 
-    def init_ui
+    def render_loop
+      loop do
+	render
+	sleep 0.1
+      end
     end
 
+    def input_loop
+      loop do
+	case e = getch 
+	when Key::ENTER,10
+	  exit 0
+	else 
+	  raise e.inspect
+	end
+      end
+    end
 
 
-    def set_columns(n)
-      @n_columns = n
+    def init_progress_monitor
+      @pm.cbks = {
+	start_action: self.method(:start_action),
+	end_action:   self.method(:end_action),
+	has_roles: Proc.new{ @roles = @pm.roles},
+	new_line: Proc.new { sleep 1 }
+      }
     end
 
+
+    def start_action(action)
+      @current_action = action
+    end
+
+    def end_action
+    end
+
+    def init_screen
+      super
+      crmode()
+      curs_set(0)
+      ObjectSpace.define_finalizer(self, proc { 
+	close_screen
+      })
+    end
+
+
+
     def render
       @cols = cols
       @lines = lines
@@ -36,9 +79,11 @@ module Themigrator
     private
     def render_title
 
+      title_window.setpos(0,0)
       title_window.addstr("The migrator")
       title_window.refresh
       now_str = Time.now.strftime("%d %b - %H:%M.%S")
+      time_window.setpos(0,0)
       time_window.addstr(now_str)
       time_window.refresh
     end
@@ -70,8 +115,13 @@ module Themigrator
 	w.refresh
       end
     end
+
+
     def render_progress
-      progress_window.addstr("hello")
+      progress_window.setpos(0,0)
+      progress_window.addstr(@pm.roles.inspect)
+      progress_window.addstr(@pm.current_action.inspect)
+      progress_window.addstr(@action)
       progress_window.refresh
     end
 
@@ -80,31 +130,34 @@ module Themigrator
       @columns ||= []
       if @columns[n].nil?
 	column_height = @lines - 4
-	column_width = @cols / n_columns
+	column_width = @cols / n_columns 
 	top = 2
 	left = column_width * (n - 1)
-	w = Window.new(column_height, column_width, top, left)
+	w = Window.new(column_height, column_width - 1, top, left)
 	w.box("|", "-")
 	@columns[n] = w
       end
       @columns[n]
-
     end
 
     def n_columns
-      @n_columns || 3
+      @previous_columns ||=0 
+      if @previous_columns != @roles.size
+	@columns = []
+      end
+      @roles.size
     end
 
 
     def something
       show_message "hello"
-#  show_message("Hit any key")
-  setpos((lines - 5) / 2, (cols - 10) / 2)
-  addstr("Hit any key")
-  refresh
-  getch
-  show_message("Hello, World!")
-  refresh
+      #  show_message("Hit any key")
+      setpos((lines - 5) / 2, (cols - 10) / 2)
+      addstr("Hit any key")
+      refresh
+      getch
+      show_message("Hello, World!")
+      refresh
     end 
 
 

data/lib/themigrator/version.rb

@@ -1,3 +1,3 @@
 module Themigrator
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/lib/themigrator.rb

@@ -5,6 +5,7 @@ require "themigrator/migrator"
 require "themigrator/script_pool"
 require "themigrator/script"
 require "themigrator/migration_progress"
+require "themigrator/ui"
 
 module Themigrator
 

metadata

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