mybot 0.1.1 → 0.2.0

data/lib/mybot/recipes.rb

@@ -0,0 +1,26 @@
+module Mybot
+	module Recipes
+		include Fmt
+		
+		def load_recipes
+      (
+        Dir["Botfile"] +
+        Dir[File.join(HOME_PATH, ".mybot", "**", "*.rb")].flatten
+      ).reject do |r|
+        !File.exists?(r)
+      end.each do |r|
+        self.load_recipe(r)
+      end
+    end
+
+    def load_recipe(r)
+      instance_eval(File.read(r), __FILE__, __LINE__)
+    rescue Exception => e
+      print_cmd! "warning", "cannot load #{r}", :magenta, :bold
+      puts e.message
+      e.backtrace.each do |line|
+        puts line
+      end
+    end
+	end
+end

data/lib/mybot/tasks.rb

@@ -1,6 +1,8 @@
 module Mybot
-  module Tasks
-    def tasks
+	module Tasks
+		include Fmt
+
+		def tasks
       @tasks ||= []
     end
 
@@ -45,9 +47,9 @@ module Mybot
     end
 
     def find_task(name)
-      ns = name.split ":"
-      task = ns.pop
-      ns = ns.join ":"
+      parts = name.split ":"
+      task = parts.pop
+      ns = parts.join ":"
 
       tasks.find do |t|
         t[:name] == task && (t[:namespace] == ns || t[:namespace].nil?)
@@ -57,10 +59,12 @@ module Mybot
     def run_task(name, options)
       task = find_task(name)
 
-      error "cannot find task '#{name}' " +
-        "use 'bot tasks:list' to see available tasks" unless task
+      unless task
+      	print_cmd! "error", "cannot find task '#{name}'", :red, :bold
+      	abort
+      end
 
-      task_info name
+      print_cmd! "task", name, :cyan, :bold
 
       task[:deps].each do |d|
         run_task(d, options)
@@ -68,5 +72,5 @@ module Mybot
 
       task[:block].call(options)
     end
-  end
+	end
 end

data/lib/mybot/templates.rb

@@ -5,10 +5,7 @@ module Mybot
       when String
         Template.new(content)
       when Hash
-        error "template file is required" unless content[:file]
-        tpl = File.join(TPL_PATH, content[:file])
-        error "template file '#{tpl}' does not exists" unless File.exists?(tpl)
-        Template.new(File.read(tpl))
+        Template.new(File.read(content[:file]))
       end
     end
 	end

data/lib/mybot/version.rb

@@ -1,3 +1,3 @@
 module Mybot
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/mybot.gemspec

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mybot/version'
@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Mybot::VERSION
   spec.authors       = ["Sebastian Sito"]
   spec.email         = ["sebastian@hypenode.com"]
-  spec.description   = %q{Provision, manage and monitor stuff}
-  spec.summary       = %q{mybot, my personal bot}
+  spec.description   = %q{Local and remote tasks with ease}
+  spec.summary       = %q{My personal bot}
   spec.homepage      = "https://github.com/sebastiansito/mybot"
   spec.license       = "MIT"
 
@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor"
-  spec.add_dependency "fog"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+
   spec.add_dependency "colored"
   spec.add_dependency "net-ssh"
   spec.add_dependency "net-sftp"
-  spec.add_dependency "listen"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mybot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -91,23 +91,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Provision, manage and monitor stuff
+description: Local and remote tasks with ease
 email:
 - sebastian@hypenode.com
 executables:
@@ -116,8 +100,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- Botfile
-- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -129,21 +111,14 @@ files:
 - lib/mybot/command.rb
 - lib/mybot/fmt.rb
 - lib/mybot/helpers.rb
-- lib/mybot/installer.rb
-- lib/mybot/lib.rb
-- lib/mybot/libs.rb
-- lib/mybot/loader.rb
 - lib/mybot/node.rb
 - lib/mybot/nodes.rb
+- lib/mybot/recipes.rb
 - lib/mybot/tasks.rb
 - lib/mybot/template.rb
 - lib/mybot/templates.rb
 - lib/mybot/version.rb
 - mybot.gemspec
-- vendor/lib/.gitkeep
-- vendor/plugins/.gitkeep
-- vendor/tasks/.gitkeep
-- vendor/tpl/.gitkeep
 homepage: https://github.com/sebastiansito/mybot
 licenses:
 - MIT
@@ -168,5 +143,5 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: mybot, my personal bot
+summary: My personal bot
 test_files: []

data/Botfile

