vraptor-scaffold 0.0.2 → 0.0.3

data/lib/load_paths.rb

@@ -8,6 +8,8 @@ require 'yaml'
 require File.dirname(__FILE__) + '/configuration'
 require File.dirname(__FILE__) + '/../lib/generators/base'
 require File.dirname(__FILE__) + '/../lib/generators/app_generator/app_generator'
+require File.dirname(__FILE__) + '/../lib/generators/app_generator/dependency'
+require File.dirname(__FILE__) + '/../lib/generators/app_generator/dependency_manager'
 require File.dirname(__FILE__) + '/../lib/generators/app_generator/freemarker_template_engine'
 require File.dirname(__FILE__) + '/../lib/generators/app_generator/jsp_template_engine'
 require File.dirname(__FILE__) + '/../lib/generators/scaffold_generator/attribute'

data/spec/lib/configuration_spec.rb

@@ -55,6 +55,5 @@ describe Configuration do
     it "should build test class path with base package" do
       Configuration.test_class_path("models", "Product.java").should == "src/test/java/br/com/caelum/models/Product.java"
     end
-
   end
 end

data/spec/lib/generators/app_generator/app_generator_spec.rb

@@ -2,6 +2,23 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
 
 describe AppGenerator do
 
+  context "build maven application with Spring 3" do
+    before(:all) do
+      @project_path = "src/vraptor-scaffold"
+      AppGenerator.new(@project_path, ["-b=mvn", "--spring3=true"]).invoke_all
+    end
+
+    after(:all) do
+      FileUtils.remove_dir("src")
+    end
+
+    it "should create pom" do
+      source =  File.join File.dirname(__FILE__), "templates", "pom_spring3.xml"
+      destination = "#{@project_path}/pom.xml"
+      exists_and_identical?(source, destination)
+    end
+  end
+
   context "build new application" do
     before(:all) do
       @project_path = "src/vraptor-scaffold"
@@ -25,7 +42,11 @@ describe AppGenerator do
     it "cannot create ivy.xml" do
       File.exist?("#{@project_path}/ivy.xml").should be_false  
     end
-    
+
+    it "cannot create build.gradle" do
+      File.exist?("#{@project_path}/build.gradle").should be_false
+    end
+
     it "cannot create eclipse wtp" do
       File.exist?("#{@project_path}/.classpath").should be_false
     end
@@ -222,6 +243,24 @@ describe AppGenerator do
     end
   end
 
+  context "configuring ant application with spring 3" do
+
+    before(:all) do
+      @project_path = "vraptor-scaffold"
+      AppGenerator.new(@project_path, ["-b=ant", "-S=true"]).invoke_all
+    end
+
+    after(:all) do
+      FileUtils.remove_dir(@project_path)
+    end
+
+    it "should create ivy.xml" do
+      source =  File.join File.dirname(__FILE__), "templates", "ivy_spring3.xml"
+      destination = "#{@project_path}/ivy.xml"
+      exists_and_identical?(source, destination)
+    end
+  end
+
   context "configuring ant application" do
 
     before(:all) do
@@ -260,17 +299,21 @@ describe AppGenerator do
       File.exist?("#{@project_path}/pom.xml").should be_false  
     end
 
+    it "cannot create build.gradle" do
+      File.exist?("#{@project_path}/build.gradle").should be_false
+    end
+
     context "eclipse wtp configuration" do
       it "should create .project" do
         project = File.join @project_path, ".project"
         File.exist?(project).should be_true
       end
-      
+
       it "should create .classpath" do
         class_path = File.join @project_path, ".classpath"
         File.exist?(class_path).should be_true
       end
-      
+
       it "should create .settings" do
         settings = File.join @project_path, ".settings"
         File.exist?(settings).should be_true
@@ -292,6 +335,50 @@ describe AppGenerator do
       File.exist?("#{@project_path}/.classpath").should be_false
     end
   end
+  
+  context "configuring gradle application with spring 3" do
+
+    before(:all) do
+      @project_path = "vraptor-scaffold"
+      AppGenerator.new(@project_path, ["-b=gradle", "-S=true"]).invoke_all
+    end
+
+    after(:all) do
+      FileUtils.remove_dir(@project_path)
+    end
+
+    it "should create build.gradle" do
+      source = File.join File.dirname(__FILE__), "templates", "build_spring3.gradle"
+      destination = "#{@project_path}/build.gradle"
+      exists_and_identical?(source, destination)
+    end
+  end
+
+  context "configuring gradle application" do
+
+    before(:all) do
+      @project_path = "vraptor-scaffold"
+      AppGenerator.new(@project_path, ["-b=gradle"]).invoke_all
+    end
+
+    after(:all) do
+      FileUtils.remove_dir(@project_path)
+    end
+
+    it "should create build.gradle" do
+      source = File.join File.dirname(__FILE__), "templates", "build.gradle"
+      destination = "#{@project_path}/build.gradle"
+      exists_and_identical?(source, destination)
+    end
+
+    it "cannot create ivy.xml" do
+      File.exist?("#{@project_path}/ivy.xml").should be_false  
+    end
+
+    it "cannot create pom.xml" do
+      File.exist?("#{@project_path}/pom.xml").should be_false  
+    end
+  end
 
   context "valid template engines" do
     it "jsp should be valid" do
@@ -311,10 +398,33 @@ describe AppGenerator do
     it "maven should be valid" do
       AppGenerator::BUILD_TOOLS.include?("mvn").should be_true
     end
+
+    it "gradle should be valid" do
+      AppGenerator::BUILD_TOOLS.include?("gradle").should be_true
+    end
   end
 
   it "should configure banner" do
     AppGenerator.banner.should == "vraptor new PROJECT_PATH [options]"
   end
+  
+  context "validate options" do
+    before(:each) do
+      @project_path = "vraptor-scaffold"
+    end
+
+    after(:each) do
+      FileUtils.remove_dir(@project_path)
+    end
+
+    it "should be invalid when build tool is not supported" do
+      Kernel.should_receive(:exit) 
+      AppGenerator.new(@project_path, ["-b=maven"]).invoke_all
+    end
 
+    it "should be invalid when template engine is not supported" do
+      Kernel.should_receive(:exit) 
+      AppGenerator.new(@project_path, ["-e=velocity"]).invoke_all
+    end
+  end
 end

data/spec/lib/generators/app_generator/dependency_manager_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
+
+describe DependencyManager do
+  
+  before(:each) do
+    others_dependency = mock(Dependency)
+    others_dependency.stub!(:exclusions).and_return([])
+    Dependency.stub!(:new).and_return(others_dependency)
+    @dependency = mock(Dependency)
+  end
+  
+  context "compile scope" do
+    it "should include freemarker dependency when template is freemarker" do
+      options = {:template_engine => "ftl"}
+      Dependency.stub!(:new).with("org.freemarker", "freemarker", "2.3.16").and_return(@dependency)
+      DependencyManager.new(options).compile_scope.include?(@dependency).should be_true
+    end
+    
+    it "should include spring 3 when user asked for that" do
+       options = {:spring3 => true}
+       Dependency.stub!(:new).with("org.springframework", "spring-web", "3.0.4.RELEASE").and_return(@dependency)
+       DependencyManager.new(options).compile_scope.include?(@dependency).should be_true
+    end
+  end
+end

data/spec/lib/generators/app_generator/dependency_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
+
+describe Dependency do
+  
+  it "should has exclusions" do
+    dependency = Dependency.new("org.vraptor", "vraptor3", "3.0.0", [Dependency.new("org.vraptor2", "2.0.0")])
+    dependency.has_exclusions?.should be_true
+  end
+  
+  it "cannot has exclusions" do
+    dependency = Dependency.new("org.vraptor", "vraptor3", "3.0.0")
+    dependency.has_exclusions?.should be_false
+  end
+end

data/spec/lib/generators/app_generator/freemarker_template_engine_spec.rb

@@ -57,36 +57,4 @@ describe FreemarkerTemplateEngine do
       exists_and_identical?(source, destination)
     end
   end
-
-  context "with maven" do
-    before(:all) do
-      AppGenerator.new(@project_path, ["--template-engine=ftl", "-b=mvn"]).invoke_all
-    end
-
-    after(:all) do
-      FileUtils.remove_dir(@project_path)
-    end
-
-    it "should append freemarker dependency in pom.xml" do
-      source = File.join FreemarkerTemplateEngine.source_root, "freemarker-pom.xml"
-      pom = "#{@project_path}/pom.xml"
-      File.read(pom).should match(File.read(source))
-    end
-  end
-
-  context "with ant" do
-    before(:all) do
-      AppGenerator.new(@project_path, ["--template-engine=ftl", "-b=ant"]).invoke_all
-    end
-
-    after(:all) do
-      FileUtils.remove_dir(@project_path)
-    end
-
-    it "should append freemarker dependency in ivy.xml" do
-      source = File.join FreemarkerTemplateEngine.source_root, "freemarker-ivy.xml"
-      ivy = "#{@project_path}/ivy.xml"
-      File.read(ivy).should match(File.read(source))
-    end
-  end
-end
+end

data/spec/lib/generators/app_generator/jsp_template_engine_spec.rb

@@ -41,4 +41,4 @@ describe JspTemplateEngine do
     end
 
   end
-end
+end

data/spec/lib/generators/app_generator/templates/build.gradle

