Merge branch 'nb74dev'

Author: junichi11

README.md

@@ -17,6 +17,8 @@ This is NetBeans plugin for WordPress.
 - create new theme action
 - hyperlink navigate
 - create new plugin action
+- custom content name
+- run command (wp-cli)
 
 ### Impotant Files
 It contains wp-config.php
@@ -26,9 +28,14 @@ You can create a new WordPress project with Wizard.
 
 1. set Tools > Options > PHP > WordPress > download url(e.g. http://wordpress.org/latest.zip) or local file path(e.g. /path/to/wordpress.zip)
 2. check New Project > PHP > PHP Application > ... > Framework > WordPress PHP Web Blog/CMS
-3. choose options
+3. select options (url / local file / wp-cli)
 4. finish
 
+### Custome Content Name
+
+If you want to use custom content name(default is `wp-content`), please set your content name to the project properties.
+(project properties > Framework > WordPress)
+
 #### options
 - Set format to project : set format option to project.properties
 - create wp-config.php : copy from wp-config-sample.php
@@ -86,13 +93,28 @@ This is very simple feature.
 - add main plugin file (plugins/plugin_name/plugin_name.php)
 - add readme file (plugins/plugin_name/readme.txt)
 
-### Hyperlink Navigate
+### Hyperlink Navigation
 This feature is available the followings:
 - add_filter, remove_filter
 - add_action, remove_action
 
 Hold down Ctrl key on first or second parameter. If text color is changed to blue, Click there.  
 Then caret position go to function. (first parameter is available when there are the same function names as parameter name : in this case, caret doesn't necessarily go to right position)
 
+### Run Command
+
+We can run wp-cli commands. *Please notice that this action needs so much time to get command list at first time.*
+
+1. Set wp-cli script path to Options. Tools > Options > PHP > WordPress
+2. Select WordPress Project node
+3. Right-click > WordPress > RunCommand...
+
+#### wp-cli
+
+Please see the followings:
+
+- https://github.com/wp-cli/wp-cli
+- http://wp-cli.org/
+
 ## License
 [Common Development and Distribution License (CDDL) v1.0 and GNU General Public License (GPL) v2](http://netbeans.org/cddl-gplv2.html)

manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.php.wordpress
 OpenIDE-Module-Layer: org/netbeans/modules/php/wordpress/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/wordpress/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.4.8
+OpenIDE-Module-Specification-Version: 0.6.0
 

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=69bd7669
+build.xml.data.CRC32=c16cf6ec
 build.xml.script.CRC32=f6cbff90
-build.xml.stylesheet.CRC32=a56c6a5b@2.56.1
+build.xml.stylesheet.CRC32=a56c6a5b@2.62.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=69bd7669
+nbproject/build-impl.xml.data.CRC32=c16cf6ec
 nbproject/build-impl.xml.script.CRC32=bfa38a5f
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.62.1

nbproject/platform.properties

@@ -7,6 +7,7 @@ cluster.path=\
     ${nbplatform.active.dir}/ide:\
     ${nbplatform.active.dir}/apisupport:\
     ${nbplatform.active.dir}/nb:\
+    ${nbplatform.active.dir}/webcommon:\
     ${nbplatform.active.dir}/java
 nbjdk.active=default
 nbplatform.active=default

nbproject/project.xml

@@ -69,6 +69,15 @@
                         <specification-version>1.29.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.extexecution</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>2</release-version>
+                        <specification-version>1.39.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.lexer</code-name-base>
                     <build-prerequisite/>
@@ -102,7 +111,16 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <implementation-version/>
+                        <specification-version>0.15.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.php.api.executable</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>0-1</release-version>
+                        <specification-version>0.19.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -111,15 +129,15 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <implementation-version/>
+                        <specification-version>0.12.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.php.api.phpmodule</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <implementation-version/>
+                        <specification-version>2.26.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -180,6 +198,14 @@
                         <specification-version>8.5.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.io</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.42.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.loaders</code-name-base>
                     <build-prerequisite/>

src/org/netbeans/modules/php/wordpress/WordPressActionsExtender.java

@@ -44,10 +44,15 @@
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Action;
+import org.netbeans.modules.php.api.util.StringUtils;
 import org.netbeans.modules.php.spi.framework.PhpModuleActionsExtender;
+import org.netbeans.modules.php.spi.framework.actions.RunCommandAction;
+import org.netbeans.modules.php.wordpress.commands.WordPressCli;
 import org.netbeans.modules.php.wordpress.ui.actions.CodeCompletionRefreshAction;
 import org.netbeans.modules.php.wordpress.ui.actions.CreatePluginAction;
 import org.netbeans.modules.php.wordpress.ui.actions.CreateThemeAction;
+import org.netbeans.modules.php.wordpress.ui.actions.WordPressRunCommandAction;
+import org.netbeans.modules.php.wordpress.ui.options.WordPressOptions;
 import org.openide.util.NbBundle;
 
 /**
@@ -62,6 +67,20 @@ public String getMenuName() {
         return Bundle.LBL_MenuName();
     }
 
+    @Override
+    public RunCommandAction getRunCommandAction() {
+        // If wp-cli path is invalid, run command action is not added to context menu.
+        String wpCliPath = WordPressOptions.getInstance().getWpCliPath();
+        if (StringUtils.isEmpty(wpCliPath)) {
+            return null;
+        }
+        String error = WordPressCli.validate(wpCliPath);
+        if (error != null) {
+            return null;
+        }
+        return WordPressRunCommandAction.getInstance();
+    }
+
     @Override
     public List<? extends Action> getActions() {
         List<Action> actions = new ArrayList<Action>();

src/org/netbeans/modules/php/wordpress/WordPressPhpModuleExtender.java

@@ -52,12 +52,15 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
@@ -66,10 +69,13 @@
 import javax.net.ssl.HttpsURLConnection;
 import javax.swing.JComponent;
 import javax.swing.event.ChangeListener;
+import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.api.util.FileUtils;
 import org.netbeans.modules.php.api.util.FileUtils.ZipEntryFilter;
+import org.netbeans.modules.php.api.util.StringUtils;
 import org.netbeans.modules.php.spi.framework.PhpModuleExtender;
+import org.netbeans.modules.php.wordpress.commands.WordPressCli;
 import org.netbeans.modules.php.wordpress.preferences.WordPressPreferences;
 import org.netbeans.modules.php.wordpress.ui.options.WordPressOptions;
 import org.netbeans.modules.php.wordpress.ui.wizards.NewProjectConfigurationPanel;
@@ -187,7 +193,6 @@ public Set<FileObject> extend(PhpModule pm) throws ExtendingException {
         panel.setAllEnabled(panel.getWpConfigPanel(), false);
 
         FileObject sourceDirectory = pm.getSourceDirectory();
-        Set<FileObject> files = new HashSet<FileObject>();
         if (panel.useUrl()) {
             // url
             String urlPath = panel.getUrlLabel();
@@ -197,26 +202,55 @@ public Set<FileObject> extend(PhpModule pm) throws ExtendingException {
             } catch (MalformedURLException ex) {
                 Exceptions.printStackTrace(ex);
             } catch (IOException ex) {
-                Exceptions.printStackTrace(ex);
+                throw new ExtendingException(ex.getLocalizedMessage());
             }
         } else if (panel.useLocalFile()) {
             // local file
             String path = panel.getLocalFileLabel();
             try {
                 FileUtils.unzip(path, FileUtil.toFile(sourceDirectory), new ZipEntryFilterImpl());
             } catch (IOException ex) {
-                Exceptions.printStackTrace(ex);
+                throw new ExtendingException(ex.getLocalizedMessage());
+            }
+
+        } else if (panel.useWpCli()) {
+            try {
+                // params
+                ArrayList<String> params = new ArrayList<String>(2);
+                WordPressOptions options = WordPressOptions.getInstance();
+                String locale = options.getWpCliDownloadLocale();
+                if (!StringUtils.isEmpty(locale)) {
+                    params.add(String.format(WordPressCli.LOCALE_PARAM, locale));
+                }
+                String version = options.getWpCliDownloadVersion();
+                if (!StringUtils.isEmpty(version)) {
+                    params.add(String.format(WordPressCli.VERSION_PARAM, version));
+                }
+
+                // run
+                WordPressCli wpCli = WordPressCli.getDefault(false);
+                Future<Integer> result = wpCli.download(pm, params);
+                if (result != null) {
+                    result.get();
+                }
+            } catch (InvalidPhpExecutableException ex) {
+                throw new ExtendingException(ex.getLocalizedMessage());
+            } catch (InterruptedException ex) {
+                Thread.currentThread().interrupt();
+            } catch (ExecutionException ex) {
+                throw new ExtendingException(ex.getLocalizedMessage());
             }
         } else {
             // do nothing
-            return files;
+            return Collections.emptySet();
         }
 
         // set format
         if (panel.useFormatOption()) {
             WordPressPreferences.setWordPressFormat(pm);
         }
 
+        Set<FileObject> files = new HashSet<FileObject>();
         if (sourceDirectory != null) {
             // create wp-config.php
             if (panel.isSelectedCreateConfig()) {

src/org/netbeans/modules/php/wordpress/WordPressPhpProvider.java

@@ -52,10 +52,14 @@
 import org.netbeans.modules.php.spi.editor.EditorExtender;
 import org.netbeans.modules.php.spi.framework.PhpFrameworkProvider;
 import org.netbeans.modules.php.spi.framework.PhpModuleActionsExtender;
+import org.netbeans.modules.php.spi.framework.PhpModuleCustomizerExtender;
 import org.netbeans.modules.php.spi.framework.PhpModuleExtender;
 import org.netbeans.modules.php.spi.framework.PhpModuleIgnoredFilesExtender;
 import org.netbeans.modules.php.spi.framework.commands.FrameworkCommandSupport;
+import org.netbeans.modules.php.wordpress.commands.WordPressCommandSupport;
+import org.netbeans.modules.php.wordpress.customizer.WordPressCustomizerExtender;
 import org.netbeans.modules.php.wordpress.editor.WordPressEditorExtender;
+import org.netbeans.modules.php.wordpress.preferences.WordPressPreferences;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.util.ImageUtilities;
@@ -67,14 +71,13 @@
  */
 public class WordPressPhpProvider extends PhpFrameworkProvider {
 
-    private static WordPressPhpProvider INSTANCE = new WordPressPhpProvider();
+    private static final WordPressPhpProvider INSTANCE = new WordPressPhpProvider();
     private static final String ICON_PATH = "org/netbeans/modules/php/wordpress/resources/wordpress_badge_8.png"; // NOI18N
     private final BadgeIcon badgeIcon;
     private static final Set<String> WP_DIRS = new HashSet<String>();
 
     static {
         WP_DIRS.add("wp-admin"); // NOI18N
-        WP_DIRS.add("wp-content"); // NOI18N
         WP_DIRS.add("wp-includes"); // NOI18N
     }
 
@@ -110,6 +113,12 @@ public boolean isInPhpModule(PhpModule pm) {
                     return false;
                 }
             }
+
+            // content name
+            FileObject content = sourceDirectory.getFileObject(WordPressPreferences.getCustomContentName(pm));
+            if (content == null) {
+                return false;
+            }
         }
         return true;
     }
@@ -152,7 +161,12 @@ public PhpModuleIgnoredFilesExtender getIgnoredFilesExtender(PhpModule pm) {
 
     @Override
     public FrameworkCommandSupport getFrameworkCommandSupport(PhpModule pm) {
-        return null;
+        return new WordPressCommandSupport(pm);
+    }
+
+    @Override
+    public PhpModuleCustomizerExtender createPhpModuleCustomizerExtender(PhpModule phpModule) {
+        return new WordPressCustomizerExtender(phpModule);
     }
 
     @Override