Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

update

  • Loading branch information...
commit 2d4a13a51568e33809b36102464e487f9e4292c8 1 parent 791a21b
@trevorturk authored
Showing with 92 additions and 87 deletions.
  1. +23 −23 Gemfile
  2. +66 −62 Gemfile.lock
  3. +3 −2 Rakefile
View
46 Gemfile
@@ -1,34 +1,34 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.3'
-gem 'devise', '1.1.2'
-gem 'hoptoad_notifier', '2.3.12'
-gem 'carrierwave', '0.5.1'
-gem 'fog', '0.3.25'
-gem 'mime-types', '1.16', :require => "mime/types"
-gem 'ruby-mp3info', '0.6.13', :require => "mp3info"
-gem 'mp4info', '1.7.3'
-gem 'toadhopper', '1.0.4'
-gem 'yajl-ruby', '0.7.8'
-gem 'heroku_s3_backup', :git => 'git://github.com/trevorturk/heroku_s3_backup.git', :ref => '58bf17abc550cfd479a6'
-gem 'flash_cookie_session', '1.0.1'
+gem 'rails'
+gem 'devise'
+gem 'hoptoad_notifier'
+gem 'mime-types', :require => "mime/types"
+gem 'ruby-mp3info', :require => "mp3info"
+gem 'mp4info'
+gem 'toadhopper'
+gem 'yajl-ruby'
+gem 'heroku_backup_task'
+gem 'flash_cookie_session'
+gem 'carrierwave', :git => 'git@github.com:jnicklas/carrierwave.git', :ref => '4dc1a5c357d8a6adcf02'
+gem 'fog'
group :production do
- gem 'thin', '1.2.7'
- gem 'pg', '0.9.0'
+ gem 'thin'
+ gem 'pg'
end
group :development do
- gem 'sqlite3-ruby', '1.3.0', :require => 'sqlite3'
- gem 'heroku', '1.10.5'
- gem 'ruby-debug', '0.10.4'
+ gem 'sqlite3-ruby', :require => 'sqlite3'
+ gem 'heroku'
+ gem 'ruby-debug'
end
group :test do
- gem 'sqlite3-ruby', '1.3.0', :require => 'sqlite3'
- gem 'populator', '0.2.5'
- gem 'machinist', '1.0.6'
- gem 'faker', '0.3.1'
- gem 'autotest-rails', '4.1.0'
- gem 'mocha', '0.9.8'
+ gem 'sqlite3-ruby', :require => 'sqlite3'
+ gem 'populator'
+ gem 'machinist'
+ gem 'faker'
+ gem 'autotest-rails'
+ gem 'mocha'
end
View
128 Gemfile.lock
@@ -1,15 +1,15 @@
GIT
- remote: git://github.com/trevorturk/heroku_s3_backup.git
- revision: 58bf17abc550cfd479a6d35af9e9d8d5168f5945
- ref: 58bf17abc550cfd479a6
+ remote: git@github.com:jnicklas/carrierwave.git
+ revision: 4dc1a5c357d8a6adcf02c3af1aa96edb51138e71
+ ref: 4dc1a5c357d8a6adcf02
specs:
- heroku_s3_backup (0.0.1)
- fog (~> 0.3.7)
+ carrierwave (0.5.1)
+ activesupport (~> 3.0)
GEM
remote: http://rubygems.org/
specs:
- ZenTest (4.4.0)
+ ZenTest (4.4.2)
abstract (1.0.0)
actionmailer (3.0.3)
actionpack (= 3.0.3)
@@ -37,69 +37,71 @@ GEM
activemodel (= 3.0.3)
activesupport (= 3.0.3)
activesupport (3.0.3)
- arel (2.0.3)
+ arel (2.0.7)
autotest-rails (4.1.0)
ZenTest
- bcrypt-ruby (2.1.2)
+ bcrypt-ruby (2.1.4)
builder (2.1.2)
- carrierwave (0.5.1)
- activesupport (~> 3.0)
columnize (0.3.2)
- configuration (1.1.0)
+ configuration (1.2.0)
daemons (1.1.0)
- devise (1.1.2)
+ devise (1.1.5)
bcrypt-ruby (~> 2.1.2)
- warden (~> 0.10.7)
+ warden (~> 1.0.2)
erubis (2.6.6)
abstract (>= 1.0.0)
eventmachine (0.12.10)
- excon (0.2.8)
- faker (0.3.1)
- flash_cookie_session (1.0.1)
+ excon (0.4.0)
+ faker (0.9.4)
+ i18n (~> 0.4)
+ flash_cookie_session (1.1.0)
rails (~> 3.0)
- fog (0.3.25)
+ fog (0.4.1)
builder
- excon (>= 0.2.4)
+ excon (>= 0.4.0)
formatador (>= 0.0.16)
json
mime-types
- net-ssh (~> 2.0.23)
- nokogiri (~> 1.4.3.1)
+ net-ssh (>= 2.0.23)
+ nokogiri (>= 1.4.4)
ruby-hmac
formatador (0.0.16)
- heroku (1.10.5)
+ heroku (1.13.7)
json_pure (>= 1.2.0, < 1.5.0)
launchy (~> 0.3.2)
- rest-client (~> 1.4.0)
- hoptoad_notifier (2.3.12)
+ rest-client (>= 1.4.0, < 1.7.0)
+ heroku_backup_task (0.0.3)
+ heroku (= 1.13.7)
+ rake
+ hoptoad_notifier (2.4.2)
activesupport
builder
- i18n (0.4.2)
- json (1.4.6)
+ i18n (0.5.0)
+ json (1.5.1)
json_pure (1.4.6)
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
linecache (0.43)
machinist (1.0.6)
- mail (2.2.9.1)
+ mail (2.2.15)
activesupport (>= 2.3.6)
- i18n (>= 0.4.1)
+ i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- mocha (0.9.8)
+ mocha (0.9.10)
rake
mp4info (1.7.3)
- net-ssh (2.0.23)
- nokogiri (1.4.3.1)
- pg (0.9.0)
+ net-ssh (2.1.0)
+ nokogiri (1.4.4)
+ pg (0.10.1)
polyglot (0.3.1)
- populator (0.2.5)
+ populator (1.0.0)
rack (1.2.1)
rack-mount (0.6.13)
rack (>= 1.0.0)
- rack-test (0.5.6)
+ rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.3)
actionmailer (= 3.0.3)
@@ -115,7 +117,7 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
- rest-client (1.4.2)
+ rest-client (1.6.1)
mime-types (>= 1.16)
ruby-debug (0.10.4)
columnize (>= 0.1)
@@ -124,43 +126,45 @@ GEM
linecache (>= 0.3)
ruby-hmac (0.4.0)
ruby-mp3info (0.6.13)
- sqlite3-ruby (1.3.0)
+ sqlite3 (1.3.3)
+ sqlite3-ruby (1.3.3)
+ sqlite3 (>= 1.3.3)
thin (1.2.7)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.14.4)
- toadhopper (1.0.4)
+ thor (0.14.6)
+ toadhopper (1.0.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.23)
- warden (0.10.7)
+ tzinfo (0.3.24)
+ warden (1.0.3)
rack (>= 1.0.0)
- yajl-ruby (0.7.8)
+ yajl-ruby (0.7.9)
PLATFORMS
ruby
DEPENDENCIES
- autotest-rails (= 4.1.0)
- carrierwave (= 0.5.1)
- devise (= 1.1.2)
- faker (= 0.3.1)
- flash_cookie_session (= 1.0.1)
- fog (= 0.3.25)
- heroku (= 1.10.5)
- heroku_s3_backup!
- hoptoad_notifier (= 2.3.12)
- machinist (= 1.0.6)
- mime-types (= 1.16)
- mocha (= 0.9.8)
- mp4info (= 1.7.3)
- pg (= 0.9.0)
- populator (= 0.2.5)
- rails (= 3.0.3)
- ruby-debug (= 0.10.4)
- ruby-mp3info (= 0.6.13)
- sqlite3-ruby (= 1.3.0)
- thin (= 1.2.7)
- toadhopper (= 1.0.4)
- yajl-ruby (= 0.7.8)
+ autotest-rails
+ carrierwave!
+ devise
+ faker
+ flash_cookie_session
+ fog
+ heroku
+ heroku_backup_task
+ hoptoad_notifier
+ machinist
+ mime-types
+ mocha
+ mp4info
+ pg
+ populator
+ rails
+ ruby-debug
+ ruby-mp3info
+ sqlite3-ruby
+ thin
+ toadhopper
+ yajl-ruby
View
5 Rakefile
@@ -3,9 +3,10 @@
require File.expand_path('../config/application', __FILE__)
require 'rake'
+require "heroku_backup_task"
Kzak::Application.load_tasks
-task :cron => :environment do
- HerokuS3Backup.backup
+task :cron do
+ HerokuBackupTask.execute
end
Please sign in to comment.
Something went wrong with that request. Please try again.