hatecf 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f676f5ae2e918677f40a743d982a5ffcbd061a3c0d2dd7bc043ee85c3d6c5da8
-  data.tar.gz: 1ab539b2ddde0464b7ed36dd02958afae19929c721513fe3b89e58cf29001c9d
+  metadata.gz: 9dac6ef08ee3123c1815d6e8381147f8927693400da455086562073f14c591e3
+  data.tar.gz: acdf885dc3fe9ef1689ec14249c6a30ce13281c1839dd8ceacaa8856b10e4d25
 SHA512:
-  metadata.gz: d78d49b37f6b614aa53062626d98c2bf4642882b688b7f436be3ea6a383f25722fd9393b3773ca5fbc66a1babbfeb668ee5ece7dfb2d0d627b55135b86023412
-  data.tar.gz: 9806d0189e2f2ff6e21a85e98a17386b0ffe079208f871dd3a78c292d17e5ffb4b0d3d0f72ff9ecf9e5e263ac5b22f36598a79596753a91a2a79d48776b977b4
+  metadata.gz: 5852eca0446e36b759683599ae8005e97cf12e8404160001078199388a7dedbbb78831340b486b63e3e5b01a677501d84f81f0eef61fd4cb22a8e7e20477f7f4
+  data.tar.gz: 245aaa98f3ae07c4bc7b7802969a2aa61ea7334815245dadc23911d5c3fc70de294eaf8617762a2e7bb74dfdd7f077a6817096e003238ceff89e6b2691e90b13

data/bootstrap_ruby

@@ -1,2 +1,2 @@
 #!/bin/sh
-dpkg -s ruby > /dev/null || (echo "machine has no ruby; installing..."; apt-get install --no-install-recommends -y ruby)
+which ruby > /dev/null || (echo "machine has no ruby; installing..."; apt-get install --no-install-recommends -y ruby)

data/lib/local.rb

@@ -18,9 +18,12 @@ module Local
     end
   end
 
+  attr_accessor :really_die
+  @really_die = false
   def die(message)
     $stderr.puts "Script error: #{message}"
     print_location
+    @really_die = true
     exit 1
   end
 
@@ -66,9 +69,11 @@ module Local
   @local_files = []
 
   require 'pathname'
+  # TODO: we are not able to copy directories with this,
+  #       but we should be
   def copy_local_files_to(dir)
     @local_files.each do |local_file|
-      # dublicating the whole directory stucture
+      # duplicating the whole directory structure
       acc = []
       Pathname.new(local_file).each_filename do |chunk|
         source_path = File.join(*(['/'] + acc << chunk))
@@ -87,14 +92,20 @@ module Local
     end
   end
 
+  @performed = false
   require 'tmpdir'
   def perform!
+    return if @performed # just for compatibility with < 0.2
+                         # when manual invoke of peform! was needed
     die "no target host specified!" if (@target[:host] || "").empty?
-    script_path = File.expand_path(ENV["_"])
-    script_dir = File.dirname(File.expand_path(ENV["_"]))
+    script_path = File.expand_path ENV["_"]
+    script_dir = File.dirname script_path
     status = nil
     Dir.mktmpdir "hatecf" do |tmp_dir|
       debug "using temporary dir #{tmp_dir}"
+      File.chmod(00755, tmp_dir) # TODO: this is a tiny security issue.
+                                 #       We should set these permissions
+                                 #       only when we have "as" blocks.
       FileUtils.cp(script_path, File.join(tmp_dir, "script.rb"))
       File.chmod(00777, File.join(tmp_dir, "script.rb"))
       FileUtils.cp(File.join(__dir__, "../remote/hatecf.rb"    ), tmp_dir)
@@ -117,19 +128,25 @@ module Local
       pid, status = Process.wait2(Process.spawn(cmd))
       debug "exit status: #{status.exitstatus}"
     end
+    @performed = true
     # FIXME: this always returns the status of "; rm" above, doesn't it?
     exit status.exitstatus
   end
 
   require 'optparse'
-  OptionParser.new do |opts|
-    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!
+  begin
+    OptionParser.new do |opts|
+      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!
+  rescue OptionParser::InvalidOption => e
+    $stderr.puts e
+    exit 1
+  end
 
   def debug(s)
     info s if @verbose

data/lib/local_dsl.rb

@@ -4,10 +4,14 @@ def target(host:, user: nil, port: nil)
   Local.type_check(:host, host, String)
   Local.type_check(:user, user, String) if user
   Local.type_check(:port, port, Integer) if port
-  #Local.target = Local::DEFAULT_TARGET.dup
-  Local.target[:host] = host
-  Local.target[:user] = user if user
-  Local.target[:port] = port if port
+  if Local.target.empty?
+    Local.target[:host] = host
+    Local.target[:user] = user if user
+    Local.target[:port] = port if port
+  else
+    Local.die "multiple targets not supported (yet, idk)"
+    exit 1
+  end
 end
 
 class LocalFile
@@ -215,10 +219,14 @@ class RemoteFile
   end
 end
 
-def perform!
+def perform! # legacy, not needed since 0.2
   Local.perform!
 end
 
+Kernel.at_exit do
+  Local.perform! unless Local.really_die
+end
+
 # Monkey-patching
 
 class Array

data/remote/remote.rb

@@ -1,9 +1,9 @@
 module Remote
   extend self
 
-  # $HOME variable should be imported from local machine
-  # in order to access ~/ paths
-  # and directory of scrip should be imported
+  # $HOME variable should be imported from the local machine
+  # in order to access tilda ~/ paths
+  # and directory of the script should be imported
   # in order to access relative ./ paths
   attr_accessor :local_home, :local_script_dir
 
@@ -129,6 +129,7 @@ module Remote
   end
 
   def service_reload(name)
+    name = name.to_s
     destructive "reloading service #{name}" do
       cmd = ["systemctl", "reload", name]
       spawn(cmd, expect_status: 0)
@@ -136,6 +137,7 @@ module Remote
   end
 
   def service_restart(name)
+    name = name.to_s
     destructive "restarting service #{name}" do
       cmd = ["systemctl", "restart", name]
       spawn(cmd, expect_status: 0)
@@ -163,6 +165,8 @@ module Remote
 
   def create_user(name, create_home, shell)
     if user_exists?(name)
+      # TODO: should we check if existing user
+      #       has the specified shell?
       ok "#{name} user exists"
     else
       destructive "creating user #{name}" do
@@ -175,6 +179,7 @@ module Remote
   end
 
   require 'fileutils'
+  # FIXME: even when run "afterwards" it crashes if user doesn't exist.
   def authorize_ssh_key(user, key)
     case key
     when LocalFile
@@ -220,7 +225,6 @@ module Remote
     end
   end
 
-  attr_accessor :apt_updated
   def dpkg_installed?(names)
     #            | virtual | virtual | removed
     #            | package | package | but
@@ -248,6 +252,7 @@ module Remote
     end
   end
 
+  @apt_updated = false
   def apt_install(names)
     names = names.to_s if names.is_a? Symbol
     names = names.split(/\s+/).map(&:strip).select{|x|not x.empty?} if names.is_a? String
@@ -255,10 +260,10 @@ module Remote
       ok "installed: #{names.join(', ')}"
     else
       destructive "apt-get install #{names.join(' ')}" do
-        unless apt_updated
+        unless @apt_updated
           cmd = ["apt-get", "update", "-q"]
           spawn(cmd, expect_status: 0)
-          apt_updated = true
+          @apt_updated = true
         end
 
         cmd = ["apt-get", "install", "--no-install-recommends", "-y"]
@@ -277,10 +282,12 @@ module Remote
     if installed.empty?
       ok "removed: #{names.join(", ")}"
     else
+      # FIXME: eh, what was the logic behind this cycle when I made it?..
+      #        Why do I need to remove packages one by one?
       installed.each do |name|
         destructive "apt-get remove #{name}" do
           cmd = ["apt-get", "remove", "-y"]
-          cmd += names
+          cmd << name
           spawn cmd, expect_status: 0
         end
       end
@@ -332,7 +339,7 @@ module Remote
 
   def rm(x)
     x = File.expand_path x
-    if File.exists? x
+    if File.exist? x
       destructive "rm #{x}" do
         FileUtils.rm x
       end
@@ -341,7 +348,7 @@ module Remote
     end
   end
 
-  # TODO: the dst is a dir case
+  # TODO: handle "dst is a dir" case
   def cp(src, dst, mode)
     src = src.remote_path if src.is_a? LocalFile
     dst = File.expand_path dst
@@ -376,10 +383,12 @@ module Remote
     end
   end
 
+  # TODO: handle "dst is a dir" case
+  # TODO: relative path case
   def ln_s(src, dst)
     src = File.expand_path src
     dst = File.expand_path dst
-    if File.exist?(dst) &&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
@@ -388,8 +397,6 @@ module Remote
     end
   end
 
-  #attr_accessor :impressionating_user
-
   def spawn(cmd, expect_status: nil)
     expect_status = [expect_status] unless expect_status.nil? || expect_status.respond_to?(:include?)
     stdout_r, stdout_w = IO.pipe
@@ -510,4 +517,11 @@ module Remote
       @verbose = true
     end
   end.parse!
+
+  @performed = false
+  def perform!
+    return if @performed
+    info "ok: #{ok_counter}, changed: #{changed_counter}"
+    @performed = true
+  end
 end

data/remote/remote_dsl.rb

@@ -181,8 +181,12 @@ def remote_file(path)
   Remote::RemoteFile.new(path)
 end
 
-def perform!
-  Remote.info "ok: #{Remote.ok_counter}, changed: #{Remote.changed_counter}"
+def perform! # legacy, not needed since 0.2
+  Remote.perform!
+end
+
+Kernel.at_exit do
+  Remote.perform!
 end
 
 # Monkey-patching

metadata

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