[devassistant] Fix NodeJS assistants problems (missing dependencies, bad dirs).

[Bohuslav Kabrda]

commit b8085714b6361e034c7d65682821217f1c928fe5
Author: Slavek Kabrda <bkabrda at redhat.com>
Date:   Tue Nov 25 11:50:36 2014 +0100

    Fix NodeJS assistants problems (missing dependencies, bad dirs).
    
    Resolves: rhbz#1167570

 devassistant-0.9.3-fix-nodejs-assistants.patch |   51 ++++++++++++++++++++++++
 devassistant.spec                              |   13 ++++++-
 2 files changed, 63 insertions(+), 1 deletions(-)
---
diff --git a/devassistant-0.9.3-fix-nodejs-assistants.patch b/devassistant-0.9.3-fix-nodejs-assistants.patch
new file mode 100644
index 0000000..d0b687f
--- /dev/null
+++ b/devassistant-0.9.3-fix-nodejs-assistants.patch
@@ -0,0 +1,51 @@
+commit ea9a21f2c1854a8f4a58a4acdd64514e50187a16
+Author: Slavek Kabrda <bkabrda at redhat.com>
+Date:   Tue Nov 25 11:28:52 2014 +0100
+
+    Make sure to create the top level directory and switch to it
+
+diff --git a/devassistant/data/assistants/crt/nodejs/app.yaml b/devassistant/data/assistants/crt/nodejs/app.yaml
+index a9e20f9..4b4650c 100644
+--- a/devassistant/data/assistants/crt/nodejs/app.yaml
++++ b/devassistant/data/assistants/crt/nodejs/app.yaml
+@@ -97,6 +97,8 @@ run:
+ - $basename~: $(basename "$name")
+ - if $(test -e "$name"):
+   - log_e: '$name already exists, cannot proceed.'
++- cl: mkdir -p "$dirname"
++- cl: cd "$dirname"
+ - cl: cp -r *appnodejs "$basename"
+ - dda_c: "$basename"
+ - cl: cd "$basename"
+diff --git a/devassistant/data/assistants/crt/nodejs/express.yaml b/devassistant/data/assistants/crt/nodejs/express.yaml
+index 36c1b33..641810a 100644
+--- a/devassistant/data/assistants/crt/nodejs/express.yaml
++++ b/devassistant/data/assistants/crt/nodejs/express.yaml
+@@ -110,6 +110,8 @@ run:
+ - if $(test -e "$name"):
+   - log_e: '$name already exists, cannot proceed.'
+ - log_i: 'Creating Express.JS project $basename in $dirname ...'
++- cl: mkdir -p "$dirname"
++- cl: cd "$dirname"
+ - cl: express --css stylus --ejs "$basename"
+ - dda_c: $basename
+ - cl: cd "$basename"
+
+commit 822c80193195af61c81be4a0ef61ae50c7653d88
+Author: Slavek Kabrda <bkabrda at redhat.com>
+Date:   Tue Nov 25 11:08:32 2014 +0100
+
+    Add forgotten nodejs-express dependency, rhbz#1167570
+
+diff --git a/devassistant/data/assistants/crt/nodejs/express.yaml b/devassistant/data/assistants/crt/nodejs/express.yaml
+index e26b8f1..36c1b33 100644
+--- a/devassistant/data/assistants/crt/nodejs/express.yaml
++++ b/devassistant/data/assistants/crt/nodejs/express.yaml
+@@ -33,6 +33,7 @@ dependencies:
+   - rpm: ['nodejs-delayed-stream']
+   - rpm: ['nodejs-devel']
+   - rpm: ['nodejs-editor']
++  - rpm: ['nodejs-express']
+   - rpm: ['nodejs-forever-agent']
+   - rpm: ['nodejs-form-data']
+   - rpm: ['nodejs-formidable']
diff --git a/devassistant.spec b/devassistant.spec
index 4b81912..4a00a5e 100644
--- a/devassistant.spec
+++ b/devassistant.spec
@@ -2,7 +2,7 @@
 
 Name:           devassistant
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DevAssistant - Making life easier for developers
 
 License:        GPLv2+ and CC-BY-SA
@@ -16,6 +16,11 @@ Source1:        %{name}.desktop
 Source2:        %{name}.appdata.xml
 
 Patch0:         devassistant-0.6.0-alter-paths-for-fedora.patch
+# Patch for https://bugzilla.redhat.com/show_bug.cgi?id=1167570
+#  Combined upstream patches:
+#  https://github.com/devassistant/devassistant-assistants-fedora/commit/822c80193195af61c81be4a0ef61ae50c7653d88
+#  https://github.com/devassistant/devassistant-assistants-fedora/commit/ea9a21f2c1854a8f4a58a4acdd64514e50187a16
+Patch1:         devassistant-0.9.3-fix-nodejs-assistants.patch
 
 BuildArch:      noarch
 
@@ -56,6 +61,8 @@ working with source control, etc.
 # remove bundled egg-info
 rm -rf %{name}.egg-info
 
+%patch1 -p1
+
 cp %{SOURCE1} .
 sed -i '/Version/d' %{name}.desktop
 
@@ -145,6 +152,10 @@ fi
 %{python_sitelib}/%{name}-%{version}-py?.?.egg-info
 
 %changelog
+* Tue Nov 25 2014 Slavek Kabrda <bkabrda at redhat.com> - 0.9.3-2
+- Fix NodeJS assistants problems (missing dependencies, bad dirs).
+Resolves: rhbz#1167570
+
 * Thu Nov 13 2014 Tomas Radej <tradej at redhat.com> - 0.9.3-1
 - Updated to newer upstream version