deplomat 0.2.14 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb0da56b82a705d6aff60ad4b01fd47941634521c963c08ae946b51167b26d6b
-  data.tar.gz: 57ae983297c8fdc9e4e13cb6a7265b6b81a334a8aef551feb88ce9227b48451f
+  metadata.gz: a5a59554a67370399c1549d1efaa1900ff11f5dfffff2da0279c8faf0df56ce5
+  data.tar.gz: 2a4194a7208c310ec6ec5c365ce27bf71d577bfca25934e97e6544e19db501d7
 SHA512:
-  metadata.gz: 2599a82810507c798ec4f739707cf3390c0ae15d068d4638cd6f50aab8ebed90affb0f5285f4b14102c308bf5727481dec068459b22ac010fa71347201b86346
-  data.tar.gz: 3ef9941798ebc7328780d6b48bad5280ac4603d9f0eb198919a232e416e4ab706ee4cd79e6a9ec5c79e6c4618bbcb87855d3a4ef2d95b90d9ecb362756ba91d5
+  metadata.gz: e6ebf8007e6bd9e4e22a969e91246d267b7e01df0d68899300b24654f257e0e3bad60c1af7515bcd2e76f656076b8f0da3171aa64156ae0b2ff3d935d0899ba5
+  data.tar.gz: ce1470376799e1572739dde2ea14df4d62a4374afac0a658c632d1e2f447e46bd7db61d6e3c6ac01b9eefb4d2eef16dda085ce52368dd0080c7812b5983b0eae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Deplomat (0.2.13)
+    deplomat (0.2.19)
       colorize
       sys-proctable
 
@@ -10,7 +10,7 @@ GEM
   specs:
     colorize (0.8.1)
     diff-lcs (1.3)
-    ffi (1.12.2)
+    ffi (1.14.1)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -24,16 +24,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    sys-proctable (1.2.2)
+    sys-proctable (1.2.6)
       ffi
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  Deplomat!
   bundler (~> 2.0)
+  deplomat!
   rspec
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/VERSION

@@ -1 +1 @@
-0.2.14
+0.2.19

data/lib/deplomat/directives.rb

@@ -1,6 +1,7 @@
 $partials                   = {}
 $deplomat_tasks             = []
 $deplomat_tasks_callbacks   = {}
+$log_tasks_status           = true
 
 def execute_in(env:)
   yield if $env == env
@@ -26,26 +27,39 @@ def print_to_terminal(message, color: nil, newline: true)
   $stdout.print message
 end
 
+def print_task_status(name, status)
+  print_to_terminal("\n--- #{name} task #{status.upcase}", color: :light_blue, newline: true)
+end
+
 # This wrapper allows us to insert external before/after
 # tasks into every method executed by deplomat.
 # Very useful for the one-time-tasks implementation.
 def add_task(*tasks)
+  tasks.each do |t|
+    init_task_callbacks(t)
+    $deplomat_tasks_callbacks[t][:before] << lambda { print_task_status(t, "started")  }
+    $deplomat_tasks_callbacks[t][:after]  << lambda { print_task_status(t, "finished") }
+  end if $log_tasks_status
   $deplomat_tasks += tasks
 end
 alias :add_tasks :add_task
 
 def before_task(task_name, requisite_number, &block)
-  $deplomat_tasks_callbacks[task_name] ||= {}
-  $deplomat_tasks_callbacks[task_name][:before] ||= []
+  init_task_callbacks(task_name)
   $deplomat_tasks_callbacks[task_name][:before] << lambda { block.call; update_requisite_number!(requisite_number) }
 end
 
 def after_task(task_name, requisite_number, &block)
-  $deplomat_tasks_callbacks[task_name] ||= {}
-  $deplomat_tasks_callbacks[task_name][:after] ||= []
+  init_task_callbacks(task_name)
   $deplomat_tasks_callbacks[task_name][:after] << lambda { block.call; update_requisite_number!(requisite_number) }
 end
 
+def init_task_callbacks(task_name)
+  $deplomat_tasks_callbacks[task_name] ||= {}
+  $deplomat_tasks_callbacks[task_name][:before] ||= []
+  $deplomat_tasks_callbacks[task_name][:after]  ||= []
+end
+
 def execute_tasks!
   $deplomat_tasks.each do |t|
     $deplomat_tasks_callbacks[t][:before].each { |block| block.call } if $deplomat_tasks_callbacks[t] && $deplomat_tasks_callbacks[t][:before]

data/lib/deplomat/local_node.rb

@@ -6,6 +6,14 @@ module Deplomat
       super
     end
 
+    def path_exist?(path)
+      exists = File.exist?(adjusted_path(path))
+      print_to_terminal((exists ? "EXISTS: #{path}" : "NOT FOUND: #{path}"))
+      exists
+    end
+    alias :path_exists? :path_exist?
+    alias :file_exists? :path_exist?
+
   end
 
 end

