cantemo-portal-agent 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee35911bd6bae5512fa8dbd656bcf191fe548f9
-  data.tar.gz: dcf5c261b9b184b9734c3b0cc9d4e9c996464e98
+  metadata.gz: de359aa5f03562ec1007a7bdb3a9dc0af6362216
+  data.tar.gz: 1fb3d59042129c18561dd1504a9ace1a5508a385
 SHA512:
-  metadata.gz: 0fcf6fe6526c7db201d74242d7d13d897944ab2ff0b0d09bb2adec07e98c3053dabd1abd083b5b4c0f5afc50153ed3dfcdbbf7a2c6c1517d6b43e5c16d293f03
-  data.tar.gz: 28e97981b20cc01ff0c379483d5d52717f9ef07ed7e013c62bcc32cd5b133f592b19b1bd3b5afbc5a8e84e0f460f4557547d2411fe7206f4cd1d725a66567c89
+  metadata.gz: 4a75c0ac6f20dedffbfb5cd7575828ea43ea29c75b1c4fea6f56c029ac4ef89dcd7d740d2b048bb04f3c455ef3420f4b7c16264ac799d7f0d4b6334dda0f87b2
+  data.tar.gz: b793017b7a68087dd13d1a278c9f37ca2cbf77bbf4a29455b9dd7f70f97ac137e4c3304698027c8cb37bb988855ff560f46da54782be700ede429b4750ee10a3

data/lib/cantemo/portal/agent/cli/commands/watch_folders.rb

@@ -9,7 +9,6 @@ require 'pp'
 
 require 'envoi/mam/agent/cli'
 require 'envoi/mam/cantemo/agent'
-# require 'envoi/aspera/watch_service/watch_folder'
 require 'envoi/mam/cantemo/agent/watch_folder_manager'
 
 Envoi::Mam::Agent::CLI::CONFIG_FILE_PATHS.clear
@@ -20,10 +19,6 @@ Envoi::Mam::Agent::CLI::CONFIG_FILE_PATHS.concat [
    '~/.cantemo-portal-agent-config.json',
 ]
 default_config_file_paths = Envoi::Mam::Agent::CLI::CONFIG_FILE_PATHS
-
-# aspera_ascp_paths = Envoi::Mam::Agent::TransferClient::Aspera::ASCP_PATHS
-# default_aspera_ascp_path = aspera_ascp_paths.find { |v| File.exist? v } || aspera_ascp_paths.first
-
 current_command = ARGV.shift
 ARGV << 'run' if ARGV.empty?
 # ARGV << '--help' if ARGV.empty?
@@ -68,13 +63,17 @@ if command
 end
 
 
-daemonize = (daemon_control_command_present && %w(start restart).include?(command)) || args[:daemonize]
+should_daemonize = (daemon_control_command_present && %w(start restart).include?(command)) || args[:daemonize]
 
 # puts "#{__FILE__}:#{__LINE__ } #{args}"
 # next_command = ARGV.shift
 # puts "COMMAND: #{next_command}"
+#
+#
+
+
 
 class Watcher < Envoi::Mam::Cantemo::Agent::WatchFolderManager; end
 # daemonize ? Watcher.run_as_daemon(args, { force: true }) : Watcher.run(args)
 # daemon_control_command_present ? Watcher.run_as_daemon(args) : Watcher.run(args)
-Watcher.run_as_daemon(args)
+Watcher.run_with_process_manager(args)

data/lib/cantemo/portal/agent/version.rb

@@ -1,7 +1,7 @@
 module Cantemo
   module Portal
     class Agent
-      VERSION = '1.2.3'.freeze
+      VERSION = '1.2.4'.freeze
     end
   end
 end

data/lib/envoi/mam/cantemo/agent/cli.rb

@@ -0,0 +1,13 @@
+require 'envoi/mam/agent/cli'
+require 'envoi/mam/cantemo/agent'
+# require 'envoi/aspera/watch_service/watch_folder'
+require 'envoi/mam/cantemo/agent/watch_folder_manager'
+
+Envoi::Mam::Agent::CLI::CONFIG_FILE_PATHS.clear
+Envoi::Mam::Agent::CLI::CONFIG_FILE_PATHS.concat [
+   './cantemo-portal-agent-config.json',
+   '~/cantemo-portal-agent-config.json',
+   './.cantemo-portal-agent-config.json',
+   '~/.cantemo-portal-agent-config.json',
+]
+default_config_file_paths = Envoi::Mam::Agent::CLI::CONFIG_FILE_PATHS

