hatecf 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9e89a8cfac1c0bf752d1c86a7b8637ca2191eecc55e53ff8f50ccf8b80acb5c
-  data.tar.gz: a3efe1d1aaeceb0c0566d88ad737d055e54181f5d7dece693a3129d4210e7525
+  metadata.gz: 827fd6c2d736fc58850a414f1e11acfba2bc5199cc867f8954df6202888a67ba
+  data.tar.gz: c397ba5ec14ec01d9ff7ea323da5f9d6100aae78c858dcf57c994132ecf64bec
 SHA512:
-  metadata.gz: 1e2770dafb8f77bf2f505aa0899c33d923ea32d785331323dadc30e26620261f3406d3f73e8a0495995613b4eb4180234071c805816a1c20bcfbf81f4781a4d7
-  data.tar.gz: 1c2ba2caa0a5c2319aa4dda79644d93e2a2f75bd9bff6963a3f5c8bc130270a766a772d324ea8afbdff6153a78ab223cb59ec5ccb4c1f114ac2c4a0e5201edbe
+  metadata.gz: 81827c49edfce7d0a44c9a180e88a3c092b5977d01e1c4ca7d1e906f11fe6ec983fdb3bbb19fcaf05a7d469244d540c73ad7cfc2f243d2dea12c36487d931fa7
+  data.tar.gz: e4fbd334575d6fb37b13dadce134f36338ab952fd1f52ed945e18b8b6221e7e886e875f0c0500e5eaac829b004429efb13308fe5d245277ae2bcc946f998ed34

data/lib/hatecf.rb

@@ -1,2 +1 @@
-#require "./local_dsl.rb"
 require File.join(__dir__, "./local_dsl.rb")

data/lib/local.rb

@@ -107,11 +107,17 @@ module Local
         FileUtils.mkdir local_files_dir
         copy_local_files_to(local_files_dir)
       end
-      cmd = "tar -czP #{tmp_dir} | ssh #{@target[:user] || DEFAULT_TARGET[:user]}@#{@target[:host]} \"tar -xzP -C / && (cd #{tmp_dir} && ./bootstrap_ruby && RUBYLIB=. ./script.rb #{@dry_run ? "--dry " : " "}--local-home #{ENV["HOME"]} --local-script-dir #{script_dir}); rm -r #{tmp_dir}\""
+      script_opts = []
+      script_opts << "--dry" if @dry_run
+      script_opts << "-v" if @verbose
+      script_opts << "--local-home #{ENV["HOME"]}"
+      script_opts << "--local-script-dir #{script_dir}"
+      cmd = "tar -czP #{tmp_dir} | ssh #{@target[:user] || DEFAULT_TARGET[:user]}@#{@target[:host]} \"tar -xzP -C / && (cd #{tmp_dir} && ./bootstrap_ruby && RUBYLIB=. ./script.rb #{script_opts.join(" ")}); rm -r #{tmp_dir}\""
       debug "executing: #{cmd}"
       pid, status = Process.wait2(Process.spawn(cmd))
       debug "exit status: #{status.exitstatus}"
     end
+    # FIXME: this always returns the status of "; rm" above, doesn't it?
     exit status.exitstatus
   end
 
@@ -120,9 +126,13 @@ module Local
     opts.on "--dry", "don't change anything, just test everything" do |x|
       @dry_run = true
     end
+    opts.on "-v", "verbose mode: print debug messages" do |x|
+      @verbose = true
+    end
   end.parse!
 
   def debug(s)
+    info s if @verbose
   end
 
   def info(s)

data/lib/local_dsl.rb

@@ -1,4 +1,3 @@
-#require "./local.rb"
 require File.join(__dir__, "./local.rb")
 
 def target(host:, user: nil, port: nil)
@@ -27,12 +26,14 @@ def local_file(path)
   return LocalFile.new(path)
 end
 
+# FIXME: unused
 class LocalEntity
   def initialize(payload)
     @payload = payload
   end
 end
 
+# FIXME: unused
 def local(x)
   LocalEntity.new(x)
 end

data/remote/remote.rb

@@ -174,6 +174,7 @@ module Remote
     end
   end
 
+  require 'fileutils'
   def authorize_ssh_key(user, key)
     case key
     when LocalFile
@@ -183,7 +184,6 @@ module Remote
     else
       raise "type #{key.class} is not supported for a SSH public key"
     end
-    require 'fileutils'
     home_dir = get_user_home_dir(user)
     ssh_dir = File.join(home_dir, ".ssh")
     authorized_keys_path = File.join(ssh_dir, "authorized_keys")
@@ -254,7 +254,7 @@ module Remote
     if dpkg_installed?(names)
       ok "installed: #{names.join(', ')}"
     else
-      destructive "apt-get install #{names.is_a?(Array) ? names.join(' ') : names}" do
+      destructive "apt-get install #{names.join(' ')}" do
         unless apt_updated
           cmd = ["apt-get", "update", "-q"]
           spawn(cmd, expect_status: 0)
@@ -368,11 +368,11 @@ module Remote
   def ln_s(src, dst)
     src = File.expand_path src
     dst = File.expand_path dst
-    if File.lstat(dst).symlink? && File.readlink(dst) == src
+    if File.exist?(dst) &&File.lstat(dst).symlink? && File.readlink(dst) == src
       ok "#{dst} leads to #{src}"
     else
       destructive "ln -s #{src} #{dst}" do
-        FileUtils.ln_s src dst
+        FileUtils.ln_s src, dst
       end
     end
   end
@@ -462,6 +462,7 @@ module Remote
   end
 
   def debug(s)
+    info s if @verbose
   end
 
   def info(s)
@@ -494,5 +495,8 @@ module Remote
     opts.on "--dry" do |x|
       @dry_run = true
     end
+    opts.on "-v" do |x|
+      @verbose = true
+    end
   end.parse!
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hatecf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Alexander Markov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies: []
 description: Configuration management engine like Ansible but without YAML and 30
   times faster