babot 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0355f66292997601578a1c85085cdfdbe71b2bd8
-  data.tar.gz: 062379bb8322b364e28e88ec7598e7559d95be41
+  metadata.gz: d30a84bef581bba5e575f75254eddf1fa28dca37
+  data.tar.gz: c9450ed722b8fcc6add142a6207ff9c95f2048df
 SHA512:
-  metadata.gz: dc51c5e669487b96c0bd2277138811f44cc172860fdd003e2a85d95a5d4872a027dfb4102bb205526206e6ea21c9400029fb58cc574f62a913b8af05ee3cc991
-  data.tar.gz: 550574a9c78c429755ffba815d449c36fd0754894cec238d5d02084d0fba3100efd62abffe96e18d1276aa24b405e89fabe05b4c29ea5ea6652247edc02e972e
+  metadata.gz: f3226467734a2827f618b9a074d70f0f3aa23191478755631f82733800b83275832ce3e7da4ddedad54bd1f14c25359236ee4f950bdc04fa3d0aa0ab34eed01d
+  data.tar.gz: 257cb4fffdd5c6eeb5df4d671ebff99b1ac859a39f46b16575a4af5ad52384514a8fa551f80320362557566359d60b6cf7cd464365abf9b7df8a7dd48ccc90c7

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    babot (0.3.0)
-      activesupport
+    babot (0.3.1)
       boson
       twitter
       whenever

data/babot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'babot'
-  s.version     = '0.3.0'
+  s.version     = '0.3.1'
   s.date        = '2013-09-08'
   s.summary     = "Babot"
   s.description = "A simple tool to manage Twitter bots"
@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
 
   s.require_path = 'lib'
   s.add_dependency "twitter"
-  s.add_dependency "activesupport"
   s.add_dependency "whenever"
   s.add_dependency "boson"
 

data/bin/babot

@@ -5,8 +5,7 @@ require 'boson/runner'
 $:.unshift File.expand_path("../../lib", __FILE__)
 require 'babot'
 
-FileUtils.mkdir_p [Babot.root.join("config"),
-                   Babot.root.join("bots")]
+FileUtils.mkdir_p Babot.root
 
 class BabotRunner < Boson::Runner
   desc "Update bot [name]"
@@ -19,14 +18,9 @@ class BabotRunner < Boson::Runner
     Babot.schedule
   end
 
-  desc "Call bot [name]"
-  def call(name)
-    Babot.call name
-  end
-
-  desc "Call bot [name] without update"
-  def dry(name)
-    puts Babot.dry(name)
+  desc "Run bot [name]"
+  def run(name)
+    Babot.run name
   end
 
   desc "Add bot [name] from [repository]"

data/lib/babot.rb

@@ -1,43 +1,29 @@
 require 'fileutils'
-require 'git'
 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(name)
-      run "cd '#{root.join('bots', name)}' && git pull --rebase origin master"
-      run "cd '#{root.join('bots', name)}' && bundle install"
+      cmd "cd '#{root.join(name)}' && git pull --rebase origin master && bundle install"
     end
 
     def schedule
-      Tempfile.open('schedule') do |cron|
-        cron.puts(list.map { |name| instanciate(name) }.map do |bot|
-          <<-eos
-            every '#{bot.when}' do
-              command 'cd #{root.join('bots', bot.name)} && bundle exec babot call #{bot.name}'
-            end
-          eos
-        end)
-        cron.flush
-        run "whenever -w -f '#{cron.path}'"
+      list.each do |name|
+        cmd "whenever -i #{name} -f #{root.join(name, 'config', 'schedule.rb')}"
       end
     end
 
     def add(name, repository)
-      if repository =~ /\//
-        run "ln -s '#{repository}' '#{root.join("bots", name)}'"
+      if repository =~ /^\//
+        cmd "ln -s '#{repository}' '#{root.join(name)}'"
       else
-        run "git clone '#{repository}' '#{root.join("bots", name)}'"
+        cmd "git clone '#{repository}' '#{root.join(name)}'"
       end
-      File.open(root.join("config", name).to_s, 'w') do |config|
+      File.open(root.join(name, "config", "credentials.yml").to_s, 'w') do |config|
         config.write({ 'consumer_key'           => "",
                        'consumer_secret'        => "",
                        'oauth_token'            => "",
@@ -46,66 +32,52 @@ class Babot
     end
 
     def delete(name)
-      run "rm -rf #{root.join('bots', name)} #{root.join('config', name)}"
+      cmd "rm -rf '#{root.join(name)}' '#{root.join(name, 'config', 'credentials.yml')}'"
     end
 
     def configure(name)
-      run "#{ENV['EDITOR'] || 'nano'} #{root.join("config", name).to_s}"
+      cmd "#{ENV['EDITOR'] || 'nano'} '#{root.join(name, "config", 'credentials.yml')}'"
     end
 
-    def call(name)
-      Twitter.update dry(name)
-    end
+    def run(name)
+      options = YAML::load_file root.join(name, "config", 'credentials.yml')
 
-    def list
-      Dir.entries(root.join "bots").reject { |name| name =~ /^\./ }
+      Twitter.configure do |config|
+        config.consumer_key = options['consumer_key']
+        config.consumer_secret = options['consumer_secret']
+        config.oauth_token = options['oauth_token']
+        config.oauth_token_secret = options['oauth_token_secret']
+      end
+      load Babot.root.join(name, 'babot.run').to_s
     end
 
-    def dry(name)
-      instanciate(name).call
+    def list
+      Dir.entries(root).reject { |name| name =~ /^\./ }
     end
 
     def dump
-      run "cd ~ && tar --exclude=.git -cf '#{Dir.pwd}/babot-#{Time.now.to_i}.tar' .babot"
+      cmd "cd ~ && tar --exclude=.git -cf '#{Dir.pwd}/babot-#{Time.now.to_i}.tar' .babot"
     end
 
     def install(dump)
-      run "cd ~ && rm -rf '.babot' && tar -xf '#{Dir.pwd}/#{dump}'"
+      cmd "cd ~ && rm -rf '.babot' && tar -xf '#{Dir.pwd}/#{dump}'"
     end
 
     def push(remote)
-      run "scp -qr '#{root}' '#{remote}:~/.' && ssh '#{remote}' 'babot schedule'"
-    end
-
-    def instanciate(name)
-      require Babot.root.join("bots", name, 'lib', 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
+      cmd "scp -qr '#{root}' '#{remote}:~/.' && ssh '#{remote}' 'babot schedule'"
     end
 
     def root
       Pathname.new(ENV["HOME"]).join ".babot"
     end
 
-    def run(command)
+    def cmd(command)
       puts command
       system command
     end
-  end
-
-  attr_accessor :name
-
-  def initialize(name, options)
-    @name = name
 
-    Twitter.configure do |config|
-      config.consumer_key = options['consumer_key']
-      config.consumer_secret = options['consumer_secret']
-      config.oauth_token = options['oauth_token']
-      config.oauth_token_secret = options['oauth_token_secret']
+    def run!
+      Twitter.update new.call
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babot
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Victor Goya
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: whenever
   requirement: !ruby/object:Gem::Requirement