fastlane-plugin-google_sheet_localize 0.3.04 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e212c4364acd3ce209bcb89e3bf988c1dcc4b0fccd984a02b3c8daf2d1a3f4bd
-  data.tar.gz: ef896141f5fd95cc775f511dc7904a5ba3d8f858c56431c281f213897ccd8cff
+  metadata.gz: 9fced4de18f8a5080a5434880e0cfaf1a913b94ce99fa0cf616d4c3aef17841e
+  data.tar.gz: a31f53557155e56132a9591069c9f145deeadcb43cb1c1de26c21b577c832dc0
 SHA512:
-  metadata.gz: 0eb92e7d0ef452b6ad3f522b86cb5adafc6877e7b304059ad0e7826a6675056e4af4e4210b64245c591c8b21f51d8fb695401790d5b424b8a4dc6ea196f8d0d8
-  data.tar.gz: 0ae0c1f89d48a4317c1c5bc84bba7ed21b90aae48d6c50a714fb01bd2020abc13f1bf01a611dbfc9d433422c77129d74721421e8a733205bf7f4d51280dd9bff
+  metadata.gz: 20e49808b8a3c5a3ea3570ce9d87d833ea4d152136e8c792d1571d1a61b227051d9d046e1db533ad1a3968fb09b292ab7cf05ea973e42edf848c556e26081e60
+  data.tar.gz: 403dc72598654501cd42e7acca89a98e7d6963513c03cbd5b5d79e542163b9cfff0df5aaa39e4ced4163656cc81508a45a4120ece9237746109e4b117602e876

data/README.md

@@ -41,6 +41,11 @@ other|%d artists
 #### String Array: (Android)
 ["Monday", "Tuesday", "Wednesday"]
 