data/lib/envoi/mam/cantemo/agent/watch_folder_manager.rb

@@ -5,6 +5,24 @@ require 'envoi/watch_folder_utility/watch_folder/handler/listen'
 
 module Envoi::Mam::Cantemo
 
+  module OS
+    def OS.windows?
+      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+    end
+
+    def OS.mac?
+      (/darwin/ =~ RUBY_PLATFORM) != nil
+    end
+
+    def OS.unix?
+      !OS.windows?
+    end
+
+    def OS.linux?
+      OS.unix? and not OS.mac?
+    end
+  end
+
   class Agent
 
     class WatchFolderManager
@@ -93,6 +111,9 @@ module Envoi::Mam::Cantemo
 
       # Iterates through watch_folder_defs and populates @watch_folders with watch folders initialized from the watch
       # folder definitions
+      #
+      # Supports both array and hash formats, the hash format will use the key as the mame if the definition doesn't
+      # already have a name set
       def process_watch_folder_defs
         logger.debug { 'Processing watch folder definitions.' }
         if watch_folder_defs.is_a?(Array)
@@ -201,8 +222,7 @@ module Envoi::Mam::Cantemo
 
         stable_files.each do |file|
           next if file.respond_to?(:ignore?) ? file.ignore? : ignored_file_paths.include?(file.path)
-          next if file.processing
-          next if file.processed
+          next if file.processing || file.processed
 
           if includes && !includes.empty?
             should_include = find_in_patterns(includes, file)
@@ -355,18 +375,25 @@ module Envoi::Mam::Cantemo
 
       end
 
-      def self.run_as_daemon(args, options = {})
+      def self.run_with_process_manager(args, options = {})
         # ARGV.unshift 'run' unless %w(start stop restart run zap killall status).include? ARGV.first
-        require 'daemons'
-        proc     = Proc.new { self.run(args) }
-        app_name = 'cantemo-portal-watch-folders'
+        if OS.windows?
+          self.run(args)
+        else
+          require 'daemons'
+          proc     = Proc.new { self.run(args) }
+          app_name = 'cantemo-portal-watch-folders'
 
-        # options[:app_name] = app_name
-        # daemons_run_proc_with_cleanup(options, &proc)
+          # options[:app_name] = app_name
+          # daemons_run_proc_with_cleanup(options, &proc)
 
-        # options[:force] = true
-        Daemons.run_proc(app_name, options, &proc)
+          # options[:force] = true
+          Daemons.run_proc(app_name, options, &proc)
+        end
+      end
 
+      def self.run_in_foreground(args, options = { })
+        self.run(args)
       end
 
     end

data/lib/envoi/watch_folder_utility/watch_folder.rb

@@ -20,7 +20,6 @@ module Envoi
                     :min_stable_time,
                     :poll_interval
 
-
       def initialize(args = { })
         initialize_logger(args)
         @definition = args[:definition].dup
@@ -42,6 +41,8 @@ module Envoi
         @default_agent = args[:default_agent]
         @default_agent_class = args[:default_agent_class] || @default_agent.class
 
+        @last_poll_time = nil
+
         process_agent_defs
         logger.debug { "Watch Folder Initialized. #{Object.__id__}" }
       end
@@ -274,10 +275,8 @@ module Envoi
           agents = agents.map { |k,v| v['name'] ||= k;  v }
         end
         if agent
-          if agent.is_a?(Hash)
-            if agent.keys.length == 1
-              agent = agent.map { |k,v| v['name'] ||= k; v }
-            end
+          if agent.is_a?(Hash) && agent.keys.length == 1
+            agent = agent.map { |k,v| v['name'] ||= k; v }
           end
           agents.concat [*agent]
           watch_folder_def.delete('agent')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cantemo-portal-agent
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asperalm
@@ -168,6 +168,7 @@ files:
 - lib/envoi/mam/agent/version.rb
 - lib/envoi/mam/agent/watch_folder_utility/foreman.rb
 - lib/envoi/mam/cantemo/agent.rb
+- lib/envoi/mam/cantemo/agent/cli.rb
 - lib/envoi/mam/cantemo/agent/watch_folder_handler-working.rb
 - lib/envoi/mam/cantemo/agent/watch_folder_handler_aspera.rb
 - lib/envoi/mam/cantemo/agent/watch_folder_manager.rb