gsd-cli 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec0f5ab4fc54d72fdbc86590104a44df95b4905b8b7a7d0a2e12f57b8c16781c
-  data.tar.gz: '087d61469575d54a24ab64c7f7cc8c537b9a77478de951372659bd868d7f090a'
+  metadata.gz: 3f51a3f09492d1446b2686d71c78e5974d82629d81750a7d889c33168297382b
+  data.tar.gz: 6db2c60577a47d8496a1713b9fc4f692106830c9562dcf0dc69bebfb76034938
 SHA512:
-  metadata.gz: e65ed3349d74c98e9429d639975e37654bc966973bc188cd1d4a1fbaaeb28347ed3c9b0c6380f0648a482cf01605ce02574ee05ac4e622da2dfbc73bacd3cfc9
-  data.tar.gz: 1e3fe3983c6dca9fb94ab71184638b4dbbbd0039465dcaa22e7f9414a365af780953624878619419981f157e6268c54aa471e8cbd5dfe907200f3217b1ed0448
+  metadata.gz: 3264339bf20ff93de39ee70832c9739f9085c0baaad522a18d6c797c0e72150320402a8a79642920cd7e649aaf2c0a60a23695a978be91ba2159d597b2dd55bb
+  data.tar.gz: cb7dfe47c96048b258937d0472612f33559e9d45ca3afd0a94084002b10cd4e3932f3caa4d7d2ef2292f3c364e958b36a0452e445ce4c9d34ce8320810c59249

data/bin/gsd-cli

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+$LOAD_PATH << "./lib"
 require "cli"

data/lib/cli.rb

@@ -34,11 +34,13 @@ command :install do |c|
   c.syntax = "gsd install [args] [options]"
   c.summary = "Install and deploy a dedicated game server as a daemon."
   c.description = "Installs and deploy a dedicated game server as a daemon (systemd unit)."
-  c.option "--path STRING", String, "Path that the game server will be installed to."
-  c.option "--steamuser STRING", String, "Steam user account required to install certain games."
-  c.option "--steampassword STRING", String, "Steam account password for installing certain games."
+  c.option "--path OPTIONAL", String, "Path that the game server will be installed to."
+  c.option "--devmode OPTIONAL", String, "To run from source or as a Gem. ('y' to run from source)"
+  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)
+    GameTemplate.new(@games[args.first()], options.path)
+                .install(options.steamuser, options.steampassword, options.devmode)
   end
 end
 

data/lib/game_template.rb

@@ -36,7 +36,7 @@ class GameTemplate
     exec(@game.launch(@install_path))
   end
 
-  def install(steamuser, steampassword)
+  def install(steamuser, steampassword, dev_mode)
     puts "Beginning installation process. This may take a while..."
     ensure_delete_unit_file()
     if @game.app_id.nil?
@@ -44,13 +44,17 @@ class GameTemplate
     else
       install_steam_server(steamuser, steampassword)
     end
-    create_unit_file()
+    binary_path = if dev_mode.nil?
+                    "/usr/local/bin/gsd-cli"
+                  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
   end
 
-  # Generic cli-facing update function
-  # for updating installed dedicated game servers
   def update
     if @game.app_id.nil?
       puts "Non-Steam games not supported."
@@ -87,13 +91,13 @@ class GameTemplate
     File.delete(@file_path) if File.file?(@file_path)
   end
 
-  def create_unit_file
+  def create_unit_file(binary_path)
     out_file = File.new(@file_path, "w")
-    out_file.puts(unit_file_contents()) # TODO: Pass in map with config
+    out_file.puts(unit_file_contents(binary_path)) # TODO: Pass in map with config
     out_file.close()
   end
 
-  def unit_file_contents
+  def unit_file_contents(binary_path)
     "[Unit]
     After=network.target
     Description=#{@desc}
@@ -104,6 +108,6 @@ class GameTemplate
     WorkingDirectory=#{Dir.pwd}
     Type=simple
     User=#{`whoami`}
-    ExecStart=#{Dir.pwd}/bin/gsd run #{@game.name} --path #{@install_path}"
+    ExecStart=#{binary_path} #{@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.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Egee
@@ -41,7 +41,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="