babot 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30a84bef581bba5e575f75254eddf1fa28dca37
-  data.tar.gz: c9450ed722b8fcc6add142a6207ff9c95f2048df
+  metadata.gz: 53807523166eb1aa1598787184bcacf42dd60c83
+  data.tar.gz: 969f1946c3b071902ef1cb03102a29136bb99915
 SHA512:
-  metadata.gz: f3226467734a2827f618b9a074d70f0f3aa23191478755631f82733800b83275832ce3e7da4ddedad54bd1f14c25359236ee4f950bdc04fa3d0aa0ab34eed01d
-  data.tar.gz: 257cb4fffdd5c6eeb5df4d671ebff99b1ac859a39f46b16575a4af5ad52384514a8fa551f80320362557566359d60b6cf7cd464365abf9b7df8a7dd48ccc90c7
+  metadata.gz: 91f53fd6de6c569db584e07658254044ba769ae49095acd294c4216aeb1bc7cce73d5536c6f6dce50c5ff69c4c0fc022e647b9c83900327065a49f59b58aec25
+  data.tar.gz: ef00c38a7e27542ff1ea83f758b1970c0230fc45bd4444705a0c1ee4656c51a7bf909253570e67aa04454048d6d6c4626276d4056237d04b118e79eaef8b54dd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    babot (0.3.1)
+    babot (0.4.0)
       boson
       twitter
       whenever
@@ -22,7 +22,7 @@ GEM
       multipart-post (~> 1.2.0)
     i18n (0.6.4)
     minitest (4.7.5)
-    multi_json (1.7.8)
+    multi_json (1.7.9)
     multipart-post (1.2.0)
     simple_oauth (0.2.0)
     thread_safe (0.1.2)

data/babot.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'babot'
-  s.version     = '0.3.1'
-  s.date        = '2013-09-08'
+  s.version     = '0.4.0'
+  s.date        = '2013-11-08'
   s.summary     = "Babot"
   s.description = "A simple tool to manage Twitter bots"
   s.authors     = ["Victor Goya"]

data/bin/babot

@@ -1,62 +1,92 @@
 #!/usr/bin/env ruby
 
 require 'boson/runner'
+require 'pathname'
+require 'yaml'
 
 $:.unshift File.expand_path("../../lib", __FILE__)
 require 'babot'
 
-FileUtils.mkdir_p Babot.root
+DEFAULT_CONFIG = {
+  'consumer_key'           => "",
+  'consumer_secret'        => "",
+  'oauth_token'            => "",
+  'oauth_token_secret'     => ""
+}
 
 class BabotRunner < Boson::Runner
+  def initialize
+    cmd "mkdir -p '#{root}'"
+  end
+
+  desc "Add bot [name] from [repository]"
+  def add(name, repository)
+    if File.directory? repository
+      cmd "ln -s '#{File.realpath repository}' '#{root.join(name)}'"
+    else
+      cmd "git clone '#{repository}' '#{root.join(name)}'"
+    end
+    cmd "mkdir -p '#{Pathname.new(root).join name, 'config'}'"
+
+    File.open(root.join(name, "config", "credentials.yml").to_s, 'w') do |config|
+      config.write DEFAULT_CONFIG.to_yaml
+    end
+    configure name
+  end
+
   desc "Update bot [name]"
   def update(name)
-    Babot.update(name)
+    cmd "cd '#{root.join(name)}' && git pull --rebase origin master && bundle install"
   end
 
   desc "Update crontab"
   def schedule
-    Babot.schedule
+    `ls #{root}`.split.each do |name|
+      cmd "whenever -i #{name} -f #{root.join(name, 'config', 'schedule.rb')}"
+    end
   end
 
   desc "Run bot [name]"
   def run(name)
-    Babot.run name
-  end
+    options = YAML::load_file root.join(name, "config", 'credentials.yml')
 
-  desc "Add bot [name] from [repository]"
-  def add(name, repository)
-    Babot.add name, repository
-    Babot.configure 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 root.join(name, 'babot.run').to_s
   end
 
   desc "Delete bot [name]"
   def delete(name)
-    Babot.delete name
+    cmd "rm -rf '#{root.join name}' '#{root.join name, 'config', 'credentials.yml'}'"
   end
 
   desc "Configure bot [name]"
   def configure(name)
-    Babot.configure name
+    cmd "#{ENV['EDITOR'] || 'nano'} '#{root.join name, "config", 'credentials.yml'}'"
   end
 
   desc "List bots"
   def list
-    puts Babot.list
+    cmd "ls '#{root}'"
   end
 
-  desc "Dump bots and configuration in tar file"
-  def dump
-    Babot.dump
+  desc "Push to remote server [remote]"
+  def push(remote)
+    cmd "scp -qr '#{root}' '#{remote}:~/.' && ssh '#{remote}' 'babot schedule'"
   end
 
-  desc "Install from tar file [path]"
-  def install(path)
-    Babot.install path
+  private
+  def root
+    Pathname.new(ENV["HOME"]).join ".babot"
   end
 
-  desc "Push to remote server [remote]"
-  def push(remote)
-    Babot.push remote
+  def cmd(command)
+    puts command
+    system command
   end
 end
 

data/lib/babot.rb

@@ -1,83 +1,7 @@
-require 'fileutils'
 require 'twitter'
-require 'pathname'
-require 'yaml'
 
 class Babot
-
-  class << self
-
-    def update(name)
-      cmd "cd '#{root.join(name)}' && git pull --rebase origin master && bundle install"
-    end
-
-    def schedule
-      list.each do |name|
-        cmd "whenever -i #{name} -f #{root.join(name, 'config', 'schedule.rb')}"
-      end
-    end
-
-    def add(name, repository)
-      if repository =~ /^\//
-        cmd "ln -s '#{repository}' '#{root.join(name)}'"
-      else
-        cmd "git clone '#{repository}' '#{root.join(name)}'"
-      end
-      File.open(root.join(name, "config", "credentials.yml").to_s, 'w') do |config|
-        config.write({ 'consumer_key'           => "",
-                       'consumer_secret'        => "",
-                       'oauth_token'            => "",
-                       'oauth_token_secret'     => "" }.to_yaml)
-      end
-    end
-
-    def delete(name)
-      cmd "rm -rf '#{root.join(name)}' '#{root.join(name, 'config', 'credentials.yml')}'"
-    end
-
-    def configure(name)
-      cmd "#{ENV['EDITOR'] || 'nano'} '#{root.join(name, "config", 'credentials.yml')}'"
-    end
-
-    def run(name)
-      options = YAML::load_file root.join(name, "config", 'credentials.yml')
-
-      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 list
-      Dir.entries(root).reject { |name| name =~ /^\./ }
-    end
-
-    def dump
-      cmd "cd ~ && tar --exclude=.git -cf '#{Dir.pwd}/babot-#{Time.now.to_i}.tar' .babot"
-    end
-
-    def install(dump)
-      cmd "cd ~ && rm -rf '.babot' && tar -xf '#{Dir.pwd}/#{dump}'"
-    end
-
-    def push(remote)
-      cmd "scp -qr '#{root}' '#{remote}:~/.' && ssh '#{remote}' 'babot schedule'"
-    end
-
-    def root
-      Pathname.new(ENV["HOME"]).join ".babot"
-    end
-
-    def cmd(command)
-      puts command
-      system command
-    end
-
-    def run!
-      Twitter.update new.call
-    end
+  def Babot.run!
+    new.call
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Victor Goya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter