coffeelint: no unnecessary double quotes, no empty functions \n conso…

…lidate package.json

Gruntfile.coffee

@@ -1,43 +1,62 @@
 
-banner = "// Copyright © 2014-2015 Ilias Ismanalijev \n
+banner = '// Copyright © 2014-2015 Ilias Ismanalijev \n
 // \n
 // This program is free software: you can redistribute it and/or modify \n
 // it under the terms of the GNU Affero General Public License as \n
 // published by the Free Software Foundation, either version 3 of the \n
 // License, or (at your option) any later version. \n
-//  \n
+//	\n
 // This program is distributed in the hope that it will be useful, \n
 // but WITHOUT ANY WARRANTY; without even the implied warranty of \n
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the \n
-// GNU Affero General Public License for more details.\n"
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the \n
+// GNU Affero General Public License for more details.\n'
 
 
-module.exports = (grunt) =>
-	coffeeFiles = ["src/coffee/main.coffee", "src/coffee/config.coffee", "src/coffee/templates.coffee", "src/coffee/reddit.coffee", "src/coffee/authentication.coffee",  "src/coffee/controls.coffee", "src/coffee/ui.coffee", "src/coffee/main/subreddits.coffee", "src/coffee/main/playlist.coffee", "src/coffee/main/song.coffee", "src/coffee/player.coffee", "src/coffee/options.coffee", "src/coffee/main/search.coffee", "src/coffee/main/remote.coffee", "src/coffee/keyboard.coffee", "src/coffee/message.coffee"]
+module.exports = (grunt) ->
+	coffeeFiles = [
+		'main',
+		'util',
+		'config',
+		'templates',
+		'reddit',
+		'authentication',
+		'controls',
+		'ui',
+		'main/subreddits',
+		'main/playlist',
+		'main/song',
+		'player',
+		'options',
+		'main/search',
+		'main/remote',
+		'keyboard',
+		'messag'
+	].map (i) -> "src/coffee/#{i}.coffee"
 
 	grunt.initConfig
 		less:
 			app:
 				options:
 					compress: true
 					cleancss: true
-					report: "gzip"
+					report: 'gzip'
 				files:
-					"app/css/style.css": "src/less/style.less"
+					'app/css/style.css': 'src/less/style.less'
+
 		coffee:
 			compile:
 				options:
 					join: true
 					sourceMap: true
 					bare: true
 				files:
-					"app/js/main.js": coffeeFiles
+					'app/js/main.js': coffeeFiles
 
 		coffeelint:
 			app: coffeeFiles
-			server: ["server/*.coffee", "server/controller/*.coffee", "server/config/*.coffee"]
+			server: ['server/*.coffee', 'server/controller/*.coffee', 'server/config/*.coffee']
 			options:
-				configFile: "./coffeelint.json"
+				configFile: './coffeelint.json'
 
 		uglify:
 			production:
@@ -46,34 +65,34 @@ module.exports = (grunt) =>
 					sourceMap: false
 					banner: banner
 				files:
-					"app/js/main.min.js": ["app/js/main.js"]
+					'app/js/main.min.js': ['app/js/main.js']
 
 		clean:
-			all: ["app/css/style.css", "app/js/main.*"]
-			production: ["app/js/*.map", "app/js/main.js", "app/js/*.coffee"]
+			all: ['app/css/style.css', 'app/js/main.*']
+			production: ['app/js/*.map', 'app/js/main.js', 'app/js/*.coffee']
 
 		watch:
 			less:
-				files: ["src/less/*"]
-				tasks: ["less"]
+				files: ['src/less/*']
+				tasks: ['less']
 			coffee:
-				files: ["src/coffee/*", "src/coffee/*/*"]
-				tasks: ["coffeelint", "coffee", "uglify"]
+				files: ['src/coffee/*', 'src/coffee/*/*']
+				tasks: ['coffeelint', 'coffee', 'uglify']
 
 			livereload:
 				options:
 					livereload: true
-				files: ["app/css/*", "app/js/*", "app/jade/**"]
+				files: ['app/css/*', 'app/js/*', 'app/jade/**']
 
