quirkey-sinatra-gen 0.2.1 → 0.2.2

data/README.rdoc

@@ -7,8 +7,6 @@ http://github.com/quirkey/sinatra-gen
 sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework.
 For more information on sinatra, check out http://sinatrarb.com
 
-!! NOW WITH SUPPORT FOR SINATRA 0.9 (02/10/09)
-
 == SYNOPSIS:
   
 sinatra-gen has a bunch of different options (based loosley on merb-gen) to try to not lock the 
@@ -24,8 +22,6 @@ e.g.
 
 === Actions
 
-!! NEW as of 0.2.0 (12/23/08)
-
 For even faster app development you specify actions to include in your app when generating.
 Actions are written out as
 
@@ -56,6 +52,7 @@ It will also generate test skeletons in the test framework of your choosing.
 	-d, --vendor                     Extract the latest sinatra to vendor/sinatra
 	    --tiny                       Only create the minimal files.
 	    --init                       Initialize a git repository
+	    --heroku                     Create a Heroku app (also runs 'git init'). Optionally, specify the path to the heroku bin
 	    --cap                        Adds config directory with basic capistrano deploy.rb
 	    --scripts                    Install the rubigen scripts (script/generate, script/destroy)
 	    --git /path/to/git           Specify a different path for 'git'

data/Rakefile

@@ -10,6 +10,7 @@ $hoe = Hoe.new('sinatra-gen', SinatraGen::VERSION) do |p|
   p.rubyforge_name       = 'quirkey'
   p.extra_deps         = [
     ['rubigen','>= 1.5.2'],
+    ['sinatra', '>= 0.9.0']
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]

data/app_generators/sinatra_app/sinatra_app_generator.rb

@@ -1,24 +1,34 @@
 class RubiGen::Commands::Create
-  
+
   def run(command, relative_path = '')
     in_directory = destination_path(relative_path)
     logger.run command
     system("cd #{in_directory} && #{command}")
   end
-  
+
 end
 
 
 class SinatraAppGenerator < RubiGen::Base
 
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name'])
+  Config::CONFIG['ruby_install_name'])
 
   SINATRA_GIT_URL = 'git://github.com/sinatra/sinatra.git'
 
   default_options :author => nil
 
-  attr_accessor :app_name, :vendor, :tiny, :git, :git_init, :test_framework, :view_framework, :install_scripts, :cap, :actions
+  attr_accessor :app_name, 
+                :vendor, 
+                :tiny, 
+                :git, 
+                :git_init, 
+                :heroku, 
+                :test_framework, 
+                :view_framework, 
+                :install_scripts, 
+                :cap, 
+                :actions
 
   def initialize(runtime_args, runtime_options = {})
     super
@@ -33,15 +43,15 @@ class SinatraAppGenerator < RubiGen::Base
     record do |m|
       # Ensure appropriate folder(s) exists
       m.directory ''
-
+      
       if git_init
         m.run("#{git} init")
-      end
-      
+      end      
+
       m.template 'config.ru.erb', 'config.ru'
       m.template 'app.rb.erb'   , "#{app_name}.rb"
       m.template 'Rakefile.erb' , 'Rakefile'
-            
+
       unless tiny
         BASEDIRS.each { |path| m.directory path }
         m.file     'config.yml', 'config.yml'
@@ -51,81 +61,88 @@ class SinatraAppGenerator < RubiGen::Base
         m.template "views/#{view_framework}_index.erb", "views/index.#{view_framework}"
         m.template "views/#{view_framework}_layout.erb", "views/layout.#{view_framework}" unless view_framework == 'builder'
       end
-      
+
       if vendor
-          m.directory 'vendor'
-          if git_init || File.exists?(File.join(@destination_root, '.git'))
-            command = "#{git} submodule add #{SINATRA_GIT_URL} vendor/sinatra"
-          else         
-            command = "#{git} clone #{SINATRA_GIT_URL} vendor/sinatra"
-          end
-          m.run(command)
+        m.directory 'vendor'
+        if git_init || File.exists?(File.join(@destination_root, '.git'))
+          command = "#{git} submodule add #{SINATRA_GIT_URL} vendor/sinatra"
+        else         
+          command = "#{git} clone #{SINATRA_GIT_URL} vendor/sinatra"
         end
-      
+        m.run(command)
+      end
+
       if cap
         m.directory 'config'
         m.file 'Capfile', 'Capfile'
         m.template 'config/deploy.rb.erb', 'config/deploy.rb'
       end
-      
+
       if install_scripts
         m.dependency "install_rubigen_scripts", [destination_root, 'sinatra-gen'], :shebang => options[:shebang], :collision => :force
       end
+      
+      if heroku
+        m.run("#{heroku} create #{app_name}")
+      end
+      
     end
   end
 
   protected
-    def banner
-      <<-EOS
-Creates the skeleton for a new sinatra app
+  def banner
+    <<-EOS
+    Creates the skeleton for a new sinatra app
 
-USAGE: #{spec.name} app_name
-EOS
-    end
+    USAGE: #{spec.name} app_name
+    EOS
+  end
 
-    def add_options!(opts)
-      opts.separator ''
-      opts.separator 'Options:'
-      
-      opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-      opts.on("-d", "--vendor", "Extract the latest sinatra to vendor/sinatra") {|o| options[:vendor] = o }
-      opts.on("--tiny", "Only create the minimal files.") {|o| options[:tiny] = o }
-      opts.on("--init", "Initialize a git repository") {|o| options[:init] = o }
-      opts.on("--cap", "Adds config directory with basic capistrano deploy.rb") {|o| options[:cap] = o }
-      opts.on("--scripts", "Install the rubigen scripts (script/generate, script/destroy)")  {|o| options[:scripts] = o }
-      opts.on("--git /path/to/git", "Specify a different path for 'git'") {|o| options[:git] = o }
-      opts.on("--test=test_framework", String, "Specify your testing framework (unit (default)/rspec/spec/shoulda/bacon)") {|o| options[:test_framework] = o }
-      opts.on("--views=view_framework", "Specify your view framework (erb (default)/haml/builder)")  {|o| options[:view_framework] = o }
-    end
+  def add_options!(opts)
+    opts.separator ''
+    opts.separator 'Options:'
 
-    def extract_options
-      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
-      # Templates can access these value via the attr_reader-generated methods, but not the
-      # raw instance variable value.
-      self.vendor          = options[:vendor]
-      self.tiny            = options[:tiny]
-      self.cap             = options[:cap]
-      self.git             = options[:git] || `which git`.strip
-      self.git_init        = options[:init] || false
-      self.test_framework  = options[:test_framework] || 'unit'
-      self.view_framework  = options[:view_framework] || 'erb'
-      self.install_scripts = options[:scripts] || false
-    end
+    opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    opts.on("-d", "--vendor", "Extract the latest sinatra to vendor/sinatra") {|o| options[:vendor] = o }
+    opts.on("--tiny", "Only create the minimal files.") {|o| options[:tiny] = o }
+    opts.on("--init", "Initialize a git repository") {|o| options[:init] = o }
+    opts.on("--heroku", "Create a Heroku app (also runs 'git init'). Optionally, specify the path to the heroku bin") { |o| options[:heroku] = o }
+    opts.on("--cap", "Adds config directory with basic capistrano deploy.rb") {|o| options[:cap] = o }
+    opts.on("--scripts", "Install the rubigen scripts (script/generate, script/destroy)")  {|o| options[:scripts] = o }
+    opts.on("--git /path/to/git", "Specify a different path for 'git'") {|o| options[:git] = o }
+    opts.on("--test=test_framework", String, "Specify your testing framework (unit (default)/rspec/spec/shoulda/bacon)") {|o| options[:test_framework] = o }
+    opts.on("--views=view_framework", "Specify your view framework (erb (default)/haml/builder)")  {|o| options[:view_framework] = o }
+  end
 
-    def klass_name
-      app_name.classify
-    end
-    
-    def parse_actions(*action_args)
-      @actions = action_args.flatten.collect { |a| a.split(':', 2) }
-    end
+  def extract_options
+    # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+    # Templates can access these value via the attr_reader-generated methods, but not the
+    # raw instance variable value.
+    self.vendor          = options[:vendor]
+    self.tiny            = options[:tiny]
+    self.cap             = options[:cap]
+    self.git             = options[:git] || `which git`.strip
+    self.heroku          = options[:heroku] ? `which heroku`.strip : false
+    self.git_init        = options[:init] || !!heroku || false
+    self.test_framework  = options[:test_framework] || 'unit'
+    self.view_framework  = options[:view_framework] || 'erb'
+    self.install_scripts = options[:scripts] || false
+  end
+
+  def klass_name
+    app_name.classify
+  end
+
+  def parse_actions(*action_args)
+    @actions = action_args.flatten.collect { |a| a.split(':', 2) }
+  end
 
-    # Installation skeleton.  Intermediate directories are automatically
-    # created so don't sweat their absence here.
-    BASEDIRS = %w(
-      lib
-      test
-      public
-      views
-    )
+  # Installation skeleton.  Intermediate directories are automatically
+  # created so don't sweat their absence here.
+  BASEDIRS = %w(
+                lib
+                test
+                public
+                views
+                )
 end

data/lib/sinatra-gen.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module SinatraGen
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/sinatra-gen.gemspec

@@ -1,12 +1,14 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{sinatra-gen}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2009-02-10}
+  s.date = %q{2009-03-27}
   s.default_executable = %q{sinatra-gen}
-  s.description = %q{sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework. For more information on sinatra, check out http://sinatra.rubyforge.org}
+  s.description = %q{sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework. For more information on sinatra, check out http://sinatrarb.com}
   s.email = ["aaron@quirkey.com"]
   s.executables = ["sinatra-gen"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
@@ -27,15 +29,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rubigen>, [">= 1.5.2"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.0"])
       s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<rubigen>, [">= 1.5.2"])
+      s.add_dependency(%q<sinatra>, [">= 0.9.0"])
       s.add_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<rubigen>, [">= 1.5.2"])
+    s.add_dependency(%q<sinatra>, [">= 0.9.0"])
     s.add_dependency(%q<newgem>, [">= 1.2.3"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end

data/test/test_sinatra_app_generator.rb

@@ -39,6 +39,15 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     assert_basic_paths_and_files
     assert_directory_exists '.git'
   end
+
+  def test_generate_app_with_heroku_option
+    run_generator('sinatra_app', [APP_ROOT, '--heroku'], sources)
+    assert_basic_paths_and_files
+    assert_directory_exists '.git'
+    assert_generated_file   '.git/config' do |config_contents|
+      assert_match(/\[remote "heroku"\]/, config_contents)      
+    end
+  end
   
   def test_generate_app_with_cap_option
     run_generator('sinatra_app', [APP_ROOT, '--cap'], sources)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quirkey-sinatra-gen
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-03-27 00:00:00 -07:00
 default_executable: sinatra-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubigen
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -21,8 +22,19 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -39,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     version: 
-description: sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework. For more information on sinatra, check out http://sinatra.rubyforge.org
+description: sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework. For more information on sinatra, check out http://sinatrarb.com
 email: 
 - aaron@quirkey.com
 executables: