babot 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b6b19753e0a50827eb7d2423bd654a7bcecceae
-  data.tar.gz: 5dc21ac5617ba8b07f4e1bf413d21f995b6702be
+  metadata.gz: 0355f66292997601578a1c85085cdfdbe71b2bd8
+  data.tar.gz: 062379bb8322b364e28e88ec7598e7559d95be41
 SHA512:
-  metadata.gz: 81c1c0a8d7fd364e5a8e0a1ab1e6c5a53f2754f4aebe69f8997d6b3c65187dfe6ee25a0daad046d30458ad457b2a57bfdf85649fc0447e2134d9d6ff58dfff16
-  data.tar.gz: 3be4b33f9fdf2a47e06f6749b68bc8ec39c0fb2499282e719b9516c26da8913f2eb12e7df322f35f43572231664a1ee26d4f17e43974fb8119fddbe0143d2d46
+  metadata.gz: dc51c5e669487b96c0bd2277138811f44cc172860fdd003e2a85d95a5d4872a027dfb4102bb205526206e6ea21c9400029fb58cc574f62a913b8af05ee3cc991
+  data.tar.gz: 550574a9c78c429755ffba815d449c36fd0754894cec238d5d02084d0fba3100efd62abffe96e18d1276aa24b405e89fabe05b4c29ea5ea6652247edc02e972e

data/Gemfile.lock

@@ -1,14 +1,9 @@
 PATH
   remote: .
   specs:
-    babot (0.2.1)
+    babot (0.3.0)
       activesupport
       boson
-      capistrano
-      capistrano-af83
-      git
-      rake
-      rvm-capistrano
       twitter
       whenever
 
@@ -21,58 +16,16 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    addressable (2.3.5)
     atomic (1.1.12)
     boson (1.2.4)
-    capistrano (2.15.5)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    capistrano-af83 (0.4.2)
-      capistrano (~> 2.14)
-      capistrano-custom-maintenance (~> 0.1.0)
-      capistrano-notification (~> 0.1)
-      shout-bot (= 0.0.4)
-      sushi (~> 0.0.2)
-    capistrano-custom-maintenance (0.1.0)
-      capistrano
-      capistrano-file-resources (>= 0.1.1)
-      json
-      mime-types
-    capistrano-file-resources (0.1.1)
-      capistrano
-      mime-types
-    capistrano-notification (0.1.1)
-      capistrano
-      shout-bot
-      validatable
     chronic (0.9.1)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    git (1.2.5)
-    highline (1.6.19)
     i18n (0.6.4)
-    json (1.8.0)
-    mime-types (1.23)
     minitest (4.7.5)
     multi_json (1.7.8)
     multipart-post (1.2.0)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    rake (10.1.0)
-    rvm-capistrano (1.4.3)
-      capistrano (>= 2.15.4)
-    shout-bot (0.0.4)
-      addressable
     simple_oauth (0.2.0)
-    sushi (0.0.2)
     thread_safe (0.1.2)
       atomic
     twitter (4.8.1)
@@ -80,7 +33,6 @@ GEM
       multi_json (~> 1.0)
       simple_oauth (~> 0.2)
     tzinfo (0.3.37)
-    validatable (1.6.7)
     whenever (0.8.4)
       activesupport (>= 2.3.4)
       chronic (>= 0.6.3)

data/README.md

@@ -1,17 +1,26 @@
 Babot helps you manage your Twitter bots.
 
-The file `~/.babot/config` contains, for each bot, the git
-    repository and the API keys.
+```
+gem install babot
+```
 
-A bot is a git repository containing :
+```
+Usage: babot [OPTIONS] COMMAND [ARGS]
 
-- a Gemfile
-- a lib directory with a [name_of_the_bot].rb file
+Available commands:
+  add        Add bot [name] from [repository]
+  call       Call bot [name]
+  configure  Configure bot [name]
+  delete     Delete bot [name]
+  dry        Call bot [name] without update
+  dump       Dump bots and configuration in tar file
+  help       Displays help for a command
+  install    Install from tar file [path]
+  list       List bots
+  push       Push to remote server [remote]
+  schedule   Update crontab
+  update     Update bot [name]
 
-Look at https://github.com/phorque/twitter-test-bot for a simple bot
-    example.
-
-A bot inherit from the Babot::Bot class and must implement a `when`
-    method returning a 'cron-style' time. When the time is reached the
-    `call` method will be called and its result will be posted to
-    Twitter.
+Options:
+  -h, --help  Displays this help message
+```

data/babot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'babot'
-  s.version     = '0.2.1'
+  s.version     = '0.3.0'
   s.date        = '2013-09-08'
   s.summary     = "Babot"
   s.description = "A simple tool to manage Twitter bots"
@@ -12,14 +12,9 @@ Gem::Specification.new do |s|
 
   s.require_path = 'lib'
   s.add_dependency "twitter"
-  s.add_dependency "git"
   s.add_dependency "activesupport"
   s.add_dependency "whenever"
-  s.add_dependency "rake"
   s.add_dependency "boson"
-  s.add_dependency "capistrano"
-  s.add_dependency "capistrano-af83"
-  s.add_dependency "rvm-capistrano"
 
   s.executables  = ['babot']
 end

data/bin/babot

@@ -49,6 +49,21 @@ class BabotRunner < Boson::Runner
   def list
     puts Babot.list
   end
+
+  desc "Dump bots and configuration in tar file"
+  def dump
+    Babot.dump
+  end
+
+  desc "Install from tar file [path]"
+  def install(path)
+    Babot.install path
+  end
+
+  desc "Push to remote server [remote]"
+  def push(remote)
+    Babot.push remote
+  end
 end
 
 BabotRunner.start

data/lib/babot.rb

@@ -13,31 +13,29 @@ class Babot
   class << self
 
     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"
+      run "cd '#{root.join('bots', name)}' && git pull --rebase origin master"
+      run "cd '#{root.join('bots', name)}' && bundle install"
     end
 
     def schedule
-      cron = File.open root.join("schedule.rb"), "w"
-      list.map { |name| instanciate(name) }.each do |bot|
-        cron.puts <<-eos
+      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}'"
       end
-      cron.close
-
-      Whenever::CommandLine.execute(file: cron.path, write: true)
     end
 
     def add(name, repository)
       if repository =~ /\//
-        FileUtils.ln_s repository, root.join("bots", name)
+        run "ln -s '#{repository}' '#{root.join("bots", name)}'"
       else
-        Git.clone repository, root.join("bots", name)
+        run "git clone '#{repository}' '#{root.join("bots", name)}'"
       end
       File.open(root.join("config", name).to_s, 'w') do |config|
         config.write({ 'consumer_key'           => "",
@@ -48,12 +46,11 @@ class Babot
     end
 
     def delete(name)
-      FileUtils.rm_rf root.join("bots", name)
-      FileUtils.rm_f root.join("config", name)
+      run "rm -rf #{root.join('bots', name)} #{root.join('config', name)}"
     end
 
     def configure(name)
-      system "#{ENV['EDITOR'] || 'nano'} #{root.join("config", name).to_s}"
+      run "#{ENV['EDITOR'] || 'nano'} #{root.join("config", name).to_s}"
     end
 
     def call(name)
@@ -68,6 +65,18 @@ class Babot
       instanciate(name).call
     end
 
+    def dump
+      run "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}'"
+    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)
 
@@ -80,6 +89,11 @@ class Babot
     def root
       Pathname.new(ENV["HOME"]).join ".babot"
     end
+
+    def run(command)
+      puts command
+      system command
+    end
   end
 
   attr_accessor :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babot
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Victor Goya
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: git
-  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: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: boson
   requirement: !ruby/object:Gem::Requirement
@@ -94,48 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  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: capistrano-af83
-  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: rvm-capistrano
-  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'
 description: A simple tool to manage Twitter bots
 email: goya.victor@gmail.com
 executables:
@@ -144,15 +74,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- Capfile
 - Gemfile
 - Gemfile.lock
 - README.md
 - babot.gemspec
 - bin/babot
-- config/boot.rb
-- config/deploy.rb
-- config/deploy/production.rb
 - lib/babot.rb
 homepage: https://github.com/phorque/babot
 licenses:

data/Capfile

@@ -1,4 +0,0 @@
-load 'deploy'
-# Uncomment if you are using Rails' asset pipeline
-    # load 'deploy/assets'
-load 'config/deploy' # remove this line to skip loading any of the default tasks

data/config/boot.rb

@@ -1,3 +0,0 @@
-
-
-require './lib/babot'

data/config/deploy.rb

@@ -1,19 +0,0 @@
-set :application, "babot"
-set :user, "babot"
-set :appname, user
-
-require "rvm/capistrano"
-
-set :rvm_ruby_string, "2.0.0"
-
-require "capistrano/af83"
-
-set :repository,  "git@github.com:phorque/babot.git"
-set :scm, :git
-
-after 'deploy:restart' do
-  config ||= "config/gaston/bots.yml"
-  upload config, "#{current_path}/config/gaston/bots.yml"
-
-  run "cd #{current_path} && bundle exec rake bots:update && bundle exec whenever -f bots/schedule.rb -w"
-end

data/config/deploy/production.rb

@@ -1,5 +0,0 @@
-set :branch, :master
-set :application, "babot.server"
-set :deploy_to,   "/home/babot"
-set :default_environment, { 'RAILS_ENV' => 'production' }
-server "#{user}@#{application}", :app, :primary => true