Update for omniauth to latest (1.8.1) rather than frozen at 1.3.1
diff --git a/Gemfile.lock b/Gemfile.lock
index cb4c664..7b9b9ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,5 @@
GIT
- remote: https://github.com/myExperiment/workflow_parser-t2flow.git
+ remote: git://github.com/myExperiment/workflow_parser-t2flow.git
revision: 21654f2e9c7f20281e5ed063b334870349228819
specs:
taverna-t2flow (0.6.0.pre.SNAPSHOT)
@@ -8,7 +8,7 @@
workflow_parser (~> 0.0)
GIT
- remote: https://github.com/myExperiment/workflow_parser.git
+ remote: git://github.com/myExperiment/workflow_parser.git
revision: a1b1478641e70c04397be133145e5039a98e6dd4
specs:
workflow_parser (0.0.1)
@@ -17,7 +17,7 @@
GEM
remote: https://rubygems.org/
specs:
- CFPropertyList (2.3.1)
+ CFPropertyList (2.3.6)
actionmailer (4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
@@ -53,95 +53,108 @@
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.3.8)
- archive-zip (0.7.0)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
+ archive-zip (0.11.0)
io-like (~> 0.3.0)
- arel (6.0.3)
- bcrypt (3.1.10)
- better_errors (2.1.1)
+ arel (6.0.4)
+ bcrypt (3.1.11)
+ better_errors (2.4.0)
coderay (>= 1.0.0)
- erubis (>= 2.6.6)
+ erubi (>= 1.0.0)
rack (>= 0.9.0)
- binding_of_caller (0.7.2)
+ binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
- bower-rails (0.10.0)
- builder (3.2.2)
- capybara (2.4.4)
- mime-types (>= 1.16)
+ bower-rails (0.11.0)
+ builder (3.2.3)
+ capybara (2.18.0)
+ addressable
+ mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- xpath (~> 2.0)
- capybara-screenshot (1.0.11)
+ xpath (>= 2.0, < 4.0)
+ capybara-screenshot (1.0.18)
capybara (>= 1.0, < 3)
launchy
- capybara-webkit (1.6.0)
- capybara (>= 2.3.0, < 2.5.0)
+ capybara-webkit (1.15.0)
+ capybara (>= 2.3, < 4.0)
json
- carrierwave (0.10.0)
- activemodel (>= 3.2.0)
- activesupport (>= 3.2.0)
- json (>= 1.7)
+ carrierwave (1.2.2)
+ activemodel (>= 4.0.0)
+ activesupport (>= 4.0.0)
mime-types (>= 1.16)
- codeclimate-test-reporter (0.4.7)
- simplecov (>= 0.7.1, < 1.0.0)
- coderay (1.1.0)
- coffee-rails (4.1.0)
+ codeclimate-test-reporter (1.0.8)
+ simplecov (<= 0.13)
+ coderay (1.1.2)
+ coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
- railties (>= 4.0.0, < 5.0)
+ railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.9.1.1)
- database_rewinder (0.5.3)
- debug_inspector (0.0.2)
- devise (3.5.2)
+ coffee-script-source (1.12.2)
+ concurrent-ruby (1.0.5)
+ connection_pool (2.2.1)
+ crass (1.0.3)
+ database_rewinder (0.8.3)
+ debug_inspector (0.0.3)
+ devise (4.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
- railties (>= 3.2.6, < 5)
+ railties (>= 4.1.0, < 5.2)
responders
- thread_safe (~> 0.1)
warden (~> 1.2.3)
- diff-lcs (1.2.5)
+ diff-lcs (1.3)
docile (1.1.5)
- dotenv (2.0.2)
- dotenv-rails (2.0.2)
- dotenv (= 2.0.2)
- railties (~> 4.0)
+ dotenv (2.2.1)
+ dotenv-rails (2.2.1)
+ dotenv (= 2.2.1)
+ railties (>= 3.2, < 5.2)
draper (2.1.0)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
request_store (~> 1.0)
- ebnf (0.3.9)
- rdf (~> 1.1)
- sxp (~> 0.1, >= 0.1.3)
+ ebnf (1.1.2)
+ rdf (>= 2.2, < 4.0)
+ sxp (~> 1.0)
+ erubi (1.7.1)
erubis (2.7.0)
- excon (0.45.4)
- execjs (2.6.0)
- factory_girl (4.5.0)
+ excon (0.60.0)
+ execjs (2.7.0)
+ factory_girl (4.9.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.5.0)
- factory_girl (~> 4.5.0)
+ factory_girl_rails (4.9.0)
+ factory_girl (~> 4.9.0)
railties (>= 3.0.0)
- faker (1.5.0)
- i18n (~> 0.5)
- faraday (0.9.1)
+ faker (1.8.7)
+ i18n (>= 0.7)
+ faraday (0.12.2)
multipart-post (>= 1.2, < 3)
+ ffi (1.9.23)
fission (0.5.0)
CFPropertyList (~> 2.2)
- fog (1.33.0)
+ fog (1.41.0)
+ fog-aliyun (>= 0.1.0)
fog-atmos
fog-aws (>= 0.6.0)
fog-brightbox (~> 0.4)
- fog-core (~> 1.32)
- fog-dynect
- fog-ecloud (= 0.1.1)
- fog-google (>= 0.0.2)
+ fog-cloudatcost (~> 0.1.0)
+ fog-core (~> 1.45)
+ fog-digitalocean (>= 0.3.0)
+ fog-dnsimple (~> 1.0)
+ fog-dynect (~> 0.0.2)
+ fog-ecloud (~> 0.1)
+ fog-google (<= 0.1.0)
+ fog-internet-archive
+ fog-joyent
fog-json
fog-local
+ fog-openstack
fog-powerdns (>= 0.1.1)
fog-profitbricks
+ fog-rackspace
fog-radosgw (>= 0.0.2)
fog-riakcs
fog-sakuracloud (>= 0.0.4)
@@ -151,53 +164,85 @@
fog-terremark
fog-vmfusion
fog-voxel
+ fog-vsphere (>= 0.4.0)
+ fog-xenserver
fog-xml (~> 0.1.1)
ipaddress (~> 0.5)
- nokogiri (~> 1.5, >= 1.5.11)
+ json (>= 1.8, < 2.0)
+ fog-aliyun (0.2.0)
+ fog-core (~> 1.27)
+ fog-json (~> 1.0)
+ ipaddress (~> 0.8)
+ xml-simple (~> 1.1)
fog-atmos (0.1.0)
fog-core
fog-xml
- fog-aws (0.7.4)
- fog-core (~> 1.27)
+ fog-aws (2.0.1)
+ fog-core (~> 1.38)
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
- fog-brightbox (0.9.0)
+ fog-brightbox (0.14.0)
fog-core (~> 1.22)
fog-json
inflecto (~> 0.0.2)
- fog-core (1.32.1)
+ fog-cloudatcost (0.1.2)
+ fog-core (~> 1.36)
+ fog-json (~> 1.0)
+ fog-xml (~> 0.1)
+ ipaddress (~> 0.8)
+ fog-core (1.45.0)
builder
- excon (~> 0.45)
+ excon (~> 0.58)
formatador (~> 0.2)
- mime-types
- net-scp (~> 1.1)
- net-ssh (>= 2.1.3)
- fog-dynect (0.0.1)
+ fog-digitalocean (0.3.0)
+ fog-core (~> 1.42)
+ fog-json (>= 1.0)
+ fog-xml (>= 0.1)
+ ipaddress (>= 0.5)
+ fog-dnsimple (1.0.0)
+ fog-core (~> 1.38)
+ fog-json (~> 1.0)
+ fog-dynect (0.0.3)
fog-core
fog-json
fog-xml
- fog-ecloud (0.1.1)
+ fog-ecloud (0.3.0)
fog-core
fog-xml
- fog-google (0.0.7)
+ fog-google (0.1.0)
fog-core
fog-json
fog-xml
+ fog-internet-archive (0.0.1)
+ fog-core
+ fog-json
+ fog-xml
+ fog-joyent (0.0.1)
+ fog-core (~> 1.42)
+ fog-json (>= 1.0)
fog-json (1.0.2)
fog-core (~> 1.0)
multi_json (~> 1.10)
- fog-local (0.2.1)
- fog-core (~> 1.27)
+ fog-local (0.5.0)
+ fog-core (>= 1.27, < 3.0)
+ fog-openstack (0.1.24)
+ fog-core (~> 1.40)
+ fog-json (>= 1.0)
+ ipaddress (>= 0.8)
fog-powerdns (0.1.1)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
- fog-profitbricks (0.0.5)
- fog-core
- fog-xml
- nokogiri
- fog-radosgw (0.0.4)
+ fog-profitbricks (4.1.1)
+ fog-core (~> 1.42)
+ fog-json (~> 1.0)
+ fog-rackspace (0.1.5)
+ fog-core (>= 1.35)
+ fog-json (>= 1.0)
+ fog-xml (>= 0.1)
+ ipaddress (>= 0.8)
+ fog-radosgw (0.0.5)
fog-core (>= 1.21.0)
fog-json
fog-xml (>= 0.0.1)
@@ -205,13 +250,13 @@
fog-core
fog-json
fog-xml
- fog-sakuracloud (1.0.1)
+ fog-sakuracloud (1.7.5)
fog-core
fog-json
fog-serverlove (0.1.2)
fog-core
fog-json
- fog-softlayer (0.4.7)
+ fog-softlayer (1.1.4)
fog-core
fog-json
fog-storm_on_demand (0.1.1)
@@ -226,74 +271,97 @@
fog-voxel (0.1.0)
fog-core
fog-xml
- fog-xml (0.1.2)
+ fog-vsphere (2.0.0)
fog-core
- nokogiri (~> 1.5, >= 1.5.11)
+ rbvmomi (~> 1.9)
+ fog-xenserver (0.3.0)
+ fog-core
+ fog-xml
+ fog-xml (0.1.3)
+ fog-core
+ nokogiri (>= 1.5.11, < 2.0.0)
formatador (0.2.5)
- globalid (0.3.6)
- activesupport (>= 4.1.0)
- hashie (3.4.2)
- headless (2.2.0)
- i18n (0.7.0)
+ globalid (0.4.1)
+ activesupport (>= 4.2.0)
+ hamster (3.0.0)
+ concurrent-ruby (~> 1.0)
+ hashie (3.5.7)
+ headless (2.3.1)
+ i18n (0.9.5)
+ concurrent-ruby (~> 1.0)
inflecto (0.0.2)
io-like (0.3.0)
- ipaddress (0.8.0)
- jbuilder (2.3.1)
- activesupport (>= 3.0.0, < 5)
- multi_json (~> 1.2)
- jquery-rails (4.0.4)
- rails-dom-testing (~> 1.0)
+ ipaddress (0.8.3)
+ jbuilder (2.7.0)
+ activesupport (>= 4.2.0)
+ multi_json (>= 1.2)
+ jquery-rails (4.3.1)
+ rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
- json (1.8.3)
- jwt (1.5.1)
- kaminari (0.16.3)
- actionpack (>= 3.0.0)
- activesupport (>= 3.0.0)
+ json (1.8.6)
+ jwt (1.5.6)
+ kaminari (1.1.1)
+ activesupport (>= 4.1.0)
+ kaminari-actionview (= 1.1.1)
+ kaminari-activerecord (= 1.1.1)
+ kaminari-core (= 1.1.1)
+ kaminari-actionview (1.1.1)
+ actionview
+ kaminari-core (= 1.1.1)
+ kaminari-activerecord (1.1.1)
+ activerecord
+ kaminari-core (= 1.1.1)
+ kaminari-core (1.1.1)
launchy (2.4.3)
addressable (~> 2.3)
- libxml-ruby (2.8.0)
+ libxml-ruby (2.9.0)
link_header (0.0.8)
- loofah (2.0.3)
+ loofah (2.2.0)
+ crass (~> 1.0.2)
nokogiri (>= 1.5.9)
macaddr (1.7.1)
systemu (~> 2.6.2)
- mail (2.6.3)
- mime-types (>= 1.16, < 3)
- mime-types (2.6.1)
- mini_portile (0.6.2)
- minitest (5.8.0)
- multi_json (1.11.2)
- multi_xml (0.5.5)
+ mail (2.7.0)
+ mini_mime (>= 0.1.1)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
+ mini_mime (1.0.0)
+ mini_portile2 (2.3.0)
+ minitest (5.11.3)
+ multi_json (1.13.1)
+ multi_xml (0.6.0)
multipart-post (2.0.0)
- net-scp (1.2.1)
- net-ssh (>= 2.6.5)
- net-ssh (2.9.2)
- nokogiri (1.6.6.2)
- mini_portile (~> 0.6.0)
- oauth2 (1.0.0)
- faraday (>= 0.8, < 0.10)
+ net-http-persistent (3.0.0)
+ connection_pool (~> 2.2)
+ nokogiri (1.8.2)
+ mini_portile2 (~> 2.3.0)
+ oauth2 (1.4.0)
+ faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
- rack (~> 1.2)
- omniauth (1.2.2)
- hashie (>= 1.2, < 4)
- rack (~> 1.0)
- omniauth-facebook (2.0.1)
+ rack (>= 1.2, < 3)
+ omniauth (1.8.1)
+ hashie (>= 3.4.6, < 3.6.0)
+ rack (>= 1.6.2, < 3)
+ omniauth-facebook (4.0.0)
omniauth-oauth2 (~> 1.2)
- omniauth-google-oauth2 (0.2.6)
- omniauth (> 1.0)
- omniauth-oauth2 (~> 1.1)
- omniauth-oauth2 (1.3.1)
- oauth2 (~> 1.0)
+ omniauth-google-oauth2 (0.5.3)
+ jwt (>= 1.5)
+ omniauth (>= 1.1.1)
+ omniauth-oauth2 (>= 1.5)
+ omniauth-oauth2 (1.5.0)
+ oauth2 (~> 1.1)
omniauth (~> 1.2)
orm_adapter (0.5.0)
- pg (0.18.2)
- puma (2.13.4)
+ pg (1.0.0)
+ public_suffix (3.0.2)
+ puma (3.11.3)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
- rack (1.6.4)
+ rack (1.6.9)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.3)
@@ -309,106 +377,138 @@
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.7)
- activesupport (>= 4.2.0.beta, < 5.0)
- nokogiri (~> 1.6.0)
+ rails-dom-testing (1.0.9)
+ activesupport (>= 4.2.0, < 5.0)
+ nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
- rails-html-sanitizer (1.0.2)
+ rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
- rails_serve_static_assets (0.0.4)
- rails_stdout_logging (0.0.3)
+ rails_serve_static_assets (0.0.5)
+ rails_stdout_logging (0.0.5)
railties (4.2.3)
actionpack (= 4.2.3)
activesupport (= 4.2.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.4.2)
- rdf (1.1.14)
+ rake (12.3.0)
+ rb-fsevent (0.10.3)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ rbvmomi (1.11.7)
+ builder (~> 3.0)
+ json (>= 1.8)
+ nokogiri (~> 1.5)
+ trollop (~> 2.1)
+ rdf (3.0.1)
+ hamster (~> 3.0)
link_header (~> 0.0, >= 0.0.8)
- rdf-turtle (1.1.7)
- ebnf (~> 0.3, >= 0.3.6)
- rdf (~> 1.1, >= 1.1.10)
- rdoc (4.2.0)
- request_store (1.2.0)
- responders (2.1.0)
- railties (>= 4.2.0, < 5)
- ro-bundle (0.2.1)
+ rdf-aggregate-repo (2.2.1)
+ rdf (>= 2.2, < 4.0)
+ rdf-turtle (1.1.2)
+ ebnf (>= 0.3.5)
+ rdf (>= 1.1.1.1)
+ rdf-xsd (3.0.0)
+ rdf (~> 3.0)
+ rdoc (4.3.0)
+ request_store (1.4.0)
+ rack (>= 1.4)
+ responders (2.4.0)
+ actionpack (>= 4.2.0, < 5.3)
+ railties (>= 4.2.0, < 5.3)
+ ro-bundle (0.2.3)
json (~> 1.8)
- ucf (~> 2.0)
+ ucf (~> 2.0.1)
uuid (~> 2.3)
- rspec-core (3.3.2)
- rspec-support (~> 3.3.0)
- rspec-expectations (3.3.1)
+ rspec-core (3.7.1)
+ rspec-support (~> 3.7.0)
+ rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.3.0)
- rspec-mocks (3.3.2)
+ rspec-support (~> 3.7.0)
+ rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.3.0)
- rspec-rails (3.3.3)
- actionpack (>= 3.0, < 4.3)
- activesupport (>= 3.0, < 4.3)
- railties (>= 3.0, < 4.3)
- rspec-core (~> 3.3.0)
- rspec-expectations (~> 3.3.0)
- rspec-mocks (~> 3.3.0)
- rspec-support (~> 3.3.0)
- rspec-support (3.3.0)
- rubyzip (1.1.7)
- sass (3.4.16)
- sass-rails (5.0.3)
- railties (>= 4.0.0, < 5.0)
+ rspec-support (~> 3.7.0)
+ rspec-rails (3.7.2)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec-core (~> 3.7.0)
+ rspec-expectations (~> 3.7.0)
+ rspec-mocks (~> 3.7.0)
+ rspec-support (~> 3.7.0)
+ rspec-support (3.7.1)
+ rubyzip (1.2.1)
+ sass (3.5.5)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ sass-rails (5.0.7)
+ railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
- tilt (~> 1.1)
- sdoc (0.4.1)
+ tilt (>= 1.1, < 3)
+ sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
- simplecov (0.10.0)
+ simplecov (0.13.0)
docile (~> 1.1.0)
- json (~> 1.8)
+ json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
- simplecov-html (0.10.0)
- slim (3.0.6)
- temple (~> 0.7.3)
+ simplecov-html (0.10.2)
+ slim (3.0.9)
+ temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
- slim-rails (3.0.1)
- actionmailer (>= 3.1, < 5.0)
- actionpack (>= 3.1, < 5.0)
- activesupport (>= 3.1, < 5.0)
- railties (>= 3.1, < 5.0)
+ slim-rails (3.1.3)
+ actionpack (>= 3.1)
+ railties (>= 3.1)
slim (~> 3.0)
- spring (1.3.6)
- sprockets (3.3.1)
- rack (~> 1.0)
- sprockets-rails (2.3.2)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- sprockets (>= 2.8, < 4.0)
- sxp (0.1.5)
+ sparql (3.0.0)
+ builder (~> 3.2)
+ ebnf (~> 1.1)
+ rdf (~> 3.0)
+ rdf-aggregate-repo (>= 2.2, < 4.0)
+ rdf-xsd (~> 3.0)
+ sparql-client (~> 3.0)
+ sxp (~> 1.0)
+ sparql-client (3.0.0)
+ net-http-persistent (>= 2.9, < 4)
+ rdf (~> 3.0)
+ spring (2.0.2)
+ activesupport (>= 4.2)
+ sprockets (3.7.1)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (3.2.1)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
+ sprockets (>= 3.0.0)
+ sxp (1.0.1)
+ rdf (>= 2.2, < 4.0)
systemu (2.6.5)
- temple (0.7.6)
- thor (0.19.1)
- thread_safe (0.3.5)
- tilt (1.4.1)
- tzinfo (1.2.2)
+ temple (0.8.0)
+ thor (0.20.0)
+ thread_safe (0.3.6)
+ tilt (2.0.8)
+ trollop (2.1.2)
+ tzinfo (1.2.5)
thread_safe (~> 0.1)
- ucf (2.0.0)
- zip-container (~> 3.0.1)
- uglifier (2.7.1)
- execjs (>= 0.3.0)
- json (>= 1.8.0)
+ ucf (2.0.1)
+ zip-container (~> 3.0.2)
+ uglifier (4.1.6)
+ execjs (>= 0.3.0, < 3)
uuid (2.3.8)
macaddr (~> 1.0)
- warden (1.2.3)
+ warden (1.2.7)
rack (>= 1.0)
- xpath (2.0.0)
- nokogiri (~> 1.3)
- zip-container (3.0.1)
- rubyzip (~> 1.1.6)
+ xml-simple (1.1.5)
+ xpath (3.0.0)
+ nokogiri (~> 1.8)
+ zip-container (3.0.2)
+ rubyzip (~> 1.2.1)
PLATFORMS
ruby
@@ -435,6 +535,7 @@
jbuilder (~> 2.0)
jquery-rails
kaminari
+ nokogiri (~> 1.8.1)
omniauth-facebook
omniauth-google-oauth2
pg
@@ -448,7 +549,11 @@
sdoc (~> 0.4.0)
slim
slim-rails
+ sparql
spring
taverna-t2flow!
uglifier (>= 1.3.0)
workflow_parser!
+
+BUNDLED WITH
+ 1.16.1
