fastlane-plugin-google_sheet_localize 0.2.10 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01c89ddd217a7a4ba1c0691f22fe7c2b663cbce770e0290e7876c1432b29dc4
-  data.tar.gz: c2cbabd869492a13b0f992efa6e331afad18a028d25de0138f865b6fcdb29ba4
+  metadata.gz: 7226e41700dadff517f0fbb7d0963ee8ee5bf72f27f5c44b983b4bf9d537e058
+  data.tar.gz: 9585d8c9e5ddc5c6ee25687f979a9505b93bd9f0eeb5a44e99823e628ad6f96a
 SHA512:
-  metadata.gz: 2c1cc4ad3ae80886de16f725bed0e29b4e759eedb156e4c4bbd585dc725add3fd3970707487833c2d603b63bf1c08b4193788f3ecaf2371b87b4f13ef1c603f3
-  data.tar.gz: 76ef7846e7691259f59712a4969392c301fcf7ae05df8f264aba415d21f91862cb62c0338906fd45b0a0b5c8b9cd6989a7e0280221ce4d6db403a87c56604657
+  metadata.gz: 32085198f4d2c22cd773f62c65fa11eb9e1cbe3fedbabdfb1925f798b47610eec039e9b6b7268e632e7a21ae0bba82ea7bc1f425927c084ab3c5cbfac24058d2
+  data.tar.gz: 38cf66f5caf4123ad4dfccc74049929cf2baed2f1f805c394094348ba3a7a5401b808cbe0a55ee2a6539ab2dc306e2dffdec1880e745831e7463cc04983a28cb

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

@@ -19,6 +19,7 @@ module Fastlane
         base_language = params[:base_language]
         code_generation_path = params[:code_generation_path]
         identifier_name = params[:identifier_name]
+        comment_example_language = params[:comment_example_language]
 
         if identifier_name.to_s.empty?
           if platform == "ios"
@@ -32,6 +33,10 @@ module Fastlane
           end
         end
 
+        if comment_example_language.to_s.empty?
+          comment_example_language = default_language
+        end
+
         spreadsheet = session.spreadsheet_by_url(spreadsheet_id)
 
         filterdWorksheets = []
@@ -80,7 +85,7 @@ module Fastlane
             end
           end
       }
-      self.createFiles(result, platform, path, default_language, base_language, code_generation_path)
+      self.createFiles(result, platform, path, default_language, base_language, code_generation_path, comment_example_language)
       end
 
       def self.generateJSONObject(contentRows, index, identifierIndex)
@@ -126,7 +131,7 @@ module Fastlane
         }
       end
 
-      def self.createFiles(languages, platform, destinationPath, defaultLanguage, base_language, codeGenerationPath)
+      def self.createFiles(languages, platform, destinationPath, defaultLanguage, base_language, codeGenerationPath, comment_example_language)
           self.createFilesForLanguages(languages, platform, destinationPath, defaultLanguage, base_language)
 
           if platform == "web"
@@ -175,7 +180,9 @@ module Fastlane
               swiftPath = destinationPath
             end
 
-            filteredItems = self.filterUnusedRows(languages[0]["items"],'identifier', "true")
+            languageItems = languages.select { |item| item["language"] == comment_example_language }.first
+
+            filteredItems = self.filterUnusedRows(languageItems["items"],'identifier', "true")
 
             swiftFilepath = "#{swiftPath}/#{swiftFilename}"
 
@@ -212,18 +219,47 @@ module Fastlane
                 arguments = self.findArgumentsInText(text)
 
                 if arguments.count == 0
-                  f.write("\n\t///Sheet comment: #{item['comment']}\n\tpublic static let #{constantName} = localized(identifier: \"#{identifier}\")\n")
+                  f.write(self.createComment(item['comment'], item['text']))
+                  f.write("public static let #{constantName} = localized(identifier: \"#{identifier}\")\n")
                 else
-                  f.write(self.createiOSFunction(constantName, identifier, arguments, item['comment']))
+                  f.write(self.createComment(item['comment'], item['text']))
+                  f.write(self.createiOSFunction(constantName, identifier, arguments))
                 end
               }
               f.write("\n}")
-              f.write(self.createiOSFileEndString())
+              f.write(self.createiOSFileEndString(destinationPath))
             end
 
           end
       end
 
+      def self.createComment(comment, example) 
+
+        if comment.to_s.empty?
+          return %Q(
+    /**
+    - Example:
+    ````
+    #{example}
+    ````
+    */
+    )
+        end
+
+      return %Q(
+    /**
+    - Sheet comment:
+    ````
+    #{comment}
+    ````
+    - Example:
+    ````
+    #{example}
+    ````
+    */
+    )
+      end
+
       def self.createFilesForLanguages(languages, platform, destinationPath, defaultLanguage, base_language)
 
         languages.each { |language|
@@ -382,30 +418,30 @@ module Fastlane
 
                 text = text.gsub("\n", "|")
 
-                line = line + "\t<plurals name=\"#{identifier}\">\n"
+                line = line + "    <plurals name=\"#{identifier}\">\n"
 
                 plural = ""
 
                 text.split("|").each_with_index { |word, wordIndex|
                   if wordIndex % 2 == 0
-                    plural = "\t\t<item quantity=\"#{word}\">"
+                    plural = "        <item quantity=\"#{word}\">"
                   else
                     plural = plural + "<![CDATA[#{word}]]></item>\n"
                     line = line + plural
                   end
                 }
-                line = line + "\t</plurals>\n"
+                line = line + "    </plurals>\n"
               elsif text.start_with?("[\"") && text.end_with?("\"]")
 
-                line = line + "\t<string-array name=\"#{identifier}\">\n"
+                line = line + "    <string-array name=\"#{identifier}\">\n"
 
                 JSON.parse(text).each { |arrayItem|
-                  line = line + "\t\t<item><![CDATA[#{arrayItem}]]></item>\n"
+                  line = line + "        <item><![CDATA[#{arrayItem}]]></item>\n"
                 }
 
-                line = line + "\t</string-array>\n"
+                line = line + "    </string-array>\n"
               else
-                line = line + "\t<string name=\"#{identifier}\"><![CDATA[#{text}]]></string>\n"
+                line = line + "    <string name=\"#{identifier}\"><![CDATA[#{text}]]></string>\n"
               end
 
               f.write(line)
@@ -416,12 +452,32 @@ module Fastlane
         }
       end
 
-      def self.createiOSFileEndString()
-        return "\n\nprivate class LocalizationHelper { }\n\nextension Localization {\n\tprivate static func localized(identifier key: String, _ args: CVarArg...) -> String {\n\t\tlet format = NSLocalizedString(key, tableName: nil, bundle: Bundle(for: LocalizationHelper.self), comment: \"\")\n\n\t\tguard !args.isEmpty else { return format }\n\n\t\treturn String(format: format, locale: .current, arguments: args)\n\t}\n}"
+      def self.createiOSFileEndString(destinationPath)
+
+        bundle = "let bundle = Bundle(for: LocalizationHelper.self)"
+
+        puts destinationPath
+
+        if destinationPath.include?(".bundle")
+
+          bundle = %Q(let bundleUrl = Bundle(for: LocalizationHelper.self).url(forResource: "#{destinationPath.split('/').last.gsub(".bundle", "")}", withExtension: "bundle")
+        \n\t\tlet bundle = Bundle(url: bundleUrl!))
+        end
+
+        return %Q(
+        \n\nprivate class LocalizationHelper { }
+        \n\nextension Localization {
+        \n\tprivate static func localized(identifier key: String, _ args: CVarArg...) -> String {
+        \n\t\t#{bundle}
+        \n\t\tlet format = NSLocalizedString(key, tableName: nil, bundle: bundle, comment: \"\")
+        \n\t\tguard !args.isEmpty else { return format }
+        \n\t\treturn String(format: format, locale: .current, arguments: args)
+        \n\t}
+        \n})
       end
 
-      def self.createiOSFunction(constantName, identifier, arguments, comment)
-          functionTitle = "\n\t///Sheet comment: #{comment}\n\tpublic static func #{constantName}("
+      def self.createiOSFunction(constantName, identifier, arguments)
+          functionTitle = "public static func #{constantName}("
 
           arguments.each_with_index do |item, index|
             functionTitle = functionTitle + "_ arg#{index}: #{item[:type]}"
@@ -534,6 +590,11 @@ module Fastlane
                                description: "Default Language",
                                   optional: true,
                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :comment_example_language,
+                                  env_name: "COMMENT_EXAMPLE_LANGUAGE",
+                               description: "Comment Example Language",
+                                  optional: true,
+                                      type: String),
           FastlaneCore::ConfigItem.new(key: :base_language,
                                   env_name: "BASE_LANGUAGE",
                                description: "Base language for Xcode projects",

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

@@ -1,5 +1,5 @@
 module Fastlane
   module GoogleSheetLocalize
-    VERSION = "0.2.10"
+    VERSION = "0.3.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.2.10
+  version: 0.3.0
 platform: ruby
 authors:
 - Mario Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive