tempatra 0.1.0 → 0.2.0

data/README.md

@@ -1,7 +1,7 @@
 Tempatra
 ========
 
-A RubiGen Sinatra application generator providing Blueprint CSS, jQuery, Haml, Sass, Compass, RSpec, Cucumber, and Capybara.
+A RubiGen Sinatra application template generator providing Blueprint CSS, jQuery, Haml, Sass, Compass, RSpec, Cucumber, and Capybara.
 
 Installation
 ------------
@@ -12,28 +12,36 @@ Installation
 Basic Usage
 -----------
 
-To generate a new application:
+Generate a new application
 
     $ tempatra your-app-name
 
-Move into your new application:
+Move into your new application
 
     $ cd your-app-name
 
-Run your application:
+To run your application locally
 
     $ shotgun --server=thin -p 4567 config.ru
 
-Then go to [http://localhost:4567/](http://localhost:4567/) with your browser.
+Then go to [http://localhost:4567/](http://localhost:4567/) with your browser)
 
-You can continuously compile your Sass stylesheets with Compass (in another terminal):
+To compile your Sass stylesheets with Compass on demand
 
-    $ compass --watch
+    $ compass compile
 
-And of course, use autospec (in yet another terminal)
+To monitor your project for changes and automatically recompile
+
+    $ compass watch
+
+Use autospec
 
     $ autospec
 
+Run RSpec and Cucumber tests
+
+    $ rake
+
 
 Options
 -------
@@ -46,9 +54,13 @@ Display Tempatra version number
 
     $ tempatra -v
 
-Create git repository
+Don't create git repository
+
+    $ tempatra your-app-name -N
+
+Don't run Compass as a standalone project
 
-    $ tempatra your-app-name -G
+    $ tempatra your-app-name -C
 
 Create and push to Heroku (requires heroku gem and Heroku account)
 
@@ -71,4 +83,4 @@ Olivier Lauzon (olauzon)
 Copyright
 ---------
 
-Copyright (c) 2009 Olivier Lauzon. See LICENSE for details.
+Copyright (c) 2009-2010 Olivier Lauzon. See LICENSE for details.

data/Rakefile

@@ -11,24 +11,24 @@ begin
     gem.homepage = "http://github.com/olauzon/tempatra"
     gem.authors = ["Olivier Lauzon", "Stewart Laufer"]
 
-    gem.add_dependency('compass',   '~> 0.10.2')
-    gem.add_dependency('cucumber',  '~> 0.7.3')
-    gem.add_dependency('haml',      '~> 3.0.9')
-    gem.add_dependency('rack-test', '~> 0.5.3')
-    gem.add_dependency('rdiscount', '~> 1.6.3.2')
-    gem.add_dependency('rspec',     '>= 1.2.6')
+    gem.add_dependency('compass',   '~> 0.10.5')
+    gem.add_dependency('cucumber',  '~> 0.8.5')
+    gem.add_dependency('haml',      '~> 3.0.18')
+    gem.add_dependency('rack-test', '~> 0.5.4')
+    gem.add_dependency('rdiscount', '~> 1.6.5')
+    gem.add_dependency('rspec',     '~> 1.3.0')
     gem.add_dependency('rubigen',   '~> 1.5.5')
     gem.add_dependency('sinatra',   '~> 1.0')
-    gem.add_dependency('shotgun',   '>= 0.6')
-    gem.add_dependency('thin',      '>= 1.2.3')
-    gem.add_dependency('capybara',  '~> 0.3.8')
+    gem.add_dependency('shotgun',   '~> 0.8')
+    gem.add_dependency('thin',      '~> 1.2.7')
+    gem.add_dependency('capybara',  '~> 0.3.9')
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.files = FileList[ 'app_generators/**/*',
                           'bin/*',
                           'lib/**/*.rb',
                           '[A-Z]*',
-                          'spec/**/*'].to_a.reject { |f| f =~ /^spec\/tmp/ }
+                          'spec/**/*'].to_a.reject { |f| f =~ /^spec\/tmp|^Gemfile/ }
     gem.test_files = FileList['spec/**/*'].to_a.reject { |f| f =~ /^spec\/tmp/ }
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/app_generators/tempatra/tempatra_generator.rb

@@ -39,12 +39,14 @@ class TempatraGenerator < RubiGen::Base
       # Root
       m.template  "_gems"               , ".gems"
       m.template  "_gitignore"          , ".gitignore"
-      m.template  "compass.config.erb"  , "compass.config"
       m.template  "config.ru.erb"       , "config.ru"
       m.template  "config.yml.erb"      , "config.yml"
       m.template  "Rakefile.erb"        , "Rakefile"
       m.template  "README.md.erb"       , "README.md"
 
+      # Config
+      m.template  "config/compass.rb.erb" , "config/compass.rb"
+
       # Sinatra
       m.template  "lib/tempatra.rb.erb" , "lib/#{app_file_name}.rb"
 
@@ -103,7 +105,7 @@ class TempatraGenerator < RubiGen::Base
       unless File.exist?(File.expand_path(@destination_root) + '/public/images/grid.png')
         m.run("#{compass} grid-img 30+10x22 public/images/grid.png --force")
       end
-      m.run("#{compass} --trace compile") if compile
+      m.run("#{compass} compile") if compile
 
       # Git
       if heroku || git_init
@@ -131,16 +133,22 @@ class TempatraGenerator < RubiGen::Base
     Move into your new application
     $ cd #{app_name}
 
-    To run your application
+    To run your application locally
     $ shotgun --server=thin -p 4567 config.ru
     (Then go to http://localhost:4567/ with your browser)
 
-    You can continuously compile your Sass stylesheets with Compass
-    $ compass --watch
+    To compile your Sass stylesheets with Compass on demand
+    $ compass compile
+
+    To monitor your project for changes and automatically recompile
+    $ compass watch
 
     Use autospec
     $ autospec
 
+    Run RSpec and Cucumber tests
+    $ rake
+
 
 "
     end
@@ -164,12 +172,13 @@ protected
     opts.separator ''
     opts.separator "Tempatra options:"
     opts.on("-v", "--version" , "Show the Tempatra version number and quit")
-    opts.on("-C", "--compile" , "Compile Compass stylesheets")    {|o| options[:compile]  = o}
+    opts.on("-C", "--no-compile" , "Don't compile Compass stylesheets")    {|o| options[:no_compile]  = o}
     opts.on("-N", "--no-git"  , "Don't create a git repository")  {|o| options[:no_git]   = o}
     opts.on("-H", "--heroku"  , "Create and push to Heroku")      {|o| options[:heroku]   = o}
   end
 
   BASEDIRS = %w(
+                  config
                   features
                   features/step_definitions
                   features/support
@@ -183,9 +192,9 @@ protected
               )
 
   def extract_options
-    @compile  = options[:compile].nil? ? false  : true
-    @git_init = options[:no_git].nil?  ? true   : false
-    @heroku   = options[:heroku].nil?  ? false  : true
+    @compile  = options[:no_compile].nil? ? true  : false
+    @git_init = options[:no_git].nil?     ? true  : false
+    @heroku   = options[:heroku].nil?     ? false : true
   end
 
   def which(bin)

data/app_generators/tempatra/templates/README.md.erb

@@ -2,16 +2,24 @@
 
 ## Usage ##
 
-Run your application:
+To run your application locally
 
     $ shotgun --server=thin -p 4567 config.ru
 
-Then go to [http://localhost:4567/](http://localhost:4567/) with your browser.
+Then go to [http://localhost:4567/](http://localhost:4567/) with your browser)
 
-You can continuously compile your Sass stylesheets with Compass (in another terminal or screen):
+To compile your Sass stylesheets with Compass on demand
 
-    $ compass --watch
+    $ compass compile
 
-And of course, use autospec (in yet another terminal or screen):
+To monitor your project for changes and automatically recompile
+
+    $ compass watch
+
+Use autospec
 
     $ autospec
+
+Run RSpec and Cucumber tests
+
+    $ rake

data/app_generators/tempatra/templates/_gems

@@ -1,4 +1,4 @@
-rdiscount   --version '~> 1.6.3.2'
+rdiscount   --version '~> 1.6.5'
 sinatra     --version '~> 1.0'
-haml        --version '~> 3.0.9'
-compass     --version '~> 0.10.2'
+haml        --version '~> 3.0.18'
+compass     --version '~> 0.10.5'

data/app_generators/tempatra/templates/lib/tempatra.rb.erb

@@ -2,16 +2,17 @@ APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 require 'rubygems'
 
-gem 'compass', '~> 0.10.2'
-require 'compass' # must be loaded before sinatra
+# <%= compile ? 'Unc' : 'C' %>omment to compile your stylesheets <%= 'without ' if compile %>using 'compass compile' or 'compass watch'
+<%= '#' if compile %>gem 'compass', '~> 0.10.5'
+<%= '#' if compile %>require 'compass' # must be loaded before sinatra
 
 gem 'sinatra', '~> 1.0'
 require 'sinatra'
 
-gem 'haml', '~> 3.0.9'
+gem 'haml', '~> 3.0.18'
 require 'haml'    # must be loaded after sinatra
 
-gem 'rdiscount', '~> 1.6.3.2'
+gem 'rdiscount', '~> 1.6.5'
 require 'rdiscount'
 
 class <%= module_name %> < Sinatra::Application
@@ -19,15 +20,16 @@ class <%= module_name %> < Sinatra::Application
   set :root, APP_ROOT
   set :haml, { :format => :html5 } # default Haml format is :xhtml
 
-  configure do
-    Compass.add_project_configuration(File.join(APP_ROOT, 'compass.config'))
-  end
+# <%= compile ? 'Unc' : 'C' %>omment to compile your stylesheets <%= 'without ' if compile %>using 'compass compile' or 'compass watch'
+<%= '#' if compile %>  configure do
+<%= '#' if compile %>    Compass.add_project_configuration(File.join(APP_ROOT, 'config/compass.rb'))
+<%= '#' if compile %>  end
 
   get '/' do
     haml :index
   end
 
-# <%= compile ? 'Unc' : 'C' %>omment to compile your stylesheets with<%= compile ? 'out' : '' %> the compass utility
+# <%= compile ? 'Unc' : 'C' %>omment to compile your stylesheets <%= 'without ' if compile %>using 'compass compile' or 'compass watch'
 <%= '#' if compile %>  get '/stylesheets/:name.css' do
 <%= '#' if compile %>    content_type 'text/css', :charset => 'utf-8'
 <%= '#' if compile %>    sass(:"stylesheets/#{params[:name]}", Compass.sass_engine_options )

data/app_generators/tempatra/templates/views/index.haml.erb

@@ -3,10 +3,10 @@
     A [Sinatra](http://www.sinatrarb.com/ "Sinatra") application template built with [Blueprint CSS](http://www.blueprintcss.org/ "Blueprint CSS"), [jQuery](http://jquery.com/ "jQuery"), [Haml](http://haml-lang.com/ "Haml"), [Sass](http://sass-lang.com/ "Sass"), [Compass](http://compass-style.org/ "Compass"), [RSpec](http://rspec.info/), [Cucumber](http://cukes.info/), and [Capybara](http://github.com/jnicklas/capybara).
 %article
   :markdown
-    This is a Sinatra application generated with [Tempatra](http://github.com/olauzon/tempatra). It is intended for designers and developers who  Sinatra, Haml, Sass, Compass, and jQuery. Tempatra provides a quick & dirty template to make design mock-ups.
+    This is a Sinatra application generated with [Tempatra](http://github.com/olauzon/tempatra). It is intended for designers and developers who are learning to use Sinatra, Haml, Sass, Compass, and jQuery. Tempatra provides a quick & dirty template to make design mock-ups.
 
     A common workflow is to start by writing Cucumber features that describe the important elements and interactions of the interface.
 
     Using [Heroku](http://heroku.com) for deployment, you can quickly share a design idea with your clients and colleagues.
 
-    Writing generators is fun and easy, thanks to the excellent [RubiGen gem](http://drnic.github.com/rubigen/).
+    Writing generators with [RubiGen](http://drnic.github.com/rubigen/) is easy.

data/app_generators/tempatra/templates/views/stylesheets/main.sass.erb

@@ -52,7 +52,7 @@ body
     +column($blueprint_grid_columns)
 
 body
-  :font-family "Garamond", "Georgia", "Times", "serif"
+  :font-family "Georgia", "Times", "serif"
   :font-size 16px
   :line-height 1.375
   p
@@ -91,7 +91,7 @@ body
 
 =alt
   :color #666
-  :font-family "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiqua", "Georgia", "serif"
+  :font-family "Palatino", "Georgia", "serif"
   :font-style italic
   :font-weight normal
   a

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tempatra
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Olivier Lauzon
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -04:00
+date: 2010-08-31 00:00:00 -04:00
 default_executable: tempatra
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 61
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 5
+        version: 0.10.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 53
         segments: 
         - 0
-        - 7
-        - 3
-        version: 0.7.3
+        - 8
+        - 5
+        version: 0.8.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 35
         segments: 
         - 3
         - 0
-        - 9
-        version: 3.0.9
+        - 18
+        version: 3.0.18
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -75,12 +75,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 0
         - 5
-        - 3
-        version: 0.5.3
+        - 4
+        version: 0.5.4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -91,13 +91,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 103
+        hash: 5
         segments: 
         - 1
         - 6
-        - 3
-        - 2
-        version: 1.6.3.2
+        - 5
+        version: 1.6.5
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -106,14 +105,14 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 27
         segments: 
         - 1
-        - 2
-        - 6
-        version: 1.2.6
+        - 3
+        - 0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -153,13 +152,13 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 27
         segments: 
         - 0
-        - 6
-        version: "0.6"
+        - 8
+        version: "0.8"
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -168,14 +167,14 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 17
         segments: 
         - 1
         - 2
-        - 3
-        version: 1.2.3
+        - 7
+        version: 1.2.7
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -186,12 +185,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
         - 3
-        - 8
-        version: 0.3.8
+        - 9
+        version: 0.3.9
   type: :runtime
   version_requirements: *id011
 description: A basic Sinatra application generator providing Blueprint CSS, jQuery, Haml, Sass, Compass, RSpec, Cucumber, and Capybara.
@@ -214,9 +213,9 @@ files:
 - app_generators/tempatra/templates/Rakefile.erb
 - app_generators/tempatra/templates/_gems
 - app_generators/tempatra/templates/_gitignore
-- app_generators/tempatra/templates/compass.config.erb
 - app_generators/tempatra/templates/config.ru.erb
 - app_generators/tempatra/templates/config.yml.erb
+- app_generators/tempatra/templates/config/compass.rb.erb
 - app_generators/tempatra/templates/features/homepage.feature.erb
 - app_generators/tempatra/templates/features/step_definitions/web_steps.rb
 - app_generators/tempatra/templates/features/support/env.rb.erb