themigrator 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c881ca29c75388a9cb240c301e340245c1d9ae6f
-  data.tar.gz: b6d56b409c7e265b6cc5f425c1bdccb3cb2fdccd
+  metadata.gz: 6188fef0eab108a19c231eac874aaa8f0fa50fd1
+  data.tar.gz: ae45a477ef136e1641f34a15d9f84304026e8e11
 SHA512:
-  metadata.gz: e2a3ecfcefedd3315e8b81624a5004c5989c468e94986350036292b14e80097ec93ea56d512ee5ae19d58b863add06d4f5547da3f6779776303c7223ce09b83f
-  data.tar.gz: 71d2296919a8e7d1b07f17666fd9cbbbc62442247ff161a8a67ea51637fe1ef4cc5ad4e44b425c7f027c3a8280e1bc98938cfc56c750031166988f4c4e71b384
+  metadata.gz: 225f6f0eeb58ab239c4fadd552c29ce31297d54f23c83b7b94a3254a292fde2b31e25d9376e7059ff83974792efc55e6ded1bd59b36935d0dfc144d7d607d15b
+  data.tar.gz: 76a90c14c5ef81e56b56afc963c7de373d5f2f4697a1de2e58c84ad767341f392d158056d7add2026ed7b501a91ba7004924aa50767b430d935136539ca17765

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 test/fixtures/sample_project/logs/
 .byebug_history
+tags

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "themigrator"
+require 'bundler/setup'
+require 'themigrator'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "themigrator"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/bin/testui

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'themigrator'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'themigrator/ui'
+require 'ostruct'
+
+i = Themigrator::UI.new(OpenStruct.new(roles: %w(mariadb riak app), run_id: 'asdf'))
+
+i.init_ui
+i.render
+sleep 2

data/exe/themigrator

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 
-require "themigrator/cli"
+require 'themigrator/cli'
 
 Themigrator::CLI.start(ARGV)
-
-
-
-
-

data/how_to_run_it

@@ -0,0 +1 @@
+ruby -I ../themigrator/lib -r themigrator ../themigrator/exe/themigrator visualize 2016-09-01-15:46:24

data/lib/themigrator/cli.rb

@@ -1,42 +1,37 @@
 require 'thor'
 require 'themigrator'
 
-
 module Themigrator
   class CLI < Thor
-
-    desc "migrate", "Migrate the current project"
-    option :roles, desc: "list of roles. By default all."
+    desc 'migrate', 'Migrate the current project'
+    option :roles, desc: 'list of roles. By default all.'
     option :background, default: true, type: :boolean, desc: "Don't move the migrator to the background"
     def migrate
       migrator_opts = {}
-      if options[:roles]
-	migrator_opts[:roles] = options[:roles].split(",")
-      end
+      migrator_opts[:roles] = options[:roles].split(',') if options[:roles]
+      migrator_opts[:log_stdout] = true unless options[:background]
       migrator = Themigrator::Migrator.new(Dir.pwd, migrator_opts)
 
-      if !options[:background]
-	exit migrator.migrate! ? 0 : -1
-      end
+      exit migrator.migrate! ? 0 : -1 unless options[:background]
 
-      pid = fork do 
-	exit migrator.migrate! ? 0 : -1
+      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
-      system("tail --pid=#{pid} --lines=+0 --follow #{log_file}")
-      #system("#{$0} visualize #{migrator.run_id}")
+      # system("tail --pid=#{pid} --lines=+0 --follow #{log_file}")
+      system("#{$PROGRAM_NAME} visualize #{migrator.run_id}")
     end
 
-    desc "roles", "show the list of roles"
+    desc 'roles', 'show the list of roles'
     def roles
       migration = Themigrator::Migration.new(Dir.pwd)
       migration.analyze_project!
       puts migration.roles.join("\n")
     end
 
