Permalink
Browse files

Refactoring Directory Layout for Build Process

- Moving bower_componets to src/kibana
- Moving server to src/server
- Adjusting all the build scripts and tests
- Adding proxy for backend server to connect
- Adding build steps for jar and server
  • Loading branch information...
simianhacker committed Aug 26, 2014
1 parent b24ac94 commit 49017ee7cf6efdf6f4d5bd905a83aed0da14b86c
Showing 2,924 changed files with 1,011,630 additions and 255 deletions.
View
@@ -1,3 +1,3 @@
{
- "directory": "./src/bower_components"
-}
+ "directory": "./src/kibana/bower_components"
+}
View
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
unitTestDir: __dirname + '/test/unit',
testUtilsDir: __dirname + '/test/utils',
- bowerComponentsDir: __dirname + '/src/bower_components',
+ bowerComponentsDir: __dirname + '/src/kibana/bower_components',
meta: {
banner: '/*! <%= package.name %> - v<%= package.version %> - ' +
@@ -36,4 +36,4 @@ module.exports = function (grunt) {
// load task definitions
grunt.loadTasks('tasks');
-};
+};
View
@@ -47,5 +47,8 @@
"requirejs": "~2.1.10",
"requirejs-text": "~2.0.10"
},
- "devDependencies": {}
+ "devDependencies": {},
+ "resolutions": {
+ "angular": ">=1.0.6"
+ }
}
View
@@ -20,6 +20,7 @@
"grunt-contrib-requirejs": "~0.4.4",
"grunt-contrib-watch": "~0.5.3",
"grunt-mocha": "~0.4.10",
+ "grunt-run": "^0.2.3",
"http-proxy": "~1.1.4",
"husky": "~0.6.0",
"istanbul": "~0.2.4",
View
@@ -1,30 +0,0 @@
-require "java"
-require "warbler"
-
-HERE = File.expand_path(File.dirname(__FILE__))
-
-task "default" => "jar:run"
-
-namespace "jar" do
- desc "Run the project jar file"
- task "run" => "jar" do
- exec("cd #{HERE} && rm -rf /tmp/kibana* && cp kibana.jar /tmp && cd /tmp && unzip -o kibana.jar 'kibana/public/*' && unzip -o kibana.jar kibana/config/web.ru && env PUBLIC_FOLDER=/tmp/kibana/public java -server -jar kibana.jar kibana/config/web.ru")
- end
-end
-
-desc "Create the project jar file"
-task "jar" do
- system("cd #{HERE} && jruby -S warble")
-end
-
-# desc "Watch for changes"
-# task "watch" => "vendor/fswatch" do
-# system("killall fswatch")
-# system("fswatch #{HERE}/lib \"bash -c \\\"kill -SIGUSR2 \\\`ps u|grep [o]rg.jruby.Main|grep bin/puma|awk {\'print \\\$2\'}\\\`\\\"\" &")
-# end
-
-desc "Run the project from jruby"
-# task "run" => "watch" do
-task "run" do
- exec("cd #{HERE} && jruby -S bundle exec jruby -S bin/kibana config/web.ru")
-end
View
@@ -1,2 +0,0 @@
-port 8000
-
View
@@ -1,12 +0,0 @@
-# Add the libs directory to the load path
-ROOT = File.expand_path("#{File.dirname(__FILE__)}/../")
-$LOAD_PATH.unshift(ROOT)
-
-require "rubygems"
-require "bundler/setup"
-
-# Require the application
-require "#{ROOT}/lib/app"
-
-# Run the application
-run Kibana::App
View
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Welcome to the Future Home of Kibana</title>
- <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- </head>
- <body>
- <div class="container">
- <div class="row">
- <div class="col-md-12 text-center" style="padding-top: 40px;">
- <h1>Welcome to the Future Home of Kibana</h1>
- <p>This is the server component of Kibana. It's just a quick prototype of the things we need.</p>
- <p><a href="/test.html">Static Server</a></p>
- <p><a href="/api/foo">Server Side APIs</a></p>
- <p><a href="/elasticsearch">Elasticsearch Proxy</a></p>
- <h3>Much more coming soon...</h3>
- </div>
- </div>
- </div>
- </body>
-</html>
View
@@ -1,9 +0,0 @@
-<html>
- <head>
- <title>This is a test file</title>
- </head>
- <body>
- <h1>This is a test</h1>
- <p>This should work outside of anything else.</p>
- </body>
-</html>
View
@@ -1,16 +0,0 @@
-require "routes/base"
-require "lib/helpers"
-
-module Kibana
- module Routes
- class Api < Base
-
- helpers Kibana::Helpers
-
- get "/api/foo" do
- json :foo => doSomething()
- end
-
- end
- end
-end
View
@@ -1,15 +0,0 @@
-require "sinatra/base"
-require "sinatra/json"
-
-module Kibana
- module Routes
- class Base < Sinatra::Base
- helpers Sinatra::JSON
-
- configure do
- # Confirgure stuffs here
- end
-
- end
- end
-end
View
@@ -1,13 +0,0 @@
-require "routes/base"
-
-module Kibana
- module Routes
- class Home < Base
-
- get "/" do
- File.read(File.join(ROOT, 'public', 'index.html'))
- end
-
- end
- end
-end
@@ -0,0 +1,13 @@
+{
+ "name": "FileSaver",
+ "homepage": "https://github.com/eligrey/FileSaver.js",
+ "_release": "c69c21d488",
+ "_resolution": {
+ "type": "branch",
+ "branch": "master",
+ "commit": "c69c21d488714ec1f9bd08044c0c4522eeb76947"
+ },
+ "_source": "git://github.com/eligrey/FileSaver.js.git",
+ "_target": "*",
+ "_originalSource": "FileSaver"
+}
Oops, something went wrong.

0 comments on commit 49017ee

Please sign in to comment.