You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/09/09 11:14:14 UTC

[1/2] git commit: updated refs/heads/master to 6f72ac9

Updated Branches:
  refs/heads/master 0bc81f934 -> 6f72ac9fc


update docs


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/31b96130
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/31b96130
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/31b96130

Branch: refs/heads/master
Commit: 31b96130f6323733c2d3c430a721222451675d3c
Parents: 0bc81f9
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Sep 9 11:11:43 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Mon Sep 9 11:13:29 2013 +0200

----------------------------------------------------------------------
 src/fauxton/writing_addons.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/31b96130/src/fauxton/writing_addons.md
----------------------------------------------------------------------
diff --git a/src/fauxton/writing_addons.md b/src/fauxton/writing_addons.md
index 85d1e7a..08f44fc 100644
--- a/src/fauxton/writing_addons.md
+++ b/src/fauxton/writing_addons.md
@@ -15,10 +15,11 @@ have the following structure:
 
 ## Generating an addon
 We have a `grunt-init` template that lets you create a skeleton addon,
-including all the boiler plate code. Run `grunt-init tasks/addon` and answer
-the questions it asks to create an addon:
+including all the boiler plate code. Run
+`./node_modules/.bin/grunt-init tasks/addon` and answer the questions
+it asks to create an addon:
 
-    ± grunt-init tasks/addon
+    $ ./node_modules/.bin/grunt-init tasks/addon
     path.existsSync is now called `fs.existsSync`.
     Running "addon" task
 


[2/2] git commit: updated refs/heads/master to 6f72ac9

Posted by ja...@apache.org.
fix addon template, s/route/routes/.js


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6f72ac9f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6f72ac9f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6f72ac9f

Branch: refs/heads/master
Commit: 6f72ac9fc9b9ef918a625389b9e521ad9fbc7621
Parents: 31b9613
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Sep 9 11:12:36 2013 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Mon Sep 9 11:13:37 2013 +0200

----------------------------------------------------------------------
 src/fauxton/tasks/addon/rename.json             |  2 +-
 .../tasks/addon/root/route.js.underscore        | 21 --------------------
 .../tasks/addon/root/routes.js.underscore       | 21 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f72ac9f/src/fauxton/tasks/addon/rename.json
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/addon/rename.json b/src/fauxton/tasks/addon/rename.json
index 1f326e9..046ca50 100644
--- a/src/fauxton/tasks/addon/rename.json
+++ b/src/fauxton/tasks/addon/rename.json
@@ -1,5 +1,5 @@
 {
-  "route.js.underscore": "{%= path %}/{%= name.toLowerCase() %}/route.js",
+  "routes.js.underscore": "{%= path %}/{%= name.toLowerCase() %}/routes.js",
   "resources.js.underscore": "{%= path %}/{%= name.toLowerCase() %}/resources.js",
   "base.js.underscore": "{%= path %}/{%= name.toLowerCase() %}/base.js"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f72ac9f/src/fauxton/tasks/addon/root/route.js.underscore
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/addon/root/route.js.underscore b/src/fauxton/tasks/addon/root/route.js.underscore
deleted file mode 100644
index 859e5bb..0000000
--- a/src/fauxton/tasks/addon/root/route.js.underscore
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy of
-// the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-
-define([
-  "app",
-  "api",
-  "addons/{%= name.toLowerCase() %}/resources"
-],
-function(app, FauxtonAPI, {%= name %}) {
-  {%= name %}.Routes = {};
-  return {%= name %};
-});

http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f72ac9f/src/fauxton/tasks/addon/root/routes.js.underscore
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/addon/root/routes.js.underscore b/src/fauxton/tasks/addon/root/routes.js.underscore
new file mode 100644
index 0000000..859e5bb
--- /dev/null
+++ b/src/fauxton/tasks/addon/root/routes.js.underscore
@@ -0,0 +1,21 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations under
+// the License.
+
+define([
+  "app",
+  "api",
+  "addons/{%= name.toLowerCase() %}/resources"
+],
+function(app, FauxtonAPI, {%= name %}) {
+  {%= name %}.Routes = {};
+  return {%= name %};
+});