From 9c350f335a607c9b5089320240602604a432423c Mon Sep 17 00:00:00 2001 From: Jake Howerton Date: Fri, 10 Jul 2015 17:50:10 -0400 Subject: [PATCH] start upgrade --- Gemfile | 7 +++-- Gemfile.lock | 74 ++++++++++++++++++++++++++------------------- spec/spec_helper.rb | 1 + 3 files changed, 48 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index 3f295a8..5fbc1cb 100644 --- a/Gemfile +++ b/Gemfile @@ -3,12 +3,13 @@ source 'http://rubygems.org' gemspec gem 'rake' -gem "json", '1.8.2' +gem "json" gem "rspec" +gem 'rspec-its' gem "simplecov", :require => false -gem "httparty", '0.9.0' +gem "httparty" gem 'webmock' gem 'httpclient' gem 'tomdoc' gem 'timecop' -gem 'jwt' \ No newline at end of file +gem 'jwt' diff --git a/Gemfile.lock b/Gemfile.lock index c305b9c..379cd8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,52 +6,64 @@ PATH GEM remote: http://rubygems.org/ specs: - addressable (2.3.2) + addressable (2.3.8) colored (1.2) - crack (0.3.1) - diff-lcs (1.1.3) - httparty (0.9.0) - multi_json (~> 1.0) - multi_xml + crack (0.4.2) + safe_yaml (~> 1.0.0) + diff-lcs (1.2.5) + docile (1.1.5) + httparty (0.13.5) + json (~> 1.8) + multi_xml (>= 0.5.2) httpclient (2.6.0.1) - json (1.8.2) - jwt (1.4.1) - multi_json (1.3.7) - multi_xml (0.5.1) - rake (10.0.2) - rspec (2.12.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) - rspec-core (2.12.1) - rspec-expectations (2.12.0) - diff-lcs (~> 1.1.3) - rspec-mocks (2.12.0) - ruby_parser (3.0.1) + json (1.8.3) + jwt (1.5.1) + multi_xml (0.5.5) + rake (10.4.2) + rspec (3.3.0) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-core (3.3.1) + rspec-support (~> 3.3.0) + rspec-expectations (3.3.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-its (1.2.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.3.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-support (3.3.0) + ruby_parser (3.7.0) sexp_processor (~> 4.1) - sexp_processor (4.1.2) - simplecov (0.7.1) - multi_json (~> 1.0) - simplecov-html (~> 0.7.1) - simplecov-html (0.7.1) - timecop (0.5.4) + safe_yaml (1.0.4) + sexp_processor (4.6.0) + simplecov (0.10.0) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + timecop (0.7.4) tomdoc (0.2.5) colored ruby_parser (>= 2.0.4) - webmock (1.9.0) - addressable (>= 2.2.7) - crack (>= 0.1.7) + webmock (1.21.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) PLATFORMS ruby DEPENDENCIES - httparty (= 0.9.0) + httparty httpclient - json (= 1.8.2) + json jwt rake rspec + rspec-its simplecov timecop tomdoc diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9da4b12..de90975 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -5,6 +5,7 @@ end require 'rspec' +require 'rspec/its' require 'zipmark' require 'webmock/rspec' require 'timecop'