Merge branch 'master' into update_dependencies

.bowerrc

 {
-  "directory": "frontend_client/app/bower_components"
+  "directory": "resources/frontend_client/app/bower_components"
 }

.gitignore

@@ -7,7 +7,9 @@ pom.xml
 pom.xml.asc
 *.jar
 *.class
-/.lein-*
+/.lein-env
+/.lein-failures
+/.lein-repl-history
 /.nrepl-port
 .hgignore
 .hg/
@@ -17,6 +19,6 @@ profiles.clj
 /*.h2.db
 /*.lock.db
 /*.trace.db
-/frontend_client/app/bower_components
+/resources/frontend_client/app/bower_components
+/resources/frontend_client/app/dist/
 /node_modules/
-/frontend_client/app/dist/

.lein-classpath

+lein_tasks

Gulpfile.js

@@ -5,7 +5,7 @@ var gulp = require('gulp'),
     react = require('gulp-react'),
     myth = require('gulp-myth');
 
-var basePath = 'frontend_client/app/';
+var basePath = 'resources/frontend_client/app/';
 
 var SRC = {
     css: [basePath + 'css/**/*.css', basePath + 'components/**/*.css'],

lein_tasks/leiningen/gulp.clj

+(ns leiningen.gulp
+  (:use clojure.java.shell))
+
+
+(defn gulp [projects & args]
+  ;; TODO - some better validations such as checking that we have gulp available
+  (println "Running `gulp build` to assemble frontend assets into a better format")
+  (let [result (sh (str (:root projects) "/node_modules/gulp/bin/gulp.js") "build")]
+    (if (= 0 (:exit result))
+      (println (:out result))
+      (println (:err result)))))
\ No newline at end of file

lein_tasks/leiningen/npm.clj

+(ns leiningen.npm
+  (:use clojure.java.shell))
+
+
+(defn npm [projects & args]
+  ;; TODO - some better validations such as checking if `npm` is available
+  (println "Running `npm install` to download javascript dependencies")
+  (let [result (sh "npm" "install")]
+    (if (= 0 (:exit result))
+      (println (:out result))
+      (println (:err result)))))
\ No newline at end of file

project.clj

 ;; -*- comment-column: 60; -*-
+;; full set of options are here .. https://github.com/technomancy/leiningen/blob/master/sample.project.clj
 
 (defproject metabase "metabase-0.1.0-SNAPSHOT"
   :description "Metabase Community Edition"
@@ -48,6 +49,8 @@
   :java-source-paths ["src/java"]
   :main ^:skip-aot metabase.core
   :target-path "target/%s"
+  :jar-exclusions [#"\.java"]
+  :prep-tasks ["npm" "gulp" "javac" "compile"]
   :ring {:handler metabase.core/app}
   :eastwood {:exclude-namespaces [:test-paths]
              :add-linters [:unused-private-vars]