bandshell 0.0.8 → 0.0.9

data/bin/bandshelld

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+# control wrapper for ConcertoConfigServer sinatra app
+
+require "rubygems"
+require "daemons"
+require "bandshell/application/app"
+
+Daemons.run_proc("bandshelld", :dir_mode => :system) do
+	ConcertoConfigServer.run!
+end

data/{web → lib/bandshell/application}/app.rb

@@ -4,7 +4,7 @@ require 'haml'
 require 'json'
 require 'net/http'
 require 'ipaddress'
-require 'netconfig'
+require 'bandshell/netconfig'
 require 'sys/uptime'
 require 'sys/proctable'
 include Sys
@@ -317,4 +317,3 @@ class ConcertoConfigServer < Sinatra::Base
 	
 end
 
-ConcertoConfigServer.run!

data/lib/{config_store.rb → bandshell/config_store.rb}

@@ -1,9 +1,9 @@
-require 'live_image'
+require 'bandshell/live_image'
 require 'fileutils'
 
 # A key/value store for strings.
 # Right now implemented as disk files.
-module ConcertoConfig
+module Bandshell
 	module ConfigStore
 		@@path = nil
 

data/lib/{live_image.rb → bandshell/live_image.rb}

@@ -2,7 +2,7 @@ require 'tempfile'
 
 # Functions for dealing with the live image
 # (where it's mounted, if it's read-only, etc)
-module ConcertoConfig
+module Bandshell
 	module LiveImage
 		def self.mountpoint
 			'/live/image'

data/lib/{netconfig.rb → bandshell/netconfig.rb}

@@ -3,7 +3,7 @@
 require 'rubygems'
 require 'json'
 require 'ipaddress'
-require 'config_store'
+require 'bandshell/config_store'
 
 # The big idea here is that we have connection methods (layer 2)
 # and addressing methods (layer 3) and by combining that configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bandshell
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -96,28 +96,28 @@ email: andrew@asquaredlabs.com
 executables:
 - concerto_netsetup
 - concerto_configserver
+- bandshelld
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/live_image.rb
-- lib/netconfig.rb
-- lib/config_store.rb
-- web/config.ru
-- web/app.rb
-- web/public/network.js
-- web/public/stylesheet.css
-- web/public/problem.js
-- web/public/trollface.png
-- web/views/main.haml
-- web/views/password.haml
-- web/views/setup.haml
-- web/views/netsettings.haml
-- web/views/problem.haml
-- web/views/player_status.haml
+- lib/bandshell/live_image.rb
+- lib/bandshell/netconfig.rb
+- lib/bandshell/config_store.rb
+- lib/bandshell/application/config.ru
+- lib/bandshell/application/views/main.haml
+- lib/bandshell/application/views/password.haml
+- lib/bandshell/application/views/setup.haml
+- lib/bandshell/application/views/netsettings.haml
+- lib/bandshell/application/views/problem.haml
+- lib/bandshell/application/views/player_status.haml
+- lib/bandshell/application/app.rb
+- lib/bandshell/application/public/network.js
+- lib/bandshell/application/public/stylesheet.css
+- lib/bandshell/application/public/problem.js
+- lib/bandshell/application/public/trollface.png
 - bin/concerto_configserver
-- bin/bandshell-daemon.rb
 - bin/concerto_netsetup
-- bin/bandshell-control.rb
+- bin/bandshelld
 homepage: 
 licenses: []
 post_install_message: 

data/bin/bandshell-control.rb

@@ -1,11 +0,0 @@
-#Daemon control for the Bandshell daemon
-#Usage: ruby myserver_control.rb start|stop|restart
-
-require 'rubygems'
-require 'daemons'
-
-Daemons.run_proc('bandshell-daemon.rb') do
-  loop do
-    sleep(5)
-  end
-end

data/bin/bandshell-daemon.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-#Requires "daemons" gem
-
-#Starts the Web App Server & verifies that it is still alive
-#Starts the Browser & verifies that it is still alive
-#Periodically uses local library methods to check for updates from the server
-#Controls screen according to rules downloaded from server
-
-#Start the daemon loop - everything happens in there
-loop do
-  sleep(5)
-end