mybot 0.0.4 → 0.1.0

data/lib/mybot.rb

@@ -1,29 +1,28 @@
-require "mybot/core-ext/kernel"
-require "mybot/core-ext/class"
-require "mybot/core-ext/array"
+$USE_COLOR = true
+$SHOW_CMD = true
+$LIVE_STDOUT = false
+$LIVE_STDERR = false
+$LIVE_STDIN = false
 
 module Mybot
-  autoload :Aws,      "mybot/aws"
-  autoload :Base,     "mybot/base"
-  autoload :Cli,      "mybot/cli"
-  autoload :Command,  "mybot/command"
-  autoload :Commands, "mybot/commands"
-  autoload :Fmt,      "mybot/fmt"
-  autoload :Lib,      "mybot/lib"
-  autoload :Libs,     "mybot/libs"
-  autoload :Messages, "mybot/messages"
-  autoload :Node,     "mybot/node"
-  autoload :Recipes,  "mybot/recipes"
-  autoload :Result,   "mybot/result"
-  autoload :Tasks,    "mybot/tasks"
-  autoload :Template, "mybot/template"
-  autoload :Utils,    "mybot/utils"
-  autoload :VERSION,  "mybot/version"
+  autoload :Base,      "mybot/base"
+  autoload :Cli,       "mybot/cli"
+  autoload :Command,   "mybot/command"
+  autoload :Fmt,       "mybot/fmt"
+  autoload :Helpers,   "mybot/helpers"
+  autoload :Installer, "mybot/installer"
+  autoload :Lib,       "mybot/lib"
+  autoload :Libs,      "mybot/libs"
+  autoload :Loader,    "mybot/loader"
+  autoload :Node,      "mybot/node"
+  autoload :Nodes,     "mybot/nodes"
+  autoload :Tasks,     "mybot/tasks"
+  autoload :Template,  "mybot/template"
+  autoload :Templates, "mybot/templates"
+  autoload :VERSION,   "mybot/version"
 
   GEM_PATH = File.dirname(File.dirname(__FILE__))
   VENDOR_PATH = File.join(GEM_PATH, "vendor", ".")
   HOME_PATH = File.expand_path "~"
   MYBOT_PATH = File.join HOME_PATH, ".mybot"
-  LIB_PATH = File.join MYBOT_PATH, "lib"
-  TPL_PATH = File.join MYBOT_PATH, "tpl"
 end

data/lib/mybot/base.rb

@@ -1,8 +1,12 @@
 module Mybot
   module Base
-    include Commands
-    include Recipes
+  	include Fmt
+    include Helpers
+    include Libs
+    include Loader
+    include Nodes
     include Tasks
+    include Templates
     extend self
   end
 end

data/lib/mybot/cli.rb

@@ -1,15 +1,55 @@
 module Mybot
   module Cli
-    include Messages
+    include Fmt
+    include Installer
     extend self
 
     def start(args)
-      unless args[0]
-        error "usage: bot <task>"
+      cmd = args.shift
+      options = parse(args)
+
+      error "usage: bot [install|uninstall|<task>] <options>" unless cmd
+
+      case cmd
+      when /(install|uninstall)/
+        self.send($1, options)
+      else
+        Base.load_files
+        Base.run_task cmd, options
       end
+    end
+
+    def parse(args)
+      options = {}
 
-      Base.load_recipes
-      Base.run_task args[0]
+      args.each_with_index do |arg, i|
+        case arg # --foo=bar, -foo=bar
+        when /\=/
+          key, value = *arg.split("=")
+          options[key.sub(/^-{1,2}/,"").to_sym] = value
+        when /^-{1,2}no-(.+)/ # --no-foo
+          options[$1.to_sym] = false
+        when /^-{1,2}(.+)/ # --foo bar, --foo, -foo
+          key = $1.to_sym
+          value = true
+          if args[i+1] && args[i+1] !~ /^-{1,2}/
+            value = args.delete_at(i+1)
+          end
+          options[key] = value
+        when Hash
+          options.merge!(arg)
+        end
+      end
+
+      options.each do |k, v|
+        case v
+          when /^true$/i   then options[k] = true
+          when /^false$/i  then options[k] = false
+          when /^\d+$/     then options[k] = v.to_i
+          when /^[\d\.]+$/ then options[k] = v.to_f
+          when /,/         then options[k] = v.split(",").map(&:strip)
+        end
+      end
     end
   end
 end

data/lib/mybot/command.rb

@@ -1,12 +1,14 @@
 module Mybot
   class Command
-    attr_accessor :channel, :out, :result
+    include Fmt
 
-    def initialize(node)
-      @node = node
-      @out = ""
+    attr_accessor :channel, :exit_status, :time
+
+    def initialize
+      @out = @stdout = @stderr = ""
       @handlers = {}
-      @result = Result.new
+      @exit_status = -1
+      @time = 0
     end
 
     def on(s, &block)
@@ -15,44 +17,51 @@ module Mybot
 
     def handle_stdout(data)
       @out = data
-      @result.stdout += data
-      @node.fmt.stdout data
+      @stdout += data
+      stdout_live(data)
       @handlers.each do |s, proc|
-        proc.call if @out.include? s
+        if @out.include? s
+          handle_info s, :type => :stdout
+          proc.call
+        end
       end
     end
 
     def handle_stderr(data)
       @out = data
-      @result.stderr += data
-      @node.fmt.stderr data
+      @stderr += data
+      stderr_live(data)
       @handlers.each do |s, proc|
-        proc.call if @out.include? s
+        if @out.include? s
+          handle_info s, :type => :stderr
+          proc.call
+        end
       end
     end
 
-    def handle_sudo
-      on "[sudo] password" do
-        write @node.options[:password], :shadow => true
-      end
+    def handle_close
+      status_info result
+      error "command exited with error" unless result[:exit_status] == 0
+    end
 
-      on "Password:" do
-        write @node.options[:password], :shadow => true
-      end
+    def write(data, options = {})
+      write_info data, options
+      @channel.send_data "#{data}\n"
+    end
 
-      on "Sorry, try again." do
-        @node.fmt.error "cannot handle sudo automatically, try manually"
-      end
+    def result
+      {
+        :stdout => filter(@stdout),
+        :stderr => filter(@stderr),
+        :exit_status => @exit_status,
+        :time => @time
+      }
     end
 
-    def write(data, options = {})
-      if options[:shadow]
-        @node.fmt.write "***"
-      else
-        @node.fmt.write data
-      end
+  private
 
-      @channel.send_data "#{data}\n"
+    def filter(data)
+      data.gsub(/\[sudo\]\ password\ for\ [a-zA-Z0-9_].+\:/, "")
     end
   end
 end

data/lib/mybot/fmt.rb

@@ -1,84 +1,175 @@
 require "colored"
 
 module Mybot
-  class Fmt
-    cattr_accessor :use_color, :show_cmd, :show_cmd,
-      :show_stdout, :show_stderr, :show_stdin
+  module Fmt
+    def info(msg)
+      info_format = "INFO"
+      info_format = info_format.blue.bold if $USE_COLOR
+      puts "#{info_format} #{msg}"
+    end
 
-    @@use_color = true
-    @@show_cmd = true
-    @@show_stdout = true
-    @@show_stderr = true
-    @@show_stdin = true
+    def warning(msg)
+      warning_format = "WARNING"
+      warning_format = warning_format.magenta.bold if $USE_COLOR
+      puts "#{warning_format} #{msg}"
+    end
 
-    def initialize(host, user)
-      @host, @user = host, user
+    def error(msg)
+      error_format = "ERROR"
+      error_format = error_format.red.bold if $USE_COLOR
+      puts "#{error_format} #{msg}"
+      abort
     end
 
-    def run(cmd)
-      run_format = "RUN"
-      run_format = run_format.blue.bold if @@use_color
-      $stdout.print "#{prompt} #{run_format} #{cmd}\n" if @@show_cmd
+    def task_info(task)
+      task_format = "TASK"
+      task_format = task_format.green.bold if $USE_COLOR
+      puts "#{task_format} #{task}"
     end
 
-    def stdout(data)
-      data = data.green if @@use_color
-      $stdout.print(data) if @@show_stdout
+    def run_info(cmd, options = {})
+      return unless $SHOW_CMD
+
+      primary_cmd "RUN", cmd, options
+      secondary_cmd "SUDO" if options[:sudo]
+      secondary_cmd "CWD", options[:cwd] if options[:cwd] != ""
+
+      unless options[:env].empty?
+        secondary_cmd "ENV"
+        kv_cmd options[:env]
+      end
     end
 
-    def stderr(data)
-      data = data.red if @@use_color
-      $stdout.print(data) if @@show_stderr
+    def handle_info(s, options = {})
+      if $USE_COLOR
+        s = s.green if options[:type] == :stdout
+        s = s.red if options[:type] == :stderr
+      end
+
+      secondary_cmd "HANDLE", s
     end
 
-    def write(data)
-      write_format = "WRITE"
-      write_format = write_format.blue.bold if @@use_color
+    def write_info(data, options = {})
+      return unless $SHOW_CMD
+
       lf_format = "<LF>"
-      lf_format = lf_format.red.bold if @@use_color
-      if @@show_stdin
-        $stdout.print "\n#{prompt} #{write_format} #{data}#{lf_format}\n"
+      lf_format = lf_format.bold if $USE_COLOR
+
+      if options[:shadow]
+        data = "*" * data.size
       end
+
+      secondary_cmd "WRITE", "#{data}#{lf_format}"
     end
 
-    def upload(from, to)
-      upload_format = "UPLOAD"
-      upload_format = upload_format.blue.bold if @@use_color
+    def status_info(result)
+      return unless $SHOW_CMD
+
+      value_format = "#{result[:exit_status]}"
 
-      if @@show_cmd
-        $stdout.print "#{prompt} #{upload_format} #{from} -> #{to}\n"
+      if $USE_COLOR
+        if result[:exit_status] == 0
+          value_format = value_format.green.bold
+        else
+          value_format = value_format.red.bold
+        end
       end
-    end
 
-    def download(from, to)
-      download_format = "DOWNLOAD"
-      download_format = download_format.blue.bold if @@use_color
-      
-      
-      if @@show_cmd
-        $stdout.print "#{prompt} #{download_format} #{from} -> #{to}\n"
+      secondary_cmd "EXIT", value_format
+      time_info result[:time]
+
+      if result[:exit_status] != 0
+        stdout(result[:stdout])
+        stderr(result[:stderr])
       end
     end
 
+    def stdout(data)
+      return if $LIVE_STDOUT || data.empty?
+
+      stdout_data_format = data.split("\r\n").join("\n")
+      stdout_data_format = stdout_data_format.green if $USE_COLOR
+
+      secondary_cmd "STDOUT"
+      puts stdout_data_format
+    end
+
+    def stderr(data)
+      return if $LIVE_STDERR || data.empty?
+
+      stderr_data_format = data
+      stderr_data_format = stderr_data_format.red if $USE_COLOR
+
+      secondary_cmd "STDERR"
+      puts stderr_data_format
+    end
+
+    def stdout_live(data)
+      return unless $LIVE_STDOUT
+
+      stdout_data_format = data
+      stdout_data_format = stdout_data_format.green if $USE_COLOR
+
+      $stdout.print stdout_data_format
+    end
+
+    def stderr_live(data)
+      return unless $LIVE_STDERR
+
+      stderr_data_format = data
+      stderr_data_format = stderr_data_format.red if $USE_COLOR
+
+      $stdout.print stderr_data_format
+    end
+
+    def upload_info(options)
+      return unless $SHOW_CMD
+
+      primary_cmd "UPLOAD", options[:file], options
+      secondary_cmd "TO", options[:to]
+    end
+
+    def download_info(options)
+      return unless $SHOW_CMD
+
+      primary_cmd "DOWNLOAD", options[:file], options
+      secondary_cmd "TO", options[:to]
+    end
+
+    def prompt(user, host)
+      prompt_format = "[#{user}@#{host}]"
+      prompt_format = prompt_format.white if $USE_COLOR
+    end
+
     def progress(n)
-      if @@show_cmd
-        $stdout.print "\r#{n}%"
-        puts if n == 100
-      end
+      return unless $SHOW_CMD
+
+      progress_format = "PROGRESS"
+      progress_format = progress_format.blue.bold if $USE_COLOR
+
+      $stdout.print "\r  #{progress_format} #{n}%"
+      puts if n == 100
     end
 
-    def error(msg)
-      error_format = "ERROR"
-      error_format = error_format.bold.red if @@use_color
-      $stdout.print "#{prompt} #{error_format} #{msg}\n"
-      abort
+    def time_info(time)
+      secondary_cmd "TIME", "#{time}s"
+    end
+
+    def primary_cmd(name, value, options = {})
+      name = name.bold if $USE_COLOR
+      prompt_format = prompt(options[:user], options[:host])
+      puts "#{prompt_format} #{name} #{value}"
     end
 
-  private
+    def secondary_cmd(name, value = "")
+      name = name.blue.bold if $USE_COLOR
+      puts "  #{name} #{value}"
+    end
 
-    def prompt
-      p ="[#{@user}@#{@host}]"
-      p = p.bold if @@use_color
+    def kv_cmd(options)
+      options.each do |k, v|
+        puts "    #{k}: #{v}"
+      end
     end
   end
 end

data/lib/mybot/helpers.rb

@@ -0,0 +1,24 @@
+module Mybot
+	module Helpers
+		def wait
+      $stdout.print "Press any key to continue..."
+      $stdin.gets
+    end
+
+    def ask(q = "")
+      $stdout.print "#{q}"
+      $stdin.gets.chomp
+    end
+
+    def yes?(q = "")
+      result = ""
+      loop do
+        $stdout.print "#{q}"
+        result = $stdin.gets.chomp
+        break if result =~ /y|yes|Y|YES|Yes|n|no|N|NO|No/
+      end
+
+      result =~ /y|yes|Y|YES|Yes/
+    end
+	end
+end