navilocal 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 63013a4268bf0f72217ed82bea6c171986343c42
-  data.tar.gz: a11148916ac42fe7034b5587881b689e8dd261ef
+SHA256:
+  metadata.gz: 01acea63a13f94dff965dfb6b9eaf14bece6efd7dc5c281886ba7253bb66b2b8
+  data.tar.gz: 7ba99210a1cac7193d24146e7973cf1b20e5d66627130f2b84dce5a62e706c76
 SHA512:
-  metadata.gz: 64caf8ecc662ab8f626231a24c481b0e28739191aaf76c48dbf325cb9955631d0aba9e2d2224eda02b719793d657b8b870cedb5924fb2a2e7cb1c195224ed671
-  data.tar.gz: e186941a3b4b7fe4de3c153dba7a868ebdb8cd0b8076aa8e9b143bd7aed2c14b78bb6c91b7449cd9b02ce59ac5d36b0102f4f4b6079d3dee7012ee085c16905a
+  metadata.gz: 9deeafa41a93a3ad8bf636cf45ca4fed863c029941adc3f84ca404e427cb48a4affc60e2e70dbbbbba1870de70e1ea26d247cc076f29a19633ad8a236e530c9c
+  data.tar.gz: 3b765eff5404307afd857010f3c623c2f30c50128f6cc2a90ad9fe42d2b7ff4eaa8a5aa66af4dc14ba2fbfb472a8986aa60cf319740fab977493ee28c28ff861

data/application/ui/navi/installer_assistant.rb

@@ -78,7 +78,7 @@ module NaviClientInstaller
 
       resp = @splash.validate_email( @settings.username, @settings.hash)
 
-      if(@settings.hash && resp.code == 200)
+      if(resp && @settings.hash && resp.code == 200)
         @current_window = @runner_window
         @runner_window.set_token resp["access_token"]
         @runner_window.start

data/application/ui/navi/main_runner.rb

@@ -17,7 +17,10 @@ module NaviClientInstaller
       @log_display = builder.get_object("tv_runner_logs")
       @scroll_control = builder.get_object("scrollview_runner_logs")
       @notifier = builder.get_object("label_progress_notifier")
-      @email_indicator = builder.get_object("label-email-indicator")
+      @email_indicator = builder.get_object("label_email_indicator")
+      @spinner_indicator = builder.get_object("spinner_indicator")
+      @stop_btn = builder.get_object("process_stop_btn")
+      @refresh_btn = builder.get_object("process_refresh_btn")
 
       image = builder.get_object("app_logo")
       image.set_from_resource('/com/navi/navi-client/images/navi-logo-small.png')
@@ -35,39 +38,52 @@ module NaviClientInstaller
         adj.set_value( adj.upper - adj.page_size )
       end
 
+      @stop_btn.signal_connect 'clicked' do |button|
+        terminate_worker_thread
+        @logger.debug "Process terminated"
+        button.set_sensitive false
+        @spinner_indicator.active = false
+        @notifier.label = "Terminated.."
+      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.."
+      end
 
-
+      @window_ui.signal_connect("destroy") {|button|
+        terminate_worker_thread
+      }
 
     end
 
 
-
-    def watch_for(file,pattern)
-      f = File.open(file,"r")
-
-      # Since this file exists and is growing, seek to the end of the most recent entry
-      f.seek(0,IO::SEEK_END)
-
-
-      while true
-        select([f])
-        puts "Found it!" unless f.gets.nil?
+    def start
+      @worker_thread = Thread.new do
+        @spinner_indicator.active = true
+        @refresh_btn.sensitive = true
+        @stop_btn.sensitive = true
+        start_fetching
       end
+
     end
 
-    def start
-      Thread.new do
-        starts
-      end
+    def terminate_worker_thread
+      @worker_thread&.terminate if @worker_thread&.alive?
 
     end
 
 
-    def starts
+    def start_fetching
 
       env = "development"
-      @client = NaviClient::Local.new("http://localhost:3008", "local", "https://api2.navihq.com/v2/generate_csv_input", true, env)
+      sso_web_url = "https://signin.navihq.com"
+      gen_csv_url = "https://api2.navihq.com/v2/generate_csv_input"
+
+      @client = NaviClient::Local.new(sso_web_url, "local", gen_csv_url, true, env)
       @client.set_token "Token: #{@token}##{@settings.username}"
       @logger = CustomLogger.new @log_display.buffer, @iter_log, @client.logger
       @client.override_logger @logger
@@ -82,10 +98,7 @@ module NaviClientInstaller
       @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)
-
-
-
+      @imap = @client.imap_connection(@settings.provider, @settings.username, @settings.password, false) if @imap.nil?
 
       if @client.errors.nil?
 
@@ -97,26 +110,23 @@ module NaviClientInstaller
         @client.logToLoggly({event:"EMAIL_SYNC_STARTED", env: env, storage: "local", email: @settings.username})
 
         sendEmailCompletedEvent = true
-        folder = "Test"
-
+        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
+        @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}"
 
-
-
         begin
           start_naviai
           @notifier.label = "Checking for previous failures.."
 
           @client.parse_prev_failed_emails
           @notifier.label = "Fetching emails..."
-          @client.retrieve_emails(imap, ['ALL'], folder) do |mail, index, isLast, id|
+          @client.retrieve_emails(@imap, ['ALL'], folder) do |mail, index, isLast, id|
 
             @logger.debug "processing email##{index + 1} with id #{mail.__id__.to_s} and uuid #{id}"
 
