scout_realtime 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.4
+
+* Added hostname to title
+* Single play/pause button
+* Added --bind option to bind to a specific IP Address on the host
+* Updating server_metrics dependency to 1.2.4
+
 ## 1.0.3
 
 * switch to relatives paths in templates, so it will work in an nginx subfolder.

data/README.md

@@ -26,7 +26,7 @@ Scout realtime is a better `top` command: it gives you disk, memory, network, CP
 
 * **Something isn't working. Where's the log?** By default, the log is written to `~/scout_realtime.log`
 * **Does my server need to have a public IP or domain name?** Yes, you need a public IP or domain name to view Scout Realtime in your browser.
-* **Installing the gem didn't work.** You need Ruby 1.8.7+ on your server to run Scout Realtime. Try `which ruby` (to confirm you have Ruby), `ruby -v` (to show Ruby's version), and `which gem` to confirm you have Ruby gems (Ruby's package manager) available.
+* **Installing the gem didn't work.** You need Ruby 1.9.3+ on your server to run Scout Realtime. Try `which ruby` (to confirm you have Ruby), `ruby -v` (to show Ruby's version), and `which gem` to confirm you have Ruby gems (Ruby's package manager) available.
 * **Can multiple people view the realtime stats?** Yes. You'll probably want to open a port in your firewall instead of relying on the SSH tunnel for access: `sudo iptables -A INPUT -p tcp --dport 5555 -j ACCEPT`
 * **The SSH tunnel is a pain. Is there a way to set up persistent access?** Yes -- open a port in your firewall using the iptables command above.
   * **Is that safe?** It's as safe or safer than any any other service you have listening for HTTP traffic. The realtime web server only serves two endpoints, and there's nothing available at either of those endpoints that can be used in an attack.

data/Vagrantfile

@@ -4,4 +4,4 @@ Vagrant::Config.run do |config|
   config.vm.box_url = "https://dl.dropboxusercontent.com/s/o5i10hcu57jamg8/ubuntu64-ruby2.box"
   config.vm.share_folder "foo", "/projects", "/Users/itsderek23/projects/"
   config.vm.forward_port 5555,5555
-end
+end

data/bin/scout_realtime

@@ -56,6 +56,7 @@ Advanced options:
   EOS
 
   opt :port, "point your web browser to this port to view realtime metrics.", :default => 5555, :short => "-p"
+  opt :bind, "bind to this IP address on the host", :default => '0.0.0.0', :short => '-b'
   opt :foreground, "run in the foreground, i.e., don't daemonize the process. Useful for debugging.", :default => false, :short => "-f"
   opt :log_path, "full path for a log file", :default=>log_path
   opt :pid_path, "full path for a PID file", :default=>pid_path
@@ -81,7 +82,7 @@ EOS
 # TODO: should be able to pass :daemonize => !opts[:foreground] to Dante::Runner instead
 if opts[:foreground]
   puts " ** Initializing. cntl-c to stop. Logging to STDOUT **"
-  Scout::Realtime::Main.instance(:port=>opts[:port]).go_sinatra
+  Scout::Realtime::Main.instance(:port=>opts[:port],:bind=>opts[:bind]).go_sinatra
   puts startup_message
 else
   if command == :start
@@ -91,7 +92,7 @@ else
     end
 
     Dante::Runner.new('scout_realtime').execute(:daemonize => !opts[:foreground], :pid_path => pid_path, :log_path => log_path, :port=>opts[:port]) do |options|
-      Scout::Realtime::Main.instance(:port=>options[:port]).go_sinatra
+      Scout::Realtime::Main.instance(:port=>options[:port],:bind=>opts[:bind]).go_sinatra
     end
     puts startup_message
     puts  '* "scout_realtime stop" to stop the daemon'

data/lib/scout_realtime/main.rb

@@ -7,9 +7,10 @@ module Scout
 
       attr_accessor :running, :runner, :stats_thread
 
-      # opts: {:port=>xxx}
+      # opts: {:port=>xxx, bind=>'0.0.0.0'}
       def initialize(opts={})
         @port=opts[:port]
+        @bind_address=opts[:bind] || '0.0.0.0'
         Scout::Realtime::logger=Logger.new(STDOUT)
         @stats_thread = Thread.new {}
         @runner = Scout::Realtime::Runner.new
@@ -50,12 +51,12 @@ module Scout
         #end
 
         start_thread
-        Scout::Realtime::WebApp.run!(:port=>@port)
+        Scout::Realtime::WebApp.run!(:port=>@port,:bind=>@bind_address)
       end
 
       def go_webrick
         logger.info("starting web server ")
-        server = WEBrick::HTTPServer.new(:Port => 5555, :AccessLog => [])
+        server = WEBrick::HTTPServer.new(:Port => @port, :AccessLog => [], :BindAddress => @bind_address)
         server.mount '/', Scout::Realtime::WebServer
         trap 'INT' do
           server.shutdown

data/lib/scout_realtime/version.rb

@@ -1,5 +1,5 @@
 module Scout
   module Realtime
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

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

@@ -6,15 +6,19 @@ function d(s){console.debug(s)}
 
 window.refresher = null;
 function toggleData() {
-  if (window.refresher) {
+	// Pause button is displayed on page load when streaming. 
+	// Play button is shown when streaming is paused.
+  if (window.refresher) { 
+		// streaming => pause
     clearInterval(window.refresher);
     window.refresher = null;
-    $("#toggle #on.button").addClass("disabled");
-    $("#toggle #off.button").removeClass("disabled");
+    $("#toggle #play").show()//addClass("disabled");
+    $("#toggle #pause").hide()//removeClass("disabled");
   } else {
+		// pause => streaming
     window.refresher = setInterval(refresh, refreshInterval);
-    $("#toggle #on.button").removeClass("disabled");
-    $("#toggle #off.button").addClass("disabled");
+    $("#toggle #play").hide()//;removeClass("disabled");
+    $("#toggle #pause").show()//;addClass("disabled");
   }
 }
 

data/lib/scout_realtime/web/stylesheets/styles.css

@@ -78,7 +78,7 @@ svg .line {
 
 #toggle #report-time {
   position: absolute;
-  right: 125px;
+  right: 75px;
   top: 14px;
   width: 80px;
   text-align: right;
@@ -90,6 +90,9 @@ svg .line {
 	display: inline-block;
 	margin: 0;
   transition: 0.1s background-color;
+	border: 1px solid #E1E1E1;
+	border-width: 0 1px;
+	margin-left: 10px;
 }
 
 #toggle .button:hover {
@@ -97,21 +100,12 @@ svg .line {
 	background-color: #FCF8F6;
 }
 
-#toggle #off {
-	border: 1px solid #E1E1E1;
-	border-width: 0 1px;
-	margin-left: 10px;
-}
-
+/* play and pause */
 #toggle img {
 	padding-top: 15px;
 	vertical-align: middle;
 }
 
-#toggle .disabled img {
-	opacity: 0.3;
-}
-
 /* sidebar */
 
 #sidebar_top, #sidebar_bottom {

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

@@ -2,7 +2,10 @@
   <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 class="button">
+      <img id='pause' src="images/pause.png" width=12 height=14 />
+      <img id='play' src="images/play.png" width=14 height=14 >
+    </span>
   </div>
 <div>
 

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

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>Scout Realtime</title>
+  <title><%= ServerMetrics::SystemInfo.hostname %> &middot; Scout Realtime</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
   <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

data/lib/scout_realtime/web_app.rb

@@ -11,7 +11,7 @@ class Scout::Realtime::WebApp < Sinatra::Base
   set :static, true # set up static file routing
   set :public_dir, File.expand_path('../web', __FILE__) # set up the static dir (with images/js/css inside)
   set :views, File.expand_path('../web/views', __FILE__) # set up the views dir
-  set :bind, "0.0.0.0" # necessary for running on vagrant
+  set :bind, self.bind || "0.0.0.0" # 0.0.0.0 is the default and is required for Vagrant
   #set :traps, false # setting this to false means 1) sinatra won't capture any interrupts or term signals; 2) we need to call Scout::Realtime::WebApp.quit! ourselves in our own signal trap
 
   #helpers Sinatra::ContentFor

data/scout_realtime.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
 
   # Runtime dependencies
-  spec.add_runtime_dependency "server_metrics", "~> 1.2.3"
+  spec.add_runtime_dependency "server_metrics", "~> 1.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_realtime
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.4
 description: Realtime server metrics in your browser.
 email:
 - support@scoutapp.com