fastlane-plugin-google_sheet_localize 0.3.05 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e04803161feae7160efc0cf2a6ede75d3da00289aff36c8e62ab039575ddd9a
-  data.tar.gz: 6b5aca1a35a1aa1c7c6db035db442d863d3c08bcdadfd21a9d132c9f10f82e14
+  metadata.gz: de5986abc705571310d0e2e91484f3ec35664149a0f69822ea56667fa8ce0d19
+  data.tar.gz: 240d6c742cb7b907213ee6ad90cd5017d9dde8f256b61ef3d3d3cfc76a494c3b
 SHA512:
-  metadata.gz: 8ff4552592d4f2786b00bd3ef1d5f7b75772bce584332e34387a47b6b10ffb4075b74ea1da2a8df3f0dc017edbdc8efc1d5ec580b0f7f5611a3a57a6223cd0fa
-  data.tar.gz: bc45ffcc87acafbf00177d91dc4a4aa2bde9fd5c9ee1cdd99c29a7f0b51370ac28538283b5097214c83ec3dc31725a1cb210135939e04e85a216d67441da68b5
+  metadata.gz: 69226f609647ec2bc52c285102a9ef08789fdfdad9835e0d2df2ff00f0a02c20d39c824c8adcf956e172be266cb931d3158cd09e2271a88cd6f0c759220e9002
+  data.tar.gz: 66992848f981c89dbb2f3912dcd0cf2a1a1135186185bccbda194d2a82864a56b277313dd85edb37f9b55e4da22f44bd10b58e41b1fc858385d303b91622b371

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
@@ -452,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
 
@@ -476,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]}"
@@ -500,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|")
@@ -509,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 + 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 +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",
@@ -614,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.05"
+    VERSION = "0.3.13"
   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.05
+  version: 0.3.13
 platform: ruby
 authors:
 - Mario Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2021-03-24 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