Implement packaging and archivePath in GradleModelLoader

forge · Aug 6, 2013 · 6da117b · 6da117b
1 parent 35ab877
commit 6da117b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderImpl.java b/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderImpl.java
@@ -50,6 +50,8 @@ private GradleModel modelFromNode(String script, Node projectNode, List<GradlePr
       String group = groupFromNode(projectNode);
       String name = nameFromNode(projectNode);
       String version = versionFromNode(projectNode);
+      String packaging = packagingFromNode(projectNode);
+      String archivePath = archivePathFromNode(projectNode);
       List<GradleTask> tasks = tasksFromNode(projectNode);
       List<GradleDependency> deps = depsFromNode(projectNode);
       List<GradleDependency> managedDeps = managedDepsFromNode(projectNode);
@@ -58,7 +60,7 @@ private GradleModel modelFromNode(String script, Node projectNode, List<GradlePr
       List<GradleSourceSet> sourceSets = sourceSetsFromNode(projectNode);
       Map<String, String> properties = propertiesFromNode(projectNode);
 
-      return new GradleModelImpl(script, group, name, version, "", "", tasks, deps,
+      return new GradleModelImpl(script, group, name, version, packaging, archivePath, tasks, deps,
                managedDeps, profiles, plugins, repositories, sourceSets, properties);
    }
 
@@ -76,6 +78,16 @@ private String versionFromNode(Node projectNode)
    {
       return projectNode.getSingle("version").getText().trim();
    }
+
+   private String packagingFromNode(Node projectNode)
+   {
+      return projectNode.getSingle("packaging").getText().trim();
+   }
+
+   private String archivePathFromNode(Node projectNode)
+   {
+      return projectNode.getSingle("archivePath").getText().trim();
+   }
 
    private List<GradleTask> tasksFromNode(Node projectNode)
    {

diff --git a/impl/src/test/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderTest.java b/impl/src/test/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderTest.java
@@ -49,6 +49,18 @@ public void testVersion()
    {
       assertEquals("0.1-SNAPSHOT", model.getVersion());
    }
+
+   @Test
+   public void testPackaging()
+   {
+      assertEquals("jar", model.getPackaging());
+   }
+
+   @Test
+   public void testArchivePath()
+   {
+      assertEquals("build/libs/Gradle Test Project-0.1-SNAPSHOT.jar", model.getArchivePath());
+   }
 
    @Test
    public void testTasks()