terrestrial-cli 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f02546d21647512c846dc00c5bef7517f032193
-  data.tar.gz: 09ef62adc956cad318d07aa365fa61c7f2441508
+  metadata.gz: ec8435d8164544f6ad8189497150081967d15eeb
+  data.tar.gz: 6d009683f9fa3f714afba2565251a0f595528167
 SHA512:
-  metadata.gz: 08e4cc56f181d6de9c2991647c42480055c82c2a721e296762ca10462b561bdc5508268606be2175550d983084346fbad96d128946c7c69fa7afa83432b11e86
-  data.tar.gz: 1b60b92d14d21cab1b01259ccd721b4ace5c330f68e2a6a64cada40c1cfbcf7c9c8a9044e7511f7acbd9687b9be655b44c7a92b8f60e0f99d77ea34f01da6fc9
+  metadata.gz: ebe46a52b38c1b783d9dcce80a59c96ea7aca70e1d9f46f08b92eb4b27b7004f465270492e01f6e860462d8dfdb8983076ee7e9b6b14fd280a6441db996c3aa8
+  data.tar.gz: 2ae0304f7b6ff1eac841e28d6845cba14a8ccaf65ca3c0dd2351e98d7c9181690dfc8363f440cbdac9d331a9bda96523c68c9f3bf7817d3d50461254c846a14c

data/lib/terrestrial/cli.rb

@@ -10,6 +10,7 @@ require "terrestrial/cli/version_checker"
 require "terrestrial/cli/version"
 require "terrestrial/cli/variable_normalizer"
 require "terrestrial/cli/terminal_ui"
+require "terrestrial/cli/language_name"
 require "terrestrial/cli/entry_collection_differ"
 require "terrestrial/cli/detects_project_type"
 require "terrestrial/cli/file_picker"
@@ -20,6 +21,8 @@ require "terrestrial/cli/android_xml_parser"
 require "terrestrial/cli/android_xml_formatter"
 require "terrestrial/cli/dot_strings_parser"
 require "terrestrial/cli/dot_strings_formatter"
+require "terrestrial/cli/unity_parser"
+require "terrestrial/cli/unity_formatter"
 require "terrestrial/cli/parser"
 require "terrestrial/cli/editor"
 require "terrestrial/cli/engine_mapper"

data/lib/terrestrial/cli/android_xml_formatter.rb

@@ -28,7 +28,7 @@ module Terrestrial
                                             %Q[#@expanded_name="#{to_s().gsub(/"/, '"')}"]
                                           end
                                       ^)
-        formatter = Printer.new(4) # See editor/printer
+        formatter = CustomPrinter.new(4) # See editor/printer
         formatter.compact = true
         formatter.write(document,"") + "\n"
       end

data/lib/terrestrial/cli/detects_project_type.rb

@@ -7,6 +7,8 @@ module Terrestrial
 
         if files.any? {|f| f.end_with?(".xcodeproj") || f.end_with?(".xcworkspace")}
           "ios"
+        elsif files.any? {|f| f.end_with?(".csproj") || f.end_with?(".unity") || f.end_with?(".unityproj")} 
+          "unity"
         else
           "android"
         end

data/lib/terrestrial/cli/editor.rb

@@ -1,4 +1,4 @@
-require 'terrestrial/cli/editor/printer'
+require 'terrestrial/cli/editor/custom_printer'
 require 'terrestrial/cli/editor/base_editor'
 require 'terrestrial/cli/editor/objc'
 require 'terrestrial/cli/editor/swift'

data/lib/terrestrial/cli/editor/android_xml.rb

@@ -52,7 +52,7 @@ module Terrestrial
                                             end
                                         ^)
           File.open(@path, "w") do |f|
-            printer = Printer.new(2)
+            printer = CustomPrinter.new(2)
             printer.compact = true
             printer.width = 1000000
             printer.write(@document, f)

data/lib/terrestrial/cli/editor/{printer.rb → custom_printer.rb}

@@ -1,6 +1,6 @@
 # Common fixes for editors that use 
 # REXML
-class Printer < REXML::Formatters::Pretty
+class CustomPrinter < REXML::Formatters::Pretty
   # The point of this little thing is to keep
   # the order of attributes when we flush the 
   # storyboard back to disk.
