fastlane-plugin-google_sheet_localize 0.3.03 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0e9d2ad57caefd5801f7a24cb4152e61b76309bfc7a1a2b2854c09b5adf6b21
-  data.tar.gz: a7fd0f0f98838de2ba7a657aad4f9a5e87b89b65df040690c3ca37dd9d7a9dbe
+  metadata.gz: 9b5d87c095c7e5ca644cad2b1843e389dc0772a30f10ee213fb21e8d5bb64e14
+  data.tar.gz: d85062c292448a24ca74fce441cb57369a588d30a3581f4929281bf605acbb3f
 SHA512:
-  metadata.gz: 2675ff5f470ee39d74861b6445d9df5ef4176a622269b1196fe33bf936ee586511f63cf45d66b654059718fa4e25fb70f2fe4662634aadb5fd733fdec7992fba
-  data.tar.gz: f237f54b45bc8ea3030f016d88322fd4da030202b17bc3593207432546712140580d078d0a3d559c8307415d8b388fb66dc7d65eae59e550e75fcb1a8b17dbe1
+  metadata.gz: 129d2376d444e9b473a455085a7b1fd58ced4a95820f4a8dd339a3c8e0021e44f505bee4c6cbdfd522200a6033017653230cfd78dded79259a09375d4141221e
+  data.tar.gz: 1130f9c3f659b4b0ad46c7d09745fb002cce7d16b3de2fc78c32e14121d84f57d733e4b8ee2c62e999a5d077149bd57d73a9e2f8342d41378ff5500548e9ca0f

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,12 +189,12 @@ 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']
 
-                values = identifier.dup.split(".")
+                values = identifier.dup.split(/\.|_/)
 
                 constantName = ""
 
@@ -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
@@ -238,24 +240,19 @@ module Fastlane
         if comment.to_s.empty?
           return %Q(
     /**
-    - Example:
-    ````
     #{example}
-    ````
     */
     )
         end
 
       return %Q(
     /**
+    #{example}
+    
     - Sheet comment:
     ````
     #{comment}
     ````
-    - Example:
-    ````
-    #{example}
-    ````
     */
     )
       end
@@ -293,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"]
@@ -304,6 +300,8 @@ module Fastlane
                     text = self.mapInvalidPlaceholder(defaultLanguageText)
                   end
 
+                  if !text.include?("one|")
+
                   matches = text.scan(/%[0-9][sdf]/)
 
                   matches.each { |match|
@@ -334,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")
@@ -344,6 +341,8 @@ module Fastlane
                   text = self.mapInvalidPlaceholder(defaultLanguageText)
                 end
 
+                if !identifier.include?('//') && text.include?("one|")
+
                 text = text.gsub("\n", "|")
 
                 formatIdentifier = identifier.gsub(".", "")
@@ -455,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
 
@@ -479,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]}"
@@ -503,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|")
@@ -583,6 +590,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",
@@ -617,7 +629,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.03"
+    VERSION = "0.3.11"
   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.03
+  version: 0.3.11
 platform: ruby
 authors:
 - Mario Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2021-02-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