vifi 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4df41fe8d0a7441f1c87512e1e66f9d7d174c183
-  data.tar.gz: 7093bcafcb74905b142c79616615a4206b666def
+  metadata.gz: 2fb4540d7defc92f59b44e3d69401e98c507d7c7
+  data.tar.gz: 6d836b64660489ebdea1fd1d979916cf1e2b4a84
 SHA512:
-  metadata.gz: aaef82fe37e9867c0f971f854df9a7e2a6ee74f30a2286ae7f7efff72b30fd26ace6823f911ca40074ef3aeed5f80562b6b46da7c5515082a49e945e453338f7
-  data.tar.gz: 9b9a0682e628215649fe894f0679e112bd90d54f78125103633787d6c33a3aafd07e45b3a522bf776612683fcddfb768645e8321381893425fa9f3c7f0c0411c
+  metadata.gz: 89d20ea8ee0617e0945581b1b41c9d3dfb986088018b17fd18ba69b7bd095c438812ef00eb460bed17aaac5254fc876a3c9ad4a568b0f775aa767263fe035048
+  data.tar.gz: 708906353a6c298f9cfa07d19195c885090e2a3e08768378fbd5aeeea7d2db01ecbc345eecb8598e2cd5462abf95f3d721b2e30516ac699e1482a6eb6465d83d

data/bin/vifi

@@ -1,23 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'vifi'
-require 'sinatra'
 
-set :bind, '0.0.0.0'
-set :port, 3141
-
-get "/update_source", provides: 'text/event-stream' do
-  stream(:keep_open) do |out|
-    data = Hash.new
-    loop do
-      data[:label] = Time.now.strftime("%r")
-      data[:value] = WillowRun::Status.new.getinfo.agrctlrssi
-      out << "data: #{data.to_json}" + "\r\n\n"
-      sleep 2
-    end
-  end
-end
-
-get "/" do
-  Vifi.build_chart + Vifi.build_updater
-end
+Vifi.run!

data/examples/app.rb

@@ -2,23 +2,5 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'vifi'
-require 'sinatra'
 
-set :bind, '0.0.0.0'
-set :port, 3141
-
-get "/update_source", provides: 'text/event-stream' do
-  stream(:keep_open) do |out|
-    data = Hash.new
-    loop do
-      data[:label] = Time.now.strftime("%r")
-      data[:value] = WillowRun::Status.new.getinfo.agrctlrssi
-      out << "data: #{data.to_json}" + "\r\n\n"
-      sleep 2
-    end
-  end
-end
-
-get "/" do
-  Vifi.build_chart + Vifi.build_updater
-end
+Vifi.run!

data/lib/vifi.rb

@@ -1,10 +1,10 @@
-require "vifi/version"
 require 'willow_run'
 require 'chart_js'
+require 'sinatra/base'
 
-module Vifi
+class Vifi < Sinatra::Base
 
-  def self.build_chart
+  def build_chart
     chart = ChartJS.line do
       data do
         labels []
@@ -17,7 +17,7 @@ module Vifi
     chart.to_html
   end
 
-  def self.build_updater(source: '/update_source', chart_obj: 'line_chart')
+  def build_updater(source: '/update_source', chart_obj: 'line_chart')
     # why not
     "<script>
       var source = new EventSource('#{source}');
@@ -32,4 +32,25 @@ module Vifi
     "
   end
 
+  set :bind, '0.0.0.0'
+  set :port, 3141
+
+  get "/update_source", provides: 'text/event-stream' do
+    stream(:keep_open) do |out|
+      data = Hash.new
+      loop do
+        data[:label] = Time.now.strftime("%r")
+        data[:value] = WillowRun::Status.new.getinfo.agrctlrssi
+        out << "data: #{data.to_json}" + "\r\n\n"
+        sleep 2
+      end
+    end
+  end
+
+  get "/" do
+    build_chart + build_updater
+  end
+
 end
+
+require "vifi/version"

data/lib/vifi/version.rb

@@ -1,3 +1,7 @@
-module Vifi
-  VERSION = "1.0.6"
+class Vifi
+  VERSION = "1.0.7"
+
+  def self.version
+    VERSION
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vifi
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Kent 'picat' Gruber