Fix service config build

DFabric · Sep 27, 2019 · cb66471 · cb66471
1 parent a71ac35
commit cb66471
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 21 deletions.
diff --git a/spec/cli_spec.cr b/spec/cli_spec.cr
@@ -122,6 +122,7 @@ describe DPPM::CLI do
     it "adds an application" do
       spec_with_prefix do |prefix|
         add_application prefix_path: prefix.path.to_s
+        delete_application prefix.path.to_s
       end
     end
 

diff --git a/spec/prefix/app_spec.cr b/spec/prefix/app_spec.cr
@@ -6,7 +6,7 @@ def spec_with_app(&block)
   spec_with_prefix do |prefix|
     pkg = prefix.new_pkg TEST_APP_PACKAGE_NAME
     app = pkg.new_app TEST_APP_PACKAGE_NAME
-    app.add confirmation: false { }
+    app.add confirmation: false, add_service: false { }
     begin
       yield app
     ensure

diff --git a/spec/service_spec.cr b/spec/service_spec.cr
@@ -31,6 +31,7 @@ def spec_with_service_app(service, &block)
 
     test_app.service.file = test_app.service_file
     test_app.service_create.config
+
     begin
       yield test_app
     ensure
@@ -67,7 +68,10 @@ def assert_service(service, file = __FILE__, line = __LINE__)
 
   it "creates a service file building", file, line do
     spec_with_service_app service do |app|
-      File.read(app.service_file).should eq app.service.config.build
+      service_config = String.build do |str|
+        app.service.config_build str
+      end
+      File.read(app.service_file).should eq service_config
     end
   end
 end

diff --git a/src/prefix/app.cr b/src/prefix/app.cr
@@ -106,7 +106,7 @@ struct DPPM::Prefix::App
       service.config.env_vars.merge! pkg_env
     end
     File.open service_file, "w" do |io|
-      service.config.build io
+      service.config_build io
     end
     service
   end

diff --git a/src/service/config.cr b/src/service/config.cr
@@ -17,7 +17,7 @@ class Service::Config
 
   def parse_env_vars(env_vars : String)
     env_vars.rchop.split("\" ").each do |env|
-      var, val = env.split("=\"")
+      var, _, val = env.partition "=\""
       @env_vars[var] = val
     end
   rescue

diff --git a/src/service/init_system.cr b/src/service/init_system.cr
@@ -3,10 +3,13 @@ module Service::InitSystem
     file : Path,
     boot_file : Path
 
+  private abstract def config_parse(io : IO)
+  private abstract def config_build(io : IO)
+
   getter config : Config do
     if @file && File.exists? @file.to_s
       File.open @file.to_s do |io|
-        Config.parse io
+        config_parse io
       end
     else
       Config.new

diff --git a/src/service/openrc.cr b/src/service/openrc.cr
@@ -40,6 +40,14 @@ class Service::OpenRC
     Service.exec? "/sbin/rc-service", {@name, {{action}}}
   end
   {% end %}
+
+  private def config_parse(io : IO)
+    Config.from_openrc io
+  end
+
+  def config_build(io : IO)
+    config.to_openrc io
+  end
 end
 
 require "./openrc_config"
diff --git a/src/service/openrc_config.cr b/src/service/openrc_config.cr
@@ -9,7 +9,7 @@ class Service::Config
   private OPENRC_NETWORK_SERVICE = "net"
 
   # ameba:disable Metrics/CyclomaticComplexity
-  def self.parse(data : String | IO)
+  def self.from_openrc(data : String | IO)
     service = new
     line_number = 1
     function_name = ""
@@ -71,14 +71,8 @@ class Service::Config
     service
   end
 
-  def build : String
-    String.build do |str|
-      build str
-    end
-  end
-
   # ameba:disable Metrics/CyclomaticComplexity
-  def build(io : IO) : Nil
+  def to_openrc(io : IO) : Nil
     io << OPENRC_SHEBANG << "\n\n"
     io << OPENRC_SUPERVISOR << '\n'
     io << OPENRC_PIDFILE

diff --git a/src/service/systemd.cr b/src/service/systemd.cr
@@ -49,6 +49,14 @@ class Service::Systemd
     Service.exec? "/bin/systemctl", {"-q", "--no-ask-password", {{action}}, @name}
   end
   {% end %}
+
+  private def config_parse(io : IO)
+    Config.from_systemd io
+  end
+
+  def config_build(io : IO)
+    config.to_systemd io
+  end
 end
 
 require "./systemd_config"
diff --git a/src/service/systemd_config.cr b/src/service/systemd_config.cr
@@ -5,7 +5,7 @@ class Service::Config
   private SYSTEMD_SHELL_LOG_REDIRECT = "/bin/sh -c '2>>"
   private SYSTEMD_NETWORK_SERVICE    = "network.target"
 
-  def self.parse(data : String | IO)
+  def self.from_systemd(data : String | IO)
     service = new
     ini = INI.parse data
     if reload = ini["Service"]["ExecReload"]?
@@ -49,14 +49,8 @@ class Service::Config
     service
   end
 
-  def build : String
-    String.build do |str|
-      build str
-    end
-  end
-
   # ameba:disable Metrics/CyclomaticComplexity
-  def build(io : IO) : Nil
+  def to_systemd(io : IO) : Nil
     # Transform the hash to a systemd service
     systemd = {"Unit"    => Hash(String, String).new,
                "Service" => {