joosy 1.2.0.alpha.63 → 1.2.0.alpha.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69739c36a5ebd92252282522b35939310ad81bc1
-  data.tar.gz: d594f2adcdeefa91aacf255cbf0a3985e23de4de
+  metadata.gz: 0823adf3077e02d1d72bf7dda25eca2619f6af2b
+  data.tar.gz: 93a63a4a7a5ddb792667df29374155773fd28ea9
 SHA512:
-  metadata.gz: 91bb29b74b08df165afa9623556424de32ea0540692d09e2e929df9b89089983377d21f20cd9b4ae4f3ce2b5ca6681f7055d12e6670947cbd843951eca808d08
-  data.tar.gz: 4846c9b0cdc628f0d75c958936d18191fc42d9bfa15ad23660963b4850ca9536c24602831f71654e27857be7eedb0dcad87005ea1472631d8fc8a20633b8a5a2
+  metadata.gz: 1307d42fe3cbb35e2a14b072c735122dfadcbdb3027384b1e63c692f61ec4860704c2ae3a4d0c8be500175c41c65b752540a6416b21320c1497802200f5e542d
+  data.tar.gz: b0610530a29bcd99bf4abfeda87f4cbb670011b137ecbc7e5b7c6076d4e095d8f125bc0a51a751646cccb9a785e4e61bac0bcc94d2fcdf911673975c7336f0d3

data/Gruntfile.coffee

@@ -1,5 +1,8 @@
 require 'sugar'
 
+Mincer = require 'mincer'
+semver = require 'semver'
+
 module.exports = (grunt) ->
   #
   # Common settings
@@ -29,7 +32,6 @@ module.exports = (grunt) ->
   #
   # Grunt extensions
   #
-  grunt.loadTasks 'lib/tasks'
   grunt.loadNpmTasks 'grunt-contrib-testem'
   grunt.loadNpmTasks 'grunt-coffeelint'
   grunt.loadNpmTasks 'grunt-release'
@@ -111,3 +113,131 @@ module.exports = (grunt) ->
     grunt.task.run if @args[0] then "testem:run:#{@args[0]}" else 'testem'
 
   grunt.registerTask 'publish', ['testem', 'publish:ensureCommits', 'doc', 'release', 'publish:gem']
+
+
+  #
+  # Building
+  #
+  grunt.registerMultiTask 'mince', ->
+    Mincer.CoffeeEngine.configure bare: false
+    environment = new Mincer.Environment
+    environment.appendPath x for x in @data.include
+    grunt.file.write @data.dest, environment.findAsset(@data.src).toString()
+
+  grunt.registerTask 'bowerize', ->
+    bower = require './bower.json'
+    meta  = require './package.json'
+
+    bower.version = meta.version
+    grunt.file.write 'bower.json', JSON.stringify(bower, null, 2)
+
+  #
+  # Publishing
+  #
+  grunt.registerTask 'publish:ensureCommits', ->
+    complete = @async()
+
+    grunt.util.spawn {cmd: "git", args: ["status", "--porcelain" ]}, (error, result) ->
+      if !!error || result.stdout.length > 0
+        console.log ""
+        console.log "Uncommited changes found. Please commit prior to release or use `--force`.".bold
+        console.log ""
+        complete false
+      else
+        complete true
+
+  grunt.registerTask 'publish:gem', ->
+    meta     = require './package.json'
+    complete = @async()
+
+    grunt.util.spawn {cmd: "gem", args: ["build", "joosy.gemspec"]}, (error, result) ->
+      return complete false if error
+
+      gem = "joosy-#{meta.version.replace('-', '.')}.gem"
+      grunt.log.ok "Built #{gem}"
+
+      grunt.util.spawn {cmd: "gem", args: ["push", gem]}, (error, result) ->
+        return complete false if error
+        grunt.log.ok "Published #{gem}"
+        grunt.file.delete gem
+        complete(true)
+
+  #
+  # Documentation
+  #
+  grunt.registerTask 'doc', ['doc:prepare', 'doc:generate']
+
+  grunt.registerTask 'doc:generate', ->
+    complete = @async()
+    version = JSON.parse(grunt.file.read 'package.json').version.split('-')
+    version = version[0]+'-'+version[1]?.split('.')[0]
+    destination = "doc/#{version}"
+    args = ['source', '--output-dir', destination]
+
+    git = (args, callback) ->
+      grunt.util.spawn {cmd: "git", args: args, opts: {stdio: [0,1,2], cwd: 'doc'}}, callback
+
+    date = (version) ->
+      return undefined unless version
+      Date.create(grunt.file.read "doc/#{version}/DATE").format "{d} {Month} {yyyy}"
+
+    git ['pull'], (error, result) ->
+      grunt.fatal "Error pulling from git" if error
+
+      grunt.file.delete destination if grunt.file.exists destination
+      grunt.util.spawn {cmd: "codo", args: args, opts: {stdio: [0,1,2]}}, (error, result) ->
+        grunt.fatal "Error generating docs" if error
+        grunt.file.write "#{destination}/DATE", (new Date).toISOString()
+
+        versions = []
+        for version in grunt.file.expand({cwd: 'doc'}, '*')
+          versions.push version if semver.valid(version)
+
+        versions = versions.sort(semver.rcompare)
+        edge     = versions.find (x) -> x.has('-')
+        stable   = versions.find (x) -> !x.has('-')
+        versions = versions.remove edge, stable
+
+        versions = {
+          edge:
+            version: edge
+            date: date(edge)
+          stable:
+            version: stable
+            date: date(stable)
+          versions: versions.map (x) -> { version: x, date: date(x) }
+        }
+        grunt.file.write 'doc/versions.js', "window.versions = #{JSON.stringify(versions)}"
+
+        git ['add', '-A'], (error, result) ->
+          grunt.fatal "Error adding files" if error
+
+          git ['commit', '-m', "Updated at #{(new Date).toISOString()}"], (error, result) ->
+            grunt.fatal "Error commiting" if error
+
+            git ['push', 'origin', 'gh-pages'], (error, result) ->
+              grunt.fatal "Error pushing" if error
+              complete()
+
+  grunt.registerTask 'doc:prepare', ->
+    if grunt.file.exists 'doc'
+      unless grunt.file.exists 'doc/.git'
+        grunt.fatal "Documentation directory exists. Please remove it"
+      else
+        return
+
+    complete = @async()
+
+    base = process.cwd()
+    git = (args, callback) ->
+      grunt.util.spawn {cmd: "git", args: args, opts: {stdio: [0,1,2]}}, callback
+
+    git ["clone", "git@github.com:joosy/joosy.git", "doc"], (error, result) ->
+      grunt.fatal "Erorr cloning repo" if error
+      process.chdir 'doc'
+
+      git ["checkout", "gh-pages"], (error, result) ->
+        grunt.fatal "Erorr checking branch out" if error
+
+        process.chdir base
+        complete()

data/bower.json

@@ -1,17 +1,16 @@
 {
   "name": "joosy",
-  "version": "1.2.0-alpha.63",
-  "main": "lib/joosy.js",
+  "version": "1.2.0-alpha.64",
+  "main": "build/joosy.js",
   "ignore": [
-    "bin",
+    "lib",
     "spec",
     "tasks",
     "templates",
-    "Gemfile",
     "Gruntfile.coffee",
     "joosy.gemspec",
     "package.json",
-    "lib/**/*.rb"
+    ".*"
   ],
   "dependencies": {
     "jquery": "~1.10.1",

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.63",
+  "version": "1.2.0-alpha.64",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {
@@ -15,17 +15,11 @@
     "node": ">=0.4.0"
   },
   "dependencies": {
-    "grunt": "~0.4.1",
-    "coffee-script": "~1.6.3",
-    "sugar": "~1.3.8",
-    "grill": "~1.0.0-alpha.5",
-    "command-router": "0.0.5",
-    "resolve": "~0.4.0",
-    "ejs": "~0.8.4",
-    "commander": "~1.2.0",
-    "colors": "~0.6.0-1"
+    "grill": "~1.0.0-alpha.12"
   },
   "devDependencies": {
+    "coffee-script": "~1.6.3",
+    "sugar": "~1.3.8",
     "bower": "~1.1.2",
     "mincer": ">= 0.5.5",
     "semver": "~2.1.0",

data/tasks/joosy.coffee

@@ -2,7 +2,7 @@ module.exports = (grunt) ->
 
   #
   # Joosy utilizes Grill to setup standalone environment
-  # Check out https://github.com/inossidabile/grill
+  # Check out https://github.com/joosy/grill
   #
   require('grill').setup grunt,
     prefix: 'joosy'

data/templates/environment/.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - '0.8'
+  - '0.10'

data/templates/environment/Gruntfile.coffee

@@ -33,23 +33,26 @@ module.exports = (grunt) ->
     testem:
       application:
         src: [
-          'public/application.js',
+          'app/javascripts/application.coffee',
           'spec/helpers/*.coffee',
           'spec/**/*_spec.coffee'
         ]
+        assets:
+          setup: ->
+            grunt.joosy.assetter('development').environment
         options:
-          parallel: 4
           launch_in_dev: ['PhantomJS'],
           launch_in_ci: ['PhantomJS']
 
   #
   # Tasks
   #
+  grunt.registerTask 'default', ['testem']
+  grunt.registerTask 'spec', ['testem']
+
   grunt.registerTask 'compile', ['joosy:compile', 'uglify', 'cssmin']
   grunt.registerTask 'server',  ['joosy:server']
 
-  grunt.registerTask 'spec', ['testem']
-
   grunt.registerTask 'deploy', ->
     if process.env['NODE_ENV'] == 'production'
       grunt.task.run ['joosy:bower', 'joosy:compile'] 

data/templates/environment/package.json

@@ -8,10 +8,11 @@
     "grunt-cli": "~0.1.9",
     "grunt-contrib-uglify": "~0.2.2",
     "grunt-contrib-cssmin": "~0.6.1",
-    "grunt-contrib-testem": "~0.2.0",
+    "grunt-contrib-testem": "~0.3.0",
     "phantom": "~0.5.2"
   },
   "scripts": {
+    "test": "node_modules/.bin/grunt testem:ci --launch=phantomjs",
     "postinstall": "node_modules/.bin/grunt deploy"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.63
+  version: 1.2.0.alpha.64
 platform: ruby
 authors:
 - Boris Staal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -57,9 +57,6 @@ files:
 - build/joosy/extensions/resources.js
 - joosy.gemspec
 - lib/joosy.rb
-- lib/tasks/build.coffee
-- lib/tasks/doc.coffee
-- lib/tasks/publish.coffee
 - package.json
 - source/joosy.coffee
 - source/joosy/application.coffee
@@ -131,6 +128,7 @@ files:
 - templates/application/templates/layouts/application.jst.hamlc
 - templates/application/templates/pages/welcome/index.jst.hamlc
 - templates/environment/.gitignore
+- templates/environment/.travis.yml
 - templates/environment/Gruntfile.coffee
 - templates/environment/Procfile
 - templates/environment/app/haml/index.haml

data/lib/tasks/build.coffee

@@ -1,16 +0,0 @@
-Mincer = require 'mincer'
-
-module.exports = (grunt) ->
-
-  grunt.registerMultiTask 'mince', ->
-    Mincer.CoffeeEngine.configure bare: false
-    environment = new Mincer.Environment
-    environment.appendPath x for x in @data.include
-    grunt.file.write @data.dest, environment.findAsset(@data.src).toString()
-
-  grunt.registerTask 'bowerize', ->
-    bower = require '../../bower.json'
-    meta  = require '../../package.json'
-
-    bower.version = meta.version
-    grunt.file.write 'bower.json', JSON.stringify(bower, null, 2)

data/lib/tasks/doc.coffee

@@ -1,80 +0,0 @@
-semver = require 'semver'
-
-module.exports = (grunt) ->
-
-  grunt.registerTask 'doc', ['doc:prepare', 'doc:generate']
-
-  grunt.registerTask 'doc:generate', ->
-    complete = @async()
-    version = JSON.parse(grunt.file.read 'package.json').version.split('-')
-    version = version[0]+'-'+version[1]?.split('.')[0]
-    destination = "doc/#{version}"
-    args = ['source', '--output-dir', destination]
-
-    git = (args, callback) ->
-      grunt.util.spawn {cmd: "git", args: args, opts: {stdio: [0,1,2], cwd: 'doc'}}, callback
-
-    date = (version) ->
-      return undefined unless version
-      Date.create(grunt.file.read "doc/#{version}/DATE").format "{d} {Month} {yyyy}"
-
-    git ['pull'], (error, result) ->
-      grunt.fatal "Error pulling from git" if error
-
-      grunt.file.delete destination if grunt.file.exists destination
-      grunt.util.spawn {cmd: "codo", args: args, opts: {stdio: [0,1,2]}}, (error, result) ->
-        grunt.fatal "Error generating docs" if error
-        grunt.file.write "#{destination}/DATE", (new Date).toISOString()
-
-        versions = []
-        for version in grunt.file.expand({cwd: 'doc'}, '*')
-          versions.push version if semver.valid(version)
-
-        versions = versions.sort(semver.rcompare)
-        edge     = versions.find (x) -> x.has('-')
-        stable   = versions.find (x) -> !x.has('-')
-        versions = versions.remove edge, stable
-
-        versions = {
-          edge:
-            version: edge
-            date: date(edge)
-          stable:
-            version: stable
-            date: date(stable)
-          versions: versions.map (x) -> { version: x, date: date(x) }
-        }
-        grunt.file.write 'doc/versions.js', "window.versions = #{JSON.stringify(versions)}"
-
-        git ['add', '-A'], (error, result) ->
-          grunt.fatal "Error adding files" if error
-
-          git ['commit', '-m', "Updated at #{(new Date).toISOString()}"], (error, result) ->
-            grunt.fatal "Error commiting" if error
-
-            git ['push', 'origin', 'gh-pages'], (error, result) ->
-              grunt.fatal "Error pushing" if error
-              complete()
-
-  grunt.registerTask 'doc:prepare', ->
-    if grunt.file.exists 'doc'
-      unless grunt.file.exists 'doc/.git'
-        grunt.fatal "Documentation directory exists. Please remove it"
-      else
-        return
-
-    complete = @async()
-
-    base = process.cwd()
-    git = (args, callback) ->
-      grunt.util.spawn {cmd: "git", args: args, opts: {stdio: [0,1,2]}}, callback
-
-    git ["clone", "git@github.com:joosy/joosy.git", "doc"], (error, result) ->
-      grunt.fatal "Erorr cloning repo" if error
-      process.chdir 'doc'
-
-      git ["checkout", "gh-pages"], (error, result) ->
-        grunt.fatal "Erorr checking branch out" if error
-
-        process.chdir base
-        complete()

data/lib/tasks/publish.coffee

@@ -1,29 +0,0 @@
-module.exports = (grunt) ->
-
-  grunt.registerTask 'publish:ensureCommits', ->
-    complete = @async()
-
-    grunt.util.spawn {cmd: "git", args: ["status", "--porcelain" ]}, (error, result) ->
-      if !!error || result.stdout.length > 0
-        console.log ""
-        console.log "Uncommited changes found. Please commit prior to release or use `--force`.".bold
-        console.log ""
-        complete false
-      else
-        complete true
-
-  grunt.registerTask 'publish:gem', ->
-    meta     = require '../../package.json'
-    complete = @async()
-
-    grunt.util.spawn {cmd: "gem", args: ["build", "joosy.gemspec"]}, (error, result) ->
-      return complete false if error
-
-      gem = "joosy-#{meta.version.replace('-', '.')}.gem"
-      grunt.log.ok "Built #{gem}"
-
-      grunt.util.spawn {cmd: "gem", args: ["push", gem]}, (error, result) ->
-        return complete false if error
-        grunt.log.ok "Published #{gem}"
-        grunt.file.delete gem
-        complete(true)