Skip to content

Commit

Permalink
[fix] #10 Livereload is working again
Browse files Browse the repository at this point in the history
[upd] #8 Open hostname is now using the connect parameter
[add] server Hostname can now be overrided by the `--host` option
[upd] removed unused parameters in `bower.json`
[upd] switch task loading to load-grunt-task
[upd] Moved release notes to the release.md file
  • Loading branch information
Plou committed Mar 5, 2014
1 parent 573612a commit 3e518f7
Show file tree
Hide file tree
Showing 14 changed files with 93 additions and 110 deletions.
16 changes: 0 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,6 @@ Go check the **[Dummy](https://github.com/Inouit/dummy)** to get a full list!
- Add a task to check git HEAD before running any task. (grunt-git ?)


# Release notes

- **1.1.3** : Upgraded to dummy 1.0.0
- **1.1.2** : Upgraded to dummy 0.11.1
- **1.1.0** :
- Transfered repository ownership to Inouit organisation
- Upgraded to dummy 0.11.0
- **1.0.1** :
- Upgraded to dummy 0.10.1
- Fixed a compatibility issue
- **1.0.0** :
- Dummy is now managed as a bower dependency
- bug fixes
- **0.2.0** : renamed *generator-dummy* to *generator-dummies* to publish to npm index
- **0.1.0** : *Dummy* is dead, long live *generator-dummy*

# Road map

- split grunt tasks into files
Expand Down
29 changes: 29 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Release notes

## 1.0

- **1.2.0** :
- Livereload is working again
- Open hostname is now using the connect parameter
- Server Hostname can now be overrided by the `--host` option
- Removed unused parameters in `bower.json`
- Switch task loading to load-grunt-task
- Moved release notes to the release.md file

- **1.1.3** : Upgraded to dummy 1.0.0
- **1.1.2** : Upgraded to dummy 0.11.1
- **1.1.0** :
- Transfered repository ownership to Inouit organisation
- Upgraded to dummy 0.11.0
- **1.0.1** :
- Upgraded to dummy 0.10.1
- Fixed a compatibility issue

- **1.0.0** :
- Dummy is now managed as a bower dependency
- bug fixes

## Beta

- **0.2.0** : renamed *generator-dummy* to *generator-dummies* to publish to npm index
- **0.1.0** : *Dummy* is dead, long live *generator-dummy*
8 changes: 4 additions & 4 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,17 @@ DummiesGenerator.prototype.askFor = function askFor() {
name: 'environment',
message: 'Where are your putting it?',
choices: [
{
name: 'Scratch',
value: 'scratch'
},
{
name: 'TYPO3',
value: 'typo3'
},
{
name: 'Symfony2',
value: 'symfony2'
},
{
name: 'Scratch',
value: 'scratch'
}
]
}
Expand Down
16 changes: 6 additions & 10 deletions app/templates/_gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ mountFolder = (connect, dir) ->
connect.static require('path').resolve(dir)

module.exports = (grunt) ->
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks)
require('load-grunt-tasks')(grunt)

grunt.initConfig

# You can't run the docco task alone, coffeFiles & sassFiles don't chain.
# You have to call them separatly.
docco:
<% if (CoffeeScript) { %>
docco:<% if (CoffeeScript) { %>
coffeeFiles:
files:
src: ['js/src/*.coffee']
Expand All @@ -32,7 +31,6 @@ module.exports = (grunt) ->
options:
output: 'docs/sass/annotated-source'
css: 'docs/assets/custom.css'

<% if (CoffeeScript) { %>
coffee:
build:
Expand All @@ -45,7 +43,6 @@ module.exports = (grunt) ->
dest: 'js'
ext: '.js'
<% } %>

sass:
build:
options:
Expand All @@ -61,23 +58,22 @@ module.exports = (grunt) ->
build:
browsers: ["last 3 version", "ie 8", "ie 7"]
src: 'css/main.css'

<% if (environment == "scratch") { %>
connect:
all:
options:
hostname: "0.0.0.0"
hostname: grunt.option('host') || "0.0.0.0"
port: grunt.option('port') || 0
livereload: grunt.option('liveport') || 35729

open:
all:
path: 'http://localhost:<%%= connect.all.options.port%>/'
path: 'http://<%%= connect.all.options.hostname%>:<%%= connect.all.options.port%>/'
<% } %>

watch:
options:
livereload: grunt.option('liveport') || 35729
livereload:
port: '<%%= connect.all.options.livereload%>'

html:
files:[
Expand Down
2 changes: 1 addition & 1 deletion app/templates/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
<% } %>
"grunt-notify": "~0.2.16",
"grunt-contrib-watch": "*",
"matchdep": "*"
"load-grunt-tasks": "*"
}
}
8 changes: 4 additions & 4 deletions app/templates/bower_components/dummy/.bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dummy",
"description": "A light Sass & coffee base front-end",
"version": "1.0.0",
"version": "1.0.1",
"author": {
"name": "Inouit",
"url": "www.inouit.fr"
Expand All @@ -27,11 +27,11 @@
"jscrollpane": "~2.0.0"
},
"homepage": "https://github.com/in8/dummy",
"_release": "1.0.0",
"_release": "1.0.1",
"_resolution": {
"type": "version",
"tag": "1.0.0",
"commit": "dbe07506f4452a544502df4af5fd0556e27eddb5"
"tag": "1.0.1",
"commit": "dee68d62e218d5b6a1c4e1f444edb8685dcba60f"
},
"_source": "git://github.com/in8/dummy.git",
"_target": ">=1.0.0",
Expand Down
36 changes: 0 additions & 36 deletions app/templates/bower_components/dummy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,42 +20,6 @@ Go check the Yeoman's [generator](https://github.com/Inouit/generator-dummy) !
- Some jQuery plugins helpers ready to use


# Release notes

- **1.0.0** :
- Reworked column system, column mixin added
- Added support of inline-block for ie7
- Added print.scss to handle print layout
- **0.11.1** : Added step classes to fixToTop jquery plugin
- **0.11.0** : Transfered repository ownership to Inouit organisation
- **0.10.1** :
- Added grunt configuration to enable stand alone use
- Removed compiled javascript files from gitignore to keep compatibility with generator-dummies
- **0.10.0** :
- A slice & content max width management improved ( ie8 fallback)
- A fallback added for inline-block on Internet Explorer < 8
- **0.9.0** : *Dummy* is dead, long live *generator-dummy*
- **0.8.3** : Removed generated documentation from repository
- **0.8.2** : Added notifications to tasks
- **0.8.1** : fixed a regression from 0.8.0
- **0.8.0** :
- Changed server task to serve (best practice)
- Switched default port to 0 to enable simple multiple server running simultaneously
- **0.7.0** : Documentation build is now automated
- **0.6.1** : Moved examples from index.html to demo/index.html
- **0.6.0** :
- Removed livereload script from html, you must use a browser extension listenning port 35729
- Until generator is built, a gruntFile for typo3 has been added
- **0.5.1** : Improved documentation
- **0.5.0** : Sourcemapping for sass & coffescript files enabled
- **0.3.0** : Vendors prefixe are now automatically added to the main.css file
- **0.4.0** : The default grunt task now build coffeescript annotated sources
- **0.2.0** : Reworked grid system : You can now use *class="column column-value"* in any wrapper to get your columns right
- **0.1.0** : First Sass & Coffe version of the Dummy

#Kown issues


# Tree

css
Expand Down
39 changes: 39 additions & 0 deletions app/templates/bower_components/dummy/RELEASE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Release notes

## 1.0

- **1.0.0** :
- Reworked column system, column mixin added
- Added support of inline-block for ie7
- Added print.scss to handle print layout


## Beta

- **0.11.1** : Added step classes to fixToTop jquery plugin
- **0.11.0** : Transfered repository ownership to Inouit organisation
- **0.10.1** :
- Added grunt configuration to enable stand alone use
- Removed compiled javascript files from gitignore to keep compatibility with generator-dummies
- **0.10.0** :
- A slice & content max width management improved ( ie8 fallback)

## Alpha
- **0.9.0** : *Dummy* is dead, long live *generator-dummy*
- **0.8.3** : Removed generated documentation from repository
- **0.8.2** : Added notifications to tasks
- **0.8.1** : fixed a regression from 0.8.0
- **0.8.0** :
- Changed server task to serve (best practice)
- Switched default port to 0 to enable simple multiple server running simultaneously
- **0.7.0** : Documentation build is now automated
- **0.6.1** : Moved examples from index.html to demo/index.html
- **0.6.0** :
- Removed livereload script from html, you must use a browser extension listenning port 35729
- Until generator is built, a gruntFile for typo3 has been added
- **0.5.1** : Improved documentation
- **0.5.0** : Sourcemapping for sass & coffescript files enabled
- **0.3.0** : Vendors prefixe are now automatically added to the main.css file
- **0.4.0** : The default grunt task now build coffeescript annotated sources
- **0.2.0** : Reworked grid system : You can now use *class="column column-value"* in any wrapper to get your columns right
- **0.1.0** : First Sass & Coffe version of the Dummy
2 changes: 1 addition & 1 deletion app/templates/bower_components/dummy/css/src/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
@mixin inline-block { display: inline-block; }

// Emulate background sizing for Internet Explorer 8
@mixin backgound-size( $size... ) {
@mixin background-size( $size... ) {
background-size: $size;
-ms-behavior: url(/backgroundsize.min.htc);
}
Expand Down
8 changes: 4 additions & 4 deletions app/templates/bower_components/modernizr/.bower.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "modernizr",
"homepage": "https://github.com/Modernizr/Modernizr",
"version": "2.7.1",
"_release": "2.7.1",
"version": "2.7.2",
"_release": "2.7.2",
"_resolution": {
"type": "version",
"tag": "v2.7.1",
"commit": "54252c10fc7d3b8b17cf458c401ca904dc354d8c"
"tag": "v2.7.2",
"commit": "6d98eaa785207ed8e20dffe311df0bab49e464d8"
},
"_source": "git://github.com/Modernizr/Modernizr.git",
"_target": "*",
Expand Down
2 changes: 1 addition & 1 deletion app/templates/bower_components/modernizr/grunt.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = function( grunt ) {

grunt.initConfig({
meta: {
version: '2.7.1',
version: '2.7.2',
banner: '/*!\n' +
' * Modernizr v<%= meta.version %>\n' +
' * www.modernizr.com\n *\n' +
Expand Down
6 changes: 3 additions & 3 deletions app/templates/bower_components/modernizr/modernizr.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Modernizr v2.7.1
* Modernizr v2.7.2
* www.modernizr.com
*
* Copyright (c) Faruk Ates, Paul Irish, Alex Sexton
Expand All @@ -24,7 +24,7 @@

window.Modernizr = (function( window, document, undefined ) {

var version = '2.7.1',
var version = '2.7.2',

Modernizr = {},

Expand Down Expand Up @@ -605,7 +605,7 @@ window.Modernizr = (function( window, document, undefined ) {

// Note, Android < 4 will pass this test, but can only animate
// a single property at a time
// daneden.me/2011/12/putting-up-with-androids-bullshit/
// goo.gl/v3V4Gp
tests['cssanimations'] = function() {
return testPropsAll('animationName');
};
Expand Down
29 changes: 0 additions & 29 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,5 @@
{
"name": "generator-dummies",
"description": "a dummy generator - light Sass & coffee front-end base",
"version": "1.1.3",
"author": {
"name": "Inouit",
"url": "www.inouit.fr"
},
"contributors": [
"Plou <cl.plou@gmail.com> (http://plou.github.io/)",
"Gregcop1 <gregcop1@gmail.com>",
"Toofff <prouyann@gmail.com> (http://yanoucrea.fr)",
"Shatimes <contact@shatimes.fr> (http://www.shatimes.fr)",
"JViste <jviste@inouit.com>"
],
"keywords": [
"yeoman-generator",
"front-end",
"grid",
"coffeescript",
"sass",
"inouit"
],
"main": "app/index.js",
"repository": {
"type": "git",
"url": "https://github.com/Inouit/generator-dummies.git"
},
"bugs": {
"url": "https://github.com/Inouit/generator-dummies/issues"
},
"dependencies": {
"dummy": ">=1.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "generator-dummies",
"description": "a dummy generator - light Sass & coffee front-end base",
"version": "1.1.3",
"version": "1.2.0",
"author": {
"name": "Inouit",
"url": "www.inouit.fr"
Expand Down

0 comments on commit 3e518f7

Please sign in to comment.