xcmultilingual 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab93f05077b93908e01de7a5a365419661b94252
-  data.tar.gz: 49cb5cfbbabf3a31609591e72f8a5e314a1339f5
+  metadata.gz: da9fbf5ba45832c00e8cee478c30c1e7f56059c9
+  data.tar.gz: d4fa56b66ea906b632dbdaa94573daa1d576e85e
 SHA512:
-  metadata.gz: ad45c0bf484fc603b585f64e989fbed8f817ab46cf59885e9bd9bfb979a73282721a60c20aeb7b0456d4d7fa33610abcc9d650e8f2fe914d9ce38676f0bd68ed
-  data.tar.gz: 4055751839a4c531b8eacfecc9fc1c80077bee25bc0ebafeaac683db5da941209037b8327409b90a36e42b9cb9960f3f252689c48e7f7b275e800a204bce09df
+  metadata.gz: d2a5c99476070187fadce16261b3e96901ef50dd65da776444035293b4c5a1ac90a8763ba40b04081b7bf96c24dc5d8b03bad1c9f8bf92cb3b7a695f87ffaf10
+  data.tar.gz: 6611c99675c2c1e0cce6f7722f432ab51555bfbc33642bd20bd2d60d74d74468f0796c371b1667be07a0f60b68090d84afd8b1ff4947cb917dece78a4ca15020

data/DemoApp/DemoApp/Multilingual.swift

@@ -28,12 +28,13 @@ struct Multilingual {
             return NSLocalizedString(rawValue, tableName: "Animal", bundle: NSBundle.mainBundle(), value: "\(rawValue)", comment: "")
         }
 
-        static func keys() -> [String] {
+        static let name = "Animal"
+
+        static var keys: [String] {
             return ["CAT", "DOG", "BEAR", "DEER", "SQUIRREL", "ELEPHANT", "GIRAFFE", "TIGER", "LION", "RABBIT", "RHINOCEROS", "GORILLA", "MONKEY"]
         }
-
-        static func localizations() -> [String] {
-            return Animal.keys().map { Animal(rawValue: $0)!.string() }
+        static var localizations: [String] {
+            return Animal.keys.map { Animal(rawValue: $0)!.string() }
         }
     }
 
@@ -46,12 +47,13 @@ struct Multilingual {
             return NSLocalizedString(rawValue, tableName: "Localizable", bundle: NSBundle.mainBundle(), value: "\(rawValue)", comment: "")
         }
 
-        static func keys() -> [String] {
+        static let name = "Localizable"
+
+        static var keys: [String] {
             return ["HELLO", "GOODMORNING", "GOODEVENING"]
         }
-
-        static func localizations() -> [String] {
-            return Localizable.keys().map { Localizable(rawValue: $0)!.string() }
+        static var localizations: [String] {
+            return Localizable.keys.map { Localizable(rawValue: $0)!.string() }
         }
     }
 
@@ -62,12 +64,13 @@ struct Multilingual {
             return NSLocalizedString(rawValue, tableName: "Sample Localization", bundle: Multilingual.bundle("Loalizations/sample2.bundle"), value: "\(rawValue)", comment: "")
         }
 
-        static func keys() -> [String] {
+        static let name = "Sample Localization"
+
+        static var keys: [String] {
             return ["SAMPLE 2"]
         }
-
-        static func localizations() -> [String] {
-            return Sample2Sample_Localization.keys().map { Sample2Sample_Localization(rawValue: $0)!.string() }
+        static var localizations: [String] {
+            return Sample2Sample_Localization.keys.map { Sample2Sample_Localization(rawValue: $0)!.string() }
         }
     }
 
@@ -78,12 +81,13 @@ struct Multilingual {
             return NSLocalizedString(rawValue, tableName: "Sample", bundle: Multilingual.bundle("sample.bundle"), value: "\(rawValue)", comment: "")
         }
 
-        static func keys() -> [String] {
+        static let name = "Sample"
+
+        static var keys: [String] {
             return ["SAMPLE"]
         }
-
-        static func localizations() -> [String] {
-            return SampleSample.keys().map { SampleSample(rawValue: $0)!.string() }
+        static var localizations: [String] {
+            return SampleSample.keys.map { SampleSample(rawValue: $0)!.string() }
         }
     }
 

data/DemoApp/DemoApp/ViewController.swift

@@ -23,24 +23,24 @@ class ViewController: UITableViewController {
     
     let tables = [
         Table(
-            name: "Localizable",
-            keys: Multilingual.Localizable.keys(),
-            localizations: Multilingual.Localizable.localizations()
+            name: Multilingual.Localizable.name,
+            keys: Multilingual.Localizable.keys,
+            localizations: Multilingual.Localizable.localizations
         ),
         Table(
-            name: "Animal",
-            keys: Multilingual.Animal.keys(),
-            localizations: Multilingual.Animal.localizations()
+            name: Multilingual.Animal.name,
+            keys: Multilingual.Animal.keys,
+            localizations: Multilingual.Animal.localizations
         ),
         Table(
-            name: "SampleSample",
-            keys: Multilingual.SampleSample.keys(),
-            localizations: Multilingual.SampleSample.localizations()
+            name: Multilingual.SampleSample.name,
+            keys: Multilingual.SampleSample.keys,
+            localizations: Multilingual.SampleSample.localizations
         ),
         Table(
-            name: "Sample2Sample_Localization",
-            keys: Multilingual.Sample2Sample_Localization.keys(),
-            localizations: Multilingual.Sample2Sample_Localization.localizations()
+            name: Multilingual.Sample2Sample_Localization.name,
+            keys: Multilingual.Sample2Sample_Localization.keys,
+            localizations: Multilingual.Sample2Sample_Localization.localizations
         )
     ]
 }

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xcmultilingual (0.1.7)
+    xcmultilingual (0.2.0)
       thor
 
 GEM

data/lib/xcmultilingual/bundle.rb

@@ -3,15 +3,21 @@ module Xcmultilingual
     def description
       name_description = name.nil? ? "MAIN BUNDLE" : name
       relative_path_description = relative_path.nil? ? "NO RELATIVE PATH" : relative_path
-      tables_description = tables.map { |table| table.description }.join("")
-      "  [Bundle] name: #{name_description}, relative_path: #{relative_path_description}, tables: #{tables_description}"
+      tables_description = tables.map { |table| table.description }.join(" / ")
+      "[#{name_description}]\nname: #{name_description}, relative_path: #{relative_path_description}, tables: #{tables_description}"
     end
   end
 
   Table = Struct.new("Table", :name, :keys) do
     def description
       keys_description = keys.join(", ")
-      "\n  - [Table] name: #{name}, keys: #{keys_description}"
+      "[Table] name: #{name}, keys: #{keys_description}"
     end
   end
 end
+
+class String
+  def safe
+    return self.gsub(" ", "_")
+  end
+end

data/lib/xcmultilingual/cli.rb

@@ -20,10 +20,13 @@ module Xcmultilingual
       writer.verbose = options[:verbose] || false
       writer.write
 
-      puts "+ DONE" if options[:verbose]
+      puts "" if options[:verbose]
+      puts "+++ DONE ++++++++++++++++++++++++" if options[:verbose]
       puts "" if options[:verbose]
       puts "  See #{destination}" if options[:verbose]
       puts "" if options[:verbose]
+      puts "+++++++++++++++++++++++++++++++++" if options[:verbose]
+      puts "" if options[:verbose]
     end
 
     map %w[--version -v] => :__print_version

data/lib/xcmultilingual/parser.rb

@@ -9,8 +9,7 @@ module Xcmultilingual
     end
 
     def parse
-      puts "+ START PARSING" if @verbose
-      puts "" if @verbose
+      puts "[START PARSING]" if @verbose
 
       destination_path = File.expand_path(@destination)
       destination_dir = File.dirname(destination_path)
@@ -41,7 +40,7 @@ module Xcmultilingual
           safe_line = line.scrub('?')
           if key = find_key(safe_line)
             bundles[bundle_name][:tables][name] << key
-            puts "  PARSE: #{File.basename(file_path)} > #{line}" if @verbose
+            puts "<#{File.basename(file_path)}> #{line}" if @verbose
           end
         end
       end
@@ -54,13 +53,11 @@ module Xcmultilingual
           bundle.tables << table
         end
 
-        puts "" if @verbose
         puts "#{bundle.description}" if @verbose
         bundle_data << bundle
       end
 
-      puts "" if @verbose
-      puts "+ PARSE SUCCEEDED" if @verbose
+      puts "[PARSE SUCCEEDED]" if @verbose
       puts "" if @verbose
 
       bundle_data

data/lib/xcmultilingual/templates/swift.erb

@@ -11,24 +11,25 @@ import Foundation
 struct <%= @name %> {
 <% @bundle_data.each do |bundle| -%>
 <% nsbundle = bundle.name ? "Multilingual.bundle(\"#{bundle.relative_path}\")" : "NSBundle.mainBundle()" -%>
-<% bundle_name = bundle.name.nil? ? "" : bundle.name.gsub(" ", "_").capitalize -%>
+<% bundle_name = bundle.name.nil? ? "" : bundle.name.safe.capitalize -%>
 <% bundle.tables.each do |table| -%>
-<% class_name = bundle_name + table.name.gsub(" ", "_") -%>
+<% class_name = bundle_name + table.name.safe -%>
     enum <%= class_name %>: String {
 <% table.keys.each do |key| -%>
-        case <%= key.gsub(" ", "_") %> = "<%= key %>"
+        case <%= key.safe %> = "<%= key %>"
 <% end # keys -%>
 
         func string() -> String {
             return NSLocalizedString(rawValue, tableName: "<%= table.name %>", bundle: <%= nsbundle %>, value: "\(rawValue)", comment: "")
         }
 
-        static func keys() -> [String] {
+        static let name = "<%= table.name %>"
+
+        static var keys: [String] {
             return ["<%= table.keys.join("\", \"") %>"]
         }
-
-        static func localizations() -> [String] {
-            return <%= class_name %>.keys().map { <%= class_name %>(rawValue: $0)!.string() }
+        static var localizations: [String] {
+            return <%= class_name %>.keys.map { <%= class_name %>(rawValue: $0)!.string() }
         }
     }
 

data/lib/xcmultilingual/version.rb

@@ -1,3 +1,3 @@
 module Xcmultilingual
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/lib/xcmultilingual/writer.rb

@@ -12,12 +12,12 @@ module Xcmultilingual
     end
 
     def write
-      puts "+ START UPDATING\n\n" if @verbose
+      puts "[START UPDATING]" if @verbose
 
       if !File.exist?("#{@destination}")
-        puts "  There is no destination file." if @verbose
+        puts "There is no destination file." if @verbose
         puts "\n+ FAILED UPDATING\n" if @verbose
-        return
+        exit 2
       end
 
       File.open("#{@destination}", "w") do |file|
@@ -25,7 +25,7 @@ module Xcmultilingual
         body = ERB.new(File.open(path).read, nil, '-').result(binding)
         file.write(body)
       end
-      puts "+ END UPDATING\n\n" if @verbose
+      puts "[END UPDATING]" if @verbose
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcmultilingual
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Naoki Morita