Switch to mainline releases of feedback, feedzirra, sinatra-contrib

dwaite · dwaite · commit cb3384a09d5f · 2013-12-26T22:28:10.000-05:00
diff --git a/Gemfile b/Gemfile
@@ -31,8 +31,8 @@ end
 gem "activerecord", "~> 4.0"
 gem "bcrypt-ruby", "~> 3.1.2"
 gem "delayed_job_active_record", "~> 4.0"
-gem "feedbag", github: "dwillis/feedbag"
-gem "feedzirra", github: "swanson/feedzirra"
+gem "feedbag", "~> 0.9.2"
+gem "feedzirra"
 gem "highline", "~> 1.6", ">= 1.6.20", require: false
 gem "i18n", "~> 0.6.9"
 gem "loofah", github: "swanson/loofah"
@@ -42,7 +42,7 @@ gem "rake", "~> 10.1", ">= 10.1.1"
 gem "sinatra", "~> 1.4", ">= 1.4.4"
 gem "sinatra-assetpack", "~> 0.3.1", require: "sinatra/assetpack"
 gem "sinatra-activerecord", "~> 1.2", ">= 1.2.3"
-gem "sinatra-contrib", github: "sinatra/sinatra-contrib"
+gem "sinatra-contrib", ">= 1.4.2"
 gem "sinatra-flash", "~> 0.3.0"
 gem "thread", "~> 0.1.3"
 gem "will_paginate", "~> 3.0", ">= 3.0.5"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,32 +1,3 @@
-GIT
-  remote: git://github.com/dwillis/feedbag.git
-  revision: c018ce823dd3a8fc1e94fa5aac53aabc14cf8b49
-  specs:
-    feedbag (0.9.1)
-      nokogiri
-
-GIT
-  remote: git://github.com/sinatra/sinatra-contrib.git
-  revision: c3f0561ed03b87e556869156d003d85780749c67
-  specs:
-    sinatra-contrib (1.4.2)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (~> 1.3)
-
-GIT
-  remote: git://github.com/swanson/feedzirra.git
-  revision: b1ff9dd220f90a6168d5c5555825bb3d33d851b8
-  specs:
-    feedzirra (0.2.0.rc2)
-      curb (~> 0.8.1)
-      loofah (~> 1.2.1)
-      nokogiri (~> 1.5.3)
-      sax-machine (~> 0.2.0.rc1)
-
 GIT
   remote: git://github.com/swanson/loofah.git
   revision: 825d715e6f1281501882d886cf34e82aebabb356
@@ -81,11 +52,21 @@ GEM
     excon (0.31.0)
     faker (1.2.0)
       i18n (~> 0.5)
+    feedbag (0.9.2)
+      hpricot (>= 0.6)
+    feedzirra (0.0.24)
+      activesupport (>= 2.3.8)
+      builder (>= 2.1.2)
+      curb (>= 0.2.3)
+      loofah (>= 0.3.1)
+      nokogiri (> 0.0.0)
+      sax-machine (>= 0.0.12)
     foreman (0.63.0)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
     formatador (0.2.4)
     highline (1.6.20)
+    hpricot (0.8.6)
     i18n (0.6.9)
     jsmin (1.0.1)
     kgio (2.8.1)
@@ -127,8 +108,8 @@ GEM
       nokogiri (>= 1.4.4)
       rspec (>= 2.0.0)
     rspec-mocks (2.14.4)
-    sax-machine (0.2.0.rc1)
-      nokogiri (~> 1.5.2)
+    sax-machine (0.1.0)
+      nokogiri (> 0.0.0)
     shotgun (0.9)
       rack (>= 1.0)
     simplecov (0.8.2)
@@ -148,6 +129,13 @@ GEM
       rack-test
       sinatra
       tilt (>= 1.3.0)
+    sinatra-contrib (1.4.2)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (~> 1.3)
     sinatra-flash (0.3.0)
       sinatra (>= 1.0.0)
     slop (3.4.7)
@@ -177,8 +165,8 @@ DEPENDENCIES
   delayed_job_active_record (~> 4.0)
   excon (~> 0.31.0)
   faker (~> 1.2)
-  feedbag!
-  feedzirra!
+  feedbag (~> 0.9.2)
+  feedzirra
   foreman (~> 0.63.0)
   formatador (~> 0.2.4)
   highline (~> 1.6, >= 1.6.20)
@@ -198,7 +186,7 @@ DEPENDENCIES
   sinatra (~> 1.4, >= 1.4.4)
   sinatra-activerecord (~> 1.2, >= 1.2.3)
   sinatra-assetpack (~> 0.3.1)
-  sinatra-contrib!
+  sinatra-contrib (>= 1.4.2)
   sinatra-flash (~> 0.3.0)
   sqlite3 (~> 1.3, >= 1.3.8)
   thread (~> 0.1.3)