+## iOS specifics
+
+In order to support Objective-C, the plugin provides the `support_objc` argument, which is default `false`.  
+Therefore, if you need Objective-C support pass `support_objc: true`.
+
 ## Example
 
 ```ruby

data/lib/fastlane/plugin/google_sheet_localize/actions/google_sheet_localize_action.rb

@@ -20,6 +20,8 @@ module Fastlane
         code_generation_path = params[:code_generation_path]
         identifier_name = params[:identifier_name]
         comment_example_language = params[:comment_example_language]
+        support_objc = params[:support_objc]
+        support_spm = params[:support_spm]
 
         if identifier_name.to_s.empty?
           if platform == "ios"
@@ -85,7 +87,7 @@ module Fastlane
             end
           end
       }
-      self.createFiles(result, platform, path, default_language, base_language, code_generation_path, comment_example_language)
+      self.createFiles(result, platform, path, default_language, base_language, code_generation_path, comment_example_language, support_objc, support_spm)
       end
 
       def self.generateJSONObject(contentRows, index, identifierIndex)
@@ -131,7 +133,7 @@ module Fastlane
         }
       end
 
-      def self.createFiles(languages, platform, destinationPath, defaultLanguage, base_language, codeGenerationPath, comment_example_language)
+      def self.createFiles(languages, platform, destinationPath, defaultLanguage, base_language, codeGenerationPath, comment_example_language, support_objc, support_spm)
           self.createFilesForLanguages(languages, platform, destinationPath, defaultLanguage, base_language)
 
           if platform == "web"
@@ -187,7 +189,7 @@ module Fastlane
             swiftFilepath = "#{swiftPath}/#{swiftFilename}"
 
             File.open(swiftFilepath, "w") do |f|
-              f.write("import Foundation\n\n// swiftlint:disable all\npublic struct Localization {\n")
+              f.write("import Foundation\n\n// swiftlint:disable all\n#{getiOSTypeDefinition(support_objc)} {\n")
               filteredItems.each { |item|
 
                 identifier = item['identifier']
@@ -220,14 +222,14 @@ module Fastlane
 
                 if arguments.count == 0
                   f.write(self.createComment(item['comment'], item['text']))
-                  f.write("public static let #{constantName} = localized(identifier: \"#{identifier}\")\n")
+                  f.write("#{getiOSAttributes(support_objc)}public static let #{constantName} = localized(identifier: \"#{identifier}\")\n")
                 else
                   f.write(self.createComment(item['comment'], item['text']))
-                  f.write(self.createiOSFunction(constantName, identifier, arguments))
+                  f.write(self.createiOSFunction(constantName, identifier, arguments, support_objc))
                 end
               }
               f.write("\n}")
-              f.write(self.createiOSFileEndString(destinationPath))
+              f.write(self.createiOSFileEndString(destinationPath, support_spm))
             end
 
           end
@@ -288,7 +290,6 @@ module Fastlane
                 line = "\n\n#{identifier}\n"
               else
 
-                if !text.include?("one|")
 
                   if (text == "" || text == "TBD") && !defaultLanguage.to_s.empty?
                     default_language_object = languages.select { |languageItem| languageItem['language'] == defaultLanguage }.first["items"]
@@ -299,6 +300,8 @@ module Fastlane
                     text = self.mapInvalidPlaceholder(defaultLanguageText)
                   end
 
+                  if !text.include?("one|")
+
                   matches = text.scan(/%[0-9][sdf]/)
 
                   matches.each { |match|
@@ -329,7 +332,6 @@ module Fastlane
               text = self.mapInvalidPlaceholder(item['text'])
               identifier = item['identifier']
 
-              if !identifier.include?('//') && text.include?("one|")
                 if (text == "" || text == "TBD") && !defaultLanguage.to_s.empty?
                   default_language_object = languages.select { |languageItem| languageItem['language'] == defaultLanguage }.first["items"]
                   default_language_object = self.filterUnusedRows(default_language_object,'identifier', "false")
@@ -339,6 +341,8 @@ module Fastlane
                   text = self.mapInvalidPlaceholder(defaultLanguageText)
                 end
 
+                if !identifier.include?('//') && text.include?("one|")
+
                 text = text.gsub("\n", "|")
 
                 formatIdentifier = identifier.gsub(".", "")
@@ -450,9 +454,9 @@ module Fastlane
         }
       end
 
-      def self.createiOSFileEndString(destinationPath)
+      def self.createiOSFileEndString(destinationPath, support_spm)
 
-        bundle = "let bundle = Bundle(for: LocalizationHelper.self)"
+        bundle = support_spm ? "let bundle = Bundle.module" : "let bundle = Bundle(for: LocalizationHelper.self)"
 
         puts destinationPath
 
@@ -474,8 +478,8 @@ module Fastlane
         \n})
       end
 
-      def self.createiOSFunction(constantName, identifier, arguments)
-          functionTitle = "public static func #{constantName}("
+      def self.createiOSFunction(constantName, identifier, arguments, support_objc)
+          functionTitle = "#{getiOSAttributes(support_objc)}public static func #{constantName}("
 
           arguments.each_with_index do |item, index|
             functionTitle = functionTitle + "_ arg#{index}: #{item[:type]}"
@@ -498,6 +502,14 @@ module Fastlane
           return functionTitle
       end
 
+      def self.getiOSTypeDefinition(support_objc)
+        return support_objc ? "public class Localization: NSObject" : "public struct Localization"
+      end
+
+      def self.getiOSAttributes(support_objc)
+        return support_objc ? "@objc " : ""
+      end
+
       def self.findArgumentsInText(text)
 
         if text.include?("one|")
@@ -507,30 +519,40 @@ module Fastlane
         result = Array.new
         filtered = self.mapInvalidPlaceholder(text)
 
-        stringIndexes = filtered.scan(/%[0-9]?[s@]/)
-        intIndexes = filtered.scan(/%[0-9]?[d]/)
-        floatIndexes = filtered.scan(/%[0-9]?[f]/)
-        doubleIndexes = filtered.scan(/%[0-9]?ld/)
+        stringIndexes = self.scan_str(filtered, /%[0-9]?[s@]/)
+        intIndexes = self.scan_str(filtered, /%[0-9]?[d]/)
+        floatIndexes = self.scan_str(filtered, /%[0-9]?[f]/)
+        doubleIndexes = self.scan_str(filtered, /%[0-9]?ld/)
 
         if stringIndexes.count > 0
-          result = result.concat(stringIndexes.map { |e| { "index": e, "type": "String" }})
+          result = result.concat(stringIndexes.map { |e| { "index": e[0], "offset": e[1], "type": "String" }})
         end
 
         if intIndexes.count > 0
-          result = result.concat(intIndexes.map { |e| { "index": e, "type": "Int" }})
+          result = result.concat(intIndexes.map { |e| { "index": e[0], "offset": e[1], "type": "Int" }})
         end
 
         if floatIndexes.count > 0
-          result = result.concat(floatIndexes.map { |e| { "index": e, "type": "Float" }})
+          result = result.concat(floatIndexes.map { |e| { "index": e[0], "offset": e[1], "type": "Float" }})
         end
 
         if doubleIndexes.count > 0
-          result = result.concat(doubleIndexes.map { |e| { "index": e, "type": "Double" }})
+          result = result.concat(doubleIndexes.map { |e| { "index": e[0], "offset": e[1], "type": "Double" }})
         end
 
+        result = result.sort_by! { |k| k["offset"] }.reverse!
+
         return result
       end
 
+      def self.scan_str(str, pattern)
+        res = []
+        (0..str.length).each do |i|
+          res << [Regexp.last_match.to_s, i] if str[i..-1] =~ /^#{pattern}/
+        end
+        res
+      end
+
       def self.mapInvalidPlaceholder(text)
         filtered = text.gsub('%s', '%@').gsub('"', '\"')
         return filtered
@@ -578,6 +600,11 @@ module Fastlane
                                default_value: [],
                                   optional: true,
                                       type: Array),
+          FastlaneCore::ConfigItem.new(key: :support_spm,
+                                  env_name: "SUPPORT_SPM",
+                               description: "Is Swift Package",
+                             default_value: false,
+                                      type: Boolean),
           FastlaneCore::ConfigItem.new(key: :language_titles,
                                   env_name: "LANGUAGE_TITLES",
                                description: "Alle language titles",
@@ -612,7 +639,12 @@ module Fastlane
                                   env_name: "CODEGENERATIONPATH",
                                description: "Code generation path for the Swift file",
                                   optional: true,
-                                      type: String)
+                                      type: String),
+          FastlaneCore::ConfigItem.new(key: :support_objc,
+                                  env_name: "OBJC_SUPPORT",
+                               description: "Whether the generated code should support Obj-C. Only relevant for the ios platform",
+                                      type: Boolean,
+                             default_value: false)
         ]
       end
 

data/lib/fastlane/plugin/google_sheet_localize/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module GoogleSheetLocalize
-    VERSION = "0.3.04"
+    VERSION = "0.3.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-google_sheet_localize
 version: !ruby/object:Gem::Version
-  version: 0.3.04
+  version: 0.3.12
 platform: ruby
 authors:
 - Mario Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -181,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Creates .strings files for iOS and strings.xml files for Android