Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bumped deps, cleaned up some unused files

  • Loading branch information...
commit 5f2a698076691ebb5783ceae1c532a4ea98cabfd 1 parent bf9200d
@rwz rwz authored
View
2  Gemfile
@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source :rubygems
# Specify dependencies in nestive.gemspec
gemspec
View
114 Gemfile.lock
@@ -7,104 +7,104 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.1)
- actionpack (= 3.2.1)
- mail (~> 2.4.0)
- actionpack (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
+ actionmailer (3.2.8)
+ actionpack (= 3.2.8)
+ mail (~> 2.4.4)
+ actionpack (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
+ journey (~> 1.0.4)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.1)
- activesupport (= 3.2.1)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
- activerecord (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- arel (~> 3.0.0)
+ activerecord (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- activesupport (3.2.1)
+ activeresource (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
- builder (3.0.0)
- combustion (0.3.1)
- rails (>= 3.1.0)
+ builder (3.0.4)
+ combustion (0.3.2)
+ rails (>= 3.0.0)
thor (>= 0.14.6)
diff-lcs (1.1.3)
erubis (2.7.0)
hike (1.2.1)
- i18n (0.6.0)
- journey (1.0.3)
- json (1.6.5)
- mail (2.4.1)
+ i18n (0.6.1)
+ journey (1.0.4)
+ json (1.7.5)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
- multi_json (1.1.0)
+ mime-types (1.19)
+ multi_json (1.3.7)
polyglot (0.3.3)
rack (1.4.1)
- rack-cache (1.1)
+ rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.1)
- actionmailer (= 3.2.1)
- actionpack (= 3.2.1)
- activerecord (= 3.2.1)
- activeresource (= 3.2.1)
- activesupport (= 3.2.1)
+ rails (3.2.8)
+ actionmailer (= 3.2.8)
+ actionpack (= 3.2.8)
+ activerecord (= 3.2.8)
+ activeresource (= 3.2.8)
+ activesupport (= 3.2.8)
bundler (~> 1.0)
- railties (= 3.2.1)
- railties (3.2.1)
- actionpack (= 3.2.1)
- activesupport (= 3.2.1)
+ railties (= 3.2.8)
+ railties (3.2.8)
+ actionpack (= 3.2.8)
+ activesupport (= 3.2.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.8.0)
- rspec-rails (2.8.1)
+ rspec (2.11.0)
+ rspec-core (~> 2.11.0)
+ rspec-expectations (~> 2.11.0)
+ rspec-mocks (~> 2.11.0)
+ rspec-core (2.11.1)
+ rspec-expectations (2.11.3)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.11.3)
+ rspec-rails (2.11.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.8.0)
- sprockets (2.1.2)
+ rspec (~> 2.11.0)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- thor (0.14.6)
+ thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
+ tzinfo (0.3.35)
PLATFORMS
ruby
DEPENDENCIES
- combustion
+ combustion (~> 0.3.2)
nestive!
- rspec-rails
+ rspec-rails (~> 2.11)
View
26 nestive.gemspec
@@ -1,26 +1,26 @@
# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "nestive/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'nestive/version'
Gem::Specification.new do |s|
s.name = "nestive"
s.version = Nestive::VERSION
s.platform = Gem::Platform::RUBY
- s.authors = ["Justin French"]
- s.email = ["justin@indent.com.au"]
- s.homepage = ""
- s.summary = %q{A Rails plugin/gem for awesome nested templates and layouts}
- s.description = %q{A Rails plugin/gem for awesome nested templates and layouts}
+ s.authors = ['Justin French']
+ s.email = ['justin@indent.com.au']
+ s.homepage = ''
+ s.summary = %{A Rails plugin/gem for awesome nested templates and layouts}
+ s.description = %{A Rails plugin/gem for awesome nested templates and layouts}
- s.rubyforge_project = "nestive"
+ s.rubyforge_project = 'nestive'
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
- s.require_paths = ["lib"]
-
+ s.require_paths = ['lib']
+
s.add_dependency 'rails', '~> 3.0'
- s.add_development_dependency 'combustion'
- s.add_development_dependency 'rspec-rails'
-
+ s.add_development_dependency 'combustion', '~> 0.3.2'
+ s.add_development_dependency 'rspec-rails', '~> 2.11'
+
end
View
3  spec/internal/config/database.yml
@@ -1,3 +0,0 @@
-test:
- adapter: sqlite3
- database: db/combustion_test.sqlite
Please sign in to comment.
Something went wrong with that request. Please try again.