@@ -14,17 +14,17 @@ class Printer < REXML::Formatters::Pretty
   #   fmt = OrderedAttributes.new
   #   fmt.write(xmldoc, $stdout)
   #
-  def write_element(elm, out)
-    att = elm.attributes
-    class <<att
-      alias _each_attribute each_attribute
+  # def write_element(elm, out)
+  #   att = elm.attributes
+  #   class <<att
+  #     alias _each_attribute each_attribute
 
-      def each_attribute(&b)
-        to_enum(:_each_attribute).sort_by {|x| x.name}.each(&b)
-      end
-    end
-    super(elm, out)
-  end
+  #     def each_attribute(&b)
+  #       to_enum(:_each_attribute).sort_by {|x| x.name}.each(&b)
+  #     end
+  #   end
+  #   super(elm, out)
+  # end
 
   # This genious is here to stop the damn thing from wrapping
   # lines over 80 chars long >.<

data/lib/terrestrial/cli/editor/storyboard.rb

@@ -24,63 +24,81 @@ module Terrestrial
 
         def initialize(entry)
           @path          = entry.file
+          @document      = REXML::Document.new(File.new(@path))
+
           @type          = entry.type
           @string        = entry.string
           @storyboard_id = entry.metadata["storyboard_element_id"]
           @identifier    = entry.identifier
 
-          @document = REXML::Document.new(File.new(@path))
+          set_document_to_double_quotes
         end
 
         def self.insert_runtime_attribute(entry)
-          self.new(entry).insert_attribute
+          editor = self.new(entry)
+          editor.insert_attribute
+          editor.save_document
         end
 
         def insert_attribute
-          node = find_node
+          node = find_node(@storyboard_id, @type)
 
           # TODO, There was a case when "node" was nil in this point, after
           # trying to find it by type + ID.
           #
           # Keep an eye out for it to see if reproducible
 
-          node.add(create_element)
+          if node.nil?
+            puts "Warning: Was not able to find #{@type} with string '#{@string}' and ID '#{@storyboard_id}' in #{@path}."
+            puts "It will not be added to your Localizable.strings file automatically."
+          else
+            node.add(create_element)
+          end
           refresh_document(node)
-          save_document
         end
 
-        private
+        def find_node(id, type)
+          REXML::XPath.first(@document, query_for(type, storyboard_id: id))
+        end
 
-        def find_node
-          REXML::XPath.first(@document, query_for(@type, storyboard_id: @storyboard_id))
+        def save_document
+          File.open(@path, "w") do |f|
+            f.write format_document
+          end 
+        end
+
+        def format_document
+          printer = CustomPrinter.new(4)
+          printer.width = 1000
+          printer.compact = true
+          printer.write(@document.root, "")
         end
 
+        private
+
         def refresh_document(node)
           # This is a bit ridiculous, but necessary because
           # &*£(*$)£@*$!£ REXML
           
           @document = REXML::Document.new(node.document.to_s)
-        end
-
-        def save_document
-          File.open(@path, "w") do |f|
-            printer = Printer.new(2)
-            printer.width = 1000
-            printer.write(@document, f)
-          end 
+          set_document_to_double_quotes
         end
 
         def query_for(type, storyboard_id: "")
           # Find element of said type, with the ID, that does not
           # have a userDefinedRuntimeAttribute as a child
 
-          QUERIES[type] + "[@id=\"#{storyboard_id}\" and not(userDefinedRuntimeAttributes)]]"
+          QUERIES[type] + "[@id=\"#{storyboard_id}\" and not(userDefinedRuntimeAttributes[@Terrestrial])]"
         end
 
         def text_attribute(type)
           Parser::Storyboard::Engine::TEXT_ATTRIBUTE[type]
         end
 
