Merge branch 'master' of git://github.com/pilu/web-app-theme

Conflicts: Gemfile Gemfile.lock web-app-theme.gemspec
gravityblast · Oct 12, 2011 · 6148157 · 6148157
2 parents c7078ba + 86fe95c
commit 6148157
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 139 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
 .DS_Store
 *.swp
 *.swo

diff --git a/Gemfile b/Gemfile
@@ -1,23 +1,4 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.1.0"
-
-# Declare your gem's dependencies in web_app_theme.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
+# Specify your gem's dependencies in web-app-theme.gemspec
 gemspec
-
-gem "rspec-rails"
-gem "rspec"
-gem "cucumber"
-gem "cucumber-rails"
-gem "aruba"
-gem "sqlite3"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,40 +2,40 @@ PATH
   remote: .
   specs:
     web-app-theme (0.8.0)
-      rails (~> 3.1.0.rc6)
+      rails (~> 3.1.0)
+      thor (~> 0.14)
       thor (~> 0.14)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0.rc6)
-      actionpack (= 3.1.0.rc6)
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc6)
-      activemodel (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
       rack (~> 1.3.2)
-      rack-cache (~> 1.0.2)
-      rack-mount (~> 0.8.1)
-      rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.12)
-    activemodel (3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
-      bcrypt-ruby (~> 2.1.4)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0.rc6)
-      activemodel (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0.rc6)
-      activemodel (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
-    activesupport (3.1.0.rc6)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
       multi_json (~> 1.0)
     arel (2.2.1)
     aruba (0.4.6)
@@ -44,11 +44,10 @@ GEM
       cucumber (>= 1.0.2)
       rdiscount (>= 1.6.8)
       rspec (>= 2.6.0)
-    bcat (0.6.1)
+    bcat (0.6.2)
       rack (~> 1.0)
-    bcrypt-ruby (2.1.4)
     builder (3.0.0)
-    capybara (1.0.1)
+    capybara (1.1.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -57,25 +56,25 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    cucumber (1.0.2)
+    cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
+      gherkin (~> 2.5.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    cucumber-rails (1.0.2)
-      capybara (>= 1.0.0)
-      cucumber (~> 1.0.0)
-      nokogiri (>= 1.4.6)
-    diff-lcs (1.1.2)
+      term-ansicolor (>= 1.0.6)
+    cucumber-rails (1.1.1)
+      capybara (>= 1.1.1)
+      cucumber (>= 1.1.0)
+      nokogiri (>= 1.5.0)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
     ffi (1.0.9)
-    gherkin (2.4.16)
+    gherkin (2.5.1)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.5.3)
-    json_pure (1.5.3)
+    json (1.6.1)
+    json_pure (1.6.1)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -84,33 +83,34 @@ GEM
     multi_json (1.0.3)
     nokogiri (1.5.0)
     polyglot (0.3.2)
-    rack (1.3.2)
-    rack-cache (1.0.2)
+    rack (1.3.4)
+    rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.2)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0.rc6)
-      actionmailer (= 3.1.0.rc6)
-      actionpack (= 3.1.0.rc6)
-      activerecord (= 3.1.0.rc6)
-      activeresource (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc6)
-    railties (3.1.0.rc6)
-      actionpack (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
     rdiscount (1.6.8)
-    rdoc (3.9.4)
+    rdoc (3.10)
+      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -125,12 +125,12 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (2.5.0)
+    selenium-webdriver (2.8.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    sprockets (2.0.0.beta.15)
+    sprockets (2.0.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
@@ -141,7 +141,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.30)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -153,7 +153,6 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   cucumber
   cucumber-rails
-  rails (~> 3.1.0.rc6)
   rspec
   rspec-rails
   sqlite3

diff --git a/README.md b/README.md
@@ -1,29 +1,38 @@
-Web App Theme
-=============
+# Web App Theme
 
 Web App Theme is a rails generator by [Andrea Franz](http://gravityblast.com) that you can use to generate admin panels quickly.
 Inspired by cool themes like [Lighthouse](http://lighthouseapp.com/), [Basecamp](http://basecamphq.com/), [RadiantCMS](http://radiantcms.org/) and others,
 it wants to be an idea to start developing a complete web application layout.
 
-Installation
-------------
+![Web App Theme screenshot](http://img.skitch.com/20091109-c2k618qerx1ysw5ytxsighuf3f.jpg)
+
+
+
 
-####Rails >= 3.1.0
+## Installation
+
+
+#### Rails >= 3.1.0
 For this version, all the stylesheets are stored inside the gems assets path. They don't need to be copied to the to the application, unless you want to customize them (using the web_app_theme:assets generator). There only css file generated when you run the theme generator is the web_app_theme.css that includes the theme of your choice.
 Add to your gemfile:
 
     gem 'web-app-theme', '~> 0.8.0'
 
-####Other versions
+
+#### Other versions
 You can use web-app-theme >= 0.6.2 with Rails 3. If you want to use it with rails 2, use web-app-theme 0.5.3
 Specify the web-app-theme gem in your Gemfile, only for :development and :test
 
     group :development, :test do
       gem 'web-app-theme', '>= 0.6.2'
     end
 
-Usage
------
+
+
+
+## Usage
+
+
 
 ### Theme Generator
 
@@ -56,6 +65,8 @@ If you need a layout for login and signup pages, you can use the `--type` option
 
     rails g web_app_theme:theme sign --layout-type=sign
 
+
+
 ### Assets Generator
 
 Used to copy a theme of your choice from the gem to your application, without parameters it will copy the 'default' theme
@@ -65,6 +76,8 @@ Used to copy a theme of your choice from the gem to your application, without pa
 This will copy the theme files on your app/assets/stylesheets/web-app-theme path.
 Also this will copy theme's images to app/assets/images/web-app-theme path
 
+
+
 ### Themed Generator
 
 Start creating your controllers manually or with a scaffold, and then use the `themed generator` to overwrite the previously generated views.
@@ -123,33 +136,38 @@ If you want to have translated pages, simple create in your locale.yml the keys
 	    all: All
 
 
-![Web App Theme screenshot](http://img.skitch.com/20091109-c2k618qerx1ysw5ytxsighuf3f.jpg)
 
-Contributing
----
+
+## Contributing
 
 * Fork this repository.
 * Duplicate the  'themes/default' folder and rename it.
 * Modify the style.css file adding your favorite colors.
 * Add a link to your theme in the 'Switch Theme' block inside the index.html file.
 * Send a pull request.
 
-Links
------
+
+
+
+## Links
 
 * Repository: git://github.com/pilu/web-app-theme.git
 * List: <http://groups.google.com/group/web-app-theme-generator>
 * Issues: <http://github.com/pilu/web-app-theme/issues>
 * Gem: <http://gemcutter.org/gems/web-app-theme>
 * Themes: <http://pilu.github.com/web-app-theme>
 
-Author
-------
+
+
+
+## Author
 
 Andrea Franz - [http://gravityblast.com](http://gravityblast.com)
 
-Contributors
-------------
+
+
+
+## Contributors
 
 * Nelson Fernandez
 * Giovanni Intini
@@ -168,8 +186,10 @@ Contributors
 * Sandro Duarte
 * David Francisco
 
-Credits
--------
+
+
+
+## Credits
 
 * Icons: FAMFAMFAM Silk icons <http://www.famfamfam.com/lab/icons/silk/>
 * Buttons: Particletree - Rediscovering the Button Element <http://particletree.com/features/rediscovering-the-button-element/>
diff --git a/Rakefile b/Rakefile
@@ -1,23 +1 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'TestingGem'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
diff --git a/lib/web-app-theme.rb b/lib/web-app-theme.rb
@@ -1,3 +1,5 @@
+require 'web-app-theme/version'
+
 module WebAppTheme
   class Engine < Rails::Engine
 

diff --git a/lib/web-app-theme/version.rb b/lib/web-app-theme/version.rb
@@ -1,3 +1,3 @@
 module WebAppTheme
-  VERSION = "0.8.0"
+  VERSION = '0.8.0'
 end