Unfork pry, bump gems (#352)

* Unfork pry, bump gems

* revert jwt upgrade

* 2.2 compat

* Pin term-ansicolor

* RUby 2.1 compat

Gemfile

@@ -1,9 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'pry',
-    git: 'https://github.com/fancyremarker/pry.git',
-    branch: 'aptible'
-
 gem 'activesupport', '~> 4.0'
 gem 'rack', '~> 1.0'
 

Gemfile.lock

@@ -1,28 +1,21 @@
-GIT
-  remote: https://github.com/fancyremarker/pry.git
-  revision: be3823aa4ffc51260f2f3ce84f0984da3dc6dd10
-  branch: aptible
-  specs:
-    pry (0.10.0)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-
 PATH
   remote: .
   specs:
     aptible-cli (0.21.0)
       activesupport (>= 4.0, < 6.0)
-      aptible-api (~> 1.5.3)
-      aptible-auth (~> 1.2.4)
+      aptible-api (~> 1.6.2)
+      aptible-auth (~> 1.2.5)
       aptible-billing (~> 1.0)
       aptible-resource (~> 1.1)
       aws-sdk (~> 2.0)
       bigdecimal (~> 1.3.5)
       cbor
       chronic_duration (~> 0.10.6)
+      concurrent-ruby (< 1.1.10)
       git (< 1.10)
-      term-ansicolor
+      jwt (~> 2.3.0)
+      rack (~> 1.0)
+      term-ansicolor (~> 1.8.0)
       thor (~> 0.20.0)
 
 GEM
@@ -35,9 +28,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aptible-api (1.5.3)
-      aptible-auth (~> 1.0)
-      aptible-resource (~> 1.0)
+    aptible-api (1.6.2)
+      aptible-auth
+      aptible-resource
       gem_config
       multipart-post (< 2.2.0)
     aptible-auth (1.2.5)
@@ -92,14 +85,14 @@ GEM
     gem_config (0.3.2)
     git (1.7.0)
       rchardet (~> 1.8)
-    hashdiff (1.1.0)
+    hashdiff (1.1.1)
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     json (2.5.1)
     jwt (2.3.0)
-    method_source (0.8.2)
+    method_source (1.1.0)
     minitest (5.12.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -116,6 +109,9 @@ GEM
     parser (2.7.2.0)
       ast (~> 2.4.1)
     powerpack (0.1.3)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     public_suffix (3.1.1)
     rack (1.6.13)
     rainbow (2.2.2)
@@ -129,7 +125,7 @@ GEM
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
@@ -143,7 +139,6 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.13.0)
-    slop (3.6.0)
     stripe (4.24.0)
       faraday (~> 0.13)
       net-http-persistent (~> 3.0)
@@ -174,7 +169,7 @@ DEPENDENCIES
   bundler (~> 1.3)
   climate_control (= 0.0.3)
   fabrication (~> 2.15.2)
-  pry!
+  pry
   rack (~> 1.0)
   rake
   rspec (~> 3.2)

aptible-cli.gemspec

@@ -20,23 +20,26 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aptible-resource', '~> 1.1'
-  spec.add_dependency 'aptible-api', '~> 1.5.3'
-  spec.add_dependency 'aptible-auth', '~> 1.2.4'
+  spec.add_dependency 'activesupport', '>= 4.0', '< 6.0'
+  spec.add_dependency 'aptible-api', '~> 1.6.2'
+  spec.add_dependency 'aptible-auth', '~> 1.2.5'
   spec.add_dependency 'aptible-billing', '~> 1.0'
-  spec.add_dependency 'thor', '~> 0.20.0'
-  spec.add_dependency 'git', '< 1.10'
-  spec.add_dependency 'term-ansicolor'
-  spec.add_dependency 'chronic_duration', '~> 0.10.6'
-  spec.add_dependency 'cbor'
+  spec.add_dependency 'aptible-resource', '~> 1.1'
   spec.add_dependency 'aws-sdk', '~> 2.0'
   spec.add_dependency 'bigdecimal', '~> 1.3.5' # https://github.com/ruby/bigdecimal#which-version-should-you-select
+  spec.add_dependency 'cbor'
+  spec.add_dependency 'chronic_duration', '~> 0.10.6'
+  spec.add_dependency 'concurrent-ruby', '< 1.1.10'
+  spec.add_dependency 'jwt', '~> 2.3.0'
+  spec.add_dependency 'git', '< 1.10'
+  spec.add_dependency 'rack', '~> 1.0'
+  spec.add_dependency 'term-ansicolor', '~> 1.8.0'
+  spec.add_dependency 'thor', '~> 0.20.0'
 
   # Temporarily pin ffi until https://github.com/ffi/ffi/issues/868 is fixed
   spec.add_dependency 'ffi', '<= 1.14.1' if Gem.win_platform?
   spec.add_dependency 'win32-process' if Gem.win_platform?
 
-  spec.add_dependency 'activesupport', '>= 4.0', '< 6.0'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'aptible-tasks', '~> 0.5.8'
   spec.add_development_dependency 'rake'