descartes 0.7.8 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32f793f787aef56198d194576c8a76861998675
-  data.tar.gz: 0cdbcd1dc464ff362280cc4ab6cbb75ad975adee
+  metadata.gz: 95f00d7baf615c6abd8b0054b5aa9867ec69b75e
+  data.tar.gz: fccadcee3c7c1a4509959eedf10f37e0a7b6f509
 SHA512:
-  metadata.gz: cb39e3bf19087832e0e885704c2ee3ca00107cdde17ef7a4b26c6894bcaa34a2454d86909d7936bc0dc0d000273930400c2c10ad1822a10666251160b7b6c672
-  data.tar.gz: 5d22fd95f01a55cdd474301643aa64006d156df993770aa836503a9d60ec135fc497e5a819472798b0e144459f066c93b3dcde50d97ac0964eb0d50f7e9345fc
+  metadata.gz: 1e4c84c9392f4b01d51f714e04891046df600c676809a16b482f575b581d3bd02cc7c1a89831cc5af7bc75e02cafa495186cc2ee9e91b0704a92623fad3b6746
+  data.tar.gz: b0fbad812364d96d88b7582ca740f88821cc08bb131078722ad82e86eb647c274ab79a30dc9078ebecd125000fb1830140aa5efdf6fa06bbece923e4ec84e699

data/bin/descartes

@@ -56,16 +56,21 @@ files = File.join File.dirname(__FILE__), '../lib/descartes/modules/files'
 FileUtils.cp_r(files, options[:dotfiles]) unless File.directory? options[:dotfiles]
 
 Dir["#{options[:dotfiles]}/**/*"].each { |file|
-  lib = Dir["#{files}/**/*"].select { |f| File.basename(f) == File.basename(file) }
-  next if     lib.empty?
-  next unless lib.first.end_with? '.txt'
+  lib = Dir["#{files}/**/*"].select { |f| File.basename(f) == File.basename(file) }.first
+  next unless lib
+  next unless lib.end_with? '.txt'
 
-  if File.read(lib.first) != File.read(file)
-    FileUtils.cp lib.first, options[:dotfiles]
+  if File.read(lib) != File.read(file)
+    FileUtils.cp lib, options[:dotfiles]
     puts "'#{file}' has been updated."
   end
 }
 
+new_files = Dir["#{files}/**/*"].map { |f| File.basename(f) } - Dir["#{options[:dotfiles]}/**/*"].map { |f| File.basename(f) }
+new_files.each { |new_file|
+  FileUtils.cp File.join(files, new_file), options[:dotfiles]
+}
+
 Cinch::Bot.new {
   configure do |c|
     c.nick     = options[:nickname]

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

@@ -0,0 +1,19 @@
+[
+  {
+    "nicknames": [
+      { "nickname": "RoxasShadowRS"},
+      { "nickname": "RoxasShadow"  },
+    ],
+    "username" : "Roxas Shadow",
+    "password" : "Eheheheheh"
+  },
+
+  {
+    "nicknames": [
+      { "nickname": "Helltilt"     },
+      { "nickname": "Hell-11"      },
+    ],
+    "username" : "Hell",
+    "password" : "Ohohohohoh"
+  },
+]

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

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

data/lib/descartes/modules/pigro.rb

@@ -13,6 +13,7 @@
 ##
 
 require 'assonnato'
+require 'json'
 
 class Descartes
   class Pigro
@@ -30,10 +31,10 @@ class Descartes
         options = { user: user.join             }
       end
 
-      host  = get_host 'pigro.txt'
-      shows = Assonnato::Show.new host
+      host  = get_host
+      shows = Assonnato.new(host).show
 
-      series = shows.all!(:ongoing, options) + shows.all!(:dropped, options) + shows.all!(:finished, options)
+      series = shows.all(:ongoing, options) + shows.all(:dropped, options) + shows.all(:finished, options)
 
       if series.empty?
         if options.has_key? :role
@@ -63,17 +64,17 @@ class Descartes
       n_ep    = (s.last == 'last' || s.last.numeric?) ? s.pop : nil
       keyword = s.join
 
-      host     = get_host 'pigro.txt'
-      shows    = Assonnato::Show.new    host
-      episodes = Assonnato::Episode.new host
+      host     = get_host
+      shows    = Assonnato.new(host).show
+      episodes = Assonnato.new(host).episode
 
-      series = shows.search! keyword
+      series = shows.search keyword
 
       if series.empty?
         m.reply 'Series not found.'
       else
         series.take(5).each { |s|
-          show = shows.get!(s.name).first
+          show = shows.get(s.name).first
 
           if n_ep.nil?
             a = show.status.downcase.start_with?(?o) ?  'an' : ?a
@@ -92,7 +93,7 @@ class Descartes
               }
             }[0..-4]
           elsif n_ep == 'last'
-            episode = episodes.last!(:ongoing).select { |ep| ep.show_name == s.name }.last
+            episode = episodes.last(:ongoing).select { |ep| ep.show_name == s.name }.last
 
             if episode
               m.reply ("#{show.name.colorize} ##{episode.episode}".colorize + ' - ').tap { |staff|
@@ -121,7 +122,7 @@ class Descartes
               m.reply "#{show.name.colorize} has no episodes yet."
             end
           else
-            episodes = episodes.get! show.name, n_ep.to_i
+            episodes = episodes.get show.name, n_ep.to_i
 
             if episodes.any?
               episodes.each { |ep|
@@ -158,15 +159,47 @@ class Descartes
       end
     end
 
-    def get_host(f)
-      file = File.join $options[:dotfiles], f
+    match /pigro (.+) - (.+) - (.+) - (.+)/, method: :edit_episode
+    def edit_episode(m, show, episode, field, status)
+      user      = get_user m.user.nick
+      host      = get_host
+      assonnato = Assonnato.new host
+
+      if user
+        login = assonnato.user.login user['username'], user['password']
+        if login['status'] == 'error'
+          m.reply login['message']
+        else
+          episode = assonnato.episode.edit show, episode.to_i, { field.to_sym => status.to_sym }
+          m.reply episode['message']
+
+          assonnato.user.logout
+        end
+      else
+        m.reply 'You are not recognized.'
+      end
+    end
+
+    def get_user(nickname)
+      file = File.join $options[:dotfiles], 'pigro.json'
+
+      if File.exists? file
+        users = JSON.parse File.read(file)
+        users.select { |user| user['nicknames'].first.values.include? nickname }.last
+      else
+        false
+      end
+    end
+
+    def get_host
+      file = File.join $options[:dotfiles], 'pigro.txt'
 
       if File.exists? file
         url = File.read(file).strip
         return url unless url.empty?
-      end       
+      end
       
-      'http://pigro.omnivium.it'
+      'pigro.omnivium.it'
     end
   end
 end

data/lib/descartes/version.rb

@@ -14,6 +14,6 @@
 
 class Descartes
   def self.version
-    '0.7.8'
+    '0.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: descartes
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: '0.8'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
@@ -177,6 +177,7 @@ files:
 - lib/descartes/modules/currency.rb
 - lib/descartes/modules/dicteng.rb
 - lib/descartes/modules/files/lastfm_api.yml
+- lib/descartes/modules/files/pigro.json
 - lib/descartes/modules/files/pigro.txt
 - lib/descartes/modules/files/replies.txt
 - lib/descartes/modules/files/sindaco.txt