@@ -0,0 +1,40 @@
+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('src/main/webapp/WEB-INF/classes')
+
+jettyRun.scanIntervalSeconds=3
+jettyRun.contextPath = '/' 
+[jettyRunWar,jettyStop]*.stopPort = 8081
+[jettyRunWar,jettyStop]*.stopKey = 'stopKey'
+
+dependencies {
+    compile group: 'br.com.caelum', name: 'vraptor', version: '3.2.0'
+    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
+    compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
+    compile group: 'javax.servlet', name: 'jstl', version: '1.2'
+    compile group: 'javax.persistence', name: 'persistence-api', version: '1.0'
+    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '3.4.0.GA'
+    compile group: 'org.hibernate', name: 'hibernate-core', version: '3.3.2.GA'
+    compile group: 'org.hibernate', name: 'hibernate-validator', version: '3.1.0.GA'
+    compile group: 'joda-time', name: 'joda-time', version: '1.6'
+
+    //Provided dependencies
+    providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
+
+    //Test dependencies
+    testCompile group: 'junit', name: 'junit', version: '4.8.2'
+    testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.1'
+    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.5'
+}

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

@@ -13,4 +13,4 @@ resources.dir=src/main/resources
 test.src.dir=src/test/java
 test.resources.dir=src/test/resources
 
-ivy.jar.file=ivy-2.2.0-rc1.jar
+ivy.jar.file=ivy-2.2.0.jar

data/spec/lib/generators/app_generator/templates/build_spring3.gradle

@@ -0,0 +1,44 @@
+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('src/main/webapp/WEB-INF/classes')
+
+jettyRun.scanIntervalSeconds=3
+jettyRun.contextPath = '/' 
+[jettyRunWar,jettyStop]*.stopPort = 8081
+[jettyRunWar,jettyStop]*.stopKey = 'stopKey'
+
+dependencies {
+    compile group: 'br.com.caelum', name: 'vraptor', version: '3.2.0', {
+        exclude group: 'org.springframework', name: 'spring'
+    }
+    compile group: 'org.springframework', name: 'spring-web', version: '3.0.4.RELEASE'
+    compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.3.1'
+    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
+    compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
+    compile group: 'javax.servlet', name: 'jstl', version: '1.2'
+    compile group: 'javax.persistence', name: 'persistence-api', version: '1.0'
+    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '3.4.0.GA'
+    compile group: 'org.hibernate', name: 'hibernate-core', version: '3.3.2.GA'
+    compile group: 'org.hibernate', name: 'hibernate-validator', version: '3.1.0.GA'
+    compile group: 'joda-time', name: 'joda-time', version: '1.6'
+
+    //Provided dependencies
+    providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
+
+    //Test dependencies
+    testCompile group: 'junit', name: 'junit', version: '4.8.2'
+    testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.1'
+    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.5'
+}

data/spec/lib/generators/app_generator/templates/ivy.xml

@@ -9,8 +9,8 @@
 	</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="org.hsqldb" name="hsqldb" rev="2.0.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" />
@@ -23,13 +23,13 @@
 		<dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->default" />
 
 		<!-- Test dependencies -->
-		<dependency org="junit" name="junit" rev="4.8.1" conf="test->default" />
+		<dependency org="junit" name="junit" rev="4.8.2" 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" />
 
-		<!-- 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/spec/lib/generators/app_generator/templates/ivy_spring3.xml

@@ -0,0 +1,39 @@
+<ivy-module version="2.0">
+	<info organisation="vraptor-scaffold" module="vraptor-scaffold" />
+
+	<configurations>
+		<conf name="default" description="dependencies used for compile" />
+		<conf name="test" description="dependencies used for tests" visibility="public" />
+		<conf name="jetty" description="dependencies used for jetty" visibility="public" />
+		<conf name="provided" description="dependencies used for compile but is not packaged" visibility="public" />
+	</configurations>
+
+	<dependencies>
+		<dependency org="br.com.caelum" name="vraptor" rev="3.2.0" conf="default">
+			<exclude org="org.springframework" name="spring" />
+		</dependency>
+		<dependency org="org.springframework" name="spring-web" rev="3.0.4.RELEASE" conf="default" />
+		<dependency org="com.thoughtworks.xstream" name="xstream" rev="1.3.1" conf="default" />
+		<dependency org="org.hsqldb" name="hsqldb" rev="2.0.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" />
+
+		<!-- Provided dependencies -->
+		<dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="provided->default" />
+
+		<!-- Test dependencies -->
+		<dependency org="junit" name="junit" rev="4.8.2" 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" />
+
+		<!-- 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/spec/lib/generators/app_generator/templates/pom.xml

@@ -6,17 +6,17 @@
 	<packaging>war</packaging>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>vraptor-scaffold</name>
-	
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-	
+
 	<build>
-	  <outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
+		<outputDirectory>${basedir}/src/main/webapp/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>
@@ -54,34 +54,16 @@
 	</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>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>2.0.0</version>
+		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>
 			<artifactId>sitemesh</artifactId>
@@ -101,48 +83,44 @@
 			<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>
-				<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>
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
 			<version>1.6</version>
 		</dependency>
+
+		<!-- Test dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.2</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>
+
+		<!-- Provided dependencies -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -156,6 +134,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>
+				<version>2.4</version>
 			</plugin>
 		</plugins>
 	</reporting>