scout_realtime 1.0.2 → 1.0.3.pre

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.3.pre
+
+* switch to relatives paths in templates, so it will work in an nginx subfolder.
+
 ## 1.0.2
 
 * Updated copyright

data/lib/scout_realtime/version.rb

@@ -1,5 +1,5 @@
 module Scout
   module Realtime
-    VERSION = "1.0.2"
+    VERSION = "1.0.3.pre"
   end
 end

data/lib/scout_realtime/web/javascripts/application.js

@@ -1,7 +1,7 @@
 var refreshInterval = 1000;
 var processIteration = 0;
 var firstShift = true;
-var overviewChartMargin = 30; // pulled from lineChart overview margin 
+var overviewChartMargin = 30; // pulled from lineChart overview margin
 function d(s){console.debug(s)}
 
 window.refresher = null;
@@ -151,7 +151,7 @@ $(document).ready(init);
 function init() {
   Processes.init({element:document.getElementById('processes')});
 	setOverviewChartWidths();
-	
+
 	$(window).on("debouncedresize", function( event ) {
 		setOverviewChartWidths();
 	});
@@ -206,7 +206,7 @@ function init() {
   // setTimeout(updateGraphData, 1000) // uncomment to get ONE update in a second (for development)
   // normally, lines 1 and 2 above will be uncommented
 
-	// in chrome, the initial chart size is larger than what the parent container is. calling it here resets things. 
+	// in chrome, the initial chart size is larger than what the parent container is. calling it here resets things.
 	// still need to call it before drawing charts as FF won't draw it full width.
 	setOverviewChartWidths()
 
@@ -272,7 +272,7 @@ function formatTime(timestamp) {
 
 
 function refresh() {
-  $.getJSON("/stats.json", function (d) {
+  $.getJSON("stats.json", function (d) {
     metrics = d;
     updateGraphData();
   }).fail(function() {
@@ -284,7 +284,7 @@ function refresh() {
 /*
 Called on initial load. Just sets the svg element to the size of its parent. This is needed on firefox.
 
-Why don't we just use % widths for containers? 
+Why don't we just use % widths for containers?
 
 The chart SVGs have a 30px left margin to handle the y-axis. We need to shift the charts over 30px to the left
 to handle this. We also need to add 30px to the width of the chart so it ends up using the entire container width
@@ -299,7 +299,7 @@ function setOverviewChartWidths(){
 	$('.overview_chart_container').each(function(i,e) {
 		$(e).width(containerWidth).css('margin-right',padding)
 	});
-	
+
   $('.overview_chart').each(function(i,e){
     $svg=$(e);
     $svg.width(containerWidth+overviewChartMargin);

data/lib/scout_realtime/web/views/header.erb

@@ -1,8 +1,8 @@
 <div> <!-- wrapper div needed for ff positioning -->
-  <img src="/images/logo.png" alt="Scout Realtime"/>
+  <img src="images/logo.png" alt="Scout Realtime"/>
   <div id="toggle">
     <span id='report-time'></span>
-    <span id='off' class="button"><img src="/images/pause.png" width=12 height=14 /></span><span id='on' class="button"><img src="/images/play.png" width=14 height=14 ></span>
+    <span id='off' class="button"><img src="images/pause.png" width=12 height=14 /></span><span id='on' class="button"><img src="images/play.png" width=14 height=14 ></span>
   </div>
 <div>
 

data/lib/scout_realtime/web/views/index.erb

@@ -12,7 +12,7 @@
   <td id="overview_charts">
       <%= erb :overview_charts%>
   </td>
-</tr> 
+</tr>
 <tr>
   <td id="processes_container">
     <h2><span>Top</span> Processes</h2>
@@ -24,4 +24,4 @@
 </tr>
 </tbody>
 </table>
-<script src="/javascripts/application.js"></script>
+<script src="javascripts/application.js"></script>

data/lib/scout_realtime/web/views/layout.erb

@@ -12,9 +12,9 @@
   <![endif]-->
   <link rel="stylesheet" href="stylesheets/styles.css?v=1.0">
   <script type="text/javascript" src="javascripts/jquery.js"></script>
-  <script src="/javascripts/d3.v3.min.js"></script>
-  <script src="/javascripts/jquery.debouncedresize.js"></script>  
-  <script src="/javascripts/d3.linechart.js"></script>
+  <script src="javascripts/d3.v3.min.js"></script>
+  <script src="javascripts/jquery.debouncedresize.js"></script>
+  <script src="javascripts/d3.linechart.js"></script>
   <script type="text/javascript" src="javascripts/handlebars-v1.1.0.js"></script>
   <script>var metrics_array=[]<%#=DATA_FOR_TESTING.to_json%>;</script>
   <script>var metrics=<%=@latest_run.to_json%>;</script>

data/lib/scout_realtime/web/views/sidebar.erb

@@ -1,10 +1,10 @@
 <div class="info" id="hostname_info">
   <div class="value" id="hostname"><%= ServerMetrics::SystemInfo.hostname %></div>
   <div class="value" id="os_info">
-    <img src="/images/linux.png" alt="Linux" height=40 valign=middle>&nbsp;&nbsp;&nbsp;
+    <img src="images/linux.png" alt="Linux" height=40 valign=middle>&nbsp;&nbsp;&nbsp;
     <%= a=ServerMetrics::SystemInfo.architecture =~ /64/ ? '64-bit' : a %> &nbsp;&nbsp;&nbsp;
     <%= ServerMetrics::SystemInfo.os_version %> &nbsp;&nbsp;&nbsp;
-  </div>      
+  </div>
 </div>
 <div class="info">
   <div class="value"><span><%= count=ServerMetrics::SystemInfo.num_processors %></span> <%= count > 1 ? 'processors' : 'processor'%></div>

data/lib/scout_realtime/web/views/sidebar_bottom.erb

@@ -1,3 +1,3 @@
 <div>An open-source tool created by <a href="https://scoutapp.com">Scout</a>.</div>
-<a href="http://github.com/scoutapp/scout_realtime" class="icon" target="_blank"><img src="/images/github.png" height=28/></a>
-<a href="https://scoutapp.com" class="icon" target="_blank"><img src="/images/scout.png" height=26/></a>
+<a href="http://github.com/scoutapp/scout_realtime" class="icon" target="_blank"><img src="images/github.png" height=28/></a>
+<a href="https://scoutapp.com" class="icon" target="_blank"><img src="images/scout.png" height=26/></a>

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout_realtime
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Andre Lewis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -711,9 +711,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -730,4 +730,3 @@ test_files:
 - test/models/processes_test.rb
 - test/runner_test.rb
 - test/test_helper.rb
-has_rdoc: