tenter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f38e303b6f15e746b96586d2a2a6e0e3ca0a2c4746cef91fec0bb455c03fd934
-  data.tar.gz: 38319bec27ca53fefc5fdb9f011e0607e3d47741df22f8586482615b9971d3aa
+  metadata.gz: 2cec3086122a566c922ffaeeda6e9d086c3dc78cd4900666e6e0ae2edefb15a3
+  data.tar.gz: 9dacc38cf020d66efa977acdbf2dfab90527b926445b5f7aa5e1e57206a7c0b0
 SHA512:
-  metadata.gz: 768b2d4c62fea0a0c2574bfb873ff8c07e7ab1a4fc535a8c32244bf8d8827e728db234aaf13fbe1febe35c6fe9e00a36a44430a19e6ec2485ad898a6927cbd31
-  data.tar.gz: b0281208e5189a643e7bd512f8f3a930e983c5f9f3fd106a41750fea263d54bd3c2eded9d4738802c86f9be647b9dc55364ea29cabf6749d5c109e073a7560bf
+  metadata.gz: b535883fe1cd070d1f8706a895c043db077950bb8e2c0d622e310e026831feed390a79980e5b0d39510c1abbed8f0f3b1072b8c4df0d92d390200724d2396193
+  data.tar.gz: 660effd30f91a6d47745ee803d73b5f0082183c49268aca2bf7fa3cabb52dfd03bef29d683c282d12081ce6c3362ca80a3e6e4b2be319184972f69b616344b0e

data/lib/tenter.rb

@@ -10,7 +10,8 @@ module Tenter
     { doc_root: "/var/www/",
       config_filename: "hooks.yaml",
       command_dir: "commands",
-      log_file: "log/commands.log" }
+      log_file: "log/commands.log",
+      timestamp: true }
   end
 
   def self.reset

data/lib/tenter/helpers.rb

@@ -30,10 +30,15 @@ module Tenter
       msg = "Command not found"
       halt 400, msg unless File.file? command["path"]
 
-      msg = "[#{Time.now}] Initiating: #{command["path"]}\n"
+      ts = Tenter.settings[:timestamp] ? "[#{Time.now}] " : ""
+      msg = ts + "Initiating: #{command["path"]}\n"
       Tenter::Utils.append_to_log command["log"], msg
 
-      pid = command["proc"].call
+      pid = if defined?(Bundler) && Bundler.respond_to?(:with_clean_env)
+              Bundler.with_clean_env { command["proc"].call }
+            else
+              command["proc"].call
+            end
       (ENV["APP_ENV"] != "test") ? Process.detach(pid) : Process.wait(pid)
     end
 

data/lib/tenter/utils.rb

@@ -21,20 +21,23 @@ module Tenter
     end
 
     def self.command(command_name, site_dir)
-      ts = %q{ | xargs -L 1 sh -c 'printf "[%s] %s\n" "$(date +%Y-%m-%d\ %H:%M:%S\ %z )" "$*" ' sh}
+      site_path = File.join(Tenter.settings[:doc_root], site_dir)
       command = {}
-      command["pwd"]  = File.join(Tenter.settings[:doc_root], site_dir)
-      command["path"] = File.join(command["pwd"],
-                                  Tenter.settings[:command_dir],
-                                  command_name)
+      command["dir"]  = File.join(site_path, Tenter.settings[:command_dir])
+      command["path"] = File.join(command["dir"], command_name)
       command["log"]  = unless Tenter.settings[:log_file].nil?
-                          File.join(command["pwd"], Tenter.settings[:log_file])
+                          File.join(site_path, Tenter.settings[:log_file])
                         else
                           "/dev/null"
                         end
       command["proc"] = Proc.new {
-        spawn command["path"] + ts, { :chdir => command["pwd"], 
-                                      :out => [ command["log"], "a" ] }
+        ts = if Tenter.settings[:timestamp]
+               %q{ | xargs -L 1 sh -c 'printf "[%s] %s\n" "$(date +%Y-%m-%d\ %H:%M:%S\ %z )" "$*" ' sh}
+             else
+               ""
+             end
+        spawn command["path"] + ts, { :chdir => command["dir"],
+                                      [ :out, :err ] => [ command["log"], "a" ] }
       }
 
       return command

data/lib/tenter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tenter
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra