descartes 0.3.16 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c15e7788e0c464a5cfbf345e508b94362a8d19f
-  data.tar.gz: cb63ff6a9d1b67295a8208b174fbc7ea507b8bea
+  metadata.gz: b0b57aa9de1df1c113ebb033c34a5130f36ee934
+  data.tar.gz: 73d20235abaf909f4410e04ddbbab5725dc5b0f0
 SHA512:
-  metadata.gz: e8bde749d631421e03b6b48c5755a6efdff801cbfbae9abf1353f4224dcfca4ea4168c3e3bdcb8e97194502e7e0db743a1322c92adcd2322623e7815b6f2e859
-  data.tar.gz: 363acf13595609620e8f11b9ce06b74eafbc07574abedcc409a0d95c2c11ab2936256b1837416ee1ec8cdde6f41e28109080b32dcc9aec94f9dda6275d8c5fa7
+  metadata.gz: 581c343dd71d0140fff87c46f61687df21fd04acd02ee8b8a926cbabd1f83528880cbe426cb8f1852cd1c396808b1af38d4fbf9a424cd978d57ce8c016d04805
+  data.tar.gz: b35bde8554bcafd40e517f27e5fb64a91cf53d13d4455688c2f51d9b3e387015745a3136398952a3bb815889d0867b79e6c4249c6231a17dec153243a75668f8

data/bin/descartes

@@ -33,8 +33,33 @@ Cinch::Bot.new {
     c.plugins.options[Cinch::Plugins::Login] = { :password => 'dat_password' }
   end
 
-  on :message, '!list' do |m|
-    m.reply m.bot.plugins.join ', '
+  on :message, '!help' do |m|
+    m.bot.plugins.each { |plugin|
+      plugin.handlers.each { |handler|
+        pattern = handler.pattern
+        name    = plugin.to_s.split('::')[1].split(?:)[0]
+
+        prefix = case pattern.prefix
+          when Regexp then pattern.prefix.source
+          when String then pattern.prefix
+          else            ''
+        end
+
+        suffix = case pattern.suffix
+          when Regexp then pattern.suffix.source
+          when String then pattern.suffix
+          else             ''
+        end
+
+        regex = case pattern.pattern
+          when Regexp then pattern.pattern.source
+          when String then pattern.pattern
+          else             ''
+        end
+
+        m.reply regex.empty? ? name : "#{name}: #{prefix}#{regex}#{suffix}"
+      }
+    }
   end
 
   on :message, '!è' do |m|

data/lib/descartes/modules/crunchyroll.rb

@@ -24,11 +24,11 @@ class Descartes
       series = Crunchyroll::find m.params[1].split('.cr ')[1]
       
       if series
-        # m.reply "#{Format(:red, series[:title])} is a series airing on #{Format(:red, series[:where])} at #{Format(:red, series[:day])} #{Format(:red, series[:hour])}:#{Format(:red, series[:min])} which is in #{Format(:red, series[:left])}."
-        m.reply "#{Format(:red, series[:title])} è una serie trasmessa da #{Format(:red, series[:where])} il #{Format(:red, series[:day].to_ita)} alle #{Format(:red, series[:hour])}:#{Format(:red, series[:min])}, cioè tra #{Format(:red, series[:left].to_ita)}."
+        # m.reply "#{series[:title].colorize} is a series airing on #{series[:where].colorize} at #{series[:day].colorize} #{series[:hour].colorize}:#{series[:min].colorize} which is in #{series[:left].colorize}."
+        m.reply "#{series[:title].colorize} è una serie trasmessa da #{series[:where].colorize} il #{series[:day].to_ita.colorize} alle #{series[:hour].colorize}:#{series[:min].colorize}, cioè tra #{series[:left].to_ita.colorize}."
       else
-        # m.reply Format(:red, 'Anime not found')
-        m.reply Format(:red, 'Anime non trovato')
+        # m.reply 'Anime not found'.colorize
+        m.reply 'Anime non trovato'.colorize
       end
     end
   end

data/lib/descartes/modules/dicteng.rb

@@ -22,8 +22,8 @@ class Descartes
 		match /([a-zA-Z]+) ([a-zA-Z]+)/, :use_prefix => false
 
 		def execute(m, action, word)
-			url = "http://www.wordreference.com/#{action}/#{word}"
-			page = Nokogiri::HTML(open(url))
+			url  = "http://www.wordreference.com/#{action}/#{word}"
+			page = Nokogiri::HTML open(url)
 			m.reply "#{page.xpath('//table[@class="WRD"]/tr[2]').text}  di più qui: #{url}"
 		end
 	end

data/lib/descartes/modules/google.rb

@@ -22,11 +22,11 @@ class Descartes
     match /google (.+)/
 
     def search(query)
-      page = Nokogiri::HTML(open("http://www.google.com/search?q=#{CGI.escape(query)}"))
+      page = Nokogiri::HTML open("http://www.google.com/search?q=#{CGI.escape(query)}")
 
       [].tap { |res|
         page.search('cite').each { |r|
-          res << { :url => r.inner_text }
+          res << { url: r.inner_text }
         }
 
         page.xpath('//h3[@class="r"]').each_with_index { |r, i|

data/lib/descartes/modules/sindaco.rb

@@ -16,10 +16,10 @@ class Descartes
   class Sindaco
     include Cinch::Plugin
 
-    match /Sindaco/
+    match 'Sindaco'
 
     def execute(m)
-      file    = File.expand_path '../files/sindaco.txt', __FILE__
+      file = File.expand_path '../files/sindaco.txt', __FILE__
       m.reply [].tap { |ary|
         File.read(file).each_line { |line| ary << line unless line.strip.empty? }
       }.sample

data/lib/descartes/modules/url.rb

@@ -23,12 +23,12 @@ class Descartes
 
     def execute(m, ssl, url)
       begin
-        page = Nokogiri::HTML(open("http#{ssl}://#{url}").read, nil, 'utf-8')
+        page = Nokogiri::HTML open("http#{ssl}://#{url}").read, nil, 'utf-8'
 
-        if url.match('youtube.com|youtu.be') != nil
-          m.reply Format(:pink, "[Youtube] #{page.css('//title').first.text.chomp(' - YouTube')}")
+        if url.match 'youtube.com|youtu.be'
+          m.reply "[Youtube] #{page.css('//title').first.text.chomp(' - YouTube')}".colorize :pink
         else
-          m.reply Format(:red, "[URL] #{page.css('//title').first.text.strip}")
+          m.reply "[URL] #{page.css('//title').first.text.strip}".colorize :red
         end
       rescue; end
     end

data/lib/descartes/version.rb

@@ -14,6 +14,6 @@
 
 class Descartes
   def self.version
-    '0.3.16'
+    '0.4'
   end
 end

data/lib/descartes.rb

@@ -14,6 +14,8 @@
 
 require 'cinch'
 require 'cinch/plugins/login'
+require 'cinch/colorize'
+
 require 'descartes/utils'
 require 'descartes/descartes'
 require 'descartes/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: descartes
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: '0.4'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cinch-colorize
+  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: nokogiri
   requirement: !ruby/object:Gem::Requirement