Merge pull request #6 from rhymes/master

Update trollop to 2.1.2
joshnesbitt · Feb 29, 2016 · 5bd2cc8 · 5bd2cc8
2 parents 0c5f0a1 + fc04612
commit 5bd2cc8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    google_url_shortener (1.0.0)
+    google_url_shortener (1.0.1)
       json (>= 1.4.6)
       rest-client (>= 1.6.7)
-      trollop (= 1.16.2)
+      trollop (>= 1.16.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    json (1.8.2)
+    json (1.8.3)
     mime-types (2.4.3)
     netrc (0.10.3)
     rest-client (1.7.3)
@@ -25,7 +25,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    trollop (1.16.2)
+    trollop (2.1.2)
 
 PLATFORMS
   ruby
@@ -36,3 +36,6 @@ DEPENDENCIES
   google_url_shortener!
   rest-client (>= 1.6.7)
   rspec (= 2.8.0)
+
+BUNDLED WITH
+   1.11.2
diff --git a/google_url_shortener.gemspec b/google_url_shortener.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json", ">= 1.4.6"
   s.add_dependency "rest-client", ">= 1.6.7"
-  s.add_dependency 'trollop', '1.16.2'
+  s.add_dependency 'trollop', '>= 1.16.2'
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", "2.8.0"

diff --git a/lib/google/url_shortener/version.rb b/lib/google/url_shortener/version.rb
@@ -1,5 +1,5 @@
 module Google
   module UrlShortener
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end