navilocal 0.0.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14eebe3430a78024693c96561e48ca9993e940530469310505b107da3c57c793
-  data.tar.gz: 03354ca57e0e15a1f34be7f8f337ef2950e851c87f2390a6b75ddf5f345ace63
+  metadata.gz: 428854cbf081cf3618d3bb45026080cc3b507627288bcbf50922a347d9f88256
+  data.tar.gz: 1f18f7e950fba484d35c38730c4cc21564825b362694e7bb1c2d3993dbeadaa9
 SHA512:
-  metadata.gz: 04c5b3c5f0d9bcb07591e94bacb15215fd56b9eed63a961cdf59332f944d9829d546bf3fa55b307a41b702c9f6dc002842640004d25900fe0bed52d60b1dea36
-  data.tar.gz: 0f6212817566b6cf1afb47fc85689d401ad4e45d772adcefc8db96d84c0f1030bf81f952f1277cdeb3e617a9f02608764dfe16a34e7963dec5cb60050ead8238
+  metadata.gz: 0c889e499760a6e755c0dd8d69687cea89d8648ac6ef1705693038e62fa6c0cc7e8740e111f51ac4cb975acacc5ccee9d7eb03f250b860d842d7e7503dc23e0b
+  data.tar.gz: 19a4a6c6148114d1b4539a76dba44e6ce640e3135e75f3d3a3d7a58791bb95314f6a60e814a67d44d35f9b27a2311744ae2e471e0f40b05e0d3d293ff54294ef

data/application/models/settings.rb

@@ -9,6 +9,11 @@ module NaviClientInstaller
 
     DEFAULT_STORAGE = File.expand_path File.join('~', '.navi')
 
+    SSO_URL = "https://signin.navihq.com"
+    GENERATE_CSV_URL = "https://api2.navihq.com/v2/generate_csv_input"
+
+
+
     attr_accessor *PROPERTIES
 
     def initialize(options = {})

data/application/ui/navi/main_runner.rb

@@ -50,11 +50,7 @@ module NaviClientInstaller
       end
 
       @refresh_btn.signal_connect 'clicked' do |button|
