proper asset build process :) (fd00b279) · Commits · github_fork / Clip

fnordmetric-core/fnordmetric.gemspec

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ Gem::Specification.new do \|s\|
		s.add_development_dependency "shoulda"

		s.files = `git ls-files`.split("\n") - [".gitignore", ".rspec", ".travis.yml"]
		s.files += ["web/fnordmetric-ui.js", "web/fnordmetric-ui.css", "web/fnordmetric-core.js", "web/fnordmetric-core.css"]
		s.test_files = `git ls-files -- spec/*`.split("\n")
		s.executables = `git ls-files -- bin/*`.split("\n").map{ \|f\| File.basename(f) }
		s.require_paths = ["lib"]

fnordmetric-core/lib/fnordmetric/web/app.rb

+5 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,11 @@ class FnordMetric::App < Sinatra::Base
		include FnordMetric::AppHelpers
		end

		%w(fnordmetric-ui.js fnordmetric-ui.css fnordmetric-core.css fnordmetric-core.js).each do \|f\|
		next if ::File.exists?(::File.expand_path("../../../../web/#{f}", __FILE__))
		raise "error: file 'web/#{f}' does not exist, please run build.sh in web/"
		end

		def initialize(opts = {})
		@opts = FnordMetric.default_options(opts)

fnordmetric-core/web/build.sh

+30 −0

Original line number	Diff line number	Diff line
		@@ -2,3 +2,33 @@

		cp ../../fnordmetric-ui/fnordmetric-ui.js ./
		cp ../../fnordmetric-ui/fnordmetric-ui.css ./

		(
		echo "/* this is an automatically generated file, don't modify it... */"
		cat vendor/jquery-ui.min.js
		cat vendor/jquery.maskedinput.js
		cat vendor/jquery.combobox.js
		cat js/fnordmetric.js
		cat js/fnordmetric.util.js
		cat js/fnordmetric.ui.js
		cat js/fnordmetric.timeline_widget.js
		cat js/fnordmetric.numbers_widget.js
		cat js/fnordmetric.bars_widget.js
		cat js/fnordmetric.pie_widget.js
		cat js/fnordmetric.toplist_widget.js
		cat js/fnordmetric.html_widget.js
		cat js/fnordmetric.realtime_timeline_widget.js
		cat js/fnordmetric.timeseries_widget.js
		cat js/fnordmetric.overview_view.js
		cat js/fnordmetric.gauge_view.js
		cat js/fnordmetric.dashboard_view.js
		cat js/fnordmetric.session_view.js
		cat js/fnordmetric.gauge_explorer.js
		) > fnordmetric-core.js

		(
		echo "/* this is an automatically generated file, don't modify it... */"
		cat vendor/font-awesome/css/font-awesome.css
		cat css/fnordmetric.core.css
		) > fnordmetric-core.css

fnordmetric-core/web/css/fnordmetric.css→fnordmetric-core/web/css/fnordmetric.core.css

+0 −0

File moved.

View file

fnordmetric-core/web/haml/app.haml

+2 −23

Original line number	Diff line number	Diff line
		@@ -3,31 +3,10 @@
		%head
		%title FnordMetric
		%script{:src => "/vendor/jquery-1.6.2.min.js", :type => "text/javascript"}
		%script{:src => "/vendor/jquery-ui.min.js", :type => "text/javascript"}
		%script{:src => "/vendor/jquery.maskedinput.js", :type => "text/javascript"}
		%script{:src => "/vendor/jquery.combobox.js", :type => "text/javascript"}

		%script{:src => "/fnordmetric-ui.js", :type => "text/javascript"}
		%link{:href => "/fnordmetric-ui.css", :rel => "stylesheet", :type => "text/css"}

		%script{:src => "/js/fnordmetric.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.util.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.ui.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.timeline_widget.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.numbers_widget.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.bars_widget.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.pie_widget.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.toplist_widget.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.html_widget.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.realtime_timeline_widget.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.timeseries_widget.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.overview_view.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.gauge_view.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.dashboard_view.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.session_view.js", :type => "text/javascript"}
		%script{:src => "/js/fnordmetric.gauge_explorer.js", :type => "text/javascript"}
		%link{:href => "/vendor/font-awesome/css/font-awesome.css", :rel => "stylesheet", :type => "text/css"}
		%link{:href => "/fnordmetric.css", :rel => "stylesheet", :type => "text/css"}
		%script{:src => "/fnordmetric-core.js", :type => "text/javascript"}
		%link{:href => "/fnordmetric-core.css", :rel => "stylesheet", :type => "text/css"}

		%body
		#app.clearfix(style="overflow:hidden;")

Admin message