applocale 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d8869b79798773984196bbfc33f3358f9c52e50
-  data.tar.gz: aaab67885d67212dc783ed7be4560e3549739315
+  metadata.gz: ce3e7bff7b22d23d3c66bb199eae555a63229fe4
+  data.tar.gz: da64526dc0fa94ad7a270145a339b92e8b2a8195
 SHA512:
-  metadata.gz: 0f6ee6f3cde1bcc235fb7cb6eefb042ad54bdb711921212f925e0f7ac978bd6066110d031b5da420ea486438dc173046b66128f3dd8d782b5941a113a93703e7
-  data.tar.gz: 81d2a69a19d328b2b9568783d9ce436d491eb4bdf25930febebc054795dd4efb7a809736ec20779e2eeda8f273730549ec7871f1dadeae73c9c11707a7dd0cf8
+  metadata.gz: 1a72c2970c189ee0ac9784d5a8bb1db62011e2459ae89ca2ef77f1815a9d8e220a465cc2de5067a8fccb047428a28adc76b0f46a61d5c573a01038238a0ce6dd
+  data.tar.gz: fbd7a924f29f4b22f18a954557380342f81ac167eebc20fa78f72f2c82bdad0df4b3297b0f0e12e41af43ee9adf943abfe35670a0fd54492871f15a29a8d7b24

data/lib/applocale/Command/init.rb

@@ -5,6 +5,7 @@ require File.expand_path('../../Core/setting.rb', __FILE__)
 require File.expand_path('../../Core/init.rb', __FILE__)
 require File.expand_path('../../Core/ParserStringFile/parse_localized_resource.rb', __FILE__)
 require File.expand_path('../../version', __FILE__)
+require File.expand_path('../../Core/GoogleHepler/google_helper', __FILE__)
 
 require 'thor'
 
@@ -58,6 +59,10 @@ module Applocale
         puts Applocale::VERSION
       end
 
+      desc "google_logout", "logout google account"
+      def google_logout()
+        GoogleHelper.reset_loginacc
+      end
     end
   end
 end

data/lib/applocale/Core/GoogleHepler/google_helper.rb

@@ -27,13 +27,20 @@ module Applocale
       end
     end
 
+    def self.reset_loginacc
+      if File.exist? CREDENTIALS_PATH
+        File.delete(CREDENTIALS_PATH)
+      end
+      puts "Account Reseted!"
+    end
+
     def self.download_spreadsheet(spreadsheet_Id, filename)
       puts "Start download from google, fileId: #{spreadsheet_Id} ...".green
       service = Google::Apis::DriveV3::DriveService.new
       service.client_options.application_name = APPLICATION_NAME
       service.authorization = self.authorize
       begin
-        content = service.export_file(spreadsheet_Id,
+        service.export_file(spreadsheet_Id,
                                       'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
                                       download_dest: filename)
         if File.exist? filename
@@ -41,12 +48,39 @@ module Applocale
         else
           ErrorUtil::DownloadFromGoogleFail.new.raise
         end
+      rescue Google::Apis::AuthorizationError => e
+        self.failauth(spreadsheet_Id, filename)
+      rescue Google::Apis::ClientError => e
+        self.failauth(spreadsheet_Id, filename)
+      rescue Google::Apis::ServerError => e
+        self.failauth( spreadsheet_Id, filename)
       rescue
         ErrorUtil::DownloadFromGoogleFail.new.raise
       end
     end
 
+    def self.failauth(spreadsheet_Id, filename)
+      ErrorUtil::DownloadFromGoogleFail.new.to_warn
+      self.askfor_relogin(true, spreadsheet_Id, filename)
+    end
+
     private
+    def self.askfor_relogin(is_firsttime, spreadsheet_Id, filename)
+      unless is_firsttime
+        puts "Invalid Command. Please input [Y/N]".red
+      end
+      puts "login again? [Y/N]".red
+      code = STDIN.gets.chomp.downcase
+      if code == 'y'
+        self.reset_loginacc
+        self.download_spreadsheet(spreadsheet_Id, filename)
+      elsif code == 'n'
+        exit(0)
+      else
+        self.askfor_relogin(false, spreadsheet_Id, filename)
+      end
+    end
+
     def self.authorize
 
       FileUtils.mkdir_p(File.dirname(CREDENTIALS_PATH))

data/lib/applocale/Core/ParseXLSX/parse_xlsx.rb

@@ -121,7 +121,7 @@ module Applocale
       if cell_value.nil?
         return ''
       else
-        return ContentUtil.add_escaped_double_quote(cell_value)
+        return ContentUtil.from_excel(cell_value)
       end
     end
 

data/lib/applocale/Util/regex_util.rb

@@ -4,7 +4,7 @@ require File.expand_path('../platform.rb', __FILE__)
 
 module Applocale
   class ValidKey
-    REGEX_KEYSTR_IOS = /\A[0-9a-zA-Z_]+\z/
+    REGEX_KEYSTR_IOS = /\A[0-9a-zA-Z_\/]+\z/
 
     def self.is_validkey(platfrom, key)
       return false if key.nil?
@@ -78,6 +78,16 @@ module Applocale
       return new_value
     end
 
+    def self.from_excel(content)
+      reg = /(?<!\\)((?:\\{2})+)*\\"/
+      new_value = content.gsub(reg) {|match|
+        match.slice!(0)
+        match
+      }
+      new_value = new_value.gsub(/\n/, "\\n")
+      new_value = new_value.gsub(/\t/, "\\t")
+      return new_value
+    end
   end
 end
 

data/lib/applocale/version.rb

@@ -1,3 +1,3 @@
 module Applocale
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: applocale
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kennix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler