From 486007c603eed62587e46bf4d3b7fb8fbc40ac83 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 28 Feb 2015 20:38:31 +0100 Subject: [PATCH] remove lock file from repo and make it work on allrubies --- .gitignore | 1 + Gemfile | 22 +++++++++++++---- Gemfile.lock | 68 ---------------------------------------------------- 3 files changed, 18 insertions(+), 73 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index eb8e985..e1831e5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ doc # bundler .bundle +Gemfile.lock # jeweler generated pkg diff --git a/Gemfile b/Gemfile index 2e80243..26559b6 100644 --- a/Gemfile +++ b/Gemfile @@ -3,15 +3,27 @@ source "http://rubygems.org" # Example: # gem "activesupport", ">= 2.3.5" -gem "moneta", "~> 0.7.20" -gem "highline", "~> 1.6.2" +if RUBY_VERSION.to_f > 1.8 + gem "moneta" + gem "highline" +else + gem "moneta", "~> 0.7.20" + gem "highline", "~> 1.6.2" +end + gem "bcrypt" # Add dependencies to develop your gem here. # Include everything needed to run rake, tests, features, etc. group :development do - gem "rspec", "~> 2.4" - gem "rdoc", "~> 3.8" gem "mocha" - gem "jeweler", "~> 1.6" + if RUBY_VERSION.to_f > 1.8 + gem "rspec" + gem "rdoc" + gem "jeweler" + else + gem "rspec", "~> 2.4" + gem "rdoc", "~> 3.8" + gem "jeweler", "~> 1.6" + end end diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 92a5a48..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,68 +0,0 @@ -GEM - remote: http://rubygems.org/ - specs: - addressable (2.3.7) - bcrypt (3.1.10) - builder (3.2.2) - diff-lcs (1.2.5) - faraday (0.8.9) - multipart-post (~> 1.2.0) - git (1.2.9.1) - github_api (0.10.1) - addressable - faraday (~> 0.8.1) - hashie (>= 1.2) - multi_json (~> 1.4) - nokogiri (~> 1.5.2) - oauth2 - hashie (3.4.0) - highline (1.6.21) - jeweler (1.8.8) - builder - bundler (~> 1.0) - git (>= 1.2.5) - github_api (= 0.10.1) - highline (>= 1.6.15) - nokogiri (= 1.5.10) - rake - rdoc - json (1.8.2) - jwt (1.3.0) - metaclass (0.0.4) - mocha (1.1.0) - metaclass (~> 0.0.1) - moneta (0.7.20) - multi_json (1.10.1) - multi_xml (0.5.5) - multipart-post (1.2.0) - nokogiri (1.5.10) - oauth2 (1.0.0) - faraday (>= 0.8, < 0.10) - jwt (~> 1.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (~> 1.2) - rack (1.6.0) - rake (10.4.2) - rdoc (3.12.2) - json (~> 1.4) - rspec (2.99.0) - rspec-core (~> 2.99.0) - rspec-expectations (~> 2.99.0) - rspec-mocks (~> 2.99.0) - rspec-core (2.99.2) - rspec-expectations (2.99.2) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.99.3) - -PLATFORMS - ruby - -DEPENDENCIES - bcrypt - highline (~> 1.6.2) - jeweler (~> 1.6) - mocha - moneta (~> 0.7.20) - rdoc (~> 3.8) - rspec (~> 2.4)