bundle update

Gemfile

@@ -9,17 +9,16 @@ source 'https://rubygems.org'
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'everypolitician', github: 'everypolitician/everypolitician-ruby'
-gem 'mediawiki_api'
-gem 'nokogiri'
-gem 'open-uri-cached'
-gem 'pry'
-gem 'rest-client'
-gem 'scraperwiki', github: 'openaustralia/scraperwiki-ruby',
-                   branch: 'morph_defaults'
+gem 'everypolitician-popolo', github: 'everypolitician/everypolitician-popolo'
+gem 'scraperwiki', github: 'openaustralia/scraperwiki-ruby', branch: 'morph_defaults'
 gem 'sqlite_magic', github: 'openc/sqlite_magic'
-gem 'wikidata-fetcher', '>=0.20.2', github: 'everypolitician/wikidata-fetcher'
-gem 'wikisnakker', github: 'everypolitician/wikisnakker'
+gem 'wikidata-fetcher', github: 'everypolitician/wikidata-fetcher'
 
-group :quality do
+group :test do
   gem 'rubocop'
 end
+
+group :development do
+  gem 'derailed'
+  gem 'pry'
+end

Gemfile.lock

@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/everypolitician/everypolitician-popolo.git
+  revision: fc3515339ceb15c5dbd1238e2cda4acfcd6f2382
+  specs:
+    everypolitician-popolo (0.9.0)
+      require_all
+
 GIT
   remote: https://github.com/everypolitician/everypolitician-ruby.git
   revision: f85e4b684324cf35ef14e7546ddd33052046d883
@@ -8,7 +15,7 @@ GIT
 
 GIT
   remote: https://github.com/everypolitician/wikidata-fetcher.git
-  revision: e85d17884d2cfdb89b90605a3613c8db64370845
+  revision: 10bc70093acadd160b2364f6a38f3866e1145aef
   specs:
     wikidata-fetcher (0.22.0)
       colorize
@@ -22,14 +29,6 @@ GIT
       wikidata-client (~> 0.0.7)
       wikisnakker
 
-GIT
-  remote: https://github.com/everypolitician/wikisnakker.git
-  revision: 72dbb8b13c9ec1c8512974fa8d86d93b01b90a15
-  specs:
-    wikisnakker (0.9.1)
-      require_all
-      yajl-ruby
-
 GIT
   remote: https://github.com/openaustralia/scraperwiki-ruby.git
   revision: fc50176812505e463077d5c673d504a6a234aa78
@@ -50,13 +49,22 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    benchmark-ips (2.7.2)
     coderay (1.1.2)
     colorize (0.8.1)
+    derailed (0.1.0)
+      derailed_benchmarks
+    derailed_benchmarks (1.3.5)
+      benchmark-ips (~> 2)
+      get_process_mem (~> 0)
+      heapy (~> 0)
+      memory_profiler (~> 0)
+      rack (>= 1)
+      rake (> 10, < 13)
+      thor (~> 0.19)
     diskcached (1.1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    everypolitician-popolo (0.9.0)
-      require_all
     excon (0.62.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
@@ -65,7 +73,9 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (0.13.0)
       faraday (>= 0.7.4, < 1.0)
+    get_process_mem (0.2.3)
     hashie (3.6.0)
+    heapy (0.1.4)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
@@ -75,6 +85,7 @@ GEM
       faraday (~> 0.9, >= 0.9.0)
       faraday-cookie_jar (~> 0.0, >= 0.0.6)
       faraday_middleware (~> 0.10, >= 0.10.0)
+    memory_profiler (0.9.12)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -84,15 +95,16 @@ GEM
     netrc (0.11.0)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    open-uri-cached (0.0.5)
     parallel (1.13.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    rack (2.0.6)
     rainbow (3.0.0)
+    rake (12.3.2)
     require_all (2.0.0)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
@@ -108,6 +120,7 @@ GEM
       unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     sqlite3 (1.3.13)
+    thor (0.20.3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
@@ -117,26 +130,26 @@ GEM
       faraday (~> 0.9)
       faraday_middleware (~> 0.9)
       hashie (~> 3.3)
+    wikisnakker (0.9.1)
+      require_all
+      yajl-ruby
     yajl-ruby (1.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  derailed
   everypolitician!
-  mediawiki_api
-  nokogiri
-  open-uri-cached
+  everypolitician-popolo!
   pry
-  rest-client
   rubocop
   scraperwiki!
   sqlite_magic!
-  wikidata-fetcher (>= 0.20.2)!
-  wikisnakker!
+  wikidata-fetcher!
 
 RUBY VERSION
    ruby 2.4.4p296
 
 BUNDLED WITH
-   1.16.5
+   2.0.1