navi_client 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed77b0572dbd2f2b752cf59de9d5ddb24681efd4363abf6969aefc6e2dff391
-  data.tar.gz: 0677d7a8a9810b437973d38fe4eb8f2b55e87e508fba87adcd409dc5fb1df84f
+  metadata.gz: b8c3281c7fe9cefc025a5f027e1628704c3e3f48ad3e44d9d78145f44811af9b
+  data.tar.gz: 363af32e8f32120620fe5997c045c11960cdb526ca1c840cb9ef644b21868176
 SHA512:
-  metadata.gz: c5545b9a4c0f5a08b2d9a6d0af26e5f0fcc947fa0bb415134aec4e53ac1876474da049eab748281594871ee166bc00ce14d9523dfe3fbac5cb60a1f3de56958b
-  data.tar.gz: 97bd3be83071a1751a3cf1c9a9a83ae4689d6ff7d77f594e34fbd1e9ddef47c2aef6c31d9ab5ed4f93201eaf68dff9c326b2fe9b3427c336c36fc82c0c9a64f9
+  metadata.gz: 45d8b5a96116df63b3752d3fb2ac6d37e2a4fb294519f991c554d21c3d3e62b258ea33289412d59ccc512ff10f88cf5d2eb7f7f737fce1b1bc0b860349d1f71b
+  data.tar.gz: dcb3be86e1b65c41da9e11bcfe1cabb73a518611fd22c62ddf0079ebea4c2573639d3db2af2dc2a2f3a4d3a06c52ee8bdcc3615a78343f4fcb302feb8f453e21

data/lib/client.rb

@@ -81,7 +81,8 @@ module Client
     message_ids = imap.uid_search(search_condition)
 
     meta_dir = @download_path + 'meta/'
-    message_ids_saved = File.directory?(meta_dir) ? (Dir.entries meta_dir).map { |i| i.split("_").first.to_i } : []
+
+    message_ids_saved = getMessageUUIds(meta_dir)
 
     message_ids = message_ids - message_ids_saved
 
@@ -113,7 +114,12 @@ module Client
           end
         end
       rescue => e
-        logger.info "Issue processing email for uuid ##{message_id}, #{e.message}"
+
+        unless logger.nil?
+          logger.info "Issue processing email for uuid ##{message_id}, #{e.message}"
+        end
+
+        logToLoggly({event:"EMAIL_SYNC_FAILED", env: @env, storage: @client_type, email: @current_user_email, uuid: message_id, error: e.message})
       end
     end
   end
@@ -216,7 +222,7 @@ module Client
       end
 
     else
-      if @debug
+      if @debug && !@logger.nil?
         @logger.info "Logging to Loggly disabled"
         @logger.info messageBody
       end

data/lib/cloud/navi_cloud_client.rb

@@ -13,7 +13,7 @@ module NaviClient
 
     attr_reader :id
 
-    def initialize(sso_web_url = "http://localhost:3008/")
+    def initialize(sso_web_url = "http://localhost:3008/", env = "development")
       super()
 
       # client-id used to track the process
@@ -41,6 +41,7 @@ module NaviClient
 
       # set email_address of current_user for s3 folder name
       @current_user_email = nil
+      @env = env
     end
 
     def override_logger(logger)
@@ -117,6 +118,21 @@ module NaviClient
       return ""
     end
 
+    def s3_resource_files(bucket_name, prefix)
+      files = []
+      credentials = Aws::Credentials.new(config[:aws_key], config[:aws_secret])
+      s3 = Aws::S3::Resource.new(credentials: credentials, region: config[:aws_region])
+      s3.bucket(bucket_name).objects(prefix: prefix).each do |obj|
+        files << obj.key
+      end
+      return files
+    end
+
+    def getMessageUUIds(prefix)
+      files = s3_resource_files(config[:s3_bucket], prefix)
+      files.empty? ? [] : files.map { |i| i.empty? ? 0 : i.split('/').last.split("_").first.to_i }
+    end
+
     def config
       YAML.load_file(Rails.root.join("config/navi_client.yml")).with_indifferent_access
     end

data/lib/local/navi_local_client.rb

@@ -10,7 +10,7 @@ module NaviClient
     include Client
     CONFIG_PATH = File.join(ENV['HOME'], '/.navi/config.yml')
 
-    def initialize(sso_web_url = 'http://localhost:3008', client_type = "local", gen_csv_url = "http://localhost:3020/v2/generate_csv_input", debug = true)
+    def initialize(sso_web_url = 'http://localhost:3008', client_type = "local", gen_csv_url = "http://localhost:3020/v2/generate_csv_input", debug = true, env = "development")
       # flag to print Ruby library debug info (very detailed)
       @net_imap_debug = false
 
@@ -30,10 +30,12 @@ module NaviClient
       @token = nil
 
       @download_path = config['download_path'] + config['username'] + '/'
+      @current_user_email = config['username']
 
       # client_type
       @client_type = client_type
       @gen_csv_url = gen_csv_url
+      @env = env
     end
 
     #
@@ -185,6 +187,10 @@ module NaviClient
       return aes_key_path, iv_path
     end
 
+    def getMessageUUIds(path)
+      File.directory?(path) ? (Dir.entries path).map { |i| i.split("_").first.to_i } : []
+    end
+
     def update_config(data)
       File.write(CONFIG_PATH, YAML.dump(data))
     end

data/lib/navi_client/version.rb

@@ -1,3 +1,3 @@
 module NaviClient
-  VERSION = "1.3.8"
+  VERSION = "1.3.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navi_client
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Sujit
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler