@stencila/dockter - npm Package Compare versions

Comparing version 0.11.1 to 0.11.2

dist/RGenerator.js

		@@ -94,5 +94,7 @@ "use strict";
		Date: ${this.date}
		Imports:\n ${pkgs.join(',\n ')}
		Description: Generated by Dockter ${new Date().toISOString()}.
		To stop Dockter generating this file and start editing it yourself, rename it to "DESCRIPTION".\n`;
		To stop Dockter generating this file and start editing it yourself, rename it to "DESCRIPTION".
		`;
		if (pkgs.length)
		desc += `Imports:\n ${pkgs.join(',\n ')}\n`;
		this.write('.DESCRIPTION', desc);
		@@ -102,6 +104,6 @@ return [['.DESCRIPTION', 'DESCRIPTION']];
		installCommand(sysVersion) {
		let cmd = 'mkdir ~/R';
		let cmd = 'mkdir -p ~/R && ';
		if (this.exists('install.R')) {
		// Run the user supplied installation script
		cmd += ` \\\n && Rscript install.R`;
		cmd += `Rscript install.R`;
		}
		@@ -111,3 +113,3 @@ else if (this.exists('DESCRIPTION') \|\| this.exists('.DESCRIPTION')) {
		// execute the installation-from-DESCRIPTION script.
		cmd += ` \\\n && bash -c "Rscript <(curl -sL https://unpkg.com/@stencila/dockter/src/install.R)"`;
		cmd += `bash -c "Rscript <(curl -sL https://unpkg.com/@stencila/dockter/src/install.R)"`;
		}
		@@ -114,0 +116,0 @@ return cmd;

package.json

		{
		"name": "@stencila/dockter",
		"version": "0.11.1",
		"version": "0.11.2",
		"description": "A Docker image builder for researchers",
		@@ -5,0 +5,0 @@ "main": "dist/index.js",

src/RGenerator.ts

		@@ -102,5 +102,7 @@ import { SoftwarePackage } from '@stencila/schema'
		Date: ${this.date}
		Imports:\n ${pkgs.join(',\n ')}
		Description: Generated by Dockter ${new Date().toISOString()}.
		To stop Dockter generating this file and start editing it yourself, rename it to "DESCRIPTION".\n`
		To stop Dockter generating this file and start editing it yourself, rename it to "DESCRIPTION".
		`
		if (pkgs.length) desc += `Imports:\n ${pkgs.join(',\n ')}\n`

		this.write('.DESCRIPTION', desc)
		@@ -111,10 +113,10 @@ return [['.DESCRIPTION', 'DESCRIPTION']]
		installCommand (sysVersion: string): string \| undefined {
		let cmd = 'mkdir ~/R'
		let cmd = 'mkdir -p ~/R && '
		if (this.exists('install.R')) {
		// Run the user supplied installation script
		cmd += ` \\\n && Rscript install.R`
		cmd += `Rscript install.R`
		} else if (this.exists('DESCRIPTION') \|\| this.exists('.DESCRIPTION')) {
		// To keep the Dockerfile as simple as possible, download and
		// execute the installation-from-DESCRIPTION script.
		cmd += ` \\\n && bash -c "Rscript <(curl -sL https://unpkg.com/@stencila/dockter/src/install.R)"`
		cmd += `bash -c "Rscript <(curl -sL https://unpkg.com/@stencila/dockter/src/install.R)"`
		}
		@@ -121,0 +123,0 @@ return cmd

tests/RGenerator.test.ts

		@@ -61,4 +61,3 @@ import fixture from './fixture'

		RUN mkdir ~/R \\
		&& bash -c "Rscript <(curl -sL https://unpkg.com/@stencila/dockter/src/install.R)"
		RUN mkdir -p ~/R && bash -c "Rscript <(curl -sL https://unpkg.com/@stencila/dockter/src/install.R)"
		`)
		@@ -106,4 +105,3 @@ })

		RUN mkdir ~/R \\
		&& bash -c "Rscript <(curl -sL https://unpkg.com/@stencila/dockter/src/install.R)"
		RUN mkdir -p ~/R && bash -c "Rscript <(curl -sL https://unpkg.com/@stencila/dockter/src/install.R)"

		@@ -110,0 +108,0 @@ COPY cmd.R cmd.R

tests/fixtures/multi-lang/Dockerfile.expected

Sorry, the diff of this file is not supported yet

New alerts