vraptor-scaffold 0.0.1.rc → 0.0.1

data/.document

@@ -1,4 +1,4 @@
-README.rdoc
+README.textile
 lib/**/*.rb
 bin/*
 LICENSE

data/.gitignore

@@ -6,3 +6,4 @@ pgk
 Gemfile.lock
 .idea
 doc
+*.swp

data/Gemfile

@@ -1,8 +1,8 @@
 source :rubygems
 
-gem "thor", ">=0.14.0"
+gem "thor", ">=0.14.3"
 gem "rake", ">=0.8.7"
-gem "activesupport", ">=3.0.0.rc"
+gem "activesupport", ">=3.0.0"
 
 gem "ruby-debug", :group => [:development, :test]
 
@@ -12,6 +12,6 @@ end
 
 group :test do
   gem "ZenTest", ">=4.3.3"
-  gem "rspec", ">=1.3.0" ,:require => "spec"
+  gem "rspec", ">=1.3.0", :require => "spec"
   gem "rcov", ">=0.9.8"
 end

data/History.txt

@@ -1,3 +1,13 @@
+=== ?.?.?.?? / 2010-??-??
+
+== New Features
+* jsp support
+* base package
+* ant + ivy
+
+== Improvements
+* Better use of Generics.
+
 === 0.0.1.rc / 2010-08-23
 
 == New Features

data/README.textile

@@ -0,0 +1,32 @@
+h1. Documentation
+
+Vraptor Scaffold website can be found at "http://vraptor.org":http://vraptor.org
+RDocs can be found at "http://rdoc.info":http://rdoc.info/github/caelum/vraptor-scaffold
+
+h1. Installation
+
+gem install vraptor-scaffold
+
+h1. Getting Started
+
+At the command line client:
+ 
+* vraptor new myapp
+* Change directory into myapp
+* vraptor scaffold product name:string value:double
+* ant jetty.run
+* Go http://localhost:8080/products
+
+h2. Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+h2. Authors
+
+Vraptor Scaffold was created by Rodolfo Liviero and is maintained by Rodolfo Liviero and "Caelum":http://www.caelum.com.br/

data/Rakefile

@@ -5,16 +5,15 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "vraptor-scaffold"
-    gem.summary = "Scaffold for vraptor 3."
-    gem.description = "Scaffold for vraptor 3 with jpa, freemarker, maven, mockito, junit and jquery."
+    gem.summary = "VRaptor Scaffold."
+    gem.description = "VRaptor scaffold extension to make it easier configuring new projects and plugins."
     gem.email = "rodolfoliviero@gmail.com"
-    gem.homepage = "http://github.com/rodolfoliviero/vraptor-scaffold"
+    gem.homepage = "http://github.com/caelum/vraptor-scaffold"
     gem.authors = ["Rodolfo Liviero"]
-    
-    gem.add_dependency "thor", ">=0.14.0"
+    gem.add_dependency "thor", ">=0.14.3"
     gem.add_dependency "rake", ">=0.8.7"
-    gem.add_dependency "activesupport", ">=3.0.0.rc"
-    gem.post_install_message = "Thank you for installing vraptor-scaffold. Please read http://github.com/rodolfoliviero/vraptor-scaffold/blob/master/README.rdoc for more information."
+    gem.add_dependency "activesupport", ">=3.0.0"
+    gem.post_install_message = "Thank you for installing vraptor-scaffold. Please read http://github.com/caelum/vraptor-scaffold/blob/master/README.rdoc for more information."
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 0
 :patch: 1
-:build: rc
+:build: 
 :major: 0

data/bin/vraptor

@@ -3,5 +3,5 @@
 require File.dirname(__FILE__) + '/../lib/vraptor-scaffold'
 
 begin
-	VraptorScaffold::Main.execute(ARGV.dup)
+  VraptorScaffold::Main.execute(ARGV.dup)
 end

data/lib/configuration.rb

@@ -0,0 +1,31 @@
+class Configuration
+  MAIN_SRC="src/main/java"
+  MAIN_RESOURCES="src/main/resources"
+  TEST_SRC="src/test/java"
+  TEST_RESOURCES="src/test/resources"
+  WEB_APP="src/main/webapp"
+  WEB_INF="#{WEB_APP}/WEB-INF"
+  META_INF="#{WEB_APP}/META-INF"
+  FILENAME = "#{META_INF}/vraptor-scaffold.properties"
+
+  def self.config
+    YAML.load_file Configuration::FILENAME
+  end
+
+  def self.template_engine
+    config["template_engine"]
+  end
+
+  def self.package
+    config["package"]
+  end
+
+  def self.main_class_path *path
+    File.join MAIN_SRC, package.gsub(".", File::Separator), path
+  end  
+
+  def self.test_class_path *path
+    File.join TEST_SRC, package.gsub(".", File::Separator), path
+  end 
+
+end

data/lib/generators/app_generator/app_generator.rb

@@ -1,134 +1,83 @@
 class AppGenerator < VraptorScaffold::Base
+
+  TEMPLATE_ENGINES = %w( jsp ftl )
+  BUILD_TOOLS = %w( ant mvn )
+  IVY_JAR = "ivy-2.2.0-rc1.jar"
+
+  argument :project_path
+
+  class_option :template_engine, :default => "jsp", :aliases => "-e",
+    :desc => "Template engine (options: #{TEMPLATE_ENGINES.join(', ')})"
+
+  class_option :package, :default => "app", :aliases => "-p", 
+    :desc => "Base package"
+
+  class_option :build_tool, :default => "ant", :aliases => "-b", 
+    :desc => "Build tools (options: #{BUILD_TOOLS.join(', ')})"
   
-   def self.source_root
-      File.dirname(__FILE__)
-   end
-  
-  def build(project_path)
-    @project_name = project_path.split("/").last
+  class_option :skip_eclipse, :type => :boolean, :aliases => "-E",
+    :desc => "Skip Eclipse files"
+
+  def self.source_root
+    File.join File.dirname(__FILE__), "templates"
+  end
+
+  def self.banner
+    "vraptor new #{self.arguments.map(&:usage).join(' ')} [options]"
+  end
+
+  def initialize(args, opts=[])
+    super([args], opts)
     self.destination_root=(project_path)
+    @project_name = project_path.split("/").last
+  end
+
+  def create_root_folder
     empty_directory "."
-    create_pom
-    create_main_java
-    create_main_resources
-    create_webapp
-    create_test
   end
-  
+
+  def configure_build_tool
+    template("pom.erb", "pom.xml") if options[:build_tool] == "mvn"
+    configure_ant if options[:build_tool] == "ant"
+  end
+
+  def create_main_java
+    empty_directory Configuration::MAIN_SRC
+    directory("src", File.join(Configuration::MAIN_SRC, options[:package].gsub(".", File::Separator)))
+  end
+
+  def create_main_resources
+    directory("resources", Configuration::MAIN_RESOURCES)
+  end
+
+  def create_webapp
+    directory("webapp", Configuration::WEB_APP)
+  end
+
+  def configure_template_engine
+    template("vraptor-scaffold.erb", Configuration::FILENAME)
+    templates = {"jsp" => JspTemplateEngine, "ftl" => FreemarkerTemplateEngine}
+    templates[options[:template_engine]].new(project_path).configure
+  end
+
+  def create_test
+    empty_directory Configuration::TEST_SRC
+    directory("src-test", File.join(Configuration::TEST_SRC, options[:package].gsub(".", File::Separator)))
+    directory("resources-test", Configuration::TEST_RESOURCES)
+  end
+
   private
-  	def create_pom
-  		template("templates/pom.erb", "pom.xml")
-  	end
-  	
-  	def create_test
-  	  empty_directory "src/test/java"
-      empty_directory "src/test/java/app"
-      empty_directory "src/test/java/app/controllers"
-      empty_directory "src/test/java/app/models"
-      empty_directory "src/test/resources"
-	  end
+  def configure_ant
+    copy_file("build.xml")
+    template("build.properties.erb", "build.properties") 
+    template("ivy.erb", "ivy.xml") 
+    copy_file(IVY_JAR)
+    create_eclipse_wtp unless options[:skip_eclipse]
+  end
   
-    def create_main_java
-      main_java = "src/main/java"
-      empty_directory main_java
-      inside main_java do
-        create_app
-      end
-    end
-    
-    def create_app
-      empty_directory "app"
-      inside "app" do
-        empty_directory "controllers"
-        create_app_models
-        create_app_infra
-        create_app_repository
-      end
-    end
-    
-    def create_app_models
-      models_path = empty_directory "models"
-      template = "Entity.java"
-      template_from_root(template, "#{models_path}/#{template}")
-    end
-    
-    def create_app_infra
-      infra_path = empty_directory "infrastructure"
-      template = "FreemarkerPathResolver.java"
-      template_from_root(template, "#{infra_path}/#{template}")
-    end
-    
-    def create_app_repository
-      repository_path = empty_directory "repositories"
-      template = "Repository.java"
-      template_from_root(template, "#{repository_path}/#{template}")
-    end
-    
-    def create_main_resources
-      main_resources = "src/main/resources"
-      empty_directory main_resources
-      inside main_resources do
-        template_from_root("log4j.properties", "#{main_resources}/log4j.properties")
-        template_from_root("messages.properties", "#{main_resources}/messages.properties")
-        meta_inf = empty_directory "META-INF"
-        template_from_root("persistence.xml", "#{meta_inf}/persistence.xml")
-      end
-    end
-    
-    def create_webapp
-      webapp = "src/main/webapp"
-      empty_directory webapp
-      inside webapp do
-        template_from_root("index.jsp", "#{webapp}/index.jsp")
-        create_decorators
-        empty_directory "images"
-        create_js
-        create_css
-        create_macros
-        create_web_inf
-      end
-    end
-    
-    def create_macros
-      macros = empty_directory "macros"
-      inside "macros" do
-        template_from_root("macros/html.ftl", "#{macros}/html.ftl")
-      end
-    end
-    
-    def create_css
-      css = empty_directory "stylesheets"
-      inside "stylesheets" do
-        template_from_root("stylesheets/scaffold.css", "#{css}/scaffold.css")
-      end
-    end
-    
-     def create_js
-      js = empty_directory "javascripts"
-      inside "javascripts" do
-        template_from_root("javascripts/jquery-1.4.2.min.js", "#{js}/jquery-1.4.2.min.js")
-      end
-    end
-    
-    def create_decorators
-      decorators = empty_directory "decorators"
-      inside decorators do
-        template_from_root("main.ftl", "#{decorators}/main.ftl")
-      end
-    end
-    
-    def create_web_inf
-      web_inf = empty_directory "WEB-INF"
-      inside "WEB-INF" do
-        template_from_root("decorators.xml", "#{web_inf}/decorators.xml")
-        template_from_root("web.xml", "#{web_inf}/web.xml")
-        empty_directory "views"
-      end
-    end
-    
-    def template_from_root(template, to)
-      in_root do
-        template("templates/#{template}", to)
-      end
-    end
+  def create_eclipse_wtp
+    template("eclipse/project.erb", ".project")
+    copy_file("eclipse/classpath", ".classpath")
+    directory("eclipse/settings", ".settings")
+  end
 end

data/lib/generators/app_generator/freemarker_template_engine.rb

@@ -0,0 +1,50 @@
+class FreemarkerTemplateEngine < VraptorScaffold::Base
+
+  def self.source_root
+    File.join(File.dirname(__FILE__), "templates", "freemarker")
+  end
+
+  def initialize(project_path)
+    super
+    self.destination_root=(project_path)
+    @project_path = project_path
+  end
+
+  def configure
+    directory("macros", File.join(Configuration::WEB_APP, "macros"))
+    template("../decorators.erb", File.join(Configuration::WEB_INF, "decorators.xml"))
+    copy_file("main.ftl", File.join(Configuration::WEB_INF, "decorators", "main.ftl"))
+    directory("infrastructure", infra_path)
+    empty_directory File.join(Configuration::WEB_INF, "views")
+    append_freemarker_dependencies
+    append_freemarker_servlet
+  end
+
+  def extension
+    "ftl"
+  end
+
+  def package
+    file = File.join(@project_path, Configuration::FILENAME)
+    package = YAML.load_file(file)['package']
+  end
+
+  private
+  def append_freemarker_servlet
+    file = File.join(Configuration::WEB_INF, "web.xml")
+    template = File.join FreemarkerTemplateEngine.source_root, "freemarker-web.xml"
+    inject_into_file(file, File.read(template), :before => "</web-app>", :verbose => false)
+  end 
+
+  def infra_path
+    File.join Configuration::MAIN_SRC, package.gsub(".", File::Separator), "infrastructure"
+  end
+
+  def append_freemarker_dependencies
+    file = "pom.xml" if File.exist?("#{@project_path}/pom.xml")
+    file = "ivy.xml" if File.exist?("#{@project_path}/ivy.xml") 
+    template = File.join FreemarkerTemplateEngine.source_root, "freemarker-#{file}"
+    inject_into_file(file, File.read(template), :after => "<dependencies>", :verbose => false)
+  end
+
+end

data/lib/generators/app_generator/jsp_template_engine.rb

@@ -0,0 +1,21 @@
+class JspTemplateEngine < VraptorScaffold::Base
+
+  def self.source_root
+    File.join(File.dirname(__FILE__), "templates", "jsp")
+  end
+
+  def initialize(project_path)
+    super
+    self.destination_root=(project_path)
+  end
+
+  def configure
+    template("../decorators.erb", File.join(Configuration::WEB_INF, "decorators.xml"))
+    copy_file("main.jsp", File.join(Configuration::WEB_INF, "decorators", "main.jsp"))
+    empty_directory File.join(Configuration::WEB_INF, "jsp")
+  end
+
+  def extension
+    "jsp"
+  end
+end

data/lib/generators/app_generator/templates/build.properties.erb

@@ -0,0 +1,16 @@
+project.name=<%= @project_name %>
+
+output.dir=target
+test.build.dir=target/test-classes
+
+webapp.dir=<%= Configuration::WEB_APP %>
+lib.dir=<%= Configuration::WEB_INF %>/lib
+build.dir=<%= Configuration::WEB_INF %>/classes
+
+src.dir=<%= Configuration::MAIN_SRC %>
+resources.dir=<%= Configuration::MAIN_RESOURCES %>
+
+test.src.dir=<%= Configuration::TEST_SRC %>
+test.resources.dir=<%= Configuration::TEST_RESOURCES %>
+
+ivy.jar.file=<%= AppGenerator::IVY_JAR %>