-	grunt.loadNpmTasks "grunt-contrib-coffee"
-	grunt.loadNpmTasks "grunt-contrib-watch"
-	grunt.loadNpmTasks "grunt-contrib-less"
-	grunt.loadNpmTasks "grunt-contrib-uglify"
-	grunt.loadNpmTasks "grunt-coffeelint"
-	grunt.loadNpmTasks "grunt-contrib-clean"
+	grunt.loadNpmTasks 'grunt-contrib-coffee'
+	grunt.loadNpmTasks 'grunt-contrib-watch'
+	grunt.loadNpmTasks 'grunt-contrib-less'
+	grunt.loadNpmTasks 'grunt-contrib-uglify'
+	grunt.loadNpmTasks 'grunt-coffeelint'
+	grunt.loadNpmTasks 'grunt-contrib-clean'
 
-	grunt.registerTask "c", ["coffee"]
-	grunt.registerTask "l", ["less"]
-	grunt.registerTask "default", ["coffee", "less", "watch"]
-	grunt.registerTask "build", ["coffee", "uglify", "less", "clean:production"]
-	grunt.registerTask "test", ["coffeelint", "clean:all"]
+	grunt.registerTask 'c', ['coffee']
+	grunt.registerTask 'l', ['less']
+	grunt.registerTask 'default', ['coffee', 'less', 'watch']
+	grunt.registerTask 'build', ['coffee', 'uglify', 'less', 'clean:production']
+	grunt.registerTask 'test', ['coffeelint', 'clean:all']

README.md

@@ -19,11 +19,9 @@
 $ git clone https://github.com/musicplayer-io/redditmusicplayer.git
 $ cd redditmusicplayer
 $ npm install
-$ cd server
-$ npm install
 
-$ cp config/reddit.coffee.sample config/reddit.coffee
-$ cd ..
+$ cp server/config/reddit.coffee.sample server/config/reddit.coffee
+# edit server/config/reddit.coffee
 
 $ cp src/coffee/config.coffee.sample src/coffee/config.coffee
 # edit src/coffee/config.coffee

coffeelint.json

@@ -65,7 +65,7 @@
     "console": false
   },
   "no_empty_functions": {
-    "level": "ignore"
+    "level": "error"
   },
   "no_empty_param_list": {
     "level": "ignore"
@@ -105,7 +105,7 @@
     "allowed_in_empty_lines": true
   },
   "no_unnecessary_double_quotes": {
-    "level": "ignore"
+    "level": "warn"
   },
   "no_unnecessary_fat_arrows": {
     "level": "warn"

package.json

@@ -1,26 +1,45 @@
 {
-  "name": "redditmusicplayer-builder",
+  "name": "redditmusicplayer-server",
   "version": "0.5.17",
-  "description": "Builder for Music Player for Reddit",
-  "scripts": {
-    "start": "coffee server/server.coffee"
-  },
+  "description": "Music Player for Reddit Server",
   "repository": {
     "type": "git",
     "url": "git@github.com:musicplayer-io/redditmusicplayer.git"
   },
+  "scripts": {
+    "start": "coffee server/server.coffee",
+    "test": "node_modules/grunt-cli/bin/grunt test"
+  },
+  "main": "server.coffee",
   "author": "Ilias Ismanalijev",
   "license": "GPLv3",
   "dependencies": {
+    "body-parser": "^1.12.4",
+    "coffee-script": "^1.9.2",
+    "connect-redis": "^3.0.1",
+    "cookie-parser": "^1.3.4",
+    "express": "^4.8.8",
+    "express-session": "^1.11.2",
+    "jade": "^1.9.2",
+    "js-yaml": "^3.3.1",
+    "lodash": "^3.9.3",
+    "morgan": "^1.5.3",
+    "passport": "^0.3.0",
+    "passport-reddit": "git+https://github.com/musicplayer-io/passport-reddit.git",
+    "passport.socketio": "^3.5.1",
+    "redis": "^2.2.5",
+    "request": "^2.55.0",
+    "socket.io": "^1.3.5"
+  },
+  "devDependencies": {
+    "coffeelint": "^1.13.0",
     "grunt": "^0.4.5",
+    "grunt-cli": "^0.1.13",
+    "grunt-coffeelint": "0.0.13",
+    "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-coffee": "^0.13.0",
     "grunt-contrib-less": "^1.0.1",
-    "grunt-contrib-uglify": "^0.9.1",
+    "grunt-contrib-uglify": "^0.9.2",
     "grunt-contrib-watch": "^0.6.1"
-  },
-  "devDependencies": {
-    "coffeelint": "^1.10.1",
-    "grunt-coffeelint": "0.0.13",
-    "grunt-contrib-clean": "^0.6.0"
   }
 }

server/config/default.coffee

@@ -1,19 +1,19 @@
-express = require "express"
-bodyParser = require "body-parser"
+express = require 'express'
+bodyParser = require 'body-parser'
 
-cookieParser = require "cookie-parser"
-bodyParser = require "body-parser"
-session = require "express-session"
-RedisStore = require("connect-redis")(session)
+cookieParser = require 'cookie-parser'
+bodyParser = require 'body-parser'
+session = require 'express-session'
+RedisStore = require('connect-redis')(session)
 
-passport = require "passport"
-jade = require "jade"
-RedditStrategy = require("passport-reddit").Strategy
+passport = require 'passport'
+jade = require 'jade'
+RedditStrategy = require('passport-reddit').Strategy
 
-logger = require "morgan"
+logger = require 'morgan'
 
 # Configure Authentication
-reddit = require "./reddit"
+reddit = require './reddit'
 passport.serializeUser (user, done) ->
 	done null, user
 
@@ -30,35 +30,35 @@ passport.use new RedditStrategy
 			done null, profile, refreshToken
 
 module.exports = ->
-	baseDir = @set "baseDir"
-	
+	baseDir = @set 'baseDir'
+
 	# The port the server should run on
-	@set "port", process.env.PORT or 4008
-
-	@set "view engine", "jade"
-	@set "views", baseDir + "/src/jade"
-
-	# Set the server"s public directory
-	@use express.static(baseDir + "/app")
+	@set 'port', process.env.PORT or 4008
+
+	@set 'view engine', 'jade'
+	@set 'views', baseDir + '/src/jade'
+
+	# Set the server's public directory
+	@use express.static(baseDir + '/app')
+
+	@use logger 'dev'
 
-	@use logger "dev"
-
 	@use cookieParser()
 	@use bodyParser.json()
 	@use bodyParser.urlencoded extended: false
 	@use session
 		resave: true
 		saveUninitialized: true
-		name: "rmp.id"
-		secret: "Reddit Music Player"
+		name: 'rmp.id'
+		secret: 'Reddit Music Player'
 		store: new RedisStore
-			prefix: "sess"
+			prefix: 'sess'
 			port: 6379
-			host: "localhost"
+			host: 'localhost'
 		cookie:
 			secure: false
 			maxAge: 30 * (24 * 60 * 60 * 1000) # days
-	
+
 	# Authentication
 	@use passport.initialize()
-	@use passport.session()
+	@use passport.session()

server/config/development.coffee

@@ -1,10 +1,10 @@
 
 # Dependencies
-express = require "express"
+express = require 'express'
 
 # Server development configuration
 module.exports = ->
 	# Output sensible errors with the full stack trace
 	@use express.errorHandler
 		dumpExceptions: true
-		showStack: true
+		showStack: true

server/config/production.coffee

@@ -1,8 +1,8 @@
 
 # Dependencies
-express = require "express"
+express = require 'express'
 
 # Server production configuration
 module.exports = ->
 	# Simple error reporting - should display a 500 page
-	@use express.errorHandler()
+	@use express.errorHandler()

server/config/reddit.coffee.sample

@@ -1,16 +1,16 @@
-if process.env.NODE_ENV is "production"
+if process.env.NODE_ENV is 'production'
 	module.exports =
-		base: "https://ssl.reddit.com/api"
-		client_id: "YOUR_CLIENT_ID"
-		client_secret: "YOUR_SECRET"
-		secret: "YOUR_SECRET"
-		redirect_uri: "https://example.com/auth/reddit/callback"
-		scope: "identity,read,save,vote,submit"
+		base: 'https://ssl.reddit.com/api'
+		client_id: 'YOUR_CLIENT_ID'
+		client_secret: 'YOUR_SECRET'
+		secret: 'YOUR_SECRET'
+		redirect_uri: 'https://example.com/auth/reddit/callback'
+		scope: 'identity,read,save,vote,submit'
 else
 	module.exports =
-		base: "https://ssl.reddit.com/api"
-		client_id: "YOUR_CLIENT_ID_DEV"
-		client_secret: "YOUR_SECRET_DEV"
-		secret: "YOUR_SECRET_DEV"
-		redirect_uri: "http://localhost:4008/auth/reddit/callback"
-		scope: "identity,read,save,vote,submit"
+		base: 'https://ssl.reddit.com/api'
+		client_id: 'YOUR_CLIENT_ID_DEV'
+		client_secret: 'YOUR_SECRET_DEV'
+		secret: 'YOUR_SECRET_DEV'
+		redirect_uri: 'http://localhost:4008/auth/reddit/callback'
+		scope: 'identity,read,save,vote,submit'