sbcp 0.1.4 → 0.2.3

data/lib/sbcp/starbound.rb

@@ -1,22 +1,56 @@
+# SBCP - Starbound Server Management Solution for Linux Servers
+# Copyright (C) 2016 Kazyyk
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'yaml'
+require 'logger'
+require 'rufus-scheduler'
+require 'celluloid/current'
+
+require_relative 'parser'
+
 module SBCP
 	class Starbound
+		include Celluloid
+
+		SESSION = {}
+		
 		def initialize
 			@config = YAML.load_file(File.expand_path('../../../config.yml', __FILE__))
+			SESSION[:info] = {
+				:started	=> nil,
+				:uptime		=> nil,
+				:restart_in	=> nil,
+			}
+			SESSION[:players] = {}
+			SESSION[:info][:restart_in] = 'Never' if @config['restart_schedule'] == 'disabled'
 			backup_schedule = @config['backup_schedule']
 			restart_schedule = @config['restart_schedule']
 			scheduler = Rufus::Scheduler.new
 			unless ['restart', 'none'].include? backup_schedule # Only run backups if they're not set to run at restart or aren't disabled
 				if backup_schedule == 'hourly'
 					scheduler.cron "0 */1 * * *" do
-						SBCP::Backup.create_backup
+						Backup.create_backup
 					end
 				elsif backup_schedule == 'daily'
 					scheduler.cron "0 0 * * *" do
-						SBCP::Backup.create_backup
+						Backup.create_backup
 					end
 				else
 					scheduler.cron "0 */#{backup_schedule} * * *" do
-						SBCP::Backup.create_backup
+						Backup.create_backup
 					end
 				end
 			end
@@ -41,31 +75,21 @@ module SBCP
 		end
 
 		def start
-			if @config['log_style'] == 'daily' then
-				log = Logger.new("#{@config['log_directory']}/starbound.log", 'daily', @config['log_history'])
-			elsif @config['log_style'] == 'restart' then
-				stamp = "#{Time.now.strftime("%m-%d-%Y-%H-%M-%S")}-starbound"
-				log = Logger.new("#{@config['log_directory']}/#{stamp}.log")
-			else
-				abort("Error: Invalid log style")
-			end
-			log.formatter = proc { |severity, datetime, progname, msg| date_format = datetime.strftime("%H:%M:%S.%N")[0...-6]; "[#{date_format}] #{msg}" }
-			log.level = Logger::INFO
-			log.info("---------- SBCP is starting a new Starbound instance ----------\n")
-			#parser = SBCP::Parser.new
+			parser = Parser.new
+
+			SESSION[:info][:started] = Time.now
 
 			IO.popen("#{@config['starbound_directory']}/linux64/starbound_server", :chdir=>"#{@config['starbound_directory']}/linux64", :err=>[:child, :out]) do |output|
 				while line = output.gets
-					log.info(line)
-					#parser.async.parse(line)
+					parser.async.parse(line)
 				end
 			end
 
 		ensure
-			log.info("---------- Starbound has successfully shut down ----------\n")
-			log.info("\n") # Adds a newline space at the end of the log. Helpful for separating restarts in daily logs.
-			log.close
-			#parser.terminate
+			parser.log("---------- Starbound has successfully shut down ----------\n")
+			parser.log("\n") # Adds a newline space at the end of the log. Helpful for separating restarts in daily logs.
+			parser.close
+			parser.terminate
 		end
 	end
 end

data/lib/sbcp/version.rb

@@ -1,3 +1,19 @@
+# SBCP - Starbound Server Management Solution for Linux Servers
+# Copyright (C) 2016 Kazyyk
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 module SBCP
-  VERSION = "0.1.4"
+  VERSION = "0.2.3"
 end

data/sbcp.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |spec|
   spec.name          = 'sbcp'
   spec.version       = SBCP::VERSION
   spec.authors       = ['Kazyyk']
-  spec.email         = ['contact@kazyyk.com']
+  spec.email         = ['kazyyk@gmail.com']
 
   spec.summary       = %q{SBCP is a Starbound server management solution for Linux.}
   spec.homepage      = 'https://www.kazyyk.com/sbcp'
-  spec.license       = 'AGPLv3'
+  spec.license       = 'GNU AGPL v3'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'bin'
@@ -28,10 +28,11 @@ Gem::Specification.new do |spec|
   #spec.add_runtime_dependency 'dm-sqlite-adapter', '~> 1.2'
   spec.add_runtime_dependency 'celluloid', '~> 0.17.3'
   spec.add_runtime_dependency 'rufus-scheduler', '~> 3.2'
-  #spec.add_runtime_dependency 'steam-condenser', '~> 1.3', '>= 1.3.11'
+  spec.add_runtime_dependency 'steam-condenser', '~> 1.3', '>= 1.3.11'
   spec.add_runtime_dependency 'rsync', '~> 1.0', '>= 1.0.9'
   spec.add_runtime_dependency 'rbzip2', '~> 0.2.0' # seven_zip_ruby would not compile, using this instead
   spec.add_runtime_dependency 'highline', '~> 1.7', '>= 1.7.8'
+  spec.add_runtime_dependency 'time_diff', '~> 0.3.0'
 
 
   spec.add_development_dependency 'bundler', '~> 1.11'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbcp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.3
 platform: ruby
 authors:
 - Kazyyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -38,6 +38,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: steam-condenser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.11
 - !ruby/object:Gem::Dependency
   name: rsync
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +112,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.8
+- !ruby/object:Gem::Dependency
+  name: time_diff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +184,7 @@ dependencies:
         version: 0.6.3
 description: 
 email:
-- contact@kazyyk.com
+- kazyyk@gmail.com
 executables:
 - sbcp
 extensions: []
@@ -168,15 +202,20 @@ files:
 - config.yml
 - lib/sbcp.rb
 - lib/sbcp/backup.rb
+- lib/sbcp/config.rb
 - lib/sbcp/daemon.rb
+- lib/sbcp/help.rb
 - lib/sbcp/logs.rb
+- lib/sbcp/panel.rb
 - lib/sbcp/parser.rb
+- lib/sbcp/rcon.rb
+- lib/sbcp/setup.rb
 - lib/sbcp/starbound.rb
 - lib/sbcp/version.rb
 - sbcp.gemspec
 homepage: https://www.kazyyk.com/sbcp
 licenses:
-- AGPLv3
+- GNU AGPL v3
 metadata: {}
 post_install_message: 
 rdoc_options: []