joosy 1.2.0.alpha.5 → 1.2.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8395d61d74334b79dff75dfac8d41a983da6cd7d
-  data.tar.gz: f8bc1d0db984fa3c4bd689a5ad00defe632c3f19
+  metadata.gz: 63dc4c11964a51d88581fd3681b2a793c196b05d
+  data.tar.gz: 80f89f164658f7cc9bf7794cf3dd440073a46c64
 SHA512:
-  metadata.gz: bf279fa42a0b35c7fb01950e28af1f33701aa762ae82747b4854da0dd46bfd04e16dd4d56f81fed3c48ce7845b17973236f0846f155fc59d2c9028e1cb03d278
-  data.tar.gz: 4a33c7dd7ff43dc198842f133d5ed2a31307f3f5173fc87b0aa431291334eca0e37d548f0194fa1a9b95ffc5a6db08998e7d25fc360c12b29a6ff63a4a2a2f7a
+  metadata.gz: 3266f0d3dae47fa2c7838e7ef53095ecd399ce802f30a822b6fa32ae9ff4ba052c1d4d8a214a5a8469dc6a586ffddaf69246dc6bd410f86cf57ae950097b80b2
+  data.tar.gz: 552f138af8a3ee7fd48d38d25c82982e9f11e389b0a98c38904b99f12c2209fdc859b5d2f7760462025d260e0a3f08f299f28e5e9ed2628e29728fbdb69b0fef

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "joosy",
-  "version": "1.2.0-alpha.5",
+  "version": "1.2.0-alpha.6",
   "main": "lib/joosy.js",
   "ignore": [
     "bin",
@@ -10,7 +10,8 @@
     "Gemfile",
     "Gruntfile.coffee",
     "joosy.gemspec",
-    "package.json"
+    "package.json",
+    "lib/**/*.rb"
   ],
   "dependencies": {
     "jquery": "~2.0.2",

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.5",
+  "version": "1.2.0-alpha.6",
   "author": "Boris Staal <boris@staal.io>",
   "bin": {
     "joosy": "bin/joosy"

data/src/joosy/generators/base.coffee

@@ -21,7 +21,7 @@ class Base
     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]
@@ -32,7 +32,7 @@ class Base
     @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]
@@ -75,7 +75,7 @@ class Base
 
   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)
@@ -100,7 +100,7 @@ class Base
       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

data/src/joosy/generators/command.coffee

@@ -3,6 +3,7 @@ module.exports = ->
   cli   = require 'command-router'
   meta  = require '../../../package.json'
   grunt = require 'grunt'
+  path  = require 'path'
 
   cli.command /new\s?(.*)?/, ->
     name = cli.params.splats[0]
@@ -36,7 +37,7 @@ module.exports = ->
       process.exit 1
 
     generator = require("./#{entity}")
-    generator = new generator(name)
+    generator = new generator(name, path.join(process.cwd(), 'source'))
     generator.generate()
     generator.perform -> process.exit 0
 

data/src/joosy/generators/layout.coffee

@@ -3,7 +3,6 @@
 class Layout extends @Base
   constructor: (@name, destination, templates) ->
     super(destination, templates)
-    @destination = @join @destination, 'source'
 
   generate: ->
     namespace = @getNamespace @name

data/src/joosy/generators/page.coffee

@@ -3,7 +3,6 @@
 class Page extends @Base
   constructor: (@name, destination, templates) ->
     super(destination, templates)
-    @destination = @join @destination, 'source'
 
   generate: ->
     namespace = @getNamespace @name

data/src/joosy/generators/project.coffee

@@ -1,10 +1,11 @@
 Standalone = require './project/standalone'
 Base       = require './project/base'
+Path       = require 'path'
 
 module.exports = class
   constructor: (@name) ->
     @standalone = new Standalone(@name)
-    @base       = new Base(@name, @standalone.destination)
+    @base       = new Base(@name, Path.join(@standalone.destination, 'source'))
 
   generate: ->
     @standalone.generate()

data/src/joosy/generators/project/base.coffee

@@ -4,7 +4,6 @@ class ProjectBase extends @Base
   constructor: (name, destination, templates) ->
     super(destination, templates)
     @name = name.split('/').pop()
-    @destination = @join @destination, 'source'
 
   generate: ->
     @file ['resources', '.gitkeep']

data/src/joosy/generators/widget.coffee

@@ -3,7 +3,6 @@
 class Widget extends @Base
   constructor: (@name, destination, templates) ->
     super(destination, templates)
-    @destination = @join @destination, 'source'
 
   generate: ->
     namespace = @getNamespace @name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.5
+  version: 1.2.0.alpha.6
 platform: ruby
 authors:
 - Boris Staal