data/lib/deplomat/node.rb

@@ -2,8 +2,7 @@ module Deplomat
 
   class Node
 
-    attr_accessor :log_to, :raise_exceptions, :logfile, :wrap_in
-    attr_reader   :current_path
+    attr_accessor :log_to, :raise_exceptions, :logfile, :wrap_in, :current_path
     attr_writer   :stdout_lines_to_ignore
 
     def stdout_lines_to_ignore
@@ -14,11 +13,12 @@ module Deplomat
       end.compact
     end
 
-    def initialize(logfile: "#{Dir.pwd}/deplomat.log", log_to: [:stdout], path: nil, raise_exceptions: true)
+    def initialize(logfile: "#{Dir.pwd}/deplomat.log", log_to: [:stdout], path: nil, log_tasks_status: true, raise_exceptions: true)
       @log_to           = log_to
+      @log_tasks_status = log_tasks_status
       @logfile          = logfile
       @raise_exceptions = raise_exceptions
-      @current_path     = path if path_exist?(path)
+      @current_path     = path.sub(/\/+\Z/, '') if !path.nil? && path_exist?(path)
     end
 
     def execute(command, path=@current_path, message: [], stdout_source: :stdout, log_command: true, _raise_exceptions: @raise_exceptions)
@@ -105,29 +105,25 @@ module Deplomat
     alias :mkdir :create_dir
 
     def create_symlink(source, target)
-      execute("ln -s #{source} #{target}")
+      execute("ln -sf #{source} #{target}")
     end
     alias :ln :create_symlink
 
-    def path_exist?(path)
-      execute("[ -e #{path} ]", @current_path, log_command: false, _raise_exceptions: true) && true
-    rescue Deplomat::ExecutionError # returned 1, file doesn't exist
-      false
+    def adjusted_path(path)
+      if !path.match(/\A\/|~\//)
+        path = "#{@current_path}/#{path}".sub("//", "/")
+      end
+      File.absolute_path(path)
     end
-    alias :path_exists? :path_exist?
-    alias :file_exists? :path_exist?
 
     def cd(path)
-      raise Deplomat::NoSuchPathError, path if !path.nil? && !path_exist?(path)
-
-      @current_path = if path =~ /\A[\/~]/ || path.nil?
+      path = adjusted_path(path)
+      raise Deplomat::NoSuchPathError, path unless path_exist?(path)
+      @current_path = if path.match(/\A\/|~\//)
         path
       else
-        File.expand_path("#{@current_path}#{path}")
-      end
-
-      # Making sure we don't end up with double // at the end of the path
-      @current_path = @current_path.chomp("/") + "/"
+        "#{@current_path}/#{path}"
+      end.sub(/\/+\Z/, '')
     end
 
     def git_push(remote="origin", branch="master")
@@ -184,7 +180,7 @@ module Deplomat
           entries_by_date.reverse! if leave[1] == :first
           entries_by_date = entries_by_date[leave[0]..entries_by_date.length]
         end
-        entries_by_date.each { |entry| remove("#{path}#{entry}") } if entries_by_date
+        entries_by_date.each { |entry| remove("#{path}/#{entry}") } if entries_by_date
       end
     end
 

data/lib/deplomat/remote_node.rb

@@ -24,7 +24,7 @@ module Deplomat
       end
       @pids.compact!
       if @pids.empty?
-        raise Deplomat::ExecutionError.new("ERROR: no ssh pid found for\n\t#{first_ssh_command}.\nThis is weird.", color: "red")
+        raise Deplomat::ExecutionError.new("ERROR: no ssh pid found for\n\t#{first_ssh_command}.\nThis is weird.")
       elsif @pids.length > 1
         log("Connected with ssh, host #{host}, but looks like another connection has been opened before...", color: "white")
         log("connection pids: #{@pids.join(", ")}. We'll be closing them all when finished.", color: "white")
@@ -50,6 +50,15 @@ module Deplomat
       super("#{@ssh_command} '#{command}'", nil, message: message, stdout_source: stdout_source, log_command: false, _raise_exceptions: _raise_exceptions)
     end
 
+    def path_exist?(path)
+      path = adjusted_path(path)
+      status = execute("test -f #{path} || test -d #{path}", nil, log_command: true, _raise_exceptions: false)[:status]
+      log((status == 1 ? "NOT FOUND: #{path}" : "EXISTS: #{path}"))
+      status == 0
+    end
+    alias :path_exists? :path_exist?
+    alias :file_exists? :path_exist?
+
     def upload(what, where, except: nil)
       except = "--exclude '#{except}'" if except
       local_execute "rsync -arzve 'ssh #{@port ? "-p #{@port.to_s} " : ""}' #{except} --delete #{what} #{@user}@#{@host}:#{where}", nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deplomat
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.19
 platform: ruby
 authors:
 - romanitup
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2020-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Deplomat