mybot 0.0.2 → 0.0.3

data/Botfile

@@ -3,7 +3,17 @@ require "fileutils"
 
 include Messages
 
+local = node "localhost", "seba",
+  :keys => ["/Users/seba/.ssh/id_rsa"]
+local.use [
+  "core/fs"
+]
+
 namespace :mybot do
+  task :version do
+    puts Mybot::VERSION
+  end
+
   task :install do
     if File.exists? Mybot::MYBOT_PATH
       error "mybot is already installed"

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+### 0.0.3
+* added Utils with lib_to_path
+* added require_*_installed helper
+* added AWS instances support
+* added nginx support with static apps
+* added rails and static apps deployment
+* added git.init
+* added PHP support with nginx and FPM
+* fixed bug when running cmd in other cmd
+* refactored output formatting
+* added apt.dpkg_reconfigure
+* Node#run now returns Result object with STDOUT, STDERR and exit status
+* added fs.mktemp
+* added mysql user and dbs management routines
+* added ~/.bash_profile, ~/.bashrc and ~/.profile loading
+* added listeners
+* added write shadows
+
 ### 0.0.2
 * started CHANGELOG
 * updated README to cover all available techniques

data/lib/mybot.rb

@@ -1,17 +1,23 @@
 require "mybot/core-ext/kernel"
+require "mybot/core-ext/class"
+require "mybot/core-ext/array"
 
 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"
 
   GEM_PATH = File.dirname(File.dirname(__FILE__))

data/lib/mybot/aws.rb

@@ -0,0 +1,54 @@
+require "fog"
+
+module Mybot
+	class Aws
+		include Messages
+
+		PROVIDER = "AWS"
+
+		def initialize(options = {})
+			error "access_key_id is required" unless options[:access_key_id]
+			error "secret_access_key is required" unless options[:secret_access_key]
+
+			@options = options
+		end
+
+		def aws
+			@aws ||= Fog::Compute.new({
+				:provider => PROVIDER,
+				:aws_access_key_id => @options[:access_key_id],
+				:aws_secret_access_key => @options[:secret_access_key]
+			})
+		end
+
+		def instances
+			aws.servers.all
+		end
+
+		def instance_exists?(name)
+			instances.each do |i|
+				return true if i.tags["Name"] == name and i.state == "running"
+			end
+
+			false
+		end
+
+		def instance_by_name(name)
+			instances.each do |i|
+				return i if i.tags["Name"] == name and i.state != "terminated"
+			end
+
+			nil
+		end
+
+		def instance_create(options = {})
+			instance = @aws.servers.create(options)
+
+			instance.wait_for do
+				ready?
+			end
+
+			instance
+		end
+	end
+end

data/lib/mybot/command.rb

@@ -1,12 +1,12 @@
 module Mybot
   class Command
-    attr_accessor :channel, :out, :stdout, :stderr, :exit_status
+    attr_accessor :channel, :out, :result
 
     def initialize(node)
       @node = node
-      @out = @stdout = @stderr = ""
+      @out = ""
       @handlers = {}
-      @exit_status = 0
+      @result = Result.new
     end
 
     def on(s, &block)
@@ -15,7 +15,7 @@ module Mybot
 
     def handle_stdout(data)
       @out = data
-      @stdout += data
+      @result.stdout += data
       @node.fmt.stdout data
       @handlers.each do |s, proc|
         proc.call if @out.include? s
@@ -24,39 +24,35 @@ module Mybot
 
     def handle_stderr(data)
       @out = data
-      @stderr += data
+      @result.stderr += data
       @node.fmt.stderr data
       @handlers.each do |s, proc|
         proc.call if @out.include? s
       end
     end
 
-    def handle_exit
-      filter(@stdout)
-    end
-
     def handle_sudo
       on "[sudo] password" do
-        write @node.options[:password]
+        write @node.options[:password], :shadow => true
       end
 
       on "Password:" do
