deplomat 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66ae898f5e989d5a0d75e1bc1553c4b5fbf0b72985f56d567196b45245a29e34
-  data.tar.gz: 7997c279e5efa60157e363a9f2a364652ab63d9043cdd4776d46518d9e9adc43
+  metadata.gz: 2e9219f57f21ff90282cc86893d24ba465a64d5af5328fa34ea178f1080f8b38
+  data.tar.gz: 690b25723ba53be14fcd54770fdd3b994ddf516e74908d926c3e5cc48e4d856e
 SHA512:
-  metadata.gz: 7e39f88db17fb163497d22f7df5e1852d4400d2cf7cf4fe95e8d17a7adaf79763bfff8d871ba3504f84a43077510fb2d92168c8980e6aba6169349476768d370
-  data.tar.gz: bc9bb50fa861aeedb8e5ca8efdebeefa7b0172beb0a46eca85e4541e35dbe7d8981603918a159bc22a3453b2c38626b78938ac75c8611b0bb5f129cf5cc38090
+  metadata.gz: c24dd2f80073a91de3cb09b2780ff11ddc42e08e96fc3ce0d7d4f851175a1b9665c6f99bfd0a2684c43843fa740961f3e2272b6ade4680091bc787a027724f66
+  data.tar.gz: ec174a32acce4e363e9dfc43f8efb8ca55f82feb93f36469c699630053d826f428b6e0307c38d9584a25509333fb26b9510609738c30903007c091fbb8569502

data/Gemfile

@@ -5,6 +5,5 @@ gem "colorize"
 
 group :development do
   gem "bundler", "~> 1.0"
-  gem "jeweler"
   gem "rspec"
 end

data/Gemfile.lock

@@ -1,71 +1,24 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.4.0)
-    builder (3.2.3)
     colorize (0.8.1)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.25)
-    git (1.4.0)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
-      oauth2 (~> 1.0)
-    hashie (3.5.7)
-    highline (1.7.10)
-    jeweler (2.3.9)
-      builder
-      bundler
-      git (>= 1.2.5)
-      github_api (~> 0.16.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      psych
-      rake
-      rdoc
-      semver2
-    jwt (1.5.6)
-    mime-types (2.99.3)
-    mini_portile2 (2.3.0)
-    multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    psych (3.0.2)
-    rack (2.0.6)
-    rake (12.3.1)
-    rdoc (6.0.4)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    ffi (1.11.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    semver2 (3.4.2)
-    sys-proctable (1.2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    sys-proctable (1.2.1)
       ffi
-    thread_safe (0.3.6)
 
 PLATFORMS
   ruby
@@ -73,9 +26,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   colorize
-  jeweler
   rspec
   sys-proctable
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/deplomat.gemspec

@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "deplomat".freeze
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/deplomat/node.rb

@@ -2,8 +2,17 @@ module Deplomat
 
   class Node
 
-    attr_accessor :log_to, :raise_exceptions, :logfile
+    attr_accessor :log_to, :raise_exceptions, :logfile, :wrap_in
     attr_reader   :current_path
+    attr_writer   :stdout_lines_to_ignore
+
+    def stdout_lines_to_ignore
+      if @stdout_lines_to_ignore.kind_of?(Array)
+        @stdout_lines_to_ignore
+      else
+        [@stdout_lines_to_ignore]
+      end.compact
+    end
 
     def initialize(logfile: "#{Dir.pwd}/deplomat.log", log_to: [:stdout], path: nil, raise_exceptions: true)
       @log_to           = log_to
@@ -14,13 +23,18 @@ module Deplomat
 
     def execute(command, path=@current_path, message: [], stdout_source: :stdout, log_command: true, _raise_exceptions: @raise_exceptions)
 
+      original_command = command
+      if @wrap_in
+        command = @wrap_in.sub("_command_", command)
+      end
+
       message = [message] if message.kind_of?(String)
       log(message[0] + "\n", color: 'white') unless message.empty? || message.nil?
 
       # Respect current_path
-      command_to_log = command
+      command_to_log = original_command
       if path
-        command_to_log = "#{command}\n(in #{path})"
+        command_to_log = "#{original_command}\n(in #{path})"
         command = "cd #{path} && #{command}"
       end
 
@@ -30,12 +44,18 @@ module Deplomat
 
         # Sometimes, programs write in stderr, although there are no errors.
         # rake assets:precompile does that, for example.
-        stdout_source_object = (stdout_source == :stderr ? stderr : stdout) 
+        stdout_source_object = (stdout_source == :stderr ? stderr : stdout)
 
         log("--> " + command_to_log + "\n", color: "white") if log_command
-        while line=stdout_source_object.gets do 
-          out << line
-          log("  #{line}") if log_command
+        stdout_source_object.readlines.each_with_index do |line, i|
+          self.stdout_lines_to_ignore.each do |line_to_ignore|
+            line_to_ignore = line_to_ignore.to_a if line_to_ignore.kind_of?(Range)
+            line_to_ignore = [line_to_ignore]    if line_to_ignore.kind_of?(Integer)
+            unless line_to_ignore.include?(i+1)
+              out << line
+              log("  #{line}") if log_command
+            end
+          end
         end
 
         error_out = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deplomat
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Roman Snitko
@@ -138,8 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Stack agnostic deployment system that uses bash and ssh commands