@@ -126,13 +136,13 @@ module NaviClientInstaller
 
             @logger.debug "Processing Complete. OK..."
 
-            if filenames.size == 10 || isLast
+            if filenames.size == 50 || isLast
               sendEmailCompletedEvent = !sendEmailCompletedEvent
 
-              @logger.debug "Sending Bulk Request for #{isLast ? filenames.size : 10} emails to Navi AI."
+              @logger.debug "Sending Bulk Request for #{isLast ? filenames.size : 50} emails to Navi AI."
               @notifier.label = "Parsing the emails..."
 
-              @client.send_request(filenames)
+              p @client.send_request(filenames)
 
               @logger.debug "Complete Ok... continue email sync"
               @notifier.label = "Fetching emails..."
@@ -154,8 +164,6 @@ module NaviClientInstaller
             end
           end
 
-
-
           @logger.debug "All emails sync and parse completed."
 
           @notifier.label = "Finalizing..."
@@ -163,18 +171,17 @@ module NaviClientInstaller
           @client.initate_csv_generation(@settings.username)
 
           @notifier.label = "Waiting for the new emails.."
-          @client.idle_loop(imap, ['UNSEEN'], folder, @settings.provider, @settings.username, @settings.password)
-
-          imap.logout
-          imap.disconnect
-
+          @client.idle_loop(@imap, ['UNSEEN'], folder, @settings.provider, @settings.username, @settings.password)
 
+          @imap.logout
+          @imap.disconnect
 
         rescue => e
+          @imap&.logout
+          @imap&.disconnect
           @logger.debug "#{e.message}"
         end
 
-
       else
         @logger.debug "Failed to connect with your email. Please recheck the configuration."
       end
@@ -211,13 +218,13 @@ class CustomLogger
   end
 
   def info msg
-    p msg
+    # p msg
     @buffer.insert_markup(@iter, "#{msg}\n")
     @logger_custom.info msg
   end
 
   def debug msg
-    p msg
+    # p msg
     @buffer.insert_markup(@iter, "#{msg}\n")
     @logger_custom.debug msg
   end

data/application/ui/navi/navi_install.rb

@@ -217,7 +217,7 @@ module NaviClientInstaller
         if %x(echo $NAVI_PATH).strip.length == 0
           %x(echo "export NAVI_PATH=$HOME/.navi" >> ~/.bashrc)
           %x(echo "export NAVI_ENV=local" >> ~/.bashrc)
-          system("source ~/.bashrc")
+          system("source $HOME/.bashrc")
         end
 
       end

data/application/ui/navi/splash.rb

@@ -32,14 +32,18 @@ module NaviClientInstaller
     end
 
     def validate_email(email, pass)
-      response = HTTParty.post("http://localhost:3008/oauth/token",
-                            body: {
-                                email: email, # get from sso_web application
-                                password: pass,
-                                grant_type: "password"
-                            }
-      )
-      response
+      # need to remove this hardcoded code
+      begin
+        HTTParty.post("https://signin.navihq.com/oauth/token",
+                      body: {
+                          email: email, # get from sso_web application
+                          password: pass,
+                          grant_type: "password"
+                      }
+        )
+      rescue
+        false
+      end
     end
 
     def initiate_signup callback
@@ -65,13 +69,13 @@ module NaviClientInstaller
           @spinner.active = false
           @password_entry.sensitive = true
 
-          if response.code != 200
-            @error_label.set_opacity 1
-          else
+          if response && response.code == 200
             @error_label.set_opacity 0
             @settings.hash = widget.text
             @settings.save_settings
             callback.call response["access_token"]
+          else
+            @error_label.set_opacity 1
           end
         end
       }

data/bin/navilocal

@@ -5,7 +5,8 @@ require 'fileutils'
 
 
 # Require all ruby files in the application folder recursively
-application_root_path = File.expand_path(__dir__).gsub("/bin", "")
+application_root_path = File.expand_path('../', __dir__)
+
 Dir[File.join(application_root_path, '**', 'ui/navi/*.rb')].each { |file| require file }
 Dir[File.join(application_root_path, '**', 'application/models/settings.rb')].each { |file| require file }
 
@@ -14,25 +15,24 @@ Dir[File.join(application_root_path, '**', 'application/models/settings.rb')].ea
 
 resource_bin = File.join(application_root_path, 'gresource.bin')
 
+# the commented block below is required to generate resources folder or update if any changes
 
 # resource_xml = File.join(application_root_path, 'resources', 'gresources.xml')
-# # Build the binary
+# # # Build the binary
 # system("glib-compile-resources",
 #        "--target", resource_bin,
 #        "--sourcedir", File.dirname(resource_xml),
 #        resource_xml)
-
-
-
-resource = Gio::Resource.load(resource_bin)
+#
+#
+#
+# resource = Gio::Resource.load(resource_bin)
 Gio::Resources.register(resource)
 
 at_exit do
-  # Before existing, please remove the binary we prodNced, thanks.
+  # Before existing, please remove the binary we prodNced, thanks. ## only for the development
   # FileUtils.rm_f(resource_bin)
 end
 
-
-
 app = NaviClientInstaller::Application.new
 app.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navilocal
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Msanjib
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,7 @@ files:
 - gresource.bin
 homepage: http://rubygems.org/gems/navilocal
 licenses:
-- MIT
+- NAVI
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Navi Local