gsd-cli 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01dfcf1833492c3a45ab541a49ffa80c9fd685b17bb4db80747e67821eb9daee
-  data.tar.gz: c21eb0061afcdc1ab8b1d4914bf5abfd04d4d9b8088dfc0d78ef301e459b63aa
+  metadata.gz: 0a1e9eea7cd1d07e679b5638e4ee39beafc325f875c62ac57a2d242f2f96e8b9
+  data.tar.gz: 9d75d55324afdfae4ff8fcec787565fe15f024b00fa873485ea287db746cdfcb
 SHA512:
-  metadata.gz: 16ae278d4a5883d7fdadc2c8e344cbb509643b0917a02d5bbd4daae16cb0dd730ba31f3f359f51ee9a75470f23654c3b5d8684a37b278128df1cb6d1995e08b5
-  data.tar.gz: eb160df6ef69b731a08787931370035b85569bb4075035e2be797df2587a426a300bb13b58dde11f6b49cc880352835a311e0431b05a1e563541b738aaa25241
+  metadata.gz: 2e34d638f8bb6064eeedf63d1c8b0c07b01593648e60e6c25ab034168f93b4ac3826ac2643e57b792ab10ed7e7b2f301472c76ae85d64d188a2b5c6cc5117a8a
+  data.tar.gz: 2f807aa2ab77e8105cb907b382162408739fb42f1ccf6d9300224ec01076b0df5151d74f93fa71c11972f7514861bb98191a4c4ab2d0887f38515401dda47f73

data/lib/cli.rb

@@ -31,7 +31,7 @@ end
 @games = userdata
 
 program :name, "gsd-cli"
-program :version, "0.1.15"
+program :version, "0.1.16"
 program :description, "A cli tool to deploy & manage dedicated game servers on Linux"
 
 command :install do |c|
@@ -43,9 +43,11 @@ command :install do |c|
   c.option "--steamuser OPTIONAL", String, "Steam user account required to install certain games."
   c.option "--steampassword OPTIONAL", String, "Steam account password for installing certain games."
   c.action do |args, options|
-    GameTemplate.new(@games[args.first()], options.path)
-                .install(options.steamuser, options.steampassword, options.devmode)
+    puts "Beginning installation process. This may take a while..."
+    GameTemplate.new(@games[args.first()])
+                .install(options.path, options.steamuser, options.steampassword, options.devmode)
   end
+  puts "Server installation & deployment complete!".green
 end
 
 command :run do |c|

data/lib/game_template.rb

@@ -5,10 +5,8 @@ require "helpers"
 
 # Create a Rust server
 class GameTemplate
-  def initialize(game, remote, path = nil)
+  def initialize(game, remote = "")
     @game = game
-    @install_path = get_install_path(path)
-    @file_path = "/tmp/#{@game.name}.service"
     @remote = remote
   end
 
@@ -44,26 +42,23 @@ class GameTemplate
   end
 
   def run
-    exec(@game.launch(@install_path))
+    exec(@game.launch(install_path))
   end
 
-  def install(steamuser, steampassword, dev_mode)
-    puts "Beginning installation process. This may take a while..."
-    ensure_delete_unit_file()
+  def install(install_path, steamuser, steampassword, dev_mode)
+    ensure_delete_unit_file(install_path)
     if @game.app_id.nil?
-      @game.install_server(@install_path)
+      @game.install_server(get_install_path(install_path))
     else
-      install_steam_server(steamuser, steampassword)
+      install_steam_server(install_path, steamuser, steampassword)
     end
-    binary_path = if dev_mode.nil?
-                    `which gsd-cli`.strip()
-                  else
-                    puts "Dev mode enabled - running from source"
-                    "#{Dir.pwd}/bin/gsd-cli"
-                  end
-    create_unit_file(binary_path)
-    system("sudo -p 'sudo password: ' cp -f #{@file_path} /etc/systemd/system/#{@game.name}.service")
-    puts "Server installation & deployment complete!".green
+    cli_path = if dev_mode.nil?
+                 `which gsd-cli`.strip()
+               else
+                 puts "Dev mode enabled - running from source"
+                 "#{Dir.pwd}/bin/gsd-cli"
+               end
+    create_unit_file(cli_path, install_path)
   end
 
   def update
@@ -77,7 +72,7 @@ class GameTemplate
   private
 
   # Installs or Updates a dedicated game server via Steamcmd
-  def install_steam_server(steamuser = nil, steampassword = nil)
+  def install_steam_server(install_path, steamuser = nil, steampassword = nil)
     login = if steamuser.nil?
               "+login anonymous"
             else
@@ -85,8 +80,8 @@ class GameTemplate
             end
     abort("STEAMCMD does not appear to be installed! Aborting...".red) if `which steamcmd`.empty?
     system("$(which steamcmd) +login anonymous +quit")
-    system("$(which steamcmd) #{login} +force_install_dir #{@install_path} +app_update #{@game.app_id} validate +quit")
-    @game.post_install(@install_path) if defined? @game.post_install
+    system("$(which steamcmd) #{login} +force_install_dir #{install_path} +app_update #{@game.app_id} validate +quit")
+    @game.post_install(install_path) if defined? @game.post_install
   end
 
   def get_install_path(path)
@@ -99,18 +94,19 @@ class GameTemplate
     install_path
   end
 
-  def ensure_delete_unit_file
-    File.delete(@file_path) if File.file?(@file_path)
+  def ensure_delete_unit_file(unit_file_path)
+    File.delete(unit_file_path) if File.file?(unit_file_path)
   end
 
-  def create_unit_file(binary_path)
-    out_file = File.new(@file_path, "w")
-    out_file.puts(unit_file_contents(binary_path)) # TODO: Pass in map with config
+  def create_unit_file(cli_path, install_path)
+    file_path = "/tmp/#{@game.name}.service"
+    out_file = File.new(file_path, "w")
+    out_file.puts(unit_file_contents(cli_path, install_path)) # TODO: Pass in map with config
     out_file.close()
+    system("sudo -p 'sudo password: ' mv -f #{"/tmp/#{@game.name}.service"} /etc/systemd/system/#{@game.name}.service")
   end
 
-  def unit_file_contents(binary_path)
-    puts binary_path
+  def unit_file_contents(cli_path, install_path)
     "[Unit]
     After=network.target
     Description=#{@desc}
@@ -120,6 +116,6 @@ class GameTemplate
     LimitNPROC=infinity
     Type=simple
     User=#{`whoami`}
-    ExecStart=#{binary_path} run #{@game.name} --path #{@install_path}"
+    ExecStart=#{cli_path} run #{@game.name} --path #{install_path}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gsd-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Egee