hatecf 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1b4ef8bbe6a61660fa428de1cf061be314514244a3d5d94f766167133ecf0a9
-  data.tar.gz: fb1bd239e0475e6f56540c0588deb1f6bd2532d43aaadc80c760ffe6dbf2f324
+  metadata.gz: 9dac6ef08ee3123c1815d6e8381147f8927693400da455086562073f14c591e3
+  data.tar.gz: acdf885dc3fe9ef1689ec14249c6a30ce13281c1839dd8ceacaa8856b10e4d25
 SHA512:
-  metadata.gz: 2234677084a122e92cb02b91e7e9015829f7f3225bc29078557263b1dc8704036d6fe3cc3ae7cfe128c0529d95f0fb865d44dc1be0251d3a581c5e3cf3faa7b4
-  data.tar.gz: fe8c113c6f812fc6d355788904bfaad665bc171dc11b6d43347b685117fa7af6981ff13e799c9193176a94c7a9a54313ba426a4b6d3a25ffd842f77db2204777
+  metadata.gz: 5852eca0446e36b759683599ae8005e97cf12e8404160001078199388a7dedbbb78831340b486b63e3e5b01a677501d84f81f0eef61fd4cb22a8e7e20477f7f4
+  data.tar.gz: 245aaa98f3ae07c4bc7b7802969a2aa61ea7334815245dadc23911d5c3fc70de294eaf8617762a2e7bb74dfdd7f077a6817096e003238ceff89e6b2691e90b13

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
 
@@ -70,7 +73,7 @@ module Local
   #       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))
@@ -100,6 +103,9 @@ module Local
     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)
@@ -128,14 +134,19 @@ module Local
   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
@@ -220,7 +224,7 @@ def perform! # legacy, not needed since 0.2
 end
 
 Kernel.at_exit do
-  Local.perform!
+  Local.perform! unless Local.really_die
 end
 
 # Monkey-patching

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hatecf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alexander Markov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-01 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