Skip to content

Commit

Permalink
PR review updates
Browse files Browse the repository at this point in the history
  • Loading branch information
junajan committed Aug 26, 2016
1 parent 63d72c1 commit 4866775
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 20 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sphere-product-type-json-generator",
"description": "A command line tool for generating ProductTypes JSON representations from CSV templates.",
"version": "0.3.0",
"version": "0.2.8",
"homepage": "https://github.com/sphereio/sphere-product-type-json-generator",
"private": false,
"author": {
Expand Down Expand Up @@ -37,7 +37,7 @@
},
"main": "main.js",
"engines": {
"node": ">= 0.10.0"
"node": ">= 4"
},
"scripts": {
"test": "grunt coverage",
Expand Down
19 changes: 5 additions & 14 deletions src/coffee/product-type-import.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ class ProductTypeImporter
Prepare for importing, initialize used modules
###
init: (argv) ->
@argv = argv
@logOptions =
name: "#{package_json.name}-#{package_json.version}"
silent: !! argv.logSilent
streams: [
{ level: 'error', stream: process.stderr }
{ level: argv.logLevel || 'info', path: (argv.logDir || '.') + "/#{package_json.name}.log" }
{ level: argv.logLevel || 'info', path: "#{argv.logDir || '.'}/#{package_json.name}.log" }
]

@logger = new ExtendedLogger
Expand All @@ -27,9 +26,9 @@ class ProductTypeImporter
@logger.bunyanLogger.trace = -> # noop
@logger.bunyanLogger.debug = -> # noop

@_ensureProductTypeImporter @argv, @logger
.then (sphereImporter) ->
@sphereImporter = sphereImporter
@_ensureCredentials argv
.then (credentials) ->
@sphereImporter = new ProductTypeImport.default(@logger, credentials)
Promise.resolve @

###
Expand Down Expand Up @@ -65,14 +64,6 @@ class ProductTypeImporter

sphereClientConfig: options

###
Create sphere product import class
###
_ensureProductTypeImporter: (argv, logger) ->
@_ensureCredentials argv
.then (credentials) =>
@sphereImporter = new ProductTypeImport.default(logger, credentials)

###
Import product types using sphere product import tool
###
Expand All @@ -86,5 +77,5 @@ class ProductTypeImporter
.catch (e) ->
console.error "Oops, something went wrong when importing product type #{productType.name} to sphere"
Promise.reject e

, concurrency: 5
module.exports = ProductTypeImporter
8 changes: 4 additions & 4 deletions src/coffee/run.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ argv = require('optimist')
.describe('sphereProtocol', 'SPHERE.IO API protocol to connect to')
.describe('sphereAuthHost', 'SPHERE.IO OAuth host to connect to')
.describe('sphereAuthProtocol', 'SPHERE.IO OAuth protocol to connect to')
.describe('sphereImport', 'import product types to SPHERE.IO')
.describe('import', 'import product types to SPHERE.IO')
.describe('logSilent', 'use console to print messages')
.describe('logDir', 'directory to store logs')
.describe('logLevel', 'log level for file logging')
.default('projectKey', false)
.default('sphereImport', false)
.default('import', false)
.default('logSilent', false)
.default('logDir', '.')
.default('logLevel', 'info')
Expand All @@ -42,7 +42,7 @@ argv = require('optimist')
.alias('target', 'td')
.alias('withRetailer', 'r')
.boolean('withRetailer')
.boolean('sphereImport')
.boolean('import')
.boolean('zip')
.demand(['types', 'attributes', 'target'])
.argv
Expand Down Expand Up @@ -127,7 +127,7 @@ Promise.all [readCsvAsync(argv.types), readCsvAsync(argv.attributes)]
# TODO: make it async
generator.run types, attributes, argv.target, argv.withRetailer
.then (result) ->
if argv.sphereImport
if argv.import
importSphereProductTypes result
.catch (e) ->
console.error "Ending with an error: #{e.message}"
Expand Down

0 comments on commit 4866775

Please sign in to comment.