bandshell 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76e1e5551356ead78b079d5f4dbafa43f432af3d
-  data.tar.gz: 58f5320c083a5dbb6c586e018100d666bbe9e24f
+  metadata.gz: 50f3b9aa759cbb5ce8623ab42424d1772e8ec3a9
+  data.tar.gz: 32f5b633dd51276279e09c33010a3013e1a4cfcf
 SHA512:
-  metadata.gz: 44769d0e908c6b2284a84e665bc7c4086bd270202ad620124aaf22a237232eb9d0b7b6a5958b034ca1daf3d34521697a4d2f2b68f47f277756e34ad7120c0eff
-  data.tar.gz: d51445442008e2ca35af39677bf1c4c6de4e2189b1c123c6e8e699317edeb0cd2938d3e0a22bcbe8bee444f03dd17e7c9bfe94dad33c21d0c23473b4a51cd562
+  metadata.gz: 5827d9317a00e3a141e19687e35d3fe15762d8723c1c570683f913b5d9d0d2119e5c0fa5fb8b076e8a165a4ae13705f352781da23073557f83a30b31f8da69d5
+  data.tar.gz: 1e3244f4c1b9da340d18811f130d188b3c51c55eedfc8b66d3ae722b78482f3e643656d19f9983e0354e1a1a1a29d796113702bbc89409aad09edcf2ce8aaf64

data/bin/bandshelld

@@ -18,6 +18,6 @@ timer_argv = ARGV.dup
 timer_argv << "--" unless timer_argv.include? "--"
 timer_argv << bandshell_url
 
-Daemons.run("bin/bandshell-timer.rb", 
+Daemons.run(File.join(File.dirname(__FILE__), "bandshell-timer.rb"), 
             :log_output=>true, :dir_mode => dir_mode,
             :ARGV => timer_argv)

data/lib/bandshell/application/app.rb

@@ -391,7 +391,8 @@ class ConcertoConfigServer < Sinatra::Base
   # to execute system maintenance functions such as updating configs
   # from Concerto, and performing screen on/off control.
   get '/background-job' do
-    if update_player_info
+    force = params.has_key? "force"
+    if update_player_info(force)
       "Update executed"
     else
       "update_player_info failed."
@@ -401,7 +402,7 @@ class ConcertoConfigServer < Sinatra::Base
   # TODO: Refactor player settings management into a separate class
  
   @@player_data_updated=Time.new(0)
-  @@screen_on_off=[{:action=>"on"}] # default to always-on
+  @@screen_on_off=[{"action"=>"on"}] # default to always-on
 
   # Fetches the latest player settings from Concerto if the current
   # settings are too old or an update is forced (force=true).
@@ -429,6 +430,7 @@ class ConcertoConfigServer < Sinatra::Base
     end
   end
 
+  # TODO: more validation before accepting.
   def parse_screen_on_off(data)
     begin
       rules = JSON.parse(data)
@@ -446,8 +448,56 @@ class ConcertoConfigServer < Sinatra::Base
 
   # Returns true if the screen should be turned on right now,
   # according to the latest data recieved from concerto-hardware.
+  # Assumes @@screen_on_off is either nil or a valid ruleset.
+  # TODO: Evaluate effects of timezones
   def screen_scheduled_on?
-    raise 'screen_scheduled_on?: TODO'
+    return true if @@screen_on_off.nil?
+
+    results = []
+    t = Time.now
+    @@screen_on_off.each do |rule|
+      rule_active = true
+      rule.each do |key, value|
+        case key
+        when "wkday"
+          rule_active = false unless value.include? t.wday.to_s
+        when "time_after"
+          rule_secs = seconds_since_midnight(Time.parse(value))
+          curr_secs = seconds_since_midnight(t)
+          rule_active = false unless curr_secs > rule_secs
+        when "time_before"
+          rule_secs = seconds_since_midnight(Time.parse(value))
+          curr_secs = seconds_since_midnight(t)
+          rule_active = false unless curr_secs < rule_secs 
+        when "date"
+          day = Time.parse(value)
+          rule_active = false unless t.year==day.year and t.yday==day.yday
+        when "action"
+          # Do nothing.
+        else
+          # Do nothing.
+          # Err on the side of being on too long.
+        end # case key
+      end
+      if rule_active and rule.has_key? "action"
+        results << rule["action"]
+      end
+    end # each rule
+    
+    if results.include? "force_on"
+      return true
+    elsif results.include? "off"
+      return false
+    elsif results.include? "on"
+      return true
+    else # All rules failed
+      return false
+    end
+  end #screen_scheduled_on?
+  
+  # For a given time object, gives a numeric representation of the
+  # time of day on the day it represents.
+  def seconds_since_midnight(time)
+    time.sec + (time.min * 60) + (time.hour * 3600)
   end
-
 end

data/lib/bandshell/application/views/main.erb

@@ -26,17 +26,17 @@
         <div class="default-padding">
 
           <div class="row-fluid">
-            <div class="span3">
+            <div class="span2">
               &nbsp;
             </div>
-            <div class="span6">
+            <div class="span8">
 
               <br />
               <%= yield %>
               <br />
 
             </div>
-            <div class="span3">
+            <div class="span2">
               &nbsp;
             </div>
           </div>

data/lib/bandshell/application/views/player_status.erb

@@ -14,3 +14,7 @@
 <pre>
   <%= JSON.pretty_generate(@on_off_rules) %>
 </pre>
+<p>
+  Screen status: Scheduled
+  <%= screen_scheduled_on? ? "On" : "Off" %>
+</p>

data/lib/bandshell/hardware_api.rb

@@ -118,7 +118,12 @@ module Bandshell
 
       data=JSON.parse(response.body)
       if data.has_key? 'screen_temp_token'
-        ConfigStore.write_config('auth_temp_token',data['screen_temp_token'])
+        # We modify the token by appending an "s".
+        # Concerto allows this and concerto-hardware will use it to
+        # recognize that the user is setting up a managed player in
+        # addition to a simple screen.
+        token = data['screen_temp_token'] + 's'
+        ConfigStore.write_config('auth_temp_token',token)
         return true
       end
       return false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bandshell
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sys-uptime
   requirement: !ruby/object:Gem::Requirement
@@ -147,19 +133,12 @@ files:
 - lib/bandshell/application/public/stylesheets/sass/views/users.scss
 - lib/bandshell/application/public/trollface.png
 - lib/bandshell/application/views/authenticate.erb
-- lib/bandshell/application/views/authenticate.haml
 - lib/bandshell/application/views/main.erb
-- lib/bandshell/application/views/main.haml
 - lib/bandshell/application/views/netsettings.erb
-- lib/bandshell/application/views/netsettings.haml
 - lib/bandshell/application/views/password.erb
-- lib/bandshell/application/views/password.haml
 - lib/bandshell/application/views/player_status.erb
-- lib/bandshell/application/views/player_status.haml
 - lib/bandshell/application/views/problem.erb
-- lib/bandshell/application/views/problem.haml
 - lib/bandshell/application/views/setup.erb
-- lib/bandshell/application/views/setup.haml
 - lib/bandshell/config_store.rb
 - lib/bandshell/hardware_api.rb
 - lib/bandshell/live_image.rb
@@ -186,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Concerto Client Tools

data/lib/bandshell/application/views/authenticate.haml

@@ -1,15 +0,0 @@
-%script{:src=>"authenticate.js"}
-
-%h1 Concerto Player Authentication
-
-#no-js
-  It looks like Javascript is disabled. The Concerto Display will not work.
-
-- unless @display_temp_token.nil?
-  #instructions
-    Please enter the following token when setting up the screen in the 
-    Concerto Panel:
-    = @display_temp_token
-
-#status
-  Waiting for first update...

data/lib/bandshell/application/views/main.haml

@@ -1,7 +0,0 @@
-!!! 5
-%html
-    %head
-        %title="Concerto Player Network Configuration"
-        %script{:src=>"https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.js"}
-        %link{:rel=>"stylesheet", :type=>"text/css", :href=>"/stylesheets/concerto-styles.css"}
-    %body=yield

data/lib/bandshell/application/views/netsettings.haml

@@ -1,64 +0,0 @@
-%script{:src=>"/javascripts/network.js"}
-%a{:href=>"/setup"}="Back to setup"
-%h1="Concerto Player Network Configuration"
-%form{:method=>"post"}
-    %h2="Connection Type"
-    %select#connection_type{:name=>"connection_type"}
-        / list out our available connection methods as options
-        / set the html selected flag on the one that is currently 
-        / selected in the config
-        - CONNECTION_METHODS.each do |cm|
-            %option{:value=>cm.basename,
-                :selected=>(cm==connection_method.class)}=cm.description
-    #connection
-        #WiredConnection
-            %h3="Wired Connection Settings"
-            %p
-                %label{:for=>"WiredConnection_interface_name"}="Interface Name"
-                %select#interface_name{:name=>"WiredConnection/interface_name"}
-                    %option{:value=>""}="Auto Select"
-                    / list out available interfaces and their MAC addresses
-                    / preselect one if there was one chosen in config
-                    - Bandshell::WiredConnection.interfaces.each do |iface|
-                        %option{:value=>iface.name, :selected=>value_from(connection_method, :interface_name)==iface.name}="#{iface.name} - #{iface.mac}"
-        #WirelessConnection
-            %h3="Wireless Connection Settings (no encryption)"
-            %p
-                %label{:for=>"WirelessConnection_interface_name"}="Interface Name"
-                %select#interface_name{:name=>"WirelessConnection/interface_name"}
-                    %option{:value=>""}="Auto Select"
-                    / same as above but with the wireless interfaces
-                    - Bandshell::WirelessConnection.interfaces.each do |iface|
-                        %option{:value=>iface.name, :selected=>value_from(connection_method, :interface_name) == iface.name}="#{iface.name} - #{iface.mac}"
-            %p
-                %label{:for=>"WirelessConnection_ssid"}="SSID"
-                %input{:type=>"text", :name=>"WirelessConnection/ssid", 
-                    :value=>value_from(connection_method, :ssid)}
-    %h2="IP Address"
-    %select#addressing_type{:name=>"addressing_type"}
-        - ADDRESSING_METHODS.each do |am|
-            %option{:value=>am.basename,
-                :selected=>(am==addressing_method.class)}=am.description
-    #address
-        #DHCPAddressing
-        #StaticAddressing
-            %h3="Static Address Settings"
-            %p
-                %label{:for=>"StaticAddressing_address"}="Address"
-                %input{:type=>"text", :name=>"StaticAddressing/address",
-                    :value=>value_from(addressing_method, :address)}
-            %p
-                %label{:for=>"StaticAddressing_netmask"}="Netmask"
-                %input{:type=>"text", :name=>"StaticAddressing/netmask", 
-                    :value=>value_from(addressing_method, :netmask)}
-            %p
-                %label{:for=>"StaticAddressing_gateway"}="Gateway"
-                %input{:type=>"text", :name=>"StaticAddressing/gateway", 
-                    :value=>value_from(addressing_method, :gateway)}
-            %p
-                %label{:for=>"StaticAddressing_address"}="Nameservers (separate with commas or spaces)"
-                %input{:type=>"text", :name=>"StaticAddressing/nameservers_flat", 
-                    :value=>value_from(addressing_method, :nameservers_flat)}
-
-    %input{:type=>"submit"}
-

data/lib/bandshell/application/views/password.haml

@@ -1,9 +0,0 @@
-%form{:method=>'post'}
-	%p
-		%label{:for=>'newpass'} New Password
-		%input{:type=>'password', :name=>'newpass'}
-	%p
-		%label{:for=>'newpass_confirm'} Confirm Password
-		%input{:type=>'password', :name=>'newpass_confirm'}
-	%p
-		%input{:type=>'submit', :value=>'Change Password'}

data/lib/bandshell/application/views/player_status.haml

@@ -1,11 +0,0 @@
-%p System Uptime: #{Uptime.uptime}
-
-%p System Processes:
-%ul
-  - for p in @proctable
-    %li
-      %b= p.comm
-      (PID #{p.pid.to_s})
-
-%p Screen on/off rules:
-%pre= JSON.pretty_generate(@on_off_rules)

data/lib/bandshell/application/views/problem.haml

@@ -1,15 +0,0 @@
-%script{:src=>"problem.js"}
-.error
-    %p
-        %img{:src=>"trollface.png"}
-
-    %h1 Problem?
-    %p 
-        Due to technical difficulties, this Concerto screen is currently not 
-        operational. Please check again soon.
-    %p
-        ==The Concerto installation at #{concerto_url} could not be reached.
-    %p
-        If the URL needs to be changed, go back to
-        %a{:href=>"/setup"}
-            Player Configuration

data/lib/bandshell/application/views/setup.haml

@@ -1,30 +0,0 @@
-%h1 Welcome to Concerto Player
-%p 
-	You're seeing this because your Concerto player has not yet been configured.
-	We need the URL of your Concerto instance before we can get up and running.
-
-- unless @errors.nil?
-	- @errors.each do |error|
-		%p{:style=>'color:red'}= error
-		
-
-%form{:method=>'post'}
-	%p
-		%label{:for=>'url'} URL
-		%input{:type=>'text', :name=>'url', :value=>@url}
-		%input{:type=>'submit', :value=>'Here it is!'}
-
-%p
-	The IPv4 address of this screen appears to be:
-	=my_ip
-%p
-	==This page can be accessed remotely via http://#{my_ip}:#{my_port}/setup
-%p
-	Username is root, default password is 'default'.
-%p 
-	Also, you may want to
-	%a{:href=>'/netconfig'} change network settings
-	or
-	%a{:href=>'/password'} change the configuration password.
-	
-