Skip to content

Commit

Permalink
updating gems and gemspec
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Fitzgerald committed Jul 4, 2011
1 parent 1b9f388 commit fe5cd5d
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 53 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ source "http://rubygems.org"
# Bundle edge Rails instead:
gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'tilt', :git => "git://github.com/rtomayko/tilt.git"
gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git"
gem 'sprockets', "= 2.0.0.beta.10"
# gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git"
gem 'execjs', :git => "git://github.com/sstephenson/execjs.git"

gem 'sqlite3'
Expand Down
93 changes: 44 additions & 49 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,81 +1,72 @@
GIT
remote: git://github.com/rails/rails.git
revision: 0dd32e8edbc2ba5d4496e7f8063536c507b74c5f
revision: 78ff00d1964bdc911175ed29559d1382ace33d64
specs:
actionmailer (3.1.0.rc1)
actionpack (= 3.1.0.rc1)
actionmailer (3.2.0.beta)
actionpack (= 3.2.0.beta)
mail (~> 2.3.0)
actionpack (3.1.0.rc1)
activemodel (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
actionpack (3.2.0.beta)
activemodel (= 3.2.0.beta)
activesupport (= 3.2.0.beta)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.0)
rack-cache (~> 1.0.1)
rack-cache (~> 1.0.2)
rack-mount (~> 0.8.1)
rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.10)
tzinfo (~> 0.3.27)
activemodel (3.1.0.rc1)
activesupport (= 3.1.0.rc1)
sprockets (= 2.0.0.beta.10)
tzinfo (~> 0.3.29)
activemodel (3.2.0.beta)
activesupport (= 3.2.0.beta)
bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.0.rc1)
activemodel (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
arel (~> 2.1.1)
tzinfo (~> 0.3.27)
activeresource (3.1.0.rc1)
activemodel (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
activesupport (3.1.0.rc1)
activerecord (3.2.0.beta)
activemodel (= 3.2.0.beta)
activesupport (= 3.2.0.beta)
arel (~> 2.1.3)
tzinfo (~> 0.3.29)
activeresource (3.2.0.beta)
activemodel (= 3.2.0.beta)
activesupport (= 3.2.0.beta)
activesupport (3.2.0.beta)
i18n (~> 0.6)
multi_json (~> 1.0)
rails (3.1.0.rc1)
actionmailer (= 3.1.0.rc1)
actionpack (= 3.1.0.rc1)
activerecord (= 3.1.0.rc1)
activeresource (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
rails (3.2.0.beta)
actionmailer (= 3.2.0.beta)
actionpack (= 3.2.0.beta)
activerecord (= 3.2.0.beta)
activeresource (= 3.2.0.beta)
activesupport (= 3.2.0.beta)
bundler (~> 1.0)
railties (= 3.1.0.rc1)
railties (3.1.0.rc1)
actionpack (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
railties (= 3.2.0.beta)
railties (3.2.0.beta)
actionpack (= 3.2.0.beta)
activesupport (= 3.2.0.beta)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)

GIT
remote: git://github.com/rtomayko/tilt.git
revision: 3108d559c272355cff69748bd587f4d9152c736c
revision: a07077f4737754757e99c2d42267f432289ffd13
specs:
tilt (1.3.2)

GIT
remote: git://github.com/sstephenson/execjs.git
revision: 2e3ec8e5df0d384281fff64ca88423315c961d19
revision: dec2b9d82a9b3712399cb59bffaa3fd2e7c87cba
specs:
execjs (1.1.3)
execjs (1.2.0)
multi_json (~> 1.0)

GIT
remote: git://github.com/sstephenson/sprockets.git
revision: 35941731c93ccea63fa4d64188d93b6b3fc7f830
specs:
sprockets (2.0.0.beta.10)
hike (~> 1.1)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)

GEM
remote: http://rubygems.org/
specs:
archive-tar-minitar (0.5.2)
arel (2.1.1)
arel (2.1.3)
bcrypt-ruby (2.1.4)
builder (3.0.0)
coffee-script (2.2.0)
Expand All @@ -87,7 +78,7 @@ GEM
erubis (2.7.0)
hike (1.1.0)
i18n (0.6.0)
jquery-rails (1.0.11)
jquery-rails (1.0.12)
railties (~> 3.0)
thor (~> 0.14)
linecache19 (0.5.12)
Expand All @@ -109,7 +100,7 @@ GEM
rack-test (0.6.0)
rack (>= 1.0)
rake (0.9.2)
rdoc (3.6.1)
rdoc (3.8)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
Expand All @@ -120,13 +111,17 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
sass (3.1.2)
sass (3.1.4)
sprockets (2.0.0.beta.10)
hike (~> 1.0)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
sqlite3 (1.3.3)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.28)
uglifier (0.5.4)
tzinfo (0.3.29)
uglifier (1.0.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)

Expand All @@ -141,7 +136,7 @@ DEPENDENCIES
rails!
ruby-debug19
sass
sprockets!
sprockets (= 2.0.0.beta.10)
sqlite3
tilt!
uglifier
6 changes: 3 additions & 3 deletions backbone-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# project in your rails apps through git.
Gem::Specification.new do |s|
s.name = "rails-backbone"
s.version = "0.2.0"
s.version = "0.5.0"
s.authors = ["Ryan Fitzgerald", "Code Brew Studios"]
s.email = ["ryan@codebrewstudios.com"]
s.homepage = "http://github.com/codebrew/backbone-rails"
Expand All @@ -11,8 +11,8 @@ Gem::Specification.new do |s|
s.description = "Quickly setup backbone.js for use with rails 3.1. Generators are provided to quickly get started."
s.files = Dir["lib/**/*"] + Dir["vendor/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]

s.add_dependency('rails', '~> 3.1.0.beta1')
s.add_dependency('coffee-script', '~> 2.2.0')
s.add_dependency('rails', '~> 3.1')
s.add_dependency('coffee-script', '~> 2.2')
s.add_dependency('ejs', '~> 1.0.0')

s.require_paths = ['lib']
Expand Down

0 comments on commit fe5cd5d

Please sign in to comment.