mybot 0.0.2 → 0.0.3

data/lib/mybot/libs.rb

@@ -0,0 +1,41 @@
+module Mybot
+	module Libs
+		def use(lib)
+      if lib.is_a?(Array)
+        lib.each do |l|
+          _use(l)
+        end
+      else
+        _use(lib)
+      end
+    end
+
+    def _use(lib)
+      lib_name = lib.split("/").last
+      lib_file = File.join(LIB_PATH, "#{lib}.rb")
+
+      unless File.exists?(lib_file)
+        error "cannot load lib '#{lib_file}'"
+      end
+
+      require lib_file
+      const = lib.split("/").map { |x| x.capitalize }.join("::")
+      klass = Kernel.qualified_const_get(const)
+
+      if klass.instance_method(:initialize).arity == 1
+        @libs[lib_name.to_sym] ||= klass.new(self)
+      else
+        warning "#{lib_name.capitalize} library constructor should " +
+          "take one argument"
+      end
+    end
+
+    def method_missing(name, *args, &block)
+      if @libs[name.to_sym]
+        @libs[name.to_sym]
+      else
+        error "no such library loaded: #{name}"
+      end
+    end
+	end
+end

data/lib/mybot/messages.rb

@@ -3,23 +3,27 @@ require "colored"
 module Mybot
   module Messages
     def info(msg)
-      info_format = "INFO".blue.bold
+      info_format = "INFO"
+      info_format = info_format.blue.bold if Fmt.use_color
       puts "#{info_format} #{msg}"
     end
 
     def warning(msg)
-      warning_format = "WARNING".magenta.bold
+      warning_format = "WARNING"
+      warning_format = warning_format.magenta.bold if Fmt.use_color
       puts "#{warning_format} #{msg}"
     end
 
     def error(msg)
-      error_format = "ERROR".red.bold
+      error_format = "ERROR"
+      error_format = error_format.red.bold if Fmt.use_color
       puts "#{error_format} #{msg}"
       abort
     end
 
     def task_info(name)
-      task_format = "TASK".green.bold
+      task_format = "TASK"
+      task_format = task_format.green.bold if Fmt.use_color
       puts "#{task_format} #{name}"
     end
   end

data/lib/mybot/node.rb

@@ -4,6 +4,8 @@ require "net/sftp"
 module Mybot
   class Node
     include Messages
+    include Libs
+
     attr_accessor :host, :user, :options, :ssh, :sftp, :fmt
 
     def initialize(host, user, options = {})
@@ -20,50 +22,12 @@ module Mybot
       @sftp ||= Net::SFTP.start(@host, @user, @options)
     end
 
-    def use(lib)
-      if lib.is_a?(Array)
-        lib.each do |l|
-          _use(l)
-        end
-      else
-        _use(lib)
-      end
-    end
-
-    def _use(lib)
-      lib_name = lib.split("/").last
-      lib_file = File.join(LIB_PATH, "#{lib}.rb")
-
-      unless File.exists?(lib_file)
-        error "cannot load lib '#{lib_file}'"
-      end
-
-      require lib_file
-      const = lib.split("/").map { |x| x.capitalize }.join("::")
-      klass = Kernel.qualified_const_get(const)
-
-      if klass.instance_method(:initialize).arity == 1
-        @libs[lib_name.to_sym] ||= klass.new(self)
-      else
-        warning "#{lib_name.capitalize} library constructor should " +
-          "take one argument"
-      end
-    end
-
-    def method_missing(name, *args, &block)
-      if @libs[name.to_sym]
-        @libs[name.to_sym]
-      else
-        error "no such library loaded: #{name}"
-      end
-    end
-
     def run(options, &block)
       error "cmd not specified" unless options[:cmd]
 
       command = Command.new(self)
       yield command if block_given?
-
+      
       ssh.open_channel do |ch|
         ch.request_pty do |ch, ok|
           @fmt.error "cannot request pty" unless ok
@@ -71,27 +35,20 @@ module Mybot
 
         command.channel = ch
 
-        if options[:env]
-          env = []
-          options[:env].each do |k, v|
-            env << "#{k}='#{v}'"
-          end
-          options[:cmd] = "#{env.join(" ")} #{options[:cmd]}"
-        end
+        inject_env(options)
 
         if options[:sudo]
           options[:cmd] = "sudo #{options[:cmd]}"
           command.handle_sudo
         end
 
-        if options[:cwd]
-          options[:cmd] = "cd #{options[:cwd]} && #{options[:cmd]}"
-        end
+        prepend_cwd(options)
+        prepend_sources(options)
 
         @fmt.run(options[:cmd])
 
         ch.exec options[:cmd] do |ch, ok|
-          @fmt.error "run: cannot exec #{options[:cmd]}" unless ok
+          @fmt.error "cannot exec #{options[:cmd]}" unless ok
 
           ch.on_data do |ch, data|
             command.handle_stdout(data)
@@ -102,17 +59,51 @@ module Mybot
           end
 
           ch.on_request("exit-status") do |ch, data|
-            command.exit_status = data.read_long
+            command.result.exit_status = data.read_long
           end
 
           ch.on_close do |ch|
-            return command.handle_exit
+            #
           end
         end
       end
 
       ssh.loop
-      return command.stdout_all
+      return command.result
+    end
+
+  private
+
+    def inject_env(options)
+      if options[:env]
+        env = []
+        options[:env].each do |k, v|
+          env << "#{k}='#{v}'"
+        end
+        options[:cmd] = "#{env.join(" ")} #{options[:cmd]}"
+      end
+    end
+
+    def prepend_cwd(options)
+      if options[:cwd]
+        options[:cmd] = "cd #{options[:cwd]} && #{options[:cmd]}"
+      end
+    end
+
+    def prepend_sources(options)
+      sources = [
+        File.join("~", ".bashrc"),
+        File.join("~", ".bash_profile"),
+        File.join("~", ".profile")
+      ].map { |f| File.expand_path(f) }
+
+      sources.reject! { |f| !File.exists?(f) }
+
+      prefix = sources.map do |s|
+        "source #{File.expand_path(s)}"
+      end.join(" && ")
+
+      options[:cmd] = "#{prefix} && #{options[:cmd]}"
     end
   end
 end

data/lib/mybot/recipes.rb

@@ -4,10 +4,10 @@ module Mybot
 
     def recipes
       @recipes ||= (
+        Dir["Botfile"] +
         Dir[File.join(GEM_PATH, "Botfile")] +
         Dir[File.join(MYBOT_PATH, "recipes", "**", "*.rb")].flatten +
-        Dir[File.join(".mybot", "**", "*.rb")].flatten +
-        Dir["Botfile"]
+        Dir[File.join(".mybot", "**", "*.rb")].flatten
       ).reject { |f| !File.exists?(f) }
     end
 

data/lib/mybot/result.rb

@@ -0,0 +1,26 @@
+module Mybot
+	class Result
+		attr_accessor :exit_status
+		attr_writer :stdout, :stderr
+
+		def initialize
+			@stdout = @stderr = ""
+			@exit_status = -1
+		end
+
+		def stdout
+			filter(@stdout)
+		end
+
+		def stderr
+			filter(@stderr)
+		end
+
+	private
+
+		def filter(data)
+			data.gsub(/\[sudo\]\ password\ for\ [a-zA-Z0-9_].+\:/, "")
+		end
+
+	end
+end

data/lib/mybot/utils.rb

@@ -0,0 +1,7 @@
+module Mybot
+	module Utils
+		def lib_to_path(lib)
+			lib.split("::").map{ |l| l.downcase }.join("/")
+		end
+	end
+end

data/lib/mybot/version.rb

@@ -1,3 +1,3 @@
 module Mybot
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/mybot.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colored"
   spec.add_dependency "net-ssh"
   spec.add_dependency "net-sftp"
+  spec.add_dependency "listen"
 end

data/vendor/lib/core/fs.rb

@@ -14,7 +14,7 @@ module Core
       elsif options[:dir]
         options[:cmd] = "test -e #{options[:dir]} && echo EXISTS"
       end
-      @node.run(options).include?("EXISTS") ? true : false
+      @node.run(options).stdout.include?("EXISTS") ? true : false
     end
 
     def create(options = {})
@@ -23,13 +23,8 @@ module Core
       end
 
       if options[:file]
-        options[:cmd] = "mktemp /tmp/mybot.XXXXX"
-        
-        # do not use sudo when creating tmp file to be able to move file
-        sudo = options[:sudo]
-        options[:sudo] = false
-        tmp = @node.run(options)
-        options[:sudo] = sudo
+        options[:pattern] = "/tmp/mybot.XXXXX"
+        tmp = mktemp(options)
 
         options[:content] ||= ""
         @node.sftp.file.open(tmp, "w") { |f| f.write options[:content] }
@@ -41,6 +36,17 @@ module Core
       end
     end
 
+    def mktemp(options = {})
+      error "pattern required" unless options[:pattern]
+
+      options[:cmd] = "mktemp #{options[:pattern]}"
+      sudo = options[:sudo]
+      options[:sudo] = false
+      tmp = @node.run(options).stdout
+      options[:sudo] = sudo
+      tmp.strip
+    end
+
     def remove(options = {})
       unless options[:file] || options[:dir]
         error "file or dir is required"
@@ -64,7 +70,7 @@ module Core
           @node.fmt.error "read: file '#{options[:file]}' does not exists"
           return ""
         end
-      end
+      end.stdout
     end
 
     def upload(options = {})

data/vendor/lib/core/osx/rails.rb

@@ -0,0 +1,31 @@
+module Core
+	module Osx
+		class Rails < Mybot::Lib
+			def initialize(node)
+				@node = node
+				@node.use [
+					"core/fs",
+					"core/osx/git"
+				]
+			end
+
+			def prepare_release(options = {})
+				error "repo is required" unless options[:repo]
+				error "release is required" unless options[:release]
+
+				options[:dir] = "/tmp/#{options[:release]}"
+				@node.fs.remove(options)
+
+				options[:file] = "/tmp/#{options[:release]}.tar.gz"
+				@node.fs.remove(options)
+
+				options[:dest] = "/tmp/#{options[:release]}"
+				@node.git.clone(options)
+
+				options[:from] = "/tmp/#{options[:release]}"
+				options[:to] = "/tmp/#{options[:release]}.tar.gz"
+				@node.fs.compress(options)
+			end
+		end
+	end
+end

data/vendor/lib/core/osx/static.rb

@@ -0,0 +1,31 @@
+module Core
+	module Osx
+		class Static < Mybot::Lib
+			def initialize(node)
+				@node = node
+				@node.use [
+					"core/fs",
+					"core/osx/git"
+				]
+			end
+
+			def prepare_release(options = {})
+				error "repo is required" unless options[:repo]
+				error "release is required" unless options[:release]
+
+				options[:dir] = "/tmp/#{options[:release]}"
+				@node.fs.remove(options)
+
+				options[:file] = "/tmp/#{options[:release]}.tar.gz"
+				@node.fs.remove(options)
+
+				options[:dest] = "/tmp/#{options[:release]}"
+				@node.git.clone(options)
+
+				options[:from] = "/tmp/#{options[:release]}"
+				options[:to] = "/tmp/#{options[:release]}.tar.gz"
+				@node.fs.compress(options)
+			end
+		end
+	end
+end

data/vendor/lib/core/ubuntu/apt.rb

@@ -9,7 +9,15 @@ module Core
 
 			def update(options = {})
 				options[:cmd] = "#{DF} apt-get update"
-				@node.run(options)
+				@node.run(options) do |cmd|
+					cmd.on "dpkg was interrupted" do
+						dpkg_reconfigure(options)
+					end
+
+					cmd.on "Could not get lock" do
+						error "Cannot update"
+					end
+				end
 			end
 
 			def upgrade(options = {})
@@ -26,7 +34,11 @@ module Core
 				error "pkg not specified" unless options[:pkg]
 
 				options[:cmd] = "#{DF} apt-get install -y #{options[:pkg]}"
-				@node.run(options)
+				@node.run(options) do |cmd|
+					cmd.on "dpkg was interrupted" do
+						dpkg_reconfigure(options)
+					end
+				end
 			end
 
 			def remove(options = {})
@@ -35,6 +47,11 @@ module Core
 				options[:cmd] = "#{DF} apt-get --purge autoremove -y #{options[:pkg]}"
 				@node.run(options)
 			end
+
+			def dpkg_reconfigure(options = {})
+				options[:cmd] = "#{DF} dpkg --configure -a"
+				@node.run(options)
+			end
 		end
 	end
 end

data/vendor/lib/core/ubuntu/git.rb

@@ -31,6 +31,18 @@ module Core
 				options[:cmd] = "git clone #{options[:repo]} #{options[:dest]}"
 				@node.run(options)
 			end
+
+			def init(options = {})
+				error "repo not specified" unless options[:repo]
+
+				options[:cmd] = "git init #{options[:repo]}"
+
+				if options[:bare]
+					options[:cmd] += " --bare"
+				end
+
+				@node.run(options)
+			end
 		end
 	end
 end