fastlane-plugin-google_sheet_localize 0.3.06 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd7e38197a7a899f0babccc4dd007133de1f45a4f75cd8164161b77a380d0be
-  data.tar.gz: 6aae195e79318258190b3a8b1d2dd68977589c771f7a746ecb48e4e04522dd3a
+  metadata.gz: 15c037771e905ef04ad956696cde554c6fde266c3d43c4018e798b4cd2633749
+  data.tar.gz: 1492ff3d8dc8564f847fcd512a5494a28be79d4bb8f255562a3445be77f0e77a
 SHA512:
-  metadata.gz: b3d4cee30ff65e35d313138b8deb8644596dc517d1c2f4517b073506a9cd5e546b082cc3f899fda617188197a29f5fbe05c4395786a48c0fcc8dc6d3dbdbe973
-  data.tar.gz: b1a107ece3531c4ee3ccdb57fec4c108540ea4f14689a1a1d5fa14b083f33621687f4afbc7f284d60301f3c4416c4a4cca55a151602eacefa6947a6cca5cd015
+  metadata.gz: f5807b14f1949f33f7137414086a49e0722b02e381baf0718581b4a0147c3514a7c8d6c89d3086565bc71d1810fd182d722d7d0f389f15a5eeeb9270b14e08c5
+  data.tar.gz: c47ed3818bdfe98c4add9aa6c6c4ee99e09f003b4ad81651941e06ffc6fd15a9ec84e1f9aaf362e8eaa522ec7690bf795a58b406b086e8c7e7b3803faabea3fa

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 class Localization: NSObject {\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("@objc 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
@@ -300,11 +302,7 @@ module Fastlane
 
                   if !text.include?("one|")
 
-                  matches = text.scan(/%[0-9][sdf]/)
-
-                  matches.each { |match|
-                    text = text.gsub(match, "%#{match[1]}$#{match[2].gsub("s","@")}")
-                  }
+                  text = text.gsub("$s","$@").gsub("%s","%@")
 
                   line = "\"#{identifier}\" = \"#{text}\";"
                   if !comment.to_s.empty?
@@ -452,9 +450,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
 
@@ -476,8 +474,8 @@ module Fastlane
         \n})
       end
 
-      def self.createiOSFunction(constantName, identifier, arguments)
-          functionTitle = "@objc 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]}"
@@ -500,6 +498,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|")
@@ -509,30 +515,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]+)?\$?([0-9]+)?.?([0-9]+)?f/)
+        doubleIndexes = self.scan_str(filtered, /%([0-9]+)?\$?([0-9]+)?.?([0-9]+)?ld/)
 
         if stringIndexes.count > 0
-          result = result.concat(stringIndexes.map { |e| { "index": e, "type": "String" }})
+          result = result + 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 + 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 + 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 + doubleIndexes.map { |e| { "index": e[0], "offset": e[1], "type": "Double" }}
         end
 
+        result = result.sort_by { |hsh| hsh[:offset] }
+
         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
@@ -580,6 +596,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",
@@ -614,7 +635,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.06"
+    VERSION = "0.4.0"
   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.06
+  version: 0.4.0
 platform: ruby
 authors:
 - Mario Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2021-03-29 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