+        def set_document_to_double_quotes
+          @document.context[:attribute_quote] = :quote
+        end
+
         def create_element
           REXML::Element.new("userDefinedRuntimeAttributes")
                 .add_element("userDefinedRuntimeAttribute", 

data/lib/terrestrial/cli/flight.rb

@@ -68,12 +68,7 @@ module Terrestrial
         if Config[:platform] == "ios"
           puts "Looks like you already have Localizable.strings files."
           puts "'flight' scans your source code for human readable strings that have not been translated"
-          puts "and helps you quickstart your internaionalization process."
-          puts ""
-          puts "If you want to new strings into your .strings file, run 'terrestrial gen'. It will:"
-          puts "  1. Scan your source code for .translated and NSLocalizedString calls."
-          puts "  2. Determine if the strings already exist in Localizable.strings."
-          puts "  3. Append any new strings to your base Localizable.strings."
+          puts "and helps you quickstart your internaionalization process and is works with unlocalized projects only."
           puts ""
           puts "For more information, visit http://docs.terrestrial.io/, or jump on our Slack via https://terrestrial-slack.herokuapp.com/"
           abort

data/lib/terrestrial/cli/init.rb

@@ -50,7 +50,7 @@ module Terrestrial
           puts "For more information, see http://docs.terrestrial.io or jump on Slack at https://terrestrial-slack.herokuapp.com/ if you have any questions."
         else
           puts "Oh snap. There was an error initializing your project."
-          puts response.body.inspect
+          puts @response.body.inspect
           abort
         end
       end
@@ -79,6 +79,8 @@ module Terrestrial
           Dir[Config[:directory] + "/**/*.strings"].map {|f| relative_path(f) }
         elsif @platform == "android"
           Dir[Config[:directory] + "/**/*/res/values/strings.xml"].map {|f| relative_path(f) }
+        elsif @platform == "unity"
+          [] # Not tracking files now
         else
           raise "Unknown platform #{@platform}"
         end

data/lib/terrestrial/cli/language_name.rb

@@ -0,0 +1,64 @@
+module Terrestrial
+  module Cli
+    module LanguageName
+
+      LANGUAGES = {
+        "af" => "Afrikaans",
+        "ar" => "Arabic",
+        "eu" => "Basque",
+        "be" => "Belarusian",
+        "bg" => "Bulgarian",
+        "ca" => "Catalan",
+        "cs" => "Czech",
+        "da" => "Danish",
+        "nl" => "Dutch",
+        "en" => "English",
+        "et" => "Estonian",
+        "fo" => "Faroese",
+        "fi" => "Finnish",
+        "fr" => "French",
+        "de" => "German",
+        "el" => "Greek",
+        "he" => "Hebrew",
+        "is" => "Icelandic",
+        "id" => "Indonesian",
+        "it" => "Italian",
+        "ja" => "Japanese",
+        "ko" => "Korean",
+        "lv" => "Latvian",
+        "lt" => "Lithuanian",
+        "no" => "Norwegian",
+        "pl" => "Polish",
+        "pt" => "Portuguese",
+        "ro" => "Romanian",
+        "ru" => "Russian",
+        "sr" => "SerboCroatian",
+        "sk" => "Slovak",
+        "sl" => "Slovenian",
+        "es" => "Spanish",
+        "sv" => "Swedish",
+        "th" => "Thai",
+        "tr" => "Turkish",
+        "uk" => "Ukrainian",
+        "vi" => "Vietnamese",
+        "zh" => "ChineseSimplified",
+        "zh-tw" => "ChineseTraditional",
+        "hu" => "Hungarian"
+      }
+
+      def initialize(language_code)
+        @code = language_code
+      end
+     
+      def human_readable_name
+        LANGUAGES.fetch(code) { abort "Unkown language '#{code}' encountered." }
+      end
+
+      private
+
+      def code
+        @code
+      end
+    end
+  end
+end

data/lib/terrestrial/cli/pull.rb

@@ -41,6 +41,8 @@ module Terrestrial
           ios_translation_file_path(language)
         elsif Config[:platform] == "android"
           android_translation_file_path(language) 
+        elsif Config[:platform] == "unity"
+          Config[:directory] + "/Assets/Terrestrial/" + human_readable_language_name(language) + ".xml"
         end
       end
 
@@ -72,6 +74,9 @@ module Terrestrial
           elsif Config[:platform] == "android"
             f.write "<!-- Updated by Terrestrial #{Time.now.to_s} -->\n\n"
             f.write AndroidXmlFormatter.new(translations).format_foreign_translation
+          elsif Config[:platform] == "unity"
+            f.write "<!-- Updated by Terrestrial #{Time.now.to_s} -->\n\n"
+            f.write UnityFormatter.new(translations).format_foreign_translation
           end
         end
       end
@@ -86,6 +91,10 @@ module Terrestrial
         end
       end
 
+      def human_readable_language_name(language_code)
+        LanguageName.new(language_code).human_readable_name
+      end
+
       def fetch_translations
         @response = web_client.get_translations(Config[:project_id], Config[:app_id])
       end

data/lib/terrestrial/cli/pull/processes_translations.rb

@@ -18,11 +18,17 @@ module Terrestrial
             process_ios
           when "android"
             process_android
+          when "unity"
+            process_unity
           else
             raise "Unknown platform"
           end
         end
 
+        def process_unity
+          process_android
+        end
+
         def process_android
           translations
             .reject {|entry| entry["translation"].nil? || entry["translation"].empty? }

data/lib/terrestrial/cli/string_registry.rb

@@ -9,6 +9,8 @@ module Terrestrial
               DotStringsParser.parse_file(Config[:directory] + "/#{file}")
             elsif Config[:platform] == "android"
               AndroidXmlParser.parse_file(Config[:directory] + "/#{file}")
+            elsif Config[:platform] == "unity"
+              UnityParser.parse_file(Config[:directory] + "/#{file}")
             end
           rescue Errno::ENOENT
             abort "Could not find #{file}. If the file is no longer in your project, remove it from your tracked files in terrestrial.yml." 

data/lib/terrestrial/cli/unity_formatter.rb

@@ -0,0 +1,20 @@
+module Terrestrial
+  module Cli
+    class UnityFormatter
+
+      def initialize(entries)
+        @formatter = AndroidXmlFormatter.new(entries)
+      end
+
+      def format_foreign_translation
+        formatter.format_foreign_translation
+      end
+
+      private
+
+      def formatter
+        @formatter
+      end
+    end
+  end
+end

data/lib/terrestrial/cli/unity_parser.rb

@@ -0,0 +1,17 @@
+module Terrestrial
+  module Cli
+    class UnityParser
+
+      def self.parse_file(file)
+        # Same file format as Android, so we delegate directly.
+        result = AndroidXmlParser.parse_file(file)
+
+        # Map over the results to change the types
+        # to be unity instead of the Android default.
+        result.map do |entry|
+          entry["type"] = "unity"
+        end
+      end
+    end
+  end
+end

data/lib/terrestrial/cli/version.rb

@@ -1,5 +1,5 @@
 module Terrestrial
   module Cli
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrestrial-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Niklas Begley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
@@ -126,8 +126,8 @@ files:
 - lib/terrestrial/cli/editor.rb
 - lib/terrestrial/cli/editor/android_xml.rb
 - lib/terrestrial/cli/editor/base_editor.rb
+- lib/terrestrial/cli/editor/custom_printer.rb
 - lib/terrestrial/cli/editor/objc.rb
-- lib/terrestrial/cli/editor/printer.rb
 - lib/terrestrial/cli/editor/storyboard.rb
 - lib/terrestrial/cli/editor/swift.rb
 - lib/terrestrial/cli/engine_mapper.rb
@@ -139,6 +139,7 @@ files:
 - lib/terrestrial/cli/flight/table_workflow.rb
 - lib/terrestrial/cli/ignite.rb
 - lib/terrestrial/cli/init.rb
+- lib/terrestrial/cli/language_name.rb
 - lib/terrestrial/cli/mixpanel_client.rb
 - lib/terrestrial/cli/parser.rb
 - lib/terrestrial/cli/parser/android_xml.rb
@@ -154,11 +155,12 @@ files:
 - lib/terrestrial/cli/scan.rb
 - lib/terrestrial/cli/string_registry.rb
 - lib/terrestrial/cli/terminal_ui.rb
+- lib/terrestrial/cli/unity_formatter.rb
+- lib/terrestrial/cli/unity_parser.rb
 - lib/terrestrial/cli/variable_normalizer.rb
 - lib/terrestrial/cli/version.rb
 - lib/terrestrial/cli/version_checker.rb
 - lib/terrestrial/config.rb
-- lib/terrestrial/creates_terrestrial_yml.rb
 - lib/terrestrial/web.rb
 - lib/terrestrial/web/response.rb
 - lib/terrestrial/yaml_helper.rb

data/lib/terrestrial/creates_terrestrial_yml.rb

@@ -1,9 +0,0 @@
-module Terrestrial
-  module Cli
-    class CreatesTerrestrialYml
-      
-      def self.run(project_id, app_id, project_type)
-      end
-    end
-  end
-end