cantemo-portal-agent 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e171c53876f59041d8c032a5ec5603b5f25a962b
-  data.tar.gz: 19e7b87575175471a9484439aee1d23b8b211491
+  metadata.gz: 4ee35911bd6bae5512fa8dbd656bcf191fe548f9
+  data.tar.gz: dcf5c261b9b184b9734c3b0cc9d4e9c996464e98
 SHA512:
-  metadata.gz: e72d5bfc3ed43872318954bacf30bbc140d2f884bd67419c64fc8568dc2fdd78c628f25a4b95fb942b33494b41d09afaa46ea4798e1b303271337178c966f296
-  data.tar.gz: 1e211ac9951ad604a900068e0b4d85b5d36fcc685660c9288d25855da209cf787145940d87c4673fedfc2b3ca93c72b220c4e4fe526819ed40b8d32d0be62b93
+  metadata.gz: 0fcf6fe6526c7db201d74242d7d13d897944ab2ff0b0d09bb2adec07e98c3053dabd1abd083b5b4c0f5afc50153ed3dfcdbbf7a2c6c1517d6b43e5c16d293f03
+  data.tar.gz: 28e97981b20cc01ff0c379483d5d52717f9ef07ed7e013c62bcc32cd5b133f592b19b1bd3b5afbc5a8e84e0f460f4557547d2411fe7206f4cd1d725a66567c89

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

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

data/lib/cantemo/portal/api/client.rb

@@ -7,7 +7,7 @@ module Cantemo
 
       class Client
 
-        def initialize(args = { })
+        def self.new(args = { })
           api_host               = args[:host]
           api_port               = args[:port]
           api_host_use_ssl       = args[:ssl]

data/lib/envoi/aspera/watch_service/client.rb

@@ -13,7 +13,7 @@ module Envoi
 
         attr_accessor :aswatchadmin_executable_path, :default_username
 
-        DEFAULT_ASWATCHADMIN_EXECUTABLE_PATH = '/Library/Aspera/bin/aswatchadmin'
+        DEFAULT_ASWATCHADMIN_EXECUTABLE_PATH = '/Library/Aspera/bin/d'
 
         DAEMON_NAME_FIELD_NAME          = 'name'
         DAEMON_CONFIGURATION_FIELD_NAME = 'configuration'

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

@@ -44,7 +44,7 @@ module Envoi
           api_config  = agent_config
           @api_client = args[:api_client] || begin
             client_args = Hash[api_config.map { |k,v| [ k.respond_to?(:to_sym) ? k.to_sym.downcase : k, v ]}]
-            _client = Cantemo::Portal::API::Client.new(client_args)
+            _client = ::Cantemo::Portal::API::Client.new(client_args)
 
             begin
               _client.version
@@ -293,8 +293,6 @@ module Envoi
           if item_id
             item_shape_import_response = api_client.item_shape_import(item_id: item_id,
                                                                       tag:     shape_tag, fileId: file_id)
-
-
           else
             import_args = {
                 storage_id:       storage_id,

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

@@ -224,7 +224,8 @@ module Envoi::Mam::Cantemo
               logger.debug { "Maximum number of active processors reached for watch folder. #{wf.name || wf.paths}" }
               next
             end
-            t = Thread.new(wf, file) do |wf, file|
+            t = Thread.new(file) do |file|
+              wf = file.watch_folder
               begin
                 process_file(file)
               rescue => e
@@ -268,7 +269,8 @@ module Envoi::Mam::Cantemo
         # AWF.run(watch_folders) { |wf| process_watch_folder(wf) }
 
         logger.info { 'Running...' }
-        watch_folders.map { |wf| wf.run if wf.respond_to?(:run) }
+        watch_folders.map { |wf| wf.respond_to?(:run) ? wf.run : logger.debug { "Skip run for #{wf}" } }
+        logger.debug { 'Initial Run Complete.' }
         loop do
           begin
             poll

data/lib/envoi/watch_folder_utility/watch_folder.rb

@@ -298,6 +298,10 @@ module Envoi
         !last_poll_time || (Time.now - last_poll_time) >= poll_interval
       end
 
+      def run
+        handler.run if handler.respond_to?(:run)
+      end
+
       def stable_files
         handler.stable_files
       end

data/lib/envoi/watch_folder_utility/watch_folder/handler/listen.rb

@@ -92,7 +92,6 @@ module Envoi
             process_definition(@definition)
             initialize_listener
             logger.debug ( "Watch Folder Handler '#{self.class.name}' Initialized. ")
-            perform_initial_inventory
           end
 
           def initialize_logger(args = { })
@@ -148,17 +147,17 @@ module Envoi
           def initialize_listener(args = { })
             @listener = ::Listen.to(*paths, {}) do |m, a, r|
               if !r.empty?
-                log "#{r.length} file(s) removed."
+                logger.info { "#{r.length} file(s) removed." }
                 lock.synchronize { r.each { |f| process_deleted_path(f) } }
               end
 
               if !m.empty?
-                log "#{m.length} file(s) modified."
+                logger.info { "#{m.length} file(s) modified." }
                 lock.synchronize { process_add_or_modified_path(m, :modified) }
               end
 
               if !a.empty?
-                log "#{a.length} file(s) added."
+                logger.info { "#{a.length} file(s) added." }
                 lock.synchronize { process_add_or_modified_path(a, :added) }
               end
 
@@ -214,8 +213,13 @@ module Envoi
             @known_path_map.select { |p,f| f.stable? }.values
           end
 
+          def run_once(options = { })
+            perform_initial_inventory
+          end
+
           def run(options = { })
             logger.info { "Starting handler for #{paths}" }
+            perform_initial_inventory
             listener.start
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cantemo-portal-agent
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asperalm
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement