vraptor-scaffold 0.0.2 → 0.0.3

data/Gemfile

@@ -12,6 +12,6 @@ end
 
 group :test do
   gem "ZenTest", ">=4.3.3"
-  gem "rspec", ">=1.3.0", :require => "spec"
+  gem "rspec", "1.3.1", :require => "spec"
   gem "rcov", ">=0.9.8"
 end

data/History.txt

@@ -1,14 +1,35 @@
-=== ?.?.?.?? / 2010-??-??
+=== 0.0.3 / 2010-11-04
+
+== New Features
+* works with gradle
+* works with spring 3
+
+== Improvements
+* bumped ivy version to 2.2.0
+* updated maven plugins
+* validate users action when create app
+* update hsqldb
+* update junit
+* better build.xml
+
+=== 0.0.2 / 2010-10-08
+
+== Improvements
+* bumped vraptor version to 3.2.0
+
+=== 0.0.1 / 2010-10-05
 
 == New Features
 * jsp support
 * base package
-* ant + ivy
+* works with ant + ivy
+* help command
 
 == Improvements
 * Better use of Generics.
+* Update Hibernate
 
-=== 0.0.1.rc / 2010-08-23
+=== 0.0.1.rc / 2010-08-24
 
 == New Features
 * Added Hamcrest 1.1

data/README.textile

@@ -1,7 +1,7 @@
 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
+RDocs can be found at "http://rdoc.info":http://rubydoc.info/gems/vraptor-scaffold
 
 h1. Installation
 

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.add_dependency "thor", ">=0.14.3"
     gem.add_dependency "rake", ">=0.8.7"
     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."
+    gem.post_install_message = "Thank you for installing vraptor-scaffold. Please read http://github.com/caelum/vraptor-scaffold/blob/master/README.textile for more information."
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

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

data/lib/generators/app_generator/app_generator.rb

@@ -1,8 +1,8 @@
 class AppGenerator < VraptorScaffold::Base
 
   TEMPLATE_ENGINES = %w( jsp ftl )
-  BUILD_TOOLS = %w( ant mvn )
-  IVY_JAR = "ivy-2.2.0-rc1.jar"
+  BUILD_TOOLS = %w( ant mvn gradle )
+  IVY_JAR = "ivy-2.2.0.jar"
 
   argument :project_path
 
@@ -18,6 +18,9 @@ class AppGenerator < VraptorScaffold::Base
   class_option :skip_eclipse, :type => :boolean, :aliases => "-E",
     :desc => "Skip Eclipse files"
 
+  class_option :spring3, :aliases => "-S", :type => :boolean,
+    :desc => "Use spring 3 instead of spring 2.5"
+
   def self.source_root
     File.join File.dirname(__FILE__), "templates"
   end
@@ -28,17 +31,32 @@ class AppGenerator < VraptorScaffold::Base
 
   def initialize(args, opts=[])
     super([args], opts)
+    validate
     self.destination_root=(project_path)
     @project_name = project_path.split("/").last
+    @dependency_manager = DependencyManager.new(options)
   end
 
   def create_root_folder
     empty_directory "."
   end
 
-  def configure_build_tool
+  def configure_maven
     template("pom.erb", "pom.xml") if options[:build_tool] == "mvn"
-    configure_ant if options[:build_tool] == "ant"
+  end
+
+  def configure_ant
+    if options[:build_tool] == "ant"
+      create_eclipse_files unless options[:skip_eclipse]
+      copy_file("build.xml")
+      template("build.properties.erb", "build.properties") 
+      template("ivy.erb", "ivy.xml") 
+      copy_file(IVY_JAR)
+    end
+  end
+
+  def configure_gradle
+    template("build.gradle.erb", "build.gradle") if options[:build_tool] == "gradle"
   end
 
   def create_main_java
@@ -57,7 +75,7 @@ class AppGenerator < VraptorScaffold::Base
   def configure_template_engine
     template("vraptor-scaffold.erb", Configuration::FILENAME)
     templates = {"jsp" => JspTemplateEngine, "ftl" => FreemarkerTemplateEngine}
-    templates[options[:template_engine]].new(project_path).configure
+    templates[options[:template_engine]].new(project_path).configure if templates[options[:template_engine]]
   end
 
   def create_test
@@ -67,17 +85,20 @@ class AppGenerator < VraptorScaffold::Base
   end
 
   private
-  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_eclipse_wtp
+  def create_eclipse_files
     template("eclipse/project.erb", ".project")
-    copy_file("eclipse/classpath", ".classpath")
+    template("eclipse/classpath.erb", ".classpath")
     directory("eclipse/settings", ".settings")
   end
+
+  def validate
+    unless BUILD_TOOLS.include? options[:build_tool]
+      puts "Build tool #{options[:build_tool]} is not supported. The supported build tools are: #{BUILD_TOOLS.join(", ")}"
+      Kernel::exit
+    end
+    unless TEMPLATE_ENGINES.include? options[:template_engine]
+      puts "Template engine #{options[:template_engine]} is not supported. The supported template engines are: #{TEMPLATE_ENGINES.join(", ")}"
+      Kernel::exit
+    end
+  end
 end

data/lib/generators/app_generator/dependency.rb

@@ -0,0 +1,15 @@
+class Dependency
+
+  attr_accessor :group, :name, :version, :exclusions
+
+  def initialize group, name, version=nil, exclusions=[]
+    @group = group
+    @name = name
+    @version = version
+    @exclusions = exclusions
+  end
+
+  def has_exclusions?
+    !@exclusions.empty?
+  end
+end

data/lib/generators/app_generator/dependency_manager.rb

@@ -0,0 +1,57 @@
+class DependencyManager
+  
+  attr_accessor :options
+  
+  def initialize(options)
+    @options = options
+  end
+ 
+  def compile_scope
+    dependencies = vraptor_dependencies + default_dependencies
+    append_freemarker_dependency_if_necessary dependencies
+    dependencies
+  end
+  
+  def test_scope
+    [Dependency.new("junit", "junit", "4.8.2"), 
+      Dependency.new("org.hamcrest", "hamcrest-all", "1.1"),
+      Dependency.new("org.mockito", "mockito-all", "1.8.5")]
+  end
+
+  def provided_scope
+    [Dependency.new("javax.servlet", "servlet-api", "2.5")]
+  end
+  
+  private
+  def default_dependencies
+    [ Dependency.new("org.hsqldb", "hsqldb", "2.0.0"),
+        Dependency.new("opensymphony", "sitemesh", "2.4.2"), Dependency.new("javax.servlet", "jstl", "1.2"),
+        Dependency.new("javax.persistence", "persistence-api", "1.0"), 
+        Dependency.new("org.hibernate", "hibernate-entitymanager", "3.4.0.GA"),
+        Dependency.new("org.hibernate", "hibernate-core", "3.3.2.GA"),
+        Dependency.new("org.hibernate", "hibernate-validator", "3.1.0.GA"),
+        Dependency.new("joda-time", "joda-time", "1.6")]
+  end
+  
+  def vraptor_dependencies
+    vraptor_dependency = Dependency.new("br.com.caelum", "vraptor", "3.2.0")
+    append_spring_dependency_if_necessary vraptor_dependency
+   end
+   
+   def spring3_dependencies
+     [Dependency.new("org.springframework", "spring-web", "3.0.4.RELEASE"), 
+       Dependency.new("com.thoughtworks.xstream", "xstream", "1.3.1")]
+   end
+   
+   def append_freemarker_dependency_if_necessary dependencies
+     dependencies << Dependency.new("org.freemarker", "freemarker", "2.3.16") if @options[:template_engine] == 'ftl'
+   end
+   
+   def append_spring_dependency_if_necessary vraptor_dependency
+     if options[:spring3]
+       vraptor_dependency.exclusions << Dependency.new("org.springframework", "spring")
+       return [vraptor_dependency] + spring3_dependencies
+      end
+      [vraptor_dependency]
+   end
+end

data/lib/generators/app_generator/freemarker_template_engine.rb

@@ -16,7 +16,6 @@ class FreemarkerTemplateEngine < VraptorScaffold::Base
     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
 
@@ -40,11 +39,4 @@ class FreemarkerTemplateEngine < VraptorScaffold::Base
     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/templates/build.gradle.erb

@@ -0,0 +1,38 @@
+repositories {
+    mavenCentral()
+}
+
+apply plugin: 'java'
+apply plugin: 'war'
+apply plugin: 'jetty'
+apply plugin: 'eclipse'
+apply plugin: 'project-report'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+version = '1.0'
+
+sourceSets.main.classesDir = new File('<%= Configuration::WEB_INF %>/classes')
+
+jettyRun.scanIntervalSeconds=3
+jettyRun.contextPath = '/' 
+[jettyRunWar,jettyStop]*.stopPort = 8081
+[jettyRunWar,jettyStop]*.stopKey = 'stopKey'
+
+dependencies {
+<% @dependency_manager.compile_scope.each do |dependency| -%>
+    compile group: '<%= dependency.group %>', name: '<%= dependency.name %>', version: '<%= dependency.version %>'<% if dependency.has_exclusions? %>, {<% dependency.exclusions.each do |exclusion| %>
+        exclude group: '<%= exclusion.group %>', name: '<%= exclusion.name %>'<% end %>
+    }<% end %>
+<% end -%>
+
+    //Provided dependencies
+<% @dependency_manager.provided_scope.each do |dependency| -%>
+    providedCompile group: '<%= dependency.group %>', name: '<%= dependency.name %>', version: '<%= dependency.version %>'
+<% end -%>
+
+    //Test dependencies
+<% @dependency_manager.test_scope.each do |dependency| -%>
+    testCompile group: '<%= dependency.group %>', name: '<%= dependency.name %>', version: '<%= dependency.version %>'
+<% end -%>
+}

data/lib/generators/app_generator/templates/build.xml

@@ -10,8 +10,8 @@
 	<path id="test.path.id">
 		<fileset dir="lib/test" />
 		<path refid="lib.path.id" />
-		<pathelement location="${build.dir}" />
 		<pathelement location="${test.build.dir}" />
+		<pathelement location="${build.dir}" />
 	</path>
 
 	<!-- ================================= 
@@ -71,6 +71,7 @@
 					<include name="**/*Test.java" />
 				</fileset>
 			</batchtest>
+			<formatter type="brief" usefile="false" />
 			<formatter type="xml" />
 			<classpath refid="test.path.id" />
 		</junit>

data/lib/generators/app_generator/templates/eclipse/{classpath → classpath.erb}

@@ -17,7 +17,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="lib" path="lib/test/hamcrest-all-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/test/junit-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/test/mockito-all-1.8.5.jar"/>
+	<% @dependency_manager.test_scope.each do |dependency| %>
+	<classpathentry kind="lib" path="lib/test/<%= "#{dependency.name}-#{dependency.version}.jar" %>"/>
+  <% end -%>
 </classpath>

data/lib/generators/app_generator/templates/ivy.erb

@@ -8,28 +8,20 @@
 		<conf name="provided" description="dependencies used for compile but is not packaged" visibility="public" />
 	</configurations>
 
-	<dependencies>
-		<dependency org="hsqldb" name="hsqldb" rev="1.8.0.10" conf="default" />
-		<dependency org="br.com.caelum" name="vraptor" rev="3.2.0" conf="default" />
-		<dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
-		<dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
-		<dependency org="javax.persistence" name="persistence-api" rev="1.0" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.4.0.GA" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-core" rev="3.3.2.GA" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-validator" rev="3.1.0.GA" conf="default" />
-		<dependency org="joda-time" name="joda-time" rev="1.6" conf="default" />
+	<dependencies><% @dependency_manager.compile_scope.each do |dependency| -%>
+		<dependency org="<%= dependency.group %>" name="<%= dependency.name %>" rev="<%= dependency.version %>" conf="default"<% if dependency.has_exclusions? %>><% dependency.exclusions.each do |exclusion| %>
+			<exclude org="<%= exclusion.group %>" name="<%= exclusion.name %>" />
+		</dependency><% end %><% else %> /><% end %><% end %>
 
-		<!-- Provided dependencies -->
-		<dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->default" />
+		<!-- Provided dependencies --><% @dependency_manager.provided_scope.each do |dependency| -%>
+		<dependency org="<%= dependency.group %>" name="<%= dependency.name %>" rev="<%= dependency.version %>" conf="provided->default" /><% end -%>
 
-		<!-- Test dependencies -->
-		<dependency org="junit" name="junit" rev="4.8.1" conf="test->default" />
-		<dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
-		<dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
+		<!-- Test dependencies --><% @dependency_manager.test_scope.each do |dependency| -%>
+		<dependency org="<%= dependency.group %>" name="<%= dependency.name %>" rev="<%= dependency.version %>" conf="test->default" /><% end -%>
 
-		<!-- Ant dependencies -->
-		<dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.14" conf="jetty->default"/>
-		<dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.14" conf="jetty->default"/>
-		<dependency org="org.mortbay.jetty" name="jetty-ant" rev="6.1.14" conf="jetty->default" />	
+		<!-- Jetty dependencies -->
+		<dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.14" conf="jetty->default" />
+		<dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.14" conf="jetty->default" />
+		<dependency org="org.mortbay.jetty" name="jetty-ant" rev="6.1.14" conf="jetty->default" />
 	</dependencies>
 </ivy-module>

data/lib/generators/app_generator/templates/pom.erb

@@ -6,17 +6,17 @@
 	<packaging>war</packaging>
 	<version>0.0.1-SNAPSHOT</version>
 	<name><%= @project_name %></name>
-	
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-	
+
 	<build>
-	  <outputDirectory>${basedir}/<%= Configuration::WEB_INF %>/classes</outputDirectory>
+		<outputDirectory>${basedir}/<%= Configuration::WEB_INF %>/classes</outputDirectory>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -32,10 +32,10 @@
 					<wtpversion>2.0</wtpversion>
 				</configuration>
 			</plugin>
-		 	<plugin>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.0</version>
+				<version>2.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
@@ -53,102 +53,34 @@
 		</plugins>
 	</build>
 
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
-			<version>1.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.8.5</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.10</version>
-		</dependency>
-		<dependency>
-			<groupId>br.com.caelum</groupId>
-			<artifactId>vraptor</artifactId>
-			<version>3.2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>opensymphony</groupId>
-			<artifactId>sitemesh</artifactId>
-			<version>2.4.2</version>
-		</dependency>
+	<dependencies><% @dependency_manager.compile_scope.each do |dependency| %>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>persistence-api</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.4.0.GA</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>slf4j-api</artifactId>
-					<groupId>org.slf4j</groupId>
-				</exclusion>
+			<groupId><%= dependency.group %></groupId>
+			<artifactId><%= dependency.name %></artifactId>
+			<version><%= dependency.version %></version><% if dependency.has_exclusions? %>
+			<exclusions><% dependency.exclusions.each do |exclusion| %>
 				<exclusion>
-					<artifactId>org.hibernate</artifactId>
-					<groupId>hibernate-core</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-			<version>3.3.2.GA</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>slf4j-api</artifactId>
-					<groupId>org.slf4j</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<version>3.1.0.GA</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>slf4j-api</artifactId>
-					<groupId>org.slf4j</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>org.hibernate</artifactId>
-					<groupId>hibernate-core</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+					<groupId><%= exclusion.group %></groupId>
+					<artifactId><%= exclusion.name %></artifactId>
+				</exclusion><% end %>
+			</exclusions><% end %>
+		</dependency><% end %>
+
+		<!-- Test dependencies --><% @dependency_manager.test_scope.each do |dependency| %>
 		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>1.6</version>
-		</dependency>
+			<groupId><%= dependency.group %></groupId>
+			<artifactId><%= dependency.name %></artifactId>
+			<version><%= dependency.version %></version>
+			<scope>test</scope>
+		</dependency><% end %>
+
+		<!-- Provided dependencies --><% @dependency_manager.provided_scope.each do |dependency| %>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
+			<groupId><%= dependency.group %></groupId>
+			<artifactId><%= dependency.name %></artifactId>
+			<version><%= dependency.version %></version>
 			<scope>provided</scope>
-		</dependency>
+		</dependency><% end %>
 	</dependencies>
 
 	<reporting>
@@ -156,6 +88,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>
+				<version>2.4</version>
 			</plugin>
 		</plugins>
 	</reporting>