From f58aa79283b13837488a5835ba09b2a99c344e0f Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 11 Apr 2016 18:51:34 -0700 Subject: [PATCH] Update Gemfile.lock, freeze hoe due to issues --- Gemfile | 2 ++ Gemfile.lock | 39 ++++++++++++++++++++------------------- ext/NilClass.rb | 4 ++++ ext/string.rb | 5 +++++ 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index 60121364..35a420e7 100644 --- a/Gemfile +++ b/Gemfile @@ -37,6 +37,7 @@ gem 'sanitize' gem 'will_paginate' gem 'simpleidn' gem 'gandi' +gem 'hoe', '3.14.2', require: nil platform :mri, :rbx do gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic @@ -81,6 +82,7 @@ group :test do gem 'rake', require: nil gem 'poltergeist' gem 'capybara_minitest_spec' + gem 'capybara', '2.6.2', require: nil gem 'rack_session_access', require: nil gem 'webmock', require: nil gem 'stripe-ruby-mock', '2.0.1', require: 'stripe_mock' diff --git a/Gemfile.lock b/Gemfile.lock index 6feabd6c..f97535c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.5.1) + activesupport (4.2.6) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -9,15 +9,14 @@ GEM tzinfo (~> 1.1) addressable (2.4.0) ago (0.1.5) - hoe (>= 1.12.2) annoy (0.5.6) highline (>= 1.5.0) ansi (1.5.0) base32 (0.3.2) - bcrypt (3.1.10) + bcrypt (3.1.11) blankslate (3.1.3) builder (3.2.2) - byebug (8.2.2) + byebug (8.2.4) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -35,9 +34,9 @@ GEM cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.1) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.1) connection_pool (2.2.0) - coveralls (0.8.11) + coveralls (0.8.13) json (~> 1.8) simplecov (~> 0.11.0) term-ansicolor (~> 1.3) @@ -52,11 +51,11 @@ GEM rack (>= 1.1.0) uuidtools (~> 2.1.1) docile (1.1.5) - domain_name (0.5.20160216) + domain_name (0.5.20160310) unf (>= 0.0.5, < 1.0.0) drydock (0.6.9) erubis (2.7.0) - fabrication (2.14.1) + fabrication (2.15.0) faker (1.6.3) i18n (~> 0.5) ffi (1.9.10) @@ -88,8 +87,8 @@ GEM rake (>= 0.9.2.2) magic (0.2.9) ffi (>= 0.6.3) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) metaclass (0.0.4) method_source (0.8.2) mime-types (2.99.1) @@ -105,7 +104,7 @@ GEM multi_json (1.11.2) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.0.2) + net-ssh (3.1.1) netrc (0.11.0) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) @@ -126,7 +125,7 @@ GEM pry-byebug (3.3.0) byebug (~> 8.0) pry (~> 0.10) - puma (2.16.0) + puma (3.4.0) rack (1.6.4) rack-cache (1.6.1) rack (>= 0.4) @@ -161,17 +160,17 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sass (3.4.21) - scrypt (2.0.2) + sass (3.4.22) + scrypt (2.1.1) ffi-compiler (>= 0.0.2) rake sequel (4.8.0) - sequel_pg (1.6.14) + sequel_pg (1.6.16) pg (>= 0.8.0) - sequel (>= 3.39.0) + sequel (>= 4.0.0) shotgun (0.9.1) rack (>= 1.0) - sidekiq (4.1.0) + sidekiq (4.1.1) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) @@ -208,7 +207,7 @@ GEM thread (0.2.2) thread_safe (0.3.5) tilt (2.0.2) - timecop (0.8.0) + timecop (0.8.1) tins (1.6.0) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -216,7 +215,7 @@ GEM unf_ext unf_ext (0.0.7.2) uuidtools (2.1.5) - webmock (1.24.1) + webmock (1.24.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -236,6 +235,7 @@ DEPENDENCIES ago base32 bcrypt + capybara (= 2.6.2) capybara_minitest_spec certified cocaine @@ -248,6 +248,7 @@ DEPENDENCIES gandi geoip hiredis + hoe (= 3.14.2) io-extra jdbc-postgres jruby-openssl diff --git a/ext/NilClass.rb b/ext/NilClass.rb index 4560b84b..a225ef88 100644 --- a/ext/NilClass.rb +++ b/ext/NilClass.rb @@ -2,4 +2,8 @@ class NilClass def empty? true end + + def blank? + true + end end diff --git a/ext/string.rb b/ext/string.rb index d4954f6f..911a3682 100644 --- a/ext/string.rb +++ b/ext/string.rb @@ -15,4 +15,9 @@ class String def is_integer? true if Integer(self) rescue false end + + def blank? + return true if self == '' + false + end end