tempatra 0.0.2 → 0.0.3

data/README.md

@@ -6,7 +6,8 @@ A RubiGen Sinatra application generator providing Blueprint CSS, jQuery, Haml, S
 Installation
 ------------
 
-    $ sudo gem install olauzon-tempatra -s http://gems.github.com/
+    $ gem sources -a http://gemcutter.org/ # If you do not have gemcutter as a source, add it!
+    $ sudo gem install tempatra
 
 Basic Usage
 -----------
@@ -49,7 +50,7 @@ Create git repository
 
     $ tempatra your-app-name -G
 
-Create and push to Heroku
+Create and push to Heroku (requires heroku gem and Heroku account)
 
     $ tempatra your-app-name -H
 

data/Rakefile

@@ -11,17 +11,17 @@ begin
     gem.homepage = "http://github.com/olauzon/tempatra"
     gem.authors = ["Olivier Lauzon"]
 
-    gem.add_dependency('chriseppstein-compass', '>= 0.8.12')
-    gem.add_dependency('cucumber', '>= 0.3.98')
-    gem.add_dependency('haml', '>= 2.2.3')
-    gem.add_dependency('rack-test', '>= 0.4.1')
+    gem.add_dependency('compass', '>= 0.8.17')
+    gem.add_dependency('cucumber', '>= 0.4.4')
+    gem.add_dependency('haml', '>= 2.2.13')
+    gem.add_dependency('rack-test', '>= 0.5.2')
     gem.add_dependency('rake', '>= 0.8.7')
-    gem.add_dependency('rdiscount', '>= 1.3.5')
+    gem.add_dependency('rdiscount', '>= 1.5.5')
     gem.add_dependency('rspec')
     gem.add_dependency('rubigen', '>= 1.5.2')
     gem.add_dependency('sinatra', '>= 0.9.4')
-    gem.add_dependency('thin', '>= 1.2.2')
-    gem.add_dependency('webrat', '>= 0.5.1')
+    gem.add_dependency('thin', '>= 1.2.3')
+    gem.add_dependency('webrat', '>= 0.5.3')
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.files = FileList[ 'app_generators/**/*',

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/app_generators/tempatra/tempatra_generator.rb

@@ -16,7 +16,8 @@ class TempatraGenerator < RubiGen::Base
               :app_full_name,
               :module_name,
               :git_init,
-              :heroku
+              :heroku,
+              :compile
 
   def initialize(runtime_args, runtime_options = {})
     super
@@ -36,13 +37,13 @@ class TempatraGenerator < RubiGen::Base
       BASEDIRS.each { |path| m.directory path }
 
       # Root
-      m.template  "_gems"         ,  ".gems"
-      m.template  "_gitignore"    ,  ".gitignore"
-      m.template  "config.rb.erb" ,   "config.rb"
-      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"
+      m.template  "_gems"         , ".gems"
+      m.template  "_gitignore"    , ".gitignore"
+      m.template  "config.rb.erb" , "config.rb"
+      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"
 
       # Sinatra
       m.template  "lib/tempatra.rb.erb" , "lib/#{app_file_name}.rb"
@@ -102,10 +103,10 @@ class TempatraGenerator < RubiGen::Base
       unless File.exist?(File.expand_path(@destination_root) + '/public/images/grid.png')
         m.run("#{compass} --force --grid-img --images-dir public/images")
       end
-      m.run("#{compass}")
+      m.run("#{compass}") if compile
 
       # Git
-      if git_init || heroku
+      if heroku || git_init
         git = which "git"
         unless File.exist?(File.expand_path(@destination_root) + '/.git/config')
           m.run("#{git} init")
@@ -134,10 +135,10 @@ class TempatraGenerator < RubiGen::Base
     $ thin start -p 4567 -R config.ru
     (Then go to http://localhost:4567/ with your browser)
 
-    While you develop, continuously compile your Sass stylesheets with Compass (in another terminal)
+    You can continuously compile your Sass stylesheets with Compass
     $ compass --watch
 
-    And of course, use autospec (in yet another terminal)
+    And of course, use autospec
     $ autospec
 
 
@@ -162,9 +163,10 @@ protected
   def add_options!(opts)
     opts.separator ''
     opts.separator "Tempatra options:"
-    opts.on("-v", "--version", "Show the Tempatra version number and quit")
-    opts.on("-G", "--git-init", "Create a git repository") {|o| options[:git] = o}
-    opts.on("-H", "--heroku", "Create and push to Heroku") {|o| options[:heroku] = o}
+    opts.on("-v", "--version" , "Show the Tempatra version number and quit")
+    opts.on("-C", "--compile" , "Compile Compass stylesheets")    {|o| options[: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(
@@ -181,8 +183,9 @@ protected
               )
 
   def extract_options
-    @git_init = options[:git]     ? true : false
-    @heroku   = options[:heroku]  ? true : false
+    @compile  = options[:compile].nil? ? false  : true
+    @git_init = options[:no_git].nil?  ? true   : false
+    @heroku   = options[:heroku].nil?  ? false  : true
   end
 
   def which(bin)

data/app_generators/tempatra/templates/Rakefile.erb

@@ -4,7 +4,6 @@ require 'rake/rdoctask'
 
 require 'spec/rake/spectask'
 
-
 task :default => [ :spec, :cucumber ]
 
 desc "Run the code examples in spec/"

data/app_generators/tempatra/templates/_gems

@@ -1,2 +1,3 @@
 rdiscount
 haml --version '>= 2.2.3'
+compass --version '>= 0.8.17'

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

@@ -1,14 +1,26 @@
 # Compass configuration
 
+if defined?(Sinatra)
+  # This is the configuration to use when running within sinatra
+  project_path  = Sinatra::Application.root
+  environment   = :development
+  images_dir    = File.join '..', 'public', 'images'
+else
+  # this is the configuration to use when running within the compass command line tool.
+  css_dir         = File.join 'public', 'stylesheets'
+  relative_assets = true
+  environment     = :production
+  images_dir      = File.join 'public', 'images'
+end
+
+# This is common configuration
+sass_dir              = File.join 'views', 'stylesheets'
+http_path             = "/"
+http_images_path      = "/images"
+http_stylesheets_path = "/stylesheets"
+
 # Require any additional compass plugins here.
-project_type  = :stand_alone
-
-# Set this to the root of your project when deployed:
-http_path         = "/"
-css_dir           = "public/stylesheets"
-sass_dir          = "views/stylesheets"
-images_dir        = "public/images"
-http_images_path  = http_path + 'images'
+project_type      = :stand_alone
 output_style      = :compact
 
 # To enable relative paths to assets via compass helper functions. Uncomment:

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

@@ -1,17 +1,27 @@
 APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 require 'rubygems'
+require 'compass'
 require 'sinatra'
 require 'haml'
-require 'sass'
 require 'rdiscount'
 
 class <%= module_name %> < Sinatra::Application
 
   set :root, APP_ROOT
 
+  configure do
+    Compass.configuration.parse(File.join(APP_ROOT, 'config.rb'))
+  end
+
   get '/' do
     haml :index
   end
 
+# <%= compile ? 'Unc' : 'C' %>omment to compile your stylesheets with<%= compile ? 'out' : '' %> the compass utility
+<%= '#' 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 )
+<%= '#' if compile %>  end
+
 end

data/spec/tempatra_spec.rb

@@ -11,7 +11,7 @@ describe "Tempatra" do
   end
 
   it "generates a new sinatra project" do
-    `ruby #{TEMPATRA_ROOT}/bin/tempatra spec/tmp`
+    `ruby #{TEMPATRA_ROOT}/bin/tempatra -N spec/tmp`
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tempatra
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Olivier Lauzon
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-29 00:00:00 -04:00
+date: 2009-11-29 00:00:00 -05:00
 default_executable: tempatra
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: chriseppstein-compass
+  name: compass
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.12
+        version: 0.8.17
     version: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.98
+        version: 0.4.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.3
+        version: 2.2.13
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.1
+        version: 0.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.5
+        version: 1.5.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -110,7 +110,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.2.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: webrat
@@ -120,7 +120,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.5.3
     version: 
 description: A Sinatra application generator using Blueprint CSS, jQuery, Haml, Sass, Compass, RSpec, Cucumber, and Webrat.
 email: olauzon@gmail.com
@@ -132,9 +132,11 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- CHANGELOG
 - LICENSE
 - README.md
 - Rakefile
+- TODO
 - VERSION
 - app_generators/tempatra/tempatra_generator.rb
 - app_generators/tempatra/templates/README.md.erb