-        terminate_worker_thread
-        @logger.debug "Restarting the process"
-        @stop_btn.set_sensitive true
-        start
-        @notifier.label = "Restarting.."
+        restart_process
       end
 
       @window_ui.signal_connect("destroy") {|button|
@@ -76,16 +72,26 @@ module NaviClientInstaller
 
     def terminate_worker_thread
       stop_naviai
+      @imap&.disconnect unless @imap&.disconnected?
       @worker_thread&.terminate if @worker_thread&.alive?
 
     end
 
+    def restart_process terminate_worker = true
+      terminate_worker_thread if terminate_worker
+      @logger.debug "Restarting the process"
+      @notifier.label = "Restarting.."
+      @stop_btn.set_sensitive true
+      start
+
+    end
+
 
     def start_fetching
 
       env = "development"
-      sso_web_url = "https://signin.navihq.com"
-      gen_csv_url = "https://api2.navihq.com/v2/generate_csv_input"
+      sso_web_url = NaviClientInstaller::Settings::SSO_URL
+      gen_csv_url = NaviClientInstaller::Settings::GENERATE_CSV_URL
 
       @client = NaviClient::Local.new(sso_web_url, "local", gen_csv_url, true, env)
       @client.set_token "Token: #{@token}##{@settings.username}"
@@ -98,34 +104,36 @@ module NaviClientInstaller
         @client.setupLoggly("navi-client")
       end
 
-      @logger.debug "Running the process.. #{@token}"
+      @logger.debug "Running the process.."
       @logger.debug "Connecting to imap server with your local config."
 
       @notifier.label = "Configuring the system.."
-      @imap = @client.imap_connection(@settings.provider, @settings.username, @settings.password, false) if @imap.nil?
+      begin
+
+        @imap = @client.imap_connection(@settings.provider, @settings.username, @settings.password, false)
+
+        if @client.errors.nil?
 
-      if @client.errors.nil?
+          @logger.debug "Complete. OK..."
 
-        @logger.debug "Complete. OK..."
+          filenames = []
+          dateStarted = DateTime.now
+          @logger.debug "Syncing started at #{dateStarted}"
+          @client.logToLoggly({event:"EMAIL_SYNC_STARTED", env: env, storage: "local", email: @settings.username})
 
-        filenames = []
-        dateStarted = DateTime.now
-        @logger.debug "Syncing started at #{dateStarted}"
-        @client.logToLoggly({event:"EMAIL_SYNC_STARTED", env: env, storage: "local", email: @settings.username})
+          sendEmailCompletedEvent = true
+          folder = "Inbox"
 
-        sendEmailCompletedEvent = true
-        folder = "Inbox"
+          #this block of code is repeated. Need to change in navi_client gem for that
+          @imap.examine folder
+          total = @imap.uid_search(['ALL']).size
+          downloaded = @client.getMessageUUIds("#{@settings.download_path}#{@settings.username}/meta/").size
+          downloaded = downloaded - 2 if downloaded > 1
 
-        #this block of code is repeated. Need to change in navi_client gem for that
-        @imap.examine folder
-        total = @imap.uid_search(['ALL']).size
-        downloaded = @client.getMessageUUIds("#{@settings.download_path}#{@settings.username}/meta/").size
-        downloaded = downloaded - 2 if downloaded > 1
+          @email_indicator.label = "#{downloaded}/#{total}"
 
-        @email_indicator.label = "#{downloaded}/#{total}"
 
-        begin
-          # start_naviai
+            # start_naviai
           @notifier.label = "Checking for previous failures.."
 
           start_naviai
@@ -181,15 +189,14 @@ module NaviClientInstaller
           @notifier.label = "Waiting for the new emails.."
           @client.idle_loop(@imap, ['UNSEEN'], folder, @settings.provider, @settings.username, @settings.password)
 
-          @imap.logout
-          @imap.disconnect
 
-        rescue => e
-          @logger.debug "#{e.message}"
-        end
 
-      else
-        @logger.debug "Failed to connect with your email. Please recheck the configuration."
+        else
+          @logger.debug "Failed to connect with your email. Please recheck the configuration."
+        end
+      rescue => e
+        @logger.debug "#{e.message}"
+        restart_process false
       end
 
     end
@@ -204,25 +211,20 @@ module NaviClientInstaller
     end
 
     def start_naviai
+      stop_naviai
       navi_path = NaviClientInstaller::Settings::DEFAULT_STORAGE
-
-      pid = spawn("#{navi_path}/bin/naviai", :out => "#{navi_path}/bin/test.out", :err => "#{navi_path}/bin/test.err")
-
-      File.open("#{navi_path}/bin/naviai_pid.tmp", 'w') { |file| file.write(pid) }
-
-      Process.detach(pid)
+      system("#{navi_path}/bin/naviai &")
+      sleep 1
     end
 
     def stop_naviai
       # kill naviai process
-      navi_path = File.join NaviClientInstaller::Settings::DEFAULT_STORAGE , 'bin', 'naviai_pid.tmp'
+      naviPid =  Integer(%x(lsof -i tcp:9090 | grep naviai | awk {'print $2'})) rescue false
       begin
-        Process.kill('QUIT', File.read(navi_path).to_i) if File.file? navi_path
-      rescue Errno::ESRCH
-        # process exited normally
+        # Process.kill('QUIT', File.read(navi_path).to_i)
+        %x(kill -9 #{naviPid}) if naviPid
       rescue
-      ensure
-        FileUtils.rm_f navi_path
+        @logger.debug "Could not stop navi ai." unless @logger.nil?
       end
     end
 

data/application/ui/navi/splash.rb

@@ -34,7 +34,7 @@ module NaviClientInstaller
     def validate_email(email, pass)
       # need to remove this hardcoded code
       begin
-        HTTParty.post("https://signin.navihq.com/oauth/token",
+        HTTParty.post(NaviClientInstaller::Settings::SSO_URL + "/oauth/token",
                       body: {
                           email: email, # get from sso_web application
                           password: pass,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navilocal
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Msanjib