@@ -1,12 +0,0 @@
-require "mybot"
-
-namespace :tasks do
-  task :list do
-    puts "available tasks:"
-    tasks.each do |t|
-      task = t[:name]
-      task = "#{t[:namespace]}:#{t[:name]}" if t[:namespace]
-      puts "  #{task}"
-    end
-  end
-end

data/CHANGELOG.md

@@ -1,2 +0,0 @@
-### 0.1.0
-* gem rewritten

data/lib/mybot/installer.rb

@@ -1,31 +0,0 @@
-require "fileutils"
-
-module Mybot
-  module Installer
-    def install(options = {})
-      if File.exists? Mybot::MYBOT_PATH
-        error "mybot is already installed"
-      end
-
-      info "installing mybot to #{Mybot::MYBOT_PATH}"
-      FileUtils.mkdir Mybot::MYBOT_PATH
-      FileUtils.cp_r Mybot::VENDOR_PATH, Mybot::MYBOT_PATH
-      ["lib", "plugins", "tasks", "tpl"].each do |dir|
-        FileUtils.rm File.join(Mybot::MYBOT_PATH, dir, ".gitkeep")
-      end
-    end
-
-    def uninstall(options = {})
-      unless File.exists? Mybot::MYBOT_PATH
-        error "mybot is not installed"
-      end
-
-      info "uninstalling mybot"
-      if yes? "Do you really want to delete ~/.mybot? [y/n]: "
-        FileUtils.rm_rf Mybot::MYBOT_PATH
-      else
-        info "uninstallation aborted"
-      end
-    end
-  end
-end

data/lib/mybot/lib.rb

@@ -1,31 +0,0 @@
-module Mybot
-  class Lib
-    def initialize(lib)
-      @lib = lib
-    end
-
-    def method_missing(name, *args, &block)
-      unless @lib[:funcs][name]
-        error "func '#{@lib[:name]}'.'#{name}' is not defined"
-      end
-
-      if args[0].nil? || !args[0].is_a?(Node)
-        error "1st arg should be node in func '#{@lib[:name]}'.'#{name}'"
-      end
-
-      if args[1].nil? || !args[1].is_a?(Hash)
-        error "2nd arg should be options in func '#{@lib[:name]}'.'#{name}'"
-      end
-
-      node = args[0]
-      options = args[1]
-
-      options[:sudo] ||= false
-      options[:cwd] ||= ""
-      options[:env] ||= {}
-      options.merge!(@lib[:options])
-
-      return @lib[:funcs][name][:block].call(node, options)
-    end
-  end
-end

data/lib/mybot/libs.rb

@@ -1,44 +0,0 @@
-module Mybot
-	module Libs
-		def libs
-			@libs ||= {}
-		end
-
-		def library(name, &block)
-      @library = name
-      unless libs[name]
-        libs[name] = {
-          :name => name,
-          :options => {},
-          :funcs => {}
-        }
-      end
-
-      yield
-    ensure
-      @library = nil
-    end
-
-    def library_options(options)
-      unless @library
-        error "library_options should be used only inside library definition"
-      end
-      
-      libs[@library][:options].merge!(options)
-    end
-
-    def func(name, &block)
-      libs[@library][:funcs][name] = {
-        :block => block
-      }
-    end
-
-    def lib(name)
-      unless libs[name]
-        error "there is no lib '#{name}'"
-      end
-
-      Lib.new libs[name]
-    end
-	end
-end

data/lib/mybot/loader.rb

@@ -1,25 +0,0 @@
-module Mybot
-  module Loader
-    def load_files
-      ( Dir[File.join(MYBOT_PATH, "lib", "**", "*.rb")].flatten +
-        Dir[File.join(MYBOT_PATH, "plugins", "**", "lib", "**", "*.rb")].flatten +
-        Dir["Botfile"] +
-        Dir[File.join(".mybot", "**", "*.rb")].flatten +
-        Dir[File.join(MYBOT_PATH, "tasks", "**", "*.rb")].flatten +
-        Dir[File.join(MYBOT_PATH, "plugins", "**", "tasks", "**", "*.rb")].flatten +
-        Dir[File.join(GEM_PATH, "Botfile")]
-      ).reject do |f|
-        !File.exists?(f)
-      end.each do |f|
-        self.load_file(f)
-      end
-    end
-
-    def load_file(f)
-      instance_eval(File.read(f), __FILE__, __LINE__)
-    rescue Exception => e
-      warning "cannot load #{f}"
-      raise(e)
-    end
-  end
-end