Permalink
Browse files

Removed gemfiles, changed travis behavior

  • Loading branch information...
1 parent a48c8e7 commit c83bf7d43c868e9eae2c5d87b839a583d75596df @pyromaniac pyromaniac committed Feb 22, 2012
Showing with 43 additions and 574 deletions.
  1. +2 −0 .gitignore
  2. +15 −9 .travis.yml
  3. +13 −0 CHANGELOG.md
  4. +13 −1 Gemfile
  5. +0 −182 Gemfile.lock
  6. +0 −7 gemfiles/Gemfile-rails-3.1
  7. +0 −185 gemfiles/Gemfile-rails-3.1.lock
  8. +0 −7 gemfiles/Gemfile-rails-3.2
  9. +0 −183 gemfiles/Gemfile-rails-3.2.lock
View
@@ -5,3 +5,5 @@ spec/dummy/db/*.sqlite3
spec/dummy/log/*.log
spec/dummy/tmp/
*.orig
+.idea
+Gemfile.lock
View
@@ -1,11 +1,17 @@
rvm:
- - 1.9.2
- - 1.9.3
- - ruby-head
- #- rbx
- #- rbx-2.0
+ - 1.9.2
+ - 1.9.3
+ - ruby-head
+ #- rbx-19mode
-gemfile:
- - Gemfile
- - gemfiles/Gemfile-rails-3.1
- - gemfiles/Gemfile-rails-3.2
+env:
+ - RAILS_VERSION=3.1.3
+ - RAILS_VERSION=3.2.1
+ - RAILS_VERSION=3-1-stable
+ - RAILS_VERSION=3-2-stable
+ - RAILS_VERSION=master
+
+matrix:
+ exclude:
+ - rvm: 1.9.2
+ env: RAILS_VERSION=master
View
@@ -10,6 +10,19 @@
This example will render page with 'hello/world' location.
+* All controller instance variable assigns will be transferret
+ to liquid as drops if they are respond to `to_liquid`
+
+ ```
+ def index
+ @answer = 42
+ render 'hello/world', :layout => 'puffer_pages'
+ end
+ ```
+
+ If `hello/world` page body: '{{count}}'
+ This action will produce '42'
+
## 0.1.1
### New features
View
14 Gemfile
@@ -2,5 +2,17 @@ source "http://rubygems.org"
gemspec
-gem 'nested_set', :git => 'git://github.com/skyeagle/nested_set.git'
gem 'puffer', :git => 'git://github.com/puffer/puffer.git'
+
+case version = ENV['RAILS_VERSION'] || '~> 3.1'
+when /master/
+ gem "rails", :git => "git://github.com/rails/rails.git"
+ gem "arel", :git => "git://github.com/rails/arel.git"
+ gem "journey", :git => "git://github.com/rails/journey.git"
+when /3-1-stable/
+ gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-1-stable"
+when /3-2-stable/
+ gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-2-stable"
+else
+ gem "rails", version
+end
View
@@ -1,182 +0,0 @@
-GIT
- remote: git://github.com/puffer/puffer.git
- revision: 719b80730fd723c7f665c95315a19edbb8148593
- specs:
- puffer (0.1.1)
- kaminari
- orm_adapter
- rails (~> 3.1)
-
-GIT
- remote: git://github.com/skyeagle/nested_set.git
- revision: f85d29df9fd060fce3c2ab80ed2998297662e9e9
- specs:
- nested_set (1.6.8)
- activerecord (>= 3.0.0)
- railties (>= 3.0.0)
-
-PATH
- remote: .
- specs:
- puffer_pages (0.1.1)
- liquid
- nested_set
- puffer
- rails (~> 3.1)
-
-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)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- journey (~> 1.0.1)
- rack (~> 1.4.0)
- rack-cache (~> 1.1)
- rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.1)
- activesupport (= 3.2.1)
- builder (~> 3.0.0)
- activerecord (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- arel (~> 3.0.0)
- tzinfo (~> 0.3.29)
- activeresource (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- activesupport (3.2.1)
- i18n (~> 0.6)
- multi_json (~> 1.0)
- arel (3.0.0)
- bcrypt-ruby (3.0.1)
- builder (3.0.0)
- capybara (1.1.2)
- mime-types (>= 1.16)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- selenium-webdriver (~> 2.0)
- xpath (~> 0.1.4)
- childprocess (0.3.1)
- ffi (~> 1.0.6)
- database_cleaner (0.7.1)
- diff-lcs (1.1.3)
- erubis (2.7.0)
- fabrication (1.2.0)
- ffi (1.0.11)
- forgery (0.5.0)
- guard (1.0.0)
- ffi (>= 0.5.0)
- thor (~> 0.14.6)
- guard-rspec (0.6.0)
- guard (>= 0.10.0)
- hike (1.2.1)
- i18n (0.6.0)
- journey (1.0.1)
- json (1.6.5)
- kaminari (0.13.0)
- actionpack (>= 3.0.0)
- activesupport (>= 3.0.0)
- railties (>= 3.0.0)
- libnotify (0.7.2)
- liquid (2.3.0)
- mail (2.4.1)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.17.2)
- multi_json (1.0.4)
- mysql (2.8.1)
- nokogiri (1.5.0)
- orm_adapter (0.0.6)
- pg (0.12.2)
- polyglot (0.3.3)
- rack (1.4.1)
- rack-cache (1.1)
- rack (>= 0.4)
- rack-ssl (1.3.2)
- rack
- rack-test (0.6.1)
- 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)
- bundler (~> 1.0)
- railties (= 3.2.1)
- railties (3.2.1)
- actionpack (= 3.2.1)
- activesupport (= 3.2.1)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
- rb-inotify (0.8.8)
- ffi (>= 0.5.0)
- 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)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec (~> 2.8.0)
- rubyzip (0.9.5)
- selenium-webdriver (2.18.0)
- childprocess (>= 0.2.5)
- ffi (~> 1.0.9)
- multi_json (~> 1.0.4)
- rubyzip
- sprockets (2.1.2)
- hike (~> 1.2)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
- thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.10)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.31)
- xpath (0.1.4)
- nokogiri (~> 1.3)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- bcrypt-ruby
- capybara (>= 0.4.0)
- database_cleaner
- fabrication
- forgery
- guard
- guard-rspec
- libnotify
- mysql
- nested_set!
- pg
- puffer!
- puffer_pages!
- rb-inotify
- rspec-rails
- sqlite3-ruby
@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => '..'
-
-gem 'rails', '~> 3.1.0'
-gem 'nested_set', :git => 'git://github.com/skyeagle/nested_set.git'
-gem 'puffer', :git => 'git://github.com/puffer/puffer.git'
Oops, something went wrong.

0 comments on commit c83bf7d

Please sign in to comment.