-    desc "visualize RUNID", "visualize a migration"
+    desc 'visualize RUNID', 'visualize a migration'
     def visualize(run_id)
       mp = Themigrator::MigrationProgress.new(Dir.pwd, run_id)
       ui = Themigrator::UI.new(mp)

data/lib/themigrator/logger.rb

@@ -3,8 +3,7 @@ require 'logger'
 
 module Themigrator
   module Logger
-
-    MAINLOGFILE = "themigrator.log"
+    MAINLOGFILE = 'themigrator.log'.freeze
     include FileUtils
 
     def log(msg)
@@ -13,9 +12,9 @@ module Themigrator
 
     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"
+      @logger.formatter = proc do |_severity, datetime, _progname, msg|
+        t = datetime.strftime('%Y-%m-%d %H:%M:%S')
+        "#{t}: #{msg}\n"
       end
     end
 
@@ -30,20 +29,19 @@ module Themigrator
     def main_log_path(base_dir, run_id)
       filename = MAINLOGFILE
       directory = log_dir(base_dir, run_id)
-      File.join(directory,filename)
+      File.join(directory, filename)
     end
 
     def log_path(base_dir, run_id, role, action)
       filename = "#{role}-#{action}.log"
       directory = log_dir(base_dir, run_id)
-      File.join(directory,filename)
+      File.join(directory, filename)
     end
 
     def log_dir(base_dir, run_id)
-      dir = File.join(base_dir,"logs",run_id)
-      mkdir_p(dir, mode: 0700)
+      dir = File.join(base_dir, 'logs', run_id)
+      mkdir_p(dir, mode: 0o700)
       dir
     end
-
   end
 end

data/lib/themigrator/migration.rb

@@ -1,18 +1,16 @@
 require 'set'
 
 module Themigrator
-
   # Holds the plan of the migration
   class Migration
-
-    ACTIONS = %w(setup pre-migrate migrate post-migrate cleanup)
+    ACTIONS = %w(setup pre-migrate migrate post-migrate cleanup).freeze
     SCRIPTS = ACTIONS | %w(rollback)
 
     attr_reader :roles, :actions
 
     def initialize(dir, options = {})
       @dir = dir
-      @action_and_roles = Hash.new{|hash,key| hash[key] = [] }
+      @action_and_roles = Hash.new { |hash, key| hash[key] = [] }
       @roles = []
       @user_roles = options[:roles] || []
       @actions = []
@@ -23,28 +21,24 @@ module Themigrator
       used_actions = [] # Should be in order
 
       SCRIPTS.each do |action|
-	path_match = File.join(@dir,"*/#{action}")
-	Dir[path_match].select { |f|
-	  File.executable?(f)
-	}.each {|f|
-	  role = File.basename(File.dirname(f))
-	  if @user_roles.none? || @user_roles.include?(role)
-	    roles.add(role)
-	    used_actions << action
-	    @action_and_roles[action] << role
-	  end
-
-	}
-
+        path_match = File.join(@dir, "*/#{action}")
+        Dir[path_match].select do |f|
+          File.executable?(f)
+        end.each do |f|
+          role = File.basename(File.dirname(f))
+          next unless @user_roles.none? || @user_roles.include?(role)
+          roles.add(role)
+          used_actions << action
+          @action_and_roles[action] << role
+        end
       end
       @roles = roles.to_a.sort
       @actions = used_actions.uniq
-      @actions.delete("rollback")
+      @actions.delete('rollback')
     end
 
     def roles_for_action(action)
       @action_and_roles[action]
     end
-
   end
 end

data/lib/themigrator/migration_progress.rb

@@ -8,12 +8,10 @@ module Themigrator
 
     attr_reader :roles, :run_id, :start_time, :pid, :status, :current_action, :actions
 
-    def cbks=(a)
-      @cbks=a
-    end
+    attr_writer :cbks
 
     # cbks
-    #
+
     # :has_roles
     # :start_action
     # :start_role_action
@@ -22,25 +20,25 @@ module Themigrator
     # :start_migration
     # :end_migration
     #
-    
-    
-    def initialize(dir, run_id) 
-      @dir, @run_id = dir, run_id
+
+    def initialize(dir, run_id)
+      @dir = dir
+      @run_id = run_id
       @log_file_path = main_log_path(dir, run_id)
       @roles = []
       @current_action = nil
       @cbks = {}
-      @actions = Hash.new do |h,k| 
-	h[k] = {
-	  start_time: nil,
-	  roles: Hash.new {|rh,rk| rh[rk] = {} },
-	  end_time: nil}
+      @actions = Hash.new do |h, k|
+        h[k] = {
+          start_time: nil,
+          roles: Hash.new { |rh, rk| rh[rk] = {} },
+          end_time: nil
+        }
       end
-
     end
 
-    def log_file(role,action)
-      log_path(@dir,@run_id,role,action)
+    def log_file(role, action)
+      log_path(@dir, @run_id, role, action)
     end
 
     def start
@@ -50,91 +48,103 @@ module Themigrator
     private
 
     def start_log_parser
-      IO.foreach(@log_file_path) do |line|
-	process_line(line)
+      @buffer = ''
+      File.open(@log_file_path, 'r') do |f|
+        loop do
+          @buffer += f.read
+          @buffer = each_line(@buffer) do |line|
+            process_line(line)
+          end
+        end
       end
-    rescue EOFError
+      # rescue EOFError
     end
 
+    def each_line(line, &block)
+      i = line.index("\n")
+      return line if i.nil?
+
+      yield line[0..i]
+      each_line(line[i + 1..-1], &block)
+    end
 
     def call_cbk(name, *args)
       cbk = @cbks[name]
       cbk.call(*args) if cbk
     end
 
-
     def process_line(line)
       line.strip!
       case line
       when /^# Logfile created on ([0-9-]+) ([0-9:]+) /
-	@start_time = Time.parse("#{$1} #{$2}")
+        @start_time = Time.parse("#{Regexp.last_match(1)} #{Regexp.last_match(2)}")
       else
-	process_log_entry(line)
+        process_log_entry(line)
       end
       call_cbk(:new_line, line)
     end
 
     def process_log_entry(line)
       time, line = extract_time(line)
-      scripts = Themigrator::Migration::SCRIPTS.join("|")
+      scripts = Themigrator::Migration::SCRIPTS.join('|')
       case line
       when /start PID=(\d+)/
-	@pid = $1.to_i
+        @pid = Regexp.last_match(1).to_i
       when /roles: (.+)/
-	@roles = $1.strip.split.sort
-	call_cbk(:has_roles, @roles)
+        @roles = Regexp.last_match(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)
+        action = Regexp.last_match(1)
+        @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)
-	run_time = $3.to_f
+        action = Regexp.last_match(1)
+        success = to_success(Regexp.last_match(2))
+        run_time = Regexp.last_match(3).to_f
 
-	@actions[action][:end_time] = time
-	@actions[action][:run_time] = run_time
-	@actions[action][:success] = success
-	@current_action = nil
+        @actions[action][:end_time] = time
+        @actions[action][:run_time] = run_time
+        @actions[action][:success] = success
+        @current_action = nil
 
       when /(#{scripts}) \| (.*) => start/
-	action = $1.to_sym
-	role = $2
-	@actions[action][:roles][role][:start_time] = time
+        action = Regexp.last_match(1)
+        role = Regexp.last_match(2)
+        @actions[action][:roles][role][:start_time] = time
+        call_cbk(:start_role_action, role, action)
       when /(#{scripts}) \| (.*) => exited with (\d+) \(([0-9\.]+) ms\)/
-	action = $1.to_sym
-	role = $2
-	exitcode = $3.to_i
-	success = exitcode == 0
-	run_time = $4.to_f
-	@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
+        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
+        @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
       when /end => (done|fail) \(([0-9.]+) ms\)/
-	@current_action = nil
-	@run_time = $3.to_f
-      else 
-	raise line.inspect
+        @current_action = nil
+        @run_time = Regexp.last_match(3).to_f
+      else
+        raise line.inspect
       end
     end
 
     def extract_time(line)
       line =~ /^([0-9-]+) ([0-9:]+) (.*)/
-      time = Time.parse("#{$1} #{$2}")
-      line = $3
-      return time, line.strip
+      time = Time.parse("#{Regexp.last_match(1)} #{Regexp.last_match(2)}")
+      line = Regexp.last_match(3)
+      [time, line.strip]
     end
 
     def rollback?
-      @actions.keys.include?("rollback")
+      @actions.keys.include?('rollback')
     end
 
     def to_success(val)
-      val == "done" ? true : false
+      val == 'done' ? true : false
     end
-
   end
 end

data/lib/themigrator/migrator.rb

@@ -2,7 +2,6 @@ require 'themigrator/logger'
 require 'themigrator/migration'
 require 'themigrator/script_pool'
 
-
 module Themigrator
   class Migrator
     include Logger
@@ -14,71 +13,68 @@ module Themigrator
       @dir = dir
       @runned_roles = []
       @start_time = Time.now
-      @run_id = @start_time.strftime("%Y-%m-%d-%H:%M:%S")
+      @run_id = @start_time.strftime('%Y-%m-%d-%H:%M:%S')
     end
 
     def migrate!
       @migration = Migration.new(@dir, roles: @options[:roles])
       @migration.analyze_project!
 
-      init_logger(main_log_path(@dir, run_id))
-      
-      log "start PID=#{$$}"
-      log "roles: #{@migration.roles.join(" ")}"
+      init_logger(main_log_path(@dir, run_id)) unless @options[:log_stdout]
+
+      log "start PID=#{$PROCESS_ID}"
+      log "roles: #{@migration.roles.join(' ')}"
       did_it_work = true
       each_action do |action|
-	if !run_action_and_wait(action) 
-	  did_it_work = false
-	  run_action_and_wait("rollback")
-	  return -1
-	end
+        next if run_action_and_wait(action)
+        did_it_work = false
+        run_action_and_wait('rollback')
+        return -1
       end
-      close_logger
       did_it_work
     ensure
       @end_time = Time.now
-      msg = did_it_work ? "done" : "fail"
+      msg = did_it_work ? 'done' : 'fail'
       log "end => #{msg} (#{run_time * 1000} ms)"
+      close_logger
     end
 
     private
 
     def each_action
       Migration::ACTIONS.each do |action|
-	yield action
+        yield action
       end
     end
 
     def each_role(action)
       @migration.roles_for_action(action).each do |role|
-	@runned_roles << role # To prevent calling rollback on roles that
-	yield role
+        @runned_roles << role # To prevent calling rollback on roles that
+        yield role
       end
       @runned_roles.uniq!
     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)
+        next if role == 'rollback' && !@runned_roles.include?(role)
 
+        script_path = find_script(role, action)
+        log_path    = log_path(@dir, run_id, role, action)
 
-	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
+        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
 
       ok = script_pool.run_and_wait
-      log("#{action} => #{ok ? "done" : "fail"} (#{script_pool.run_time*1000} ms)")
+      log("#{action} => #{ok ? 'done' : 'fail'} (#{script_pool.run_time * 1000} ms)")
       ok
     end
 
@@ -90,5 +86,4 @@ module Themigrator
       @end_time - @start_time if @end_time
     end
   end
-
 end

data/lib/themigrator/progress_window.rb

@@ -0,0 +1,20 @@
+
+module Themigrator
+  class UI
+    module ProgressWindow
+      def render_progress
+        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
+
+      def progress_window
+        @progress_widnow ||= Window.new(@lines - 1, @cols - 1, @lines - 1, 0).tap do |w|
+          w.attrset(A_DIM)
+        end
+      end
+    end
+  end
+end