Update Gradle build process.

Author: breandan

.gitignore

@@ -12,6 +12,7 @@
  .idea/shelf
  .idea/tasks.xml
  .idea/dictionaries
+ .idea/libraries/Gradle*.xml
 
 # Sensitive or high-churn files:
 # .idea/dataSources.ids
@@ -35,11 +36,10 @@ idear.zip
 ### Gradle template
 .gradle
 build/
+gradle.properties
 
 # Ignore Gradle GUI config
 gradle-app.setting
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-
+!gradle-wrapper.jar

.idea/workspace.xml

@@ -25,10 +25,15 @@ intellij {
     version '15.0.1'
     plugins 'coverage'
     pluginName 'idear'
+
+    publish {
+        pluginId '7910'
+        apply from: "gradle.properties"
+    }
 }
 
 group 'com.jetbrains'
-version '0.0.1-SNAPSHOT'
+version '1.2'
 
 repositories {
     mavenCentral()

build.gradle

@@ -19,12 +19,13 @@
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Gradle: edu.cmu.sphinx:sphinx4-core:5prealpha-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.opennlp:opennlp-tools:1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.3.3" level="project" />
     <orderEntry type="library" name="Gradle: com.mashape.unirest:unirest-java:1.4.7" level="project" />
     <orderEntry type="library" name="Gradle: de.dfki.mary:marytts-runtime:5.2-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Gradle: de.dfki.mary:marytts-lang-en:5.2-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Gradle: de.dfki.mary:voice-cmu-slt-hsmm:5.2-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.3.3" level="project" />
     <orderEntry type="library" name="Gradle: org.codehaus.jettison:jettison:1.3.7" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore-nio:4.3.2" level="project" />
     <orderEntry type="library" name="Gradle: com.jetbrains:annotations:15.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.jetbrains:asm-all:15.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.jetbrains:asm-commons:15.0.1" level="project" />
@@ -134,7 +135,6 @@
     <orderEntry type="library" name="Gradle: com.jetbrains:jacocoagent:15.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.jetbrains:jacocoant:15.0.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore-nio:4.3.2" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-math3:3.2" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.3.6" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpasyncclient:4.0.2" level="project" />

idear.iml

@@ -4,7 +4,7 @@
     <version>1.2</version>
     <vendor email="breandan.considine@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
 
-    <description><![CDATA[Speech recognition for IntelliJ IDEA. Idear listens to voice commands and assists with simple actions like debugging, navigation, and refactoring. For a complete list of commands, please see the <a href="https://github.com/breandan/idear/blob/master/src/resources/com.jetbrains.idear/grammars/command.gram">command grammar</a>.]]></description>
+    <description><![CDATA[Speech recognition for IntelliJ IDEA. Idear listens to voice commands and assists with simple actions like debugging, navigation, and refactoring. For a complete list of commands, please see the <a href="https://github.com/breandan/idear/blob/master/src/main/resources/com.jetbrains.idear/grammars/command.gram">command grammar</a>.]]></description>
     <change-notes><![CDATA[Introduces debugging and AceJump navigation.]]>
     </change-notes>
 

src/main/resources/META-INF/plugin.xml

@@ -0,0 +1,39 @@
+package com.jetbrains.idear;
+
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
+import com.jetbrains.idear.actions.recognition.ActionCallInfo;
+import com.jetbrains.idear.actions.recognition.ExtractActionRecognizer;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class ActionRecognizerTest {
+
+    @Test
+    public void test_extract_with_name() throws Exception {
+        String text = "idea extract to variable myTest";
+
+        ExtractActionRecognizer recognizer = new ExtractActionRecognizer();
+        assertTrue(recognizer.isMatching(text));
+
+        ActionCallInfo info = recognizer.getActionInfo(text, getEmptyDataContext());
+        assertEquals("IntroduceVariable", info.getActionId());
+        assertEquals("myTest", info.getTypeAfter());
+    }
+
+    @Test
+    public void test_extract_without_name() throws Exception {
+        String text = "idea extract to variable";
+        ExtractActionRecognizer recognizer = new ExtractActionRecognizer();
+        assertTrue(recognizer.isMatching(text));
+
+        ActionCallInfo info = recognizer.getActionInfo(text, getEmptyDataContext());
+        assertEquals("IntroduceVariable", info.getActionId());
+    }
+
+    private static DataContext getEmptyDataContext() {
+        return SimpleDataContext.getSimpleContext("", null);
+    }
+}

src/test/java/com/jetbrains/idear/ActionRecognizerTest.java

@@ -0,0 +1,79 @@
+package com.jetbrains.idear;
+
+import com.jetbrains.idear.nlp.NlpParserService;
+import opennlp.tools.parser.Parse;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class NlpParserTest {
+    private static NlpParserService myParser;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        myParser = new NlpParserService("en-parser-chunking.bin");
+        myParser.init();
+    }
+
+    @Test
+    public void testExtractFind_Class() throws Exception {
+        doTestExtractAction("Idea find usage of class action", "find");
+    }
+
+    @Test
+    public void testExtractFind_Method() throws Exception {
+        doTestExtractAction("Idea find usage of method run", "find");
+    }
+
+    @Test
+    public void testExtractGoTo_Class() throws Exception {
+        doTestExtractAction("Idea go to class CodeStyleSettings", "go");
+    }
+
+    @Test
+    public void testExtractGoTo_Method() throws Exception {
+        doTestExtractAction("Idea go to method apply", "go");
+    }
+
+    @Test
+    public void testExtractExtract_Variable() throws Exception {
+        doTestExtractAction("Idea extract to variable x", "extract");
+    }
+
+    @Test
+    public void testExtractExtract_Variable_WithoutName() throws Exception {
+        doTestExtractAction("Idea extract to variable", "extract");
+    }
+
+    @Test
+    public void testExtractExtract_Field_WithoutName() throws Exception {
+        doTestExtractAction("Idea extract to field", "extract");
+    }
+
+    @Test
+    public void testExtractExtract_Field() throws Exception {
+        doTestExtractAction("Idea extract to field x", "extract");
+    }
+
+    @Test
+    public void testExtractIntroduce_Field() throws Exception {
+        doTestExtractAction("Idea introduce field", "introduce");
+    }
+
+    @Test
+    public void testInline_Field() throws Exception {
+        doTestExtractAction("Idea inline", "inline");
+    }
+
+    private void doTestExtractAction(String sentence, String action) throws IOException {
+        Parse root = myParser.parseSentence(sentence);
+        assertNotNull(root);
+        Parse head = root.getChildren()[0].getHead();
+        assertEquals(head.getCoveredText(), action);
+    }
+
+}