Merge 'origin/develop'

Gemfile

@@ -10,7 +10,7 @@ gem 'sass'
 gem 'rdiscount'
 gem 't'
 gem 'nokogiri'
-gem 'feedzirra'
+gem 'feedjira'
 gem 'ri_cal'
 gem 'rqrcode_png'
 

Gemfile.lock

@@ -2,111 +2,111 @@ GEM
   remote: http://gems.github.com/
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
-    adsf (1.1.1)
+    adsf (1.2.0)
       rack (>= 1.0.0)
-    atomic (1.1.14)
+    buftok (0.2.0)
-    buftok (0.1)
     builder (3.2.2)
-    celluloid (0.15.2)
+    celluloid (0.16.0)
-      timers (~> 1.1.0)
+      timers (~> 4.0.0)
-    chunky_png (1.2.9)
+    chunky_png (1.3.3)
     coderay (1.1.0)
     colored (1.2)
-    cri (2.4.0)
+    cri (2.6.1)
-      colored (>= 1.2)
+      colored (~> 1.2)
-    curb (0.8.5)
+    curb (0.8.6)
-    descendants_tracker (0.0.3)
+    equalizer (0.0.9)
-    equalizer (0.0.7)
+    faraday (0.9.0)
-    faraday (0.8.8)
+      multipart-post (>= 1.2, < 3)
-      multipart-post (~> 1.2.0)
+    feedjira (1.5.0)
-    feedzirra (0.7.0)
+      curb (~> 0.8)
-      curb (~> 0.8.1)
+      loofah (~> 2.0)
-      loofah (~> 1.2.1)
+      sax-machine (~> 1.0)
-      sax-machine (~> 0.2.1)
+    ffi (1.9.6)
-    ffi (1.9.3)
+    formatador (0.2.5)
-    formatador (0.2.4)
+    geokit (1.9.0)
-    geokit (1.6.7)
       multi_json (>= 1.3.2)
-    guard (2.2.4)
+    guard (2.8.2)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-nanoc (1.0.1)
+    guard-nanoc (1.0.3)
-      guard (>= 1.8.0)
+      guard (~> 2.8)
-      nanoc (>= 3.6.3)
+      nanoc (~> 3.6)
-    htmlentities (4.3.1)
+    hitimes (1.2.2)
-    http (0.5.0)
+    htmlentities (4.3.2)
-      http_parser.rb
+    http (0.6.3)
-    http_parser.rb (0.5.3)
+      http_parser.rb (~> 0.6.0)
+    http_parser.rb (0.6.0)
     json (1.8.1)
-    launchy (2.4.0)
+    launchy (2.4.3)
       addressable (~> 2.3)
-    listen (2.2.0)
+    listen (2.8.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    loofah (1.2.1)
+    loofah (2.0.1)
-      nokogiri (>= 1.4.4)
+      nokogiri (>= 1.5.9)
-    lumberjack (1.0.4)
+    lumberjack (1.0.9)
-    memoizable (0.2.0)
+    memoizable (0.4.2)
-      thread_safe (~> 0.1.3)
+      thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
-    mini_portile (0.5.2)
+    mini_portile (0.6.1)
-    multi_json (1.8.2)
+    multi_json (1.10.1)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
-    nanoc (3.6.6)
+    nanoc (3.7.3)
       cri (~> 2.3)
     nanoc3 (3.3.0)
       nanoc (>= 3.3.0)
-    nokogiri (1.6.1)
+    naught (1.0.0)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
     oauth (0.4.7)
-    pry (0.9.12.3)
+    pry (0.10.1)
-      coderay (~> 1.0)
+      coderay (~> 1.1.0)
-      method_source (~> 0.8)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
-    rb-fsevent (0.9.3)
+    rb-fsevent (0.9.4)
-    rb-inotify (0.9.2)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdiscount (2.1.7)
+    rdiscount (2.1.7.1)
-    retryable (1.3.3)
+    retryable (1.3.6)
     ri_cal (0.8.8)
     rqrcode (0.4.2)
-    rqrcode_png (0.1.2)
+    rqrcode_png (0.1.5)
       chunky_png
       rqrcode
-    sass (3.2.12)
+    sass (3.4.8)
-    sax-machine (0.2.1)
+    sax-machine (1.1.1)
-      nokogiri (~> 1.6.0)
+    simple_oauth (0.3.0)
-    simple_oauth (0.2.0)
+    slop (3.6.0)
-    slop (3.4.7)
+    systemu (2.6.4)
-    systemu (2.5.2)
+    t (2.8.0)
-    t (2.0.0)
+      geokit (>= 1.8.3, < 2)
-      geokit (~> 1.6)
       htmlentities (~> 4.3)
-      launchy (~> 2.3)
+      launchy (~> 2.4)
-      oauth (~> 0.4)
+      oauth (~> 0.4.7)
-      retryable (~> 1.2)
+      retryable (~> 1.3)
-      thor (>= 0.18.1, < 2)
+      thor (>= 0.19.1, < 2)
-      twitter (~> 5.0)
+      twitter (~> 5.12)
-    thor (0.18.1)
+    thor (0.19.1)
-    thread_safe (0.1.3)
+    thread_safe (0.3.4)
-      atomic
+    timers (4.0.1)
-    timers (1.1.0)
+      hitimes
-    twitter (5.0.0)
+    twitter (5.13.0)
-      buftok (~> 0.1.0)
+      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+      buftok (~> 0.2.0)
-      equalizer (~> 0.0.7)
+      equalizer (~> 0.0.9)
-      faraday (>= 0.8, < 0.10)
+      faraday (~> 0.9.0)
-      http (~> 0.5.0)
+      http (~> 0.6.0)
-      http_parser.rb (~> 0.5.0)
+      http_parser.rb (~> 0.6.0)
       json (~> 1.8)
-      memoizable (~> 0.2.0)
+      memoizable (~> 0.4.0)
-      simple_oauth (~> 0.2.0)
+      naught (~> 1.0)
+      simple_oauth (~> 0.3.0)
 
 PLATFORMS
   ruby
@@ -114,7 +114,7 @@ PLATFORMS
 DEPENDENCIES
   adsf
   builder
-  feedzirra
+  feedjira
   guard-nanoc
   nanoc3
   nokogiri

scripts/update-planetfeeds.rb

@@ -5,7 +5,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'yaml'
-require 'feedzirra'
+require 'feedjira'
 
 def getBlogroll(blogroll_file)
   blogroll_raw = YAML.load_file(blogroll_file)