Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7E2E11071D for ; Tue, 24 Feb 2015 02:46:51 +0000 (UTC) Received: (qmail 6895 invoked by uid 500); 24 Feb 2015 02:46:51 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 6855 invoked by uid 500); 24 Feb 2015 02:46:51 -0000 Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list dev@cordova.apache.org Received: (qmail 6842 invoked by uid 99); 24 Feb 2015 02:46:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2015 02:46:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BFFABE0388; Tue, 24 Feb 2015 02:46:50 +0000 (UTC) From: agrieve To: dev@cordova.apache.org Reply-To: dev@cordova.apache.org References: In-Reply-To: Subject: [GitHub] cordova-lib pull request: CB-8499 `cordova platform save` should s... Content-Type: text/plain Message-Id: <20150224024650.BFFABE0388@git1-us-west.apache.org> Date: Tue, 24 Feb 2015 02:46:50 +0000 (UTC) Github user agrieve commented on a diff in the pull request: https://github.com/apache/cordova-lib/pull/170#discussion_r25224748 --- Diff: cordova-lib/src/cordova/platform_metadata.js --- @@ -0,0 +1,102 @@ +/** + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. +*/ + + +var path = require('path'), + cordova_util = require('./util'), + fs = require('fs'), + Q = require('q'), + shelljs = require('shelljs'); + + +// Retrieves the platforms and their versions from the platforms.json file +// Returns an array of {platform: platform, version: version} ... +// ... where version could be '3.4.0', '/path/to/platform' or 'git://...' +function getVersions(projectRoot) { + var platformsDir = path.join(projectRoot, 'platforms'); + var platformsJsonFile = path.join(platformsDir, 'platforms.json'); + + // If the platforms.json file doesn't exist, retrieve versions from platforms installed on the filesystem... + // ...Note that in this case, we won't be able to know what source(folder, git-url) the platform came from, we'll just use versions + return getPlatVersionsFromFile(platformsJsonFile).fail(function(){ + return getPlatVersionsFromFileSystem(projectRoot); + }); +} + +// Returns a promise +function getPlatVersionsFromFile(platformsJsonFile){ + var platformData = require(platformsJsonFile); + var platformVersions = []; + + platformVersions = Object.keys(platformData).map(function(p){ + return {platform: p, version: platformData[p]}; + }); + + return Q(platformVersions); +} + +// Returns a promise +function getPlatVersionsFromFileSystem(projectRoot){ + var platformVersions = []; + var platforms_on_fs = cordova_util.listPlatforms(projectRoot); + platforms_on_fs.forEach(function(platform){ + var script = path.join(projectRoot, 'platforms', platform, 'cordova', 'version'); + + // Use version script to retrieve installed version of the platform + var version = shelljs.exec(script).output; + + // clean the version we get back from the script + // This is necessary because the version script uses console.log to pass back + // the version. Using console.log ends up adding additional line breaks/newlines to the value returned. + // ToDO: version scripts should be refactored to not use console.log() + var versionCleaned = version.replace(/\r?\n|\r/g, ''); + platformVersions.push({platform: platform, version: versionCleaned}); + }); + + return Q(platformVersions); +} + +// Saves platform@version into platforms.json +function save(projectRoot, platform, version) { + var platformsDir = path.join(projectRoot, 'platforms'); + var platformJsonFile = path.join(platformsDir, 'platforms.json'); + if(!fs.existsSync(platformJsonFile)){ + fs.writeFileSync(platformJsonFile, JSON.stringify({}, null, 4), 'utf-8'); --- End diff -- unless I'm missing something, you overwrite this file a few lines below. No need to write an empty file here. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org For additional commands, e-mail: dev-help@cordova.apache.org