deplomat 0.2.13 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06ea7373755469a175c961d68e8968cbcb183d44a938b50da8f87314a3032318
-  data.tar.gz: 6947ac82c80f4f4bc702a21c9d5aa76ba6e03f243376619d266e8771519a74b8
+  metadata.gz: 5be39a71be9b135b2a5bd233ce808833deb860517af15ae03bb6723c13fd5e35
+  data.tar.gz: 95e328842dce669a4a8845d562eaa2cb8b8fb2e4cdda52f5c7fd5a818a99c235
 SHA512:
-  metadata.gz: 757c22b3acfcca212194f2f7d7b2fd0b4f52751d328d88d995517acd85be43404319e8b735fd16dffcf433c2faebeaaf0e1ad41b5247f90a5ded36dd5163880e
-  data.tar.gz: 077f00f699e37215daaf96dba5fd2a1c7666697d0f3e9448cf96d095295817d74e54bc050cb1217c73f890d4c6c01029ccc2fdebe208e9db8188514d45549832
+  metadata.gz: deb7c22ca7382f2376d3f0fbec59f6527514f631d4d6cf685551e2ac2f1dde028faf9949972bf302b444eed2d93f24ce070e6080fed5fd1228e19830da2c574c
+  data.tar.gz: 45f7bac07247125eb476a8b1355e869882c4822b4e8fcaf4ed6097689f0f9766e7e39024d3ec7c000757d4d63fc45853036ee10ec0efb55b25eb64b4dc594001

data/Gemfile

@@ -1,9 +1,3 @@
 source "http://rubygems.org"
 
-gem "sys-proctable"
-gem "colorize"
-
-group :development do
-  gem "bundler", "~> 2.0"
-  gem "rspec"
-end
+gemspec

data/Gemfile.lock

@@ -1,9 +1,16 @@
+PATH
+  remote: .
+  specs:
+    deplomat (0.2.18)
+      colorize
+      sys-proctable
+
 GEM
   remote: http://rubygems.org/
   specs:
     colorize (0.8.1)
     diff-lcs (1.3)
-    ffi (1.11.1)
+    ffi (1.14.1)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -17,7 +24,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    sys-proctable (1.2.1)
+    sys-proctable (1.2.6)
       ffi
 
 PLATFORMS
@@ -25,9 +32,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  colorize
+  deplomat!
   rspec
-  sys-proctable
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.18

data/deplomat.gemspec

@@ -16,4 +16,10 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.require_paths = ["lib"]
+
+  spec.add_dependency "colorize"
+  spec.add_dependency "sys-proctable"
+
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rspec"
 end

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/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)
@@ -123,11 +123,11 @@ module Deplomat
       @current_path = if path =~ /\A[\/~]/ || path.nil?
         path
       else
-        File.expand_path("#{@current_path}#{path}")
+        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("/") + "/"
+      # Remove / from the end of the current path
+      @current_path.sub!(/\/+\Z/, '')
     end
 
     def git_push(remote="origin", branch="master")
@@ -184,7 +184,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 Error.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")

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: deplomat
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.18
 platform: ruby
 authors:
 - romanitup
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
-dependencies: []
+date: 2020-12-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Stack agnostic deployment system that uses bash and ssh commands
 email: 
 executables: []
@@ -53,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Deplomat