src/joosy/generators/base.coffee in joosy-1.2.0.alpha.5 vs src/joosy/generators/base.coffee in joosy-1.2.0.alpha.6
- old
+ new
@@ -19,22 +19,22 @@
getBasename: (name) ->
name = name.split('/')
name.pop()
template: (source, destination, data) ->
- source = @join(@templates, source...) if source instanceof Array
+ source = @join(source...) if source instanceof Array
destination = @join(destination...) if destination instanceof Array
@actions.push ['template', destination, source, data]
file: (destination, content='') ->
destination = @join(destination...) if destination instanceof Array
@actions.push ['file', destination, content]
copy: (source, destination) ->
- source = @join(@templates, source...) if source instanceof Array
+ source = @join(source...) if source instanceof Array
destination = @join(destination...) if destination instanceof Array
@actions.push ['copy', destination, source]
camelize: (string) ->
@@ -73,11 +73,11 @@
@[method] next, action...
performCopyAction: (callback, destination, source) ->
write = =>
- File.copy source, @join(@destination, destination)
+ File.copy @join(@templates, source), @join(@destination, destination)
Log.ok "#{destination} copied..."
if File.exists(@destination, destination)
Commander.confirm "#{destination} exists. Overwrite? ", (y) ->
write() if y
@@ -98,10 +98,10 @@
else
write()
callback()
performTemplateAction: (callback, destination, source, data) ->
- @performFileAction callback, destination, @compileTemplate(source, data)
+ @performFileAction callback, destination, @compileTemplate(@join(@templates, source), data)
if module?
module.exports = Base
else
@Base = Base
\ No newline at end of file