-        write @node.options[:password]
+        write @node.options[:password], :shadow => true
       end
 
       on "Sorry, try again." do
-        @node.fmt.error "cannot handle sudo automatically, try to it manually"
+        @node.fmt.error "cannot handle sudo automatically, try manually"
       end
     end
 
-    def write(data)
-      @node.fmt.write data
-      @channel.send_data "#{data}\n"
-    end
+    def write(data, options = {})
+      if options[:shadow]
+        @node.fmt.write "***"
+      else
+        @node.fmt.write data
+      end
 
-    def filter(data)
-      data.gsub!("[sudo] password for #{@node.options[:user]}:", "")
-      data.strip
+      @channel.send_data "#{data}\n"
     end
   end
 end

data/lib/mybot/commands.rb

@@ -1,3 +1,5 @@
+require "listen"
+
 module Mybot
   module Commands
     include Messages
@@ -6,6 +8,10 @@ module Mybot
       Node.new(host, user, options)
     end
 
+    def aws(options = {})
+      Aws.new(options)
+    end
+
     def namespace(name)
       outer_ns, @namespace = @namespace, name.to_s
       if outer_ns && outer_ns != ""
@@ -80,5 +86,23 @@ module Mybot
 
       result =~ /y|yes|Y|YES|Yes/
     end
+
+    def add_listener(*args, &block)
+      @listeners ||= []
+
+      l = Listen.to *args
+      l.change do
+        block.call
+      end
+
+      @listeners << l
+      info "added listener for #{args[0]}"
+    end
+
+    def start_listeners
+      info "starting listeners"
+      @listeners[0..-2].each { |l| l.start(false) }
+      @listeners.last.start(true)
+    end
   end
 end

data/lib/mybot/core-ext/array.rb

@@ -0,0 +1,9 @@
+class Array
+	def extract_options!
+    if last.is_a?(Hash)
+      pop
+    else
+      {}
+    end
+  end
+end

data/lib/mybot/core-ext/class.rb

@@ -0,0 +1,53 @@
+class Class
+	def cattr_reader(*syms)
+    options = syms.extract_options!
+    syms.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}
+          @@#{sym}
+        end
+      EOS
+
+      unless options[:instance_reader] == false || options[:instance_accessor] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}
+            @@#{sym}
+          end
+        EOS
+      end
+    end
+  end
+  
+  def cattr_writer(*syms)
+    options = syms.extract_options!
+    syms.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
+      EOS
+
+      unless options[:instance_writer] == false || options[:instance_accessor] == false
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{sym}=(obj)
+            @@#{sym} = obj
+          end
+        EOS
+      end
+      self.send("#{sym}=", yield) if block_given?
+    end
+  end
+
+  def cattr_accessor(*syms, &blk)
+    cattr_reader(*syms)
+    cattr_writer(*syms, &blk)
+  end
+end

data/lib/mybot/fmt.rb

@@ -2,65 +2,66 @@ require "colored"
 
 module Mybot
   class Fmt
-    attr_accessor :use_color, :show_cmd,
+    cattr_accessor :use_color, :show_cmd, :show_cmd,
       :show_stdout, :show_stderr, :show_stdin
 
+    @@use_color = true
+    @@show_cmd = true
+    @@show_stdout = true
+    @@show_stderr = true
+    @@show_stdin = true
+
     def initialize(host, user)
       @host, @user = host, user
-      @use_color = true
-      @show_cmd = true
-      @show_stdout = true
-      @show_stderr = true
-      @show_stdin = true
     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
+      run_format = run_format.blue.bold if @@use_color
+      $stdout.print "#{prompt} #{run_format} #{cmd}\n" if @@show_cmd
     end
 
     def stdout(data)
-      data = data.green if @use_color
-      $stdout.print(data) if @show_stdout
+      data = data.green if @@use_color
+      $stdout.print(data) if @@show_stdout
     end
 
     def stderr(data)
-      data = data.red if @use_color
-      $stdout.print(data) if @show_stderr
+      data = data.red if @@use_color
+      $stdout.print(data) if @@show_stderr
     end
 
     def write(data)
       write_format = "WRITE"
-      write_format = write_format.blue.bold if @use_color
+      write_format = write_format.blue.bold if @@use_color
       lf_format = "<LF>"
-      lf_format = lf_format.red.bold if @use_color
-      if @show_stdin
+      lf_format = lf_format.red.bold if @@use_color
+      if @@show_stdin
         $stdout.print "\n#{prompt} #{write_format} #{data}#{lf_format}\n"
       end
     end
 
     def upload(from, to)
       upload_format = "UPLOAD"
-      upload_format = upload_format.blue.bold if @use_color
+      upload_format = upload_format.blue.bold if @@use_color
 
-      if @show_cmd
+      if @@show_cmd
         $stdout.print "#{prompt} #{upload_format} #{from} -> #{to}\n"
       end
     end
 
     def download(from, to)
       download_format = "DOWNLOAD"
-      download_format = download_format.blue.bold if @use_color
+      download_format = download_format.blue.bold if @@use_color
       
       
-      if @show_cmd
+      if @@show_cmd
         $stdout.print "#{prompt} #{download_format} #{from} -> #{to}\n"
       end
     end
 
     def progress(n)
-      if @show_cmd
+      if @@show_cmd
         $stdout.print "\r#{n}%"
         puts if n == 100
       end
@@ -68,7 +69,7 @@ module Mybot
 
     def error(msg)
       error_format = "ERROR"
-      error_format = error_format.bold.red if @use_color
+      error_format = error_format.bold.red if @@use_color
       $stdout.print "#{prompt} #{error_format} #{msg}\n"
       abort
     end
@@ -77,7 +78,7 @@ module Mybot
 
     def prompt
       p ="[#{@user}@#{@host}]"
-      p = p.bold if @use_color
+      p = p.bold if @@use_color
     end
   end
 end

data/lib/mybot/lib.rb

@@ -1,9 +1,70 @@
 module Mybot
-	class Lib
-		include Messages
-		include Commands
-		def method_missing(name, *args, &block)
-			error "library '#{self.class}' does not provide method #{name}"
-		end
-	end
+  class Lib
+    include Messages
+    include Commands
+    include Utils
+
+    def method_missing(name, options = {}, &block)
+      lib_path = lib_to_path(self.class.to_s)
+
+      if name =~ /require\_([a-zA-Z_]*)installed/
+        base_name = $1.chomp "_"
+
+        methods = []
+
+        if base_name != ""
+          methods = [
+            "#{base_name}_installed?",
+            "#{base_name}_install",
+            "#{base_name}_reconfigure"
+          ]
+        else
+          methods = ["installed?", "install", "reconfigure"]
+        end
+
+        methods[0..-2].each do |m|
+          unless respond_to?(m)
+            error "lib '#{lib_path}' does not have method '#{m}'"
+          end
+        end
+
+        unless send(methods[0], options)
+          send(methods[1], options)
+        end
+
+        if respond_to?(methods[2])
+          send(methods[2], options)
+        end
+
+        return
+      elsif name =~ /require\_([a-zA-Z_]*)created/
+        base_name = $1.chomp "_"
+
+        methods = []
+
+        if base_name != ""
+          methods = [
+            "#{base_name}_exists?",
+            "#{base_name}_create"
+          ]
+        else
+          methods = ["exists?", "create"]
+        end
+
+        methods.each do |m|
+          unless respond_to?(m)
+            error "lib '#{lib_path}' does not have method '#{m}'"
+          end
+        end
+
+        unless send(methods[0], options)
+          send(methods[1], options)
+        end
+
+        return
+      end
+
+      error "library '#{lib_path}' does not provide method #{name}"
+    end
+  end
 end