Merge branch 'release-1.0.4.2'

History.md

@@ -1,5 +1,11 @@
 ## v.NEXT
 
+## v1.0.4.2, 2015-Mar-20
+
+* Fix regression in 1.0.4 where using Cordova for the first time in a project
+  with hyphens in its directory name would fail.  #3950
+
+
 ## v1.0.4.1, 2015-Mar-18
 
 * Fix regression in 1.0.4 where `meteor publish-for-arch` only worked for

docs/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.4.1
+METEOR@1.0.4.2

docs/client/helpers.js

@@ -1,4 +1,4 @@
-release = Meteor.release ? "1.0.4.1" : "(checkout)";
+release = Meteor.release ? "1.0.4.2" : "(checkout)";
 
 Template.registerHelper("release", release);
 

examples/clock/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.4.1
+METEOR@1.0.4.2

examples/leaderboard/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.4.1
+METEOR@1.0.4.2

examples/localmarket/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.4.1
+METEOR@1.0.4.2

examples/todos/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.4.1
+METEOR@1.0.4.2

packages/meteor-tool/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.0.43'
+  version: '1.0.44'
 });
 
 Package.includeTool();

scripts/admin/banners.json

@@ -5,13 +5,19 @@
                    "0.9.2.1", "0.9.2.2", "0.9.3", "0.9.3.1", "0.9.4", "1.0", "1.0.1", "1.0.2", "1.0.2.1",
                    "1.0.3", "1.0.3.1", "1.0.3.2"],
       "banner": {
-        "text": "=> Meteor 1.0.4.1: MongoDB 2.6 and 3.0 support, performance improvements,\n   Cordova upgrades, template-specific subscriptions, and more!\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.0.4.1 by running 'meteor update'."
+        "text": "=> Meteor 1.0.4.2: MongoDB 2.6 and 3.0 support, performance improvements,\n   Cordova upgrades, template-specific subscriptions, and more!\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.0.4.2 by running 'meteor update'."
       }
     },
     {
       "versions": ["1.0.4"],
       "banner": {
-        "text": "=> Meteor 1.0.4.1: Fixes a regression in publishing packages in 1.0.4.\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.0.4.1 by running 'meteor update'."
+        "text": "=> Meteor 1.0.4.2: Fixes regressions in publishing packages and creating new Cordova projects in 1.0.4.\n\n   This release is being downloaded in the background. Update your app to Meteor 1.0.4.2 by running 'meteor update --patch'."
+      }
+    },
+    {
+      "versions": ["1.0.4.1"],
+      "banner": {
+        "text": "=> Meteor 1.0.4.2: Fixes a regression in creating new Cordova projects in 1.0.4 and 1.0.4.1.\n\n   This release is being downloaded in the background. Update your app to Meteor 1.0.4.2 by running 'meteor update --patch'."
       }
     }
   ]

scripts/admin/meteor-release-official.json

@@ -1,7 +1,7 @@
 {
     "track": "METEOR",
-    "version": "1.0.4.1",
-    "patchFrom": ["1.0.4"],
+    "version": "1.0.4.2",
+    "patchFrom": ["1.0.4", "1.0.4.1"],
     "recommended": false,
     "official": true,
     "description": "The Official Meteor Distribution"

tools/commands-cordova.js

@@ -375,7 +375,10 @@ var ensureCordovaProject = function (projectContext, appName) {
     try {
       var creation = execFileSyncOrThrow(localCordova,
         ['create', files.pathBasename(cordovaPath),
-          'com.meteor.' + appName, appName.replace(/\s/g, '')],
+         // Cordova app identifiers have to look like Java namespaces.
+         // Change weird characters (especially hyphens) into underscores.
+         'com.meteor.userapps.' + appName.replace(/[^a-zA-Z\d_$.]/g, '_'),
+         appName.replace(/\s/g, '')],
         { cwd: files.pathDirname(cordovaPath), env: buildCordovaEnv() });
 
       // create a folder for storing local plugins