babot 0.1.5 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb8a45434ea899ca641bf88e57fd8234f5c099f8
-  data.tar.gz: fc78fb184612d1662a6874f036a54539bb6ec24c
+  metadata.gz: 3b6b19753e0a50827eb7d2423bd654a7bcecceae
+  data.tar.gz: 5dc21ac5617ba8b07f4e1bf413d21f995b6702be
 SHA512:
-  metadata.gz: c7017c77bf5c724288ff87bae98191f668a756e0148dcd7b88b5f65556690cbdacbace9ca4297e34e77e89e5e7ca0da1d745d74c34cb7bde2f7ce49d37a596f4
-  data.tar.gz: c220fc560c8faf77d4f744716f37cc8f04abc8826b71f727b84a322c7723b74ff642029d0ded1b1c184fc8e364385b804049b4367ced4d95d5aa389055684612
+  metadata.gz: 81c1c0a8d7fd364e5a8e0a1ab1e6c5a53f2754f4aebe69f8997d6b3c65187dfe6ee25a0daad046d30458ad457b2a57bfdf85649fc0447e2134d9d6ff58dfff16
+  data.tar.gz: 3be4b33f9fdf2a47e06f6749b68bc8ec39c0fb2499282e719b9516c26da8913f2eb12e7df322f35f43572231664a1ee26d4f17e43974fb8119fddbe0143d2d46

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    babot (0.1.3)
+    babot (0.2.1)
       activesupport
       boson
       capistrano

data/babot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'babot'
-  s.version     = '0.1.5'
+  s.version     = '0.2.1'
   s.date        = '2013-09-08'
   s.summary     = "Babot"
   s.description = "A simple tool to manage Twitter bots"

data/bin/babot

@@ -1,15 +1,17 @@
 #!/usr/bin/env ruby
 
 require 'boson/runner'
-require 'pathname'
 
 $:.unshift File.expand_path("../../lib", __FILE__)
 require 'babot'
 
+FileUtils.mkdir_p [Babot.root.join("config"),
+                   Babot.root.join("bots")]
+
 class BabotRunner < Boson::Runner
-  desc "Update bots"
-  def update
-    Babot.update
+  desc "Update bot [name]"
+  def update(name)
+    Babot.update(name)
   end
 
   desc "Update crontab"
@@ -31,7 +33,6 @@ class BabotRunner < Boson::Runner
   def add(name, repository)
     Babot.add name, repository
     Babot.configure name
-    Babot.update
   end
 
   desc "Delete bot [name]"
@@ -43,6 +44,11 @@ class BabotRunner < Boson::Runner
   def configure(name)
     Babot.configure name
   end
+
+  desc "List bots"
+  def list
+    puts Babot.list
+  end
 end
 
 BabotRunner.start

data/lib/babot.rb

@@ -4,34 +4,41 @@ require 'twitter'
 require 'pathname'
 require 'yaml'
 require 'tempfile'
+require 'whenever'
 require 'active_support/core_ext/string/inflections'
+require 'bundler/cli'
 
 class Babot
 
   class << self
 
-    def update
-      Dir["#{bots_root}/*"].each do |repository|
-        Git.open(repository).pull
-      end
+    def update(name)
+      git = Git.open(root.join("bots", name), :log => Logger.new(STDOUT))
+      git.fetch "origin"
+      git.merge "origin", "master"
+      system "cd #{root.join('bots', name)} && bundle install"
     end
 
     def schedule
-      File.open(root.join("schedule.rb"), "w") do |schedule|
-        @@config['bots'].map do |name, options|
-          bot = instanciate name, options
-          schedule.puts <<-eos
+      cron = File.open root.join("schedule.rb"), "w"
+      list.map { |name| instanciate(name) }.each do |bot|
+        cron.puts <<-eos
             every '#{bot.when}' do
-              rake 'bots:call[#{name}]'
+              command 'cd #{root.join('bots', bot.name)} && bundle exec babot call #{bot.name}'
             end
           eos
-        end
-        Whenever::CommandLine.execute(file: schedule.path, write: true)
       end
+      cron.close
+
+      Whenever::CommandLine.execute(file: cron.path, write: true)
     end
 
     def add(name, repository)
-      Git.clone repository, bot_root(name)
+      if repository =~ /\//
+        FileUtils.ln_s repository, root.join("bots", name)
+      else
+        Git.clone repository, root.join("bots", name)
+      end
       File.open(root.join("config", name).to_s, 'w') do |config|
         config.write({ 'consumer_key'           => "",
                        'consumer_secret'        => "",
@@ -41,8 +48,8 @@ class Babot
     end
 
     def delete(name)
-      FileUtils.rm_rf bot_root(name)
-      FileUtils.rm_f config_root.join(name)
+      FileUtils.rm_rf root.join("bots", name)
+      FileUtils.rm_f root.join("config", name)
     end
 
     def configure(name)
@@ -53,14 +60,19 @@ class Babot
       Twitter.update dry(name)
     end
 
+    def list
+      Dir.entries(root.join "bots").reject { |name| name =~ /^\./ }
+    end
+
     def dry(name)
-      instanciate(name, YAML.load_file(config_root.join name)).call
+      instanciate(name).call
     end
 
-    def instanciate(name, config)
-      require Babot.bot_root(name).join('lib', name)
+    def instanciate(name)
+      require Babot.root.join("bots", name, 'lib', name)
 
-      Babot::const_get(name.camelize).new(name)
+      options = YAML.load_file(root.join("config", name))
+      Babot::const_get(name.camelize).new(name, options)
     rescue StandardError, ScriptError => error
       puts error, error.backtrace
     end
@@ -68,21 +80,13 @@ class Babot
     def root
       Pathname.new(ENV["HOME"]).join ".babot"
     end
+  end
 
-    def bots_root
-      root.join("bots")
-    end
-
-    def config_root
-      root.join("config")
-    end
+  attr_accessor :name
 
-    def bot_root(name)
-      bots_root.join name
-    end
-  end
+  def initialize(name, options)
+    @name = name
 
-  def initialize(options)
     Twitter.configure do |config|
       config.consumer_key = options['consumer_key']
       config.consumer_secret = options['consumer_secret']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babot
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors:
 - Victor Goya