status-im
/
re-natal
mirror of https://github.com/status-im/re-natal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed upgrade command to default the interface in .re-natal to 'reagent' if absent

This commit is contained in:
Artur Girenko 2016-02-11 21:44:45 +01:00
parent f9317c7698
commit e4bd064083
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
re-natal.coffee
View File

@ -56,7 +56,8 @@ interfaceConf =
shims: ["cljsjs.react", "cljsjs.react.dom"] shims: ["cljsjs.react", "cljsjs.react.dom"]
sampleCommandNs: '(in-ns \'$PROJECT_NAME_HYPHENATED$.state)' sampleCommandNs: '(in-ns \'$PROJECT_NAME_HYPHENATED$.state)'
sampleCommand: '(swap! app-state assoc :app/msg "Hello Native World!")' sampleCommand: '(swap! app-state assoc :app/msg "Hello Native World!")'
interfaceNames = Object.keys interfaceConf interfaceNames = Object.keys interfaceConf
defaultInterface = 'reagent'
log = (s, color = 'green') -> log = (s, color = 'green') ->
console.log chalk[color] s console.log chalk[color] s
@ -157,7 +158,7 @@ writeConfig = (config) ->
message message
verifyConfig = (config) -> verifyConfig = (config) ->
if !config.androidHost? || !config.modules? || !config.imageDirs? if !config.androidHost? || !config.modules? || !config.imageDirs? || !config.interface?
throw new Error 're-natal project needs to be upgraded, please run: re-natal upgrade' throw new Error 're-natal project needs to be upgraded, please run: re-natal upgrade'
config config
@ -450,11 +451,27 @@ generateDevScripts = () ->
message message
doUpgrade = (config) -> doUpgrade = (config) ->
interfaceName = config.interface;
projName = config.name; projName = config.name;
projNameHyph = projName.replace(camelRx, '$1-$2').toLowerCase() projNameHyph = projName.replace(camelRx, '$1-$2').toLowerCase()
projNameUs = toUnderscored projName projNameUs = toUnderscored projName
unless config.interface
config.interface = defaultInterface
unless config.modules
config.modules = []
unless config.imageDirs
config.imageDirs = ["images"]
unless config.androidHost
config.androidHost = "localhost"
writeConfig(config)
log 'upgraded .re-natal'
interfaceName = config.interface;
copyDevEnvironmentFiles(interfaceName, projNameHyph, projName, "localhost") copyDevEnvironmentFiles(interfaceName, projNameHyph, projName, "localhost")
copyProdEnvironmentFiles(interfaceName, projNameHyph, projName) copyProdEnvironmentFiles(interfaceName, projNameHyph, projName)
log 'upgraded files in env/' log 'upgraded files in env/'
@ -462,18 +479,6 @@ doUpgrade = (config) ->
copyFigwheelBridge(projNameUs) copyFigwheelBridge(projNameUs)
log 'upgraded figwheel-bridge.js' log 'upgraded figwheel-bridge.js'
if (!config.modules)
config.modules = []
if (!config.imageDirs)
config.imageDirs = ["images"]
if (!config.androidHost)
config.androidHost = "localhost"
writeConfig(config)
log 'upgraded .re-natal'
edit "src/#{projNameUs}/ios/core.cljs", [[/\^:figwheel-load\s/g, ""]] edit "src/#{projNameUs}/ios/core.cljs", [[/\^:figwheel-load\s/g, ""]]
edit "src/#{projNameUs}/android/core.cljs", [[/\^:figwheel-load\s/g, ""]] edit "src/#{projNameUs}/android/core.cljs", [[/\^:figwheel-load\s/g, ""]]
log 'upgraded core.cljs' log 'upgraded core.cljs'
@ -498,7 +503,7 @@ cli.version pkgJson.version
cli.command 'init <name>' cli.command 'init <name>'
.description 'create a new ClojureScript React Native project' .description 'create a new ClojureScript React Native project'
.option "-i, --interface [#{interfaceNames.join ' '}]", 'specify React interface', 'reagent' .option "-i, --interface [#{interfaceNames.join ' '}]", 'specify React interface', defaultInterface
.action (name, cmd) -> .action (name, cmd) ->
if typeof name isnt 'string' if typeof name isnt 'string'
logErr ''' logErr '''