Skip to content

Instantly share code, notes, and snippets.

@guipdutra

guipdutra/p

Created August 13, 2014 21:00
Show Gist options
  • Save guipdutra/31afec615c2689c5c8b4 to your computer and use it in GitHub Desktop.
Save guipdutra/31afec615c2689c5c8b4 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
p
diff --git a/Gemfile b/Gemfile
index aaa4ce3..af8d414 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,8 @@
source 'https://rubygems.org'
-ruby "1.9.3"
-gem 'rails', '4.0.2'
-gem 'pg', '0.14.1'
+ruby "2.1.2"
+gem "iconv", "~> 1.0.3"
+gem 'rails', '4.1.4'
+gem 'pg'
gem 'thin'
gem 'pry-rails'
gem 'stripe', :git => 'https://github.com/stripe/stripe-ruby'
@@ -66,8 +67,6 @@ group :test do
gem 'factory_girl_rails' #instead of fixtures
gem 'cucumber-rails', '1.2.1', :require => false
gem 'database_cleaner', '0.7.0'
- gem 'launchy'
- gem "poltergeist"
end
# To use ActiveModel has_secure_password
@@ -89,6 +88,6 @@ gem 'tilt', '1.3.4'
gem 'rest-client'
# 4.0.2 Upgrade
-gem 'adzerk', :git => 'https://github.com/41ads/adzerk-api.git'
+#gem 'adzerk', :git => 'https://github.com/41ads/adzerk-api.git'
gem "nokogiri", "~> 1.6.1"
gem 'protected_attributes'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4cfeffc..7378411 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,4 @@
GIT
- remote: https://github.com/41ads/adzerk-api.git
- revision: 91e10a770f6c64a600ab5881c4fa22b93ff3b5fd
- specs:
- adzerk (0.2)
- activesupport (~> 4.0.2)
- json (>= 1.7.7)
- rest-client (>= 1.6.7)
-
-GIT
remote: https://github.com/41ads/chosen-rails.git
revision: 50fc0243eeac1e65ef42ef27a6046243ea864f6c
specs:
@@ -19,46 +10,48 @@ GIT
GIT
remote: https://github.com/stripe/stripe-ruby
- revision: d7ddf47d57736b607b9d0717a114ceb6bcd3f4b0
+ revision: 9cf5089dc15534b7ed581e0ce4d84fa82f592efb
specs:
- stripe (1.9.9)
- mime-types (~> 1.25)
- multi_json (>= 1.0.4, < 2)
+ stripe (1.14.0)
+ json (~> 1.8.1)
+ mime-types (>= 1.25, < 3.0)
rest-client (~> 1.4)
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.0.2)
- actionpack (= 4.0.2)
+ actionmailer (4.1.4)
+ actionpack (= 4.1.4)
+ actionview (= 4.1.4)
mail (~> 2.5.4)
- actionpack (4.0.2)
- activesupport (= 4.0.2)
- builder (~> 3.1.0)
- erubis (~> 2.7.0)
+ actionpack (4.1.4)
+ actionview (= 4.1.4)
+ activesupport (= 4.1.4)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- activemodel (4.0.2)
- activesupport (= 4.0.2)
- builder (~> 3.1.0)
- activerecord (4.0.2)
- activemodel (= 4.0.2)
- activerecord-deprecated_finders (~> 1.0.2)
- activesupport (= 4.0.2)
- arel (~> 4.0.0)
- activerecord-deprecated_finders (1.0.3)
- activesupport (4.0.2)
- i18n (~> 0.6, >= 0.6.4)
- minitest (~> 4.2)
- multi_json (~> 1.3)
+ actionview (4.1.4)
+ activesupport (= 4.1.4)
+ builder (~> 3.1)
+ erubis (~> 2.7.0)
+ activemodel (4.1.4)
+ activesupport (= 4.1.4)
+ builder (~> 3.1)
+ activerecord (4.1.4)
+ activemodel (= 4.1.4)
+ activesupport (= 4.1.4)
+ arel (~> 5.0.0)
+ activesupport (4.1.4)
+ i18n (~> 0.6, >= 0.6.9)
+ json (~> 1.7, >= 1.7.7)
+ minitest (~> 5.1)
thread_safe (~> 0.1)
- tzinfo (~> 0.3.37)
- addressable (2.3.6)
+ tzinfo (~> 1.1)
annotate (2.5.0)
rake
- arel (4.0.1)
- atomic (1.1.16)
- bcrypt-ruby (3.1.2)
+ arel (5.0.1.20140414130214)
+ bcrypt (3.1.7)
+ bcrypt-ruby (3.1.5)
+ bcrypt (>= 3.1.3)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
@@ -66,7 +59,7 @@ GEM
debug_inspector (>= 0.0.1)
bootstrap-sass (2.2.2.0)
sass (~> 3.2)
- builder (3.1.4)
+ builder (3.2.2)
callsite (0.0.11)
cancan (1.6.10)
capistrano (2.14.2)
@@ -82,43 +75,47 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- carrierwave (0.9.0)
+ carrierwave (0.10.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
+ mime-types (>= 1.16)
celluloid (0.15.2)
timers (~> 1.1.0)
- childprocess (0.3.9)
+ childprocess (0.5.3)
ffi (~> 1.0, >= 1.0.11)
- chunky_png (1.3.0)
+ chunky_png (1.3.1)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
- coffee-script (2.2.0)
+ coffee-script (2.3.0)
coffee-script-source
execjs
- coffee-script-source (1.7.0)
- compass (0.12.4)
+ coffee-script-source (1.7.1)
+ compass (0.12.7)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
- sass (~> 3.2.17)
- compass-rails (1.1.7)
+ sass (~> 3.2.19)
+ compass-rails (2.0.0)
compass (>= 0.12.2)
- sprockets (<= 2.11.0)
- connection_pool (1.2.0)
- country_select (1.2.0)
- cucumber (1.3.10)
+ connection_pool (2.0.0)
+ countries (0.9.3)
+ currencies (~> 0.4.2)
+ country_select (1.3.1)
+ countries (= 0.9.3)
+ cucumber (1.3.15)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0)
- multi_test (>= 0.0.2)
+ multi_test (>= 0.1.1)
cucumber-rails (1.2.1)
capybara (>= 1.1.2)
cucumber (>= 1.1.3)
nokogiri (>= 1.5.0)
- d3-rails (3.3.7)
+ currencies (0.4.2)
+ d3-rails (3.4.4)
railties (>= 3.1)
daemons (1.1.9)
database_cleaner (0.7.0)
@@ -127,14 +124,12 @@ GEM
erubis (2.7.0)
eventmachine (1.0.3)
excon (0.6.6)
- execjs (2.0.2)
- factory_girl (4.3.0)
+ execjs (2.2.1)
+ factory_girl (4.4.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.3.0)
- factory_girl (~> 4.3.0)
+ factory_girl_rails (4.4.1)
+ factory_girl (~> 4.4.0)
railties (>= 3.0.0)
- faye-websocket (0.4.7)
- eventmachine (>= 0.12.0)
ffi (1.9.3)
fog (0.9.0)
builder
@@ -149,7 +144,7 @@ GEM
font-awesome-sass-rails (3.0.2.2)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
- formatador (0.2.4)
+ formatador (0.2.5)
foundation-icons-sass-rails (3.0.0)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
@@ -165,58 +160,51 @@ GEM
thor (>= 0.14.6)
guard-rspec (1.2.1)
guard (>= 1.1)
- highline (1.6.20)
+ highline (1.6.21)
hike (1.2.3)
- http_parser.rb (0.5.3)
httparty (0.10.2)
multi_json (~> 1.0)
multi_xml (>= 0.5.2)
- i18n (0.6.9)
+ i18n (0.6.11)
+ iconv (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.8.1)
- kgio (2.8.1)
- launchy (2.4.2)
- addressable (~> 2.3)
+ kgio (2.9.2)
listen (0.7.3)
- lumberjack (1.0.4)
+ lumberjack (1.0.9)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- meta_request (0.2.8)
- callsite
- rack-contrib
- railties
+ meta_request (0.3.3)
+ callsite (~> 0.0, >= 0.0.11)
+ rack-contrib (~> 1.1)
+ railties (>= 3.0.0, < 5.0.0)
method_source (0.8.2)
mime-types (1.25.1)
- mini_portile (0.5.2)
- minitest (4.7.5)
- multi_json (1.9.2)
- multi_test (0.0.3)
+ mini_portile (0.6.0)
+ minitest (5.4.0)
+ multi_json (1.10.1)
+ multi_test (0.1.1)
multi_xml (0.5.5)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.7.0)
+ net-ssh (2.9.1)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- nokogiri (1.6.1)
- mini_portile (~> 0.5.0)
+ netrc (0.7.7)
+ nokogiri (1.6.3.1)
+ mini_portile (= 0.6.0)
pg (0.14.1)
- poltergeist (1.0.3)
- capybara (~> 1.1)
- childprocess (~> 0.3)
- faye-websocket (~> 0.4.4)
- http_parser.rb (~> 0.5.3)
- multi_json (~> 1.0)
- polyglot (0.3.3)
- protected_attributes (1.0.5)
+ polyglot (0.3.5)
+ protected_attributes (1.0.8)
activemodel (>= 4.0.1, < 5.0)
- pry (0.9.12.4)
- coderay (~> 1.0)
- method_source (~> 0.8)
+ pry (0.10.0)
+ coderay (~> 1.1.0)
+ method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
@@ -225,104 +213,110 @@ GEM
rack (1.5.2)
rack-contrib (1.1.0)
rack (>= 0.9.1)
- rack-protection (1.5.1)
+ rack-protection (1.5.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.0.2)
- actionmailer (= 4.0.2)
- actionpack (= 4.0.2)
- activerecord (= 4.0.2)
- activesupport (= 4.0.2)
+ rails (4.1.4)
+ actionmailer (= 4.1.4)
+ actionpack (= 4.1.4)
+ actionview (= 4.1.4)
+ activemodel (= 4.1.4)
+ activerecord (= 4.1.4)
+ activesupport (= 4.1.4)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.0.2)
- sprockets-rails (~> 2.0.0)
- railties (4.0.2)
- actionpack (= 4.0.2)
- activesupport (= 4.0.2)
+ railties (= 4.1.4)
+ sprockets-rails (~> 2.0)
+ railties (4.1.4)
+ actionpack (= 4.1.4)
+ activesupport (= 4.1.4)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- raindrops (0.12.0)
- rake (10.1.1)
+ raindrops (0.13.0)
+ rake (10.3.2)
rb-fsevent (0.9.1)
- redis (3.0.6)
- redis-namespace (1.4.1)
- redis (~> 3.0.4)
- rest-client (1.6.7)
- mime-types (>= 1.16)
+ redis (3.1.0)
+ redis-namespace (1.5.0)
+ redis (~> 3.0, >= 3.0.4)
+ rest-client (1.7.2)
+ mime-types (>= 1.16, < 3.0)
+ netrc (~> 0.7)
rickshaw_rails (1.4.5)
railties (>= 3.1.0)
rmagick (2.13.2)
- rolify (3.2.0)
- rspec-core (2.14.7)
- rspec-expectations (2.14.4)
+ rolify (3.4.0)
+ rspec-collection_matchers (1.0.0)
+ rspec-expectations (>= 2.99.0.beta1)
+ rspec-core (2.99.1)
+ rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0)
- rspec-mocks (2.14.4)
- rspec-rails (2.14.1)
+ rspec-mocks (2.99.2)
+ rspec-rails (2.99.0)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 2.14.0)
- rspec-expectations (~> 2.14.0)
- rspec-mocks (~> 2.14.0)
+ rspec-collection_matchers
+ rspec-core (~> 2.99.0)
+ rspec-expectations (~> 2.99.0)
+ rspec-mocks (~> 2.99.0)
ruby-hmac (0.4.0)
- rubyzip (1.1.0)
- sass (3.2.17)
- sass-rails (4.0.2)
+ rubyzip (1.1.6)
+ sass (3.2.19)
+ sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
- sprockets-rails (~> 2.0.0)
- selenium-webdriver (2.39.0)
- childprocess (>= 0.2.5)
+ sprockets-rails (~> 2.0)
+ selenium-webdriver (2.42.0)
+ childprocess (>= 0.5.0)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
- sidekiq (2.17.2)
+ sidekiq (3.2.1)
celluloid (>= 0.15.2)
- connection_pool (>= 1.0.0)
+ connection_pool (>= 2.0.0)
json
redis (>= 3.0.6)
redis-namespace (>= 1.3.1)
- simple_form (3.0.1)
- actionpack (>= 4.0.0, < 4.1)
- activemodel (>= 4.0.0, < 4.1)
- sinatra (1.4.4)
+ simple_form (3.0.2)
+ actionpack (~> 4.0)
+ activemodel (~> 4.0)
+ sinatra (1.4.5)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
- slim (2.0.2)
+ slim (2.0.3)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
- slop (3.4.7)
+ slop (3.6.0)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.0.1)
+ sprockets-rails (2.1.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
- temple (0.6.7)
- thin (1.6.1)
+ temple (0.6.8)
+ thin (1.6.2)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
- thor (0.18.1)
- thread_safe (0.3.1)
- atomic (>= 1.1.7, < 2)
+ thor (0.19.1)
+ thread_safe (0.3.4)
tilt (1.3.4)
timers (1.1.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.39)
- uglifier (2.4.0)
+ tzinfo (1.2.1)
+ thread_safe (~> 0.1)
+ uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)
- unicorn (4.8.0)
+ unicorn (4.8.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
@@ -334,7 +328,6 @@ PLATFORMS
ruby
DEPENDENCIES
- adzerk!
annotate (= 2.5.0)
bcrypt-ruby
better_errors
@@ -357,17 +350,16 @@ DEPENDENCIES
growl (= 1.0.3)
guard-rspec (= 1.2.1)
httparty (~> 0.10.2)
+ iconv (~> 1.0.3)
jquery-rails (= 2.0.2)
- launchy
meta_request
net-scp (~> 1.0.4)
nokogiri (~> 1.6.1)
- pg (= 0.14.1)
- poltergeist
+ pg
protected_attributes
pry-rails
quiet_assets (= 1.0.2)
- rails (= 4.0.2)
+ rails (= 4.1.4)
rb-fsevent (= 0.9.1)
rest-client
rickshaw_rails
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment