sinatra-gen 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.1.1 2008-12-16
+
+* 1 major enhancement
+	* added --cap option for generating capistrano recipe
+* 1 minor enhancement
+	* added empty config.yml on generation
+	
 == 0.1.0 2008-12-13
 
 * 1 major enhancement:

data/Manifest.txt

@@ -5,9 +5,12 @@ README.rdoc
 Rakefile
 app_generators/sinatra_app/USAGE
 app_generators/sinatra_app/sinatra_app_generator.rb
+app_generators/sinatra_app/templates/Capfile
 app_generators/sinatra_app/templates/Rakefile.erb
 app_generators/sinatra_app/templates/app.rb.erb
 app_generators/sinatra_app/templates/config.ru.erb
+app_generators/sinatra_app/templates/config.yml
+app_generators/sinatra_app/templates/config/deploy.rb.erb
 app_generators/sinatra_app/templates/lib/module.rb.erb
 app_generators/sinatra_app/templates/test/test_app_rspec.rb.erb
 app_generators/sinatra_app/templates/test/test_app_shoulda.rb.erb
@@ -20,4 +23,5 @@ app_generators/sinatra_app/templates/views/erb_layout.erb
 app_generators/sinatra_app/templates/views/haml_index.erb
 app_generators/sinatra_app/templates/views/haml_layout.erb
 bin/sinatra-gen
-lib/sinatra-gen.rb
+lib/sinatra-gen.rb
+sinatra-gen.gemspec

data/README.rdoc

@@ -18,18 +18,20 @@ Run:
   
 e.g.
 
-  sinatra-gen mysinatrapp --vendor -i --test=shoulda --views=haml
+  sinatra-gen mysinatrapp --vendor --init --test=shoulda --views=haml
 
 Options (can also be obtained by running sinatra-gen with no arguments):
 
- -v, --version                    Show the sinatra-gen version number and quit.
- -d, --vendor                     Extract the latest sinatra to vendor/sinatra
- -t, --tiny                       Only create the minimal files.
- -s, --scripts                    Install the rubigen scripts (script/generate, script/destroy)
- -i, --init                       Initialize a git repository
-     --git /path/to/git           Specify a different path for 'git'
-     --test=test_framework        Specify your testing framework (unit (default)/rspec/spec/shoulda)
-     --views=view_framework       Specify your view framework (erb (default)/haml/builder)
+	-v, --version                    Show the sinatra-gen version number and quit.
+	-d, --vendor                     Extract the latest sinatra to vendor/sinatra
+	    --tiny                       Only create the minimal files.
+	    --init                       Initialize a git repository
+	    --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'
+	    --test=test_framework        Specify your testing framework (unit (default)/rspec/spec/shoulda)
+	    --views=view_framework       Specify your view framework (erb (default)/haml/builder)
+
 
 The --tiny option will create no directories. Just an app.rb, a Rakefile, and a config.ru (Rackup file)
 

data/Rakefile

@@ -6,8 +6,8 @@ require File.dirname(__FILE__) + '/lib/sinatra-gen'
 $hoe = Hoe.new('sinatra-gen', SinatraGen::VERSION) do |p|
   p.developer('Aaron Quint', 'aaron@quirkey.com')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message = 'PostInstall.txt'
-  p.rubyforge_name       = "quirkey"
+  p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
+  p.rubyforge_name       = 'quirkey'
   p.extra_deps         = [
     ['rubigen','>= 1.3.3'],
   ]

data/app_generators/sinatra_app/sinatra_app_generator.rb

@@ -5,7 +5,7 @@ class SinatraAppGenerator < RubiGen::Base
 
   default_options :author => nil
 
-  attr_accessor :app_name, :vendor, :tiny, :git, :git_init, :test_framework, :view_framework, :install_scripts
+  attr_accessor :app_name, :vendor, :tiny, :git, :git_init, :test_framework, :view_framework, :install_scripts, :cap
 
   def initialize(runtime_args, runtime_options = {})
     super
@@ -18,7 +18,7 @@ class SinatraAppGenerator < RubiGen::Base
   def manifest
     record do |m|
       # Ensure appropriate folder(s) exists
-      m.directory ''      
+      m.directory ''
 
       if git_init
         `cd #{@destination_root} && #{git} init`
@@ -30,6 +30,7 @@ class SinatraAppGenerator < RubiGen::Base
             
       unless tiny
         BASEDIRS.each { |path| m.directory path }
+        m.file     'config.yml', 'config.yml'
         m.template 'lib/module.rb.erb', "lib/#{app_name}.rb"
         m.template 'test/test_helper.rb.erb', 'test/test_helper.rb'
         m.template "test/test_app_#{test_framework}.rb.erb", "test/test_#{app_name}.rb"
@@ -47,6 +48,12 @@ class SinatraAppGenerator < RubiGen::Base
         `#{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
@@ -68,9 +75,10 @@ EOS
       
       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("-t", "--tiny", "Only create the minimal files.") {|o| options[:tiny] = o }
-      opts.on("-i", "--init", "Initialize a git repository") {|o| options[:init] = o }
-      opts.on("-s", "--scripts", "Install the rubigen scripts (script/generate, script/destroy)")  {|o| options[:scripts] = 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)") {|o| options[:test_framework] = o }
       opts.on("--views=view_framework", "Specify your view framework (erb (default)/haml/builder)")  {|o| options[:view_framework] = o }
@@ -82,6 +90,7 @@ EOS
       # 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]
       self.test_framework  = options[:test_framework] || 'unit'

data/app_generators/sinatra_app/templates/Capfile

@@ -0,0 +1,3 @@
+load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+load 'config/deploy'

data/app_generators/sinatra_app/templates/config/deploy.rb.erb

@@ -0,0 +1,13 @@
+set :application, "<%= app_name %>"
+set :deploy_via, :remote_cache
+set :user, 'SERVER_USER_NAME'
+set :runner, user
+
+set :scm, :git
+set :repository, "git@github.com:GITHUB_USER_NAME/#{application}.git"
+set :branch, 'master'
+set :git_enable_submodules, 1
+set :keep_releases, 3
+set :deploy_to, "/var/www/apps/#{application}"
+
+server "YOUR_DOMAIN", :web, :app, :db, :primary => true

data/app_generators/sinatra_app/templates/config.yml

@@ -0,0 +1 @@
+---

data/bin/sinatra-gen

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'rubigen'
 
 if %w(-v --version).include? ARGV.first
-  require 'sinatra-gen'
+  require File.join(File.dirname(__FILE__), '..', 'lib', 'sinatra-gen')
   puts "#{File.basename($0)} #{SinatraGen::VERSION}"
   exit(0)
 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.1.0'
+  VERSION = '0.1.1'
 end

data/sinatra-gen.gemspec

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{sinatra-gen}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Aaron Quint"]
+  s.date = %q{2008-12-16}
+  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.email = ["aaron@quirkey.com"]
+  s.executables = ["sinatra-gen"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "app_generators/sinatra_app/USAGE", "app_generators/sinatra_app/sinatra_app_generator.rb", "app_generators/sinatra_app/templates/Capfile", "app_generators/sinatra_app/templates/Rakefile.erb", "app_generators/sinatra_app/templates/app.rb.erb", "app_generators/sinatra_app/templates/config.ru.erb", "app_generators/sinatra_app/templates/config.yml", "app_generators/sinatra_app/templates/config/deploy.rb.erb", "app_generators/sinatra_app/templates/lib/module.rb.erb", "app_generators/sinatra_app/templates/test/test_app_rspec.rb.erb", "app_generators/sinatra_app/templates/test/test_app_shoulda.rb.erb", "app_generators/sinatra_app/templates/test/test_app_spec.rb.erb", "app_generators/sinatra_app/templates/test/test_app_unit.rb.erb", "app_generators/sinatra_app/templates/test/test_helper.rb.erb", "app_generators/sinatra_app/templates/views/builder_index.erb", "app_generators/sinatra_app/templates/views/erb_index.erb", "app_generators/sinatra_app/templates/views/erb_layout.erb", "app_generators/sinatra_app/templates/views/haml_index.erb", "app_generators/sinatra_app/templates/views/haml_layout.erb", "bin/sinatra-gen", "lib/sinatra-gen.rb", "sinatra-gen.gemspec", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_sinatra_app_generator.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/quirkey/sinatra-gen}
+  s.post_install_message = %q{PostInstall.txt}
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{sinatra-gen}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework}
+  s.test_files = ["test/test_generator_helper.rb", "test/test_helper.rb", "test/test_sinatra_app_generator.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rubigen>, [">= 1.3.3"])
+      s.add_development_dependency(%q<newgem>, [">= 1.2.1"])
+      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+    else
+      s.add_dependency(%q<rubigen>, [">= 1.3.3"])
+      s.add_dependency(%q<newgem>, [">= 1.2.1"])
+      s.add_dependency(%q<hoe>, [">= 1.8.0"])
+    end
+  else
+    s.add_dependency(%q<rubigen>, [">= 1.3.3"])
+    s.add_dependency(%q<newgem>, [">= 1.2.1"])
+    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+  end
+end

data/test/test_sinatra_app_generator.rb

@@ -54,6 +54,16 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     assert_directory_exists '.git'
   end
   
+  def test_generate_app_with_cap_option
+    run_generator('sinatra_app', [APP_ROOT, '--cap'], sources)
+    assert_basic_paths_and_files
+    assert_directory_exists 'config'
+    assert_generated_file   'Capfile'
+    assert_generated_file   'config/deploy.rb' do |deploy_contents|
+      assert_match(/set \:application, "#{app_name}"/, deploy_contents)
+    end
+  end
+  
   def test_generate_app_with_rspect_test_option
     run_generator('sinatra_app', [APP_ROOT, '--test=rspec'], sources)
     assert_basic_paths_and_files
@@ -145,6 +155,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     assert_generated_file   'config.ru'
     assert_generated_file   'app.rb'
     assert_generated_file   'Rakefile'
+    assert_generated_file   'config.yml'
     assert_generated_module  "lib/#{app_name}"
   end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-gen
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-13 00:00:00 -05:00
+date: 2008-12-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -62,9 +62,12 @@ files:
 - Rakefile
 - app_generators/sinatra_app/USAGE
 - app_generators/sinatra_app/sinatra_app_generator.rb
+- app_generators/sinatra_app/templates/Capfile
 - app_generators/sinatra_app/templates/Rakefile.erb
 - app_generators/sinatra_app/templates/app.rb.erb
 - app_generators/sinatra_app/templates/config.ru.erb
+- app_generators/sinatra_app/templates/config.yml
+- app_generators/sinatra_app/templates/config/deploy.rb.erb
 - app_generators/sinatra_app/templates/lib/module.rb.erb
 - app_generators/sinatra_app/templates/test/test_app_rspec.rb.erb
 - app_generators/sinatra_app/templates/test/test_app_shoulda.rb.erb
@@ -78,6 +81,7 @@ files:
 - app_generators/sinatra_app/templates/views/haml_layout.erb
 - bin/sinatra-gen
 - lib/sinatra-gen.rb
+- sinatra-gen.gemspec
 has_rdoc: true
 homepage: http://github.com/quirkey/sinatra-gen
 post_install_message: PostInstall.txt