descartes 0.5.1 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70d53614c92aa0c985b2c8514d8359beaf5a7570
-  data.tar.gz: 220a70fb3ddbec37db16359468e811e157b5a0ef
+  metadata.gz: 2e04a1ec3c104c6178834d8bad31f6ec3541c597
+  data.tar.gz: 9bdddb1230425c304deccef0b14d110da7668242
 SHA512:
-  metadata.gz: c224bd942027a29b915a3b4717514ab51cbd609163a14c3e3240aab7db3e50fff04af43189c02d330d35c88c5cb19975d3339addb4736f5999c5d19d550f229e
-  data.tar.gz: c9ddbc0adc6a755d5a68a7dd38ed30bd096f410658c4df4121b63cd9653c90ffa182c5287e93c602d5b605f461cdbb560d763e9bb52d7246abd792135b621dd6
+  metadata.gz: 0a295fdbfba13164bb72c8293af021768bba17fbd141b78209077d8f05d29b06429edea339e5aed711fef3301263c298e051dc9bc9baf7bdfcf5cea394c6053b
+  data.tar.gz: 0e91e0ec5413b90a72b5abafb30b256e0795656d6f2c6d99b5dfc8139654307637e5392661704d254b2c88e5cc0d9d80d8cb1088c4c8a8497ad59782fa15cc20

data/bin/descartes

@@ -15,22 +15,54 @@
 ##
 
 require 'descartes'
+require 'optparse'
+require 'fileutils'
 
-nickname  = ARGV[0]     || 'Descartes'
-server    = ARGV[1]     || 'irc.rizon.net'
-channels  = ARGV[2..-1] || ['#aggvistnurummor']
-plugins   = Descartes.load
+options = {
+  :nickname => 'Descartes',
+  :server   => 'irc.rizon.net',
+  :channels => ['#aggvistnurummor'],
+  :dotfiles => File.join(ENV['HOME'], '.descartes'),
+  :password => 'dat_password'
+}
+
+OptionParser.new { |o|
+  o.on '-n', '--nickname NICKNAME', 'bot\'s nickname' do |nickname|
+    options[:nickname] = nickname
+  end
+
+  o.on '-s', '--server SERVER', 'target IRC server' do |server|
+    options[:server] = server
+  end
+
+  o.on '-c', '--channel #chan1,#chan2,#chan3', 'target channels' do |channels|
+    options[:channels] = channels.split(?,).map { |s| s.strip }
+  end
+
+  o.on '-d', '--dotfiles PATH', 'folder where store config files' do |dotfiles|
+    options[:dotfiles] = dotfiles
+  end
+
+  o.on '-p', '--password password', 'target channel\'s password' do |password|
+    options[:password] = password
+  end
+}.parse!
+
+unless File.directory? options[:dotfiles]
+  files = File.join File.dirname(__FILE__), '../lib/descartes/modules/files'
+  FileUtils.cp_r files, options[:dotfiles]
+end
 
 Cinch::Bot.new {
   configure do |c|
-    c.nick     = nickname
+    c.nick     = options[:nickname]
     c.realname = 'Descartes'
     c.user     = 'Descartes'
-    c.server   = server
-    c.channels = channels
+    c.server   = options[:server]
+    c.channels = options[:channels]
     
-    c.plugins.plugins  = [Cinch::Plugins::Login] + plugins
-    c.plugins.options[Cinch::Plugins::Login] = { :password => 'dat_password' }
+    c.plugins.plugins  = [Cinch::Plugins::Login] + Descartes.load(options)
+    c.plugins.options[Cinch::Plugins::Login] = { :password => options[:password] }
   end
 
   on :message, '!help' do |m|
@@ -77,5 +109,4 @@ Cinch::Bot.new {
   on :message, '!version' do |m|
     m.reply Descartes.version
   end
-
 }.start

data/lib/descartes/descartes.rb

@@ -13,7 +13,9 @@
 ##
 
 class Descartes
-  def self.load
+  def self.load(options)
+    $options = options
+
     Dir.glob(File.expand_path('../modules/*.rb', __FILE__)).each { |plugin|
       require plugin
     }

data/lib/descartes/modules/files/pigro.txt

@@ -1 +1 @@
-http://localhost:4567
+http://pigro.omnivium.it:4567

data/lib/descartes/modules/files/sindaco.txt

@@ -13,4 +13,5 @@ http://i47.tinypic.com/fjj3gx.jpg
 Io dico solo che il Detective Conan è il motivo per cui il Giappone si meriterebbe un'altra bomba atomica.
 Ti farò lezioni di encode quando tua madre sarà in oncologia.
 Il Sindaco è comunista quanto Hitler / Si, forse un pochino di più / Nel senso che ha la passione in comune per il genocidio? / No, per le loli.
-La Ninna Nanna del Sindaco: Dormi dormi / bella bambina / che c'è il sindaco che s'avvicina. / Il letto traballa / e l'orsetto se la squaglia. / La mammina resta in cucina / e col babbo fa melina. / Basta solo che dal corridoio / non vedan la pelata di quell'avvoltoio.
+La Ninna Nanna del Sindaco: Dormi dormi / bella bambina / che c'è il sindaco che s'avvicina. / Il letto traballa / e l'orsetto se la squaglia. / La mammina resta in cucina / e col babbo fa melina. / Basta solo che dal corridoio / non vedan la pelata di quell'avvoltoio.
+Il fansub italiano è ostaggio di un manipolo di lanzichenecchi.

data/lib/descartes/modules/lastfm.rb

@@ -21,12 +21,12 @@ class Descartes
     include Cinch::Plugin
 
     def authenticate!
-      file = File.join File.dirname(__FILE__), 'files', 'lastfm_api.yml'
+      file = File.join $options[:dotfiles], 'lastfm_api.yml'
       Rockstar.lastfm = YAML.load_file file
     end
 
     def get_lastfm_nicks_archive
-      file = File.join File.dirname(__FILE__), 'files', 'lastfm_nicks.yml'
+      file = File.join $options[:dotfiles], 'lastfm_nicks.yml'
       FileUtils.touch file unless File.exists? file
       YAML.load_file(file) || {}
     end
@@ -37,16 +37,16 @@ class Descartes
 
       usernick   = m.user.nick
       lastfmnick = get_lastfm_nicks_archive[usernick]
-      m.reply "Hey #{usernick}, I don't know your Last.fm nick. add it using '!lastfmuser add <lastfmnick>'." unless lastfmnick
+      m.reply "Hey #{usernick.colorize}, I don't know your Last.fm nick. add it using '!lastfmuser add <lastfmnick>'." unless lastfmnick
 
       user  = Rockstar::User.new lastfmnick
       track = user.recent_tracks.first
 
-      album = track.album.empty? ? "in #{track.album}" : 'in no known album'
+      album = track.album.empty? ? 'in no known album' : "in #{track.album.colorize}"
       if track.now_playing?
-        m.reply "#{lastfmnick} is listening to #{track.name} by #{track.artist} (#{album}) right now!"
+        m.reply "#{lastfmnick.colorize} is listening to #{track.name.colorize} by #{track.artist.colorize} (#{album}) right now!"
       else
-        m.reply "The last song #{lastfmnick} listened to is #{track.name} by #{track.artist} (#{album})."
+        m.reply "The last song #{lastfmnick.colorize} listened to is #{track.name.colorize} by #{track.artist.colorize} (#{album})."
       end
     end
 
@@ -55,7 +55,7 @@ class Descartes
       nicks              = get_lastfm_nicks_archive
       nicks[m.user.nick] = lastfmnick
 
-      file = File.join File.dirname(__FILE__), 'files', 'lastfm_nicks.yml'
+      file = File.join $options[:dotfiles], 'lastfm_nicks.yml'
       File.open(file, ?w) { |f| f.write YAML.dump(nicks) }
 
       m.reply "Ok, added user #{lastfmnick}."
@@ -66,7 +66,7 @@ class Descartes
       nicks = get_lastfm_nicks_archive
       nicks.delete lastfmnick
 
-      file  = File.join File.dirname(__FILE__), 'files', 'lastfm_nicks.yml'
+      file  = File.join $options[:dotfiles], 'lastfm_nicks.yml'
       File.open(file, ?w) { |f| f.write YAML.dump(nicks) }
 
       m.reply "Ok, removed user #{lastfmnick}."

data/lib/descartes/modules/pigro.rb

@@ -17,57 +17,73 @@ require 'assonnato'
 class Descartes
   class Pigro
     include Cinch::Plugin
-    match /dat_show (.+) (.+)/
+    match /show (.+)/
+
+    def execute(m, keyword)
+      s       = keyword.split
+      n_ep    = s.last.numeric? ? s.pop : nil
+      keyword = s.join
 
-    def execute(m, keyword, n_ep)
       host     = get_host 'pigro.txt'
-      series   = Assonnato::Show.new(host).search! keyword
+      shows    = Assonnato::Show.new    host
       episodes = Assonnato::Episode.new host
 
+      series = shows.search! keyword
+
       if series.empty?
         m.reply 'Series not found'
         return
       end
 
       series.each { |s|
-        m.reply "#{s.name.colorize} (#{s.status} series of #{s.tot_episodes} episodes airing #{s.airing})"
-        m.reply ''.tap { |staff|
-          {
-            :Translator => s.translator,
-            :Editor     => s.editor,
-            :Checker    => s.checker,
-            :Timer      => s.timer,
-            :Typesetter => s.typesetter,
-            :Encoder    => s.encoder,
-            :QC         => s.qchecker
-          }.each_pair { |key, val|
-            staff << "#{key.to_s.colorize}: #{val} / " unless val.empty?
-          }
-        }[0..-4]
+        show = shows.get!(s.name).first
 
-        eps = episodes.get! s.name, n_ep.to_i
-        eps.each { |ep|
-          m.reply "Episode #{ep.episode} - ".colorize.tap { |staff|
+        if n_ep.nil?
+          m.reply "#{show.name.colorize} (#{show.status} series of #{show.tot_episodes} episodes airing #{show.airing})"
+          m.reply ''.tap { |staff|
             {
-              :Translation => ep.translation,
-              :Editing     => ep.editing,
-              :Check       => ep.checking,
-              :Timing      => ep.timing,
-              :Typesetting => ep.typesetting,
-              :Encoding    => ep.encoding,
-              :QC          => ep.qchecking
+              :Translator => show.translator,
+              :Editor     => show.editor,
+              :Checker    => show.checker,
+              :Timer      => show.timer,
+              :Typesetter => show.typesetter,
+              :Encoder    => show.encoder,
+              :QC         => show.qchecker
             }.each_pair { |key, val|
-              staff << "#{key.to_s.colorize}: #{val ? 'gg' : 'nope'} / "
+              staff << "#{key.to_s.colorize}: #{val} / " unless val.empty?
             }
-            staff << 'Download'.colorize + ": #{ep.download}" if ep.download
           }[0..-4]
-        }
+        else
+          eps = episodes.get! show.name, n_ep.to_i
+          eps.each { |ep|
+            m.reply "Episode #{ep.episode} - ".colorize.tap { |staff|
+              {
+                :Translation => ep.translation,
+                :Editing     => ep.editing,
+                :Check       => ep.checking,
+                :Timing      => ep.timing,
+                :Typesetting => ep.typesetting,
+                :Encoding    => ep.encoding,
+                :QC          => ep.qchecking
+              }.each_pair { |key, val|
+                staff << "#{key.to_s.colorize}: #{val ? 'gg' : 'nope'} / "
+              }
+              staff << 'Download'.colorize + ": #{ep.download}" unless ep.download.strip.empty?
+            }[0..-4]
+          }
+        end
       }
     end
 
     def get_host(f)
-      file = File.join File.dirname(__FILE__), 'files', f
-      File.exists?(file) ? File.read(file) : 'http://localhost'
+      file = File.join $options[:dotfiles], f
+
+      if File.exists? file
+        url = File.read(file).strip
+        return url unless url.empty?
+      end       
+      
+      'http://pigro.omnivium.it:4567'
     end
   end
 end

data/lib/descartes/modules/reply.rb

@@ -19,7 +19,7 @@ class Descartes
     match /.*\?/, :prefix => lambda { |m| m.bot.nick }
 
     def execute(m)
-      file    = File.expand_path '../files/replies.txt', __FILE__
+      file = File.join $options[:dotfiles], 'replies.txt'
       m.reply [].tap { |ary|
         File.read(file).each_line { |line| ary << line unless line.strip.empty? }
       }.sample

data/lib/descartes/modules/sindaco.rb

@@ -19,7 +19,7 @@ class Descartes
     match 'Sindaco'
 
     def execute(m)
-      file = File.expand_path '../files/sindaco.txt', __FILE__
+      file = File.join $options[:dotfiles], 'sindaco.txt'
       m.reply [].tap { |ary|
         File.read(file).each_line { |line| ary << line unless line.strip.empty? }
       }.sample

data/lib/descartes/utils.rb

@@ -35,4 +35,8 @@ class String
     require 'htmlentities'
     HTMLEntities.new.decode self
   end
+
+  def numeric?
+    self.to_i.to_s == self || self.to_f.to_s == self
+  end
 end

data/lib/descartes/version.rb

@@ -14,6 +14,6 @@
 
 class Descartes
   def self.version
-    '0.5.1'
+    '0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: descartes
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: '0.6'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch