bandshell 0.0.15 → 0.0.20

data/lib/bandshell/application/app.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'sinatra/base'
-require 'erb'
+require 'haml'
 require 'json'
 require 'net/http'
 require 'ipaddress'
@@ -13,6 +13,9 @@ class ConcertoConfigServer < Sinatra::Base
 	# set paths relative to this file's location
 	set :root, File.dirname(__FILE__)
 
+	# listen on all IPv4 and IPv6 interfaces
+	set :bind, '::'
+
 	# push these over to netconfig.rb?
 	# Our list of available physical-layer connection methods...
 	CONNECTION_METHODS = [ 
@@ -31,6 +34,8 @@ class ConcertoConfigServer < Sinatra::Base
 		IPAddress.parse("::1") 
 	]
 
+	set :haml, { :format => :html5, :layout => :main }
+
 	helpers do
 		# Get the return value of the method on obj if obj supports the method.
 		# Otherwise return the empty string.
@@ -160,12 +165,12 @@ class ConcertoConfigServer < Sinatra::Base
 		if network_ok
 			# Everything's up and running, we just don't know what 
 			# our URL should be.
-			erb :setup
+			haml :setup
 		else
 			# The network settings are not sane, we don't have an IP.
 			# Redirect the user to the network configuration page to 
 			# take care of this.
-			#redirect '/netconfig'
+			redirect '/netconfig'
 		end
 	end
 
@@ -189,7 +194,7 @@ class ConcertoConfigServer < Sinatra::Base
 	# render a page indicating that the concerto_url is no good.
 	# this page redirects to / every 5 seconds
 	get '/problem' do
-		erb :problem
+		haml :problem
 	end
 
 	get '/netconfig' do
@@ -209,7 +214,7 @@ class ConcertoConfigServer < Sinatra::Base
 
 		# view will grab what it can from our existing 
 		# connection/addressing methods using value_from().
-		erb :netsettings, :locals => { 
+		haml :netsettings, :locals => { 
 				:connection_method => cm, 
 				:addressing_method => am 
 			}
@@ -294,7 +299,7 @@ class ConcertoConfigServer < Sinatra::Base
 
 	get '/password' do
 		protected!
-		erb :password
+		haml :password
 	end
 
 	post '/password' do
@@ -313,7 +318,7 @@ class ConcertoConfigServer < Sinatra::Base
 	#Requires ffi, sys-uptime, and sys-proctable gems
 	get '/player_status' do
 	  @proctable = ProcTable.ps
-	  erb :player_status
+	  haml :player_status
 	end	
 	
 end

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

@@ -0,0 +1,6 @@
+%htmlt
+    %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=>"/stylesheet.css"}
+    %body=yield

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

@@ -0,0 +1,64 @@
+%script{:src=>"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

@@ -0,0 +1,9 @@
+%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

@@ -0,0 +1,8 @@
+System Uptime: #{Uptime.uptime}
+
+System Processes:
+%br/
+- for p in @proctable
+  %b= p.comm
+  (PID #{p.pid.to_s})
+  %br/

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

@@ -0,0 +1,15 @@
+%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

@@ -0,0 +1,25 @@
+%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.
+
+%form{:method=>'post'}
+	%p
+		%label{:for=>'url'} URL
+		%input{:type=>'text', :name=>'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}/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.
+	
+	

data/lib/bandshell/live_image.rb

@@ -5,7 +5,13 @@ require 'tempfile'
 module Bandshell
 	module LiveImage
 		def self.mountpoint
-			'/live/image'
+			if File.exist? '/etc/concerto/medium_path'
+				IO.read('/etc/concerto/medium_path').chomp
+			else
+				# sane default for Debian Live-based systems
+				# (as of 2013-04-24)
+				'/lib/live/mount/medium'
+			end
 		end
 
 		def self.readonly?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bandshell
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sys-uptime
   requirement: !ruby/object:Gem::Requirement
@@ -100,21 +116,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/bandshell/config_store.rb
 - lib/bandshell/live_image.rb
 - lib/bandshell/netconfig.rb
-- lib/bandshell/config_store.rb
 - lib/bandshell/application/config.ru
-- lib/bandshell/application/views/netsettings.erb
-- lib/bandshell/application/views/setup.erb
-- lib/bandshell/application/views/player_status.erb
-- lib/bandshell/application/views/problem.erb
-- lib/bandshell/application/views/layout.erb
-- lib/bandshell/application/views/password.erb
-- lib/bandshell/application/app.rb
+- lib/bandshell/application/views/main.haml
+- lib/bandshell/application/views/setup.haml
+- lib/bandshell/application/views/password.haml
+- lib/bandshell/application/views/netsettings.haml
+- lib/bandshell/application/views/problem.haml
+- lib/bandshell/application/views/player_status.haml
 - lib/bandshell/application/public/network.js
 - lib/bandshell/application/public/stylesheet.css
 - lib/bandshell/application/public/problem.js
 - lib/bandshell/application/public/trollface.png
+- lib/bandshell/application/app.rb
 - bin/concerto_configserver
 - bin/concerto_netsetup
 - bin/bandshelld
@@ -143,3 +159,4 @@ signing_key:
 specification_version: 3
 summary: Concerto Client Tools
 test_files: []
+has_rdoc: 

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

@@ -1,11 +0,0 @@
-<html>
-	<head>
-		<title>Concerto Player Network Configuration</title>
-		<!-- this probably should not be relied upon long term... -->
-		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.js"></script>
-		<link rel="stylesheet" type="text/css" href="stylesheet.css" />
-	</head>
-	<body>
-<%= yield %>
-	</body>
-</html>

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

@@ -1,89 +0,0 @@
-<script src="network.js"></script>
-<a href="/setup">Back to setup</a>
-<h1>Concerto Player Network Configuration</h1>
-<form method="post">
-	<h2>Connection Type</h2>
-	<select id="connection_type" name="connection_type" />
-	<% CONNECTION_METHODS.each do |cm| %>
-		<option value="<%= cm.basename %>"
-			<%= cm==connection_method.class?"selected":"" %>>
-			<%= cm.description %>
-		</option>
-	<% end %>
-	</select>
-	<div id="connection">
-		<div id="WiredConnection">
-			<h3>Wired Connection Settings</h3>
-			<p>
-				<label for="WiredConnection_interface_name">Interface Name</label>
-				<select id="interface_name" name="WiredConnection/interface_name">
-					<option value="">Auto Select</option>
-					<% Bandshell::WiredConnection.interfaces.each do |iface| %>
-						<option 
-							value="<%=iface.name%>"
-							<%= value_from(connection_method, :interface_name)==iface.name?"selected":"" %>
-						>
-							<%= iface.name %> - <% iface.mac %>
-						</option>
-					<% end %>
-				</select>
-			</p>
-		</div>
-
-		<div id="WirelessConnection">
-			<h3>Wireless Connection Settings (no encryption)</h3>
-			<p>
-				<label for="WirelessConnection/interface_name">Interface Name</label>
-				<!-- FIXME both shouldn't have same ID -->
-				<select id="interface_name" name="WirelessConnection/interface_name">
-					<option value="">Auto Select</option>
-					<% Bandshell::WirelessConnection.interfaces.each do |iface| %>
-						<option 
-							value="<%=iface.name%>"
-							<%=value_from(connection_method, :interface_name) == iface?"selected":""%>
-						>
-							<%= iface.name %> - <%= iface.mac %>
-						</option>
-					<% end %>
-				</select>
-			</p>
-			<p>
-				<label for="WirelessConnection_ssid">SSID</label>
-				<input type="text" name="WirelessConnection/ssid" 
-					value="<%=value_from(connection_method, :ssid)%>" />
-			</p>
-		</div>
-	</div>
-
-	<div id="address">
-		<div id="DHCPAddressing"></div>
-		<div id="StaticAddressing">
-			<h3>Static Address Settings</h3>
-			<p>
-				<label for="StaticAddressing_address">Address</label>
-				<input type="text" name="StaticAddressing/address"
-					value="<%=value_from(addressing_method, :address %>" />
-			</p>
-
-			<p>
-				<label for="StaticAddressing_netmask">Netmask</label>
-				<input type="text" name="StaticAddressing/netmask"
-					value="<%=value_from(addressing_method, :netmask %>" />
-			</p>
-
-			<p>
-				<label for="StaticAddressing_netmask">Gateway</label>
-				<input type="text" name="StaticAddressing/gateway"
-					value="<%=value_from(addressing_method, :gateway %>" />
-			</p>
-
-			<p>
-				<label for="StaticAddressing_netmask">Nameservers (separate with commas or spaces)</label>
-				<input type="text" name="StaticAddressing/nameservers_flat"
-					value="<%=value_from(addressing_method, :nameservers_flat %>" />
-			</p>
-			
-		</div>
-	</div>
-	<input type="submit" />
-</form>

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

@@ -1,15 +0,0 @@
-<form method="post">
-	<p>
-		<label for="newpass">New Password</label>
-		<input type="password" name="newpass" />
-	</p>
-
-	<p>
-		<label for="newpass_confirm">Confirm Password</label>
-		<input type="password" name="newpass_confirm" />
-	</p>
-
-	<p>
-		<input type="submit" value="Change Password" />
-	</p>
-</form>

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

@@ -1,6 +0,0 @@
-System Uptime: <%= Uptime.uptime %>
-
-System Processes: <br />
-<% @proctable.each do |p| %>
-	<b><%= p.comm %></b> (PID <%= p.pid.to_s %>)<br />
-<% end %>

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

@@ -1,17 +0,0 @@
-<script src="problem.js"></script>
-<div class="error">
-	<p>
-		<img src="trollface.png" />
-	</p>
-	<h1>Problem?</h1>
-	<p>
-		Due to technical difficulties, this Concerto screen is currently not 
-		operational. Please check again soon.
-	</p>
-	<p>
-		The Concerto installation at <%= concerto_url %> could not be reached.
-	</p>
-	<p>
-		<a href="/setup">Player Configuration</a>
-	</p>
-</div>

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

@@ -1,33 +0,0 @@
-<h1>Welcome to Concerto Player</h1>
-<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.
-</p>
-
-<form method="post">
-	<p>
-		<label for="url">URL</label>
-		<input type="text" name="url" />
-		<input type="submit" value="OK" />
-	</p>
-</form>
-
-<p>
-	The IPv4 address of this screen appears to be: <%= my_ip %>
-</p>
-
-<p>
-	This page can be accessed remotely via http://<%= my_ip %>/setup
-</p>
-
-<p>
-	Username is root, default password is 'default'.
-</p>
-
-<p> 
-	Also, you may want to
-	<a href="/netconfig">change network settings</a> or
-	<a href="/password">change the configuration password.</a>
-</p>
-	
-