Permalink
Browse files

heroku 1.9.3

  • Loading branch information...
1 parent 2267f54 commit 70ea82d3311fa68f93635f54a4b50ca73cbb2fc1 @brownman committed Nov 2, 2012
Showing with 78 additions and 37 deletions.
  1. +7 −1 Gemfile
  2. +50 −35 Gemfile.lock
  3. +8 −1 Gemfile~
  4. +8 −0 README.rdoc
  5. +5 −0 README.rdoc~
View
@@ -1,7 +1,13 @@
source 'https://rubygems.org'
ruby '1.9.3'
-gem 'rails', '3.2.2'
+
+#gem 'bundler', '1.2.0.pre'
+gem 'rails', '3.2.3'
+
+gem "heroku"
+
+
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
View
@@ -1,31 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.2)
- actionpack (= 3.2.2)
- mail (~> 2.4.0)
- actionpack (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ actionmailer (3.2.3)
+ actionpack (= 3.2.3)
+ mail (~> 2.4.4)
+ actionpack (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.2)
- activesupport (= 3.2.2)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- activerecord (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- activesupport (3.2.2)
+ activeresource (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
@@ -45,32 +45,41 @@ GEM
daemons (1.1.9)
diff-lcs (1.1.3)
ejs (1.0.0)
- em-websocket (0.3.6)
+ em-websocket (0.3.8)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
erubis (2.7.0)
eventmachine (1.0.0)
+ excon (0.16.7)
execjs (1.4.0)
multi_json (~> 1.0)
ffi (1.1.5)
- guard (1.5.2)
+ guard (1.5.3)
listen (>= 0.4.2)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
- guard-coffeescript (0.5.4)
+ guard-coffeescript (1.2.1)
coffee-script (>= 2.2.0)
- guard (>= 0.8.3)
+ guard (>= 1.1.0)
guard-jasmine (1.9.3)
childprocess
guard (>= 1.1.0)
multi_json
thor
- guard-livereload (0.4.2)
+ guard-livereload (1.1.0)
em-websocket (>= 0.2.0)
- guard (>= 0.10.0)
+ guard (>= 1.5.0)
multi_json (~> 1.0)
haml (3.1.7)
+ heroku (2.33.0)
+ heroku-api (~> 0.3.5)
+ launchy (>= 0.3.2)
+ netrc (~> 0.7.7)
+ rest-client (~> 1.6.1)
+ rubyzip
+ heroku-api (0.3.6)
+ excon (~> 0.16.7)
hike (1.2.1)
i18n (0.6.1)
jasmine (1.2.1)
@@ -87,9 +96,11 @@ GEM
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
+ launchy (2.1.2)
+ addressable (~> 2.3)
less (2.2.2)
commonjs (~> 0.2.6)
- less-rails (2.2.5)
+ less-rails (2.2.6)
actionpack (>= 3.1)
less (~> 2.2.0)
libv8 (3.3.10.4)
@@ -104,6 +115,7 @@ GEM
method_source (0.8.1)
mime-types (1.19)
multi_json (1.3.6)
+ netrc (0.7.7)
pg (0.14.1)
polyglot (0.3.3)
pry (0.9.10)
@@ -117,21 +129,21 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.2)
- actionmailer (= 3.2.2)
- actionpack (= 3.2.2)
- activerecord (= 3.2.2)
- activeresource (= 3.2.2)
- activesupport (= 3.2.2)
+ rails (3.2.3)
+ actionmailer (= 3.2.3)
+ actionpack (= 3.2.3)
+ activerecord (= 3.2.3)
+ activeresource (= 3.2.3)
+ activesupport (= 3.2.3)
bundler (~> 1.0)
- railties (= 3.2.2)
+ railties (= 3.2.3)
rails-backbone (0.7.0)
coffee-script (~> 2.2.0)
ejs (~> 1.0.0)
railties (>= 3.1.0)
- railties (3.2.2)
- actionpack (= 3.2.2)
- activesupport (= 3.2.2)
+ railties (3.2.3)
+ actionpack (= 3.2.3)
+ activesupport (= 3.2.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -141,6 +153,8 @@ GEM
ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
+ rest-client (1.6.7)
+ mime-types (>= 1.16)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
@@ -177,7 +191,7 @@ GEM
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.1.4)
+ twitter-bootstrap-rails (2.1.5)
actionpack (>= 3.1)
less-rails (~> 2.2.3)
railties (>= 3.1)
@@ -196,11 +210,12 @@ DEPENDENCIES
guard-coffeescript
guard-jasmine
guard-livereload
+ heroku
jasmine
jasminerice
jquery-rails
pg
- rails (= 3.2.2)
+ rails (= 3.2.3)
rails-backbone (= 0.7.0)
rb-inotify (~> 0.8.8)
sass-rails (~> 3.2.3)
View
@@ -1,6 +1,13 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.2'
+ruby '1.9.3'
+
+gem 'bundler', '1.2.0.pre'
+gem 'rails', '3.2.3'
+
+gem "heroku"
+
+
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
View
@@ -24,3 +24,11 @@ todo:
==based on: Sample Backbone App using Backbone-relational
+https://secure.travis-ci.org/brownman/book-splitter-backbone-bootstrap.png
+
+[![Build Status](https://secure.travis-ci.org/brownman/book-splitter-backbone-bootstrap.png)](http://travis-ci.org/brownman/book-splitter-backbone-bootstrap)
+
+!https://secure.travis-ci.org/brownman/book-splitter-backbone-bootstrap.png(Build Status)!:http://travis-ci.org/brownman/book-splitter-backbone-bootstrap
+
+{<img src="https://secure.travis-ci.org/brownman/book-splitter-backbone-bootstrap.png" alt="Build Status" />}[http://travis-ci.org/brownman/book-splitter-backbone-bootstrap]
+
View
@@ -3,6 +3,7 @@ book-splitter for smartphones
todo:
+- post will not fetch comments anless user click on a post
- text to ascii - dealing with endl - on song-texts
- db - add element to story: right-to-left:boolean, title:string
- using db - to store array structure
@@ -22,4 +23,8 @@ todo:
==based on: Sample Backbone App using Backbone-relational
+https://secure.travis-ci.org/brownman/book-splitter-backbone-bootstrap.png
+[![Build Status](https://secure.travis-ci.org/brownman/book-splitter-backbone-bootstrap.png)](http://travis-ci.org/brownman/book-splitter-backbone-bootstrap)
+!https://secure.travis-ci.org/brownman/book-splitter-backbone-bootstrap.png(Build Status)!:http://travis-ci.org/brownman/book-splitter-backbone-bootstrap
+{<img src="https://secure.travis-ci.org/brownman/book-splitter-backbone-bootstrap.png" alt="Build Status" />}[http://travis-ci.org/brownman/book-splitter-backbone-bootstrap]

0 comments on commit 70ea82d

Please sign in to comment.