terrestrial-cli 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec8435d8164544f6ad8189497150081967d15eeb
-  data.tar.gz: 6d009683f9fa3f714afba2565251a0f595528167
+  metadata.gz: 022e7e24bdc8f7eac43ef37debe3a0a5c9adf049
+  data.tar.gz: 961b8861d2b68f04f6b53a854e45fef56faf0a0c
 SHA512:
-  metadata.gz: ebe46a52b38c1b783d9dcce80a59c96ea7aca70e1d9f46f08b92eb4b27b7004f465270492e01f6e860462d8dfdb8983076ee7e9b6b14fd280a6441db996c3aa8
-  data.tar.gz: 2ae0304f7b6ff1eac841e28d6845cba14a8ccaf65ca3c0dd2351e98d7c9181690dfc8363f440cbdac9d331a9bda96523c68c9f3bf7817d3d50461254c846a14c
+  metadata.gz: b28356338e252dc9de49880b725d20a65276cec919292ae7d639807beefb47fcab627eccd37c411807841684be5ae44a4a050e1f85292c11221dbb53c5e5ba08
+  data.tar.gz: b5740884faa0dd0f12ba8fe98ca1e8a69d155792afe10010b3286637cf6384362f923a981e44fb433c2750ca2411cf587f83e86a0b2b046540a2a795ca132b24

data/README.md

@@ -1,8 +1,10 @@
 # Terrestrial::Cli
 
-Official Terrestrial command line tool. For more documentation visit the [official docs](http://docs.terrestrial.io/).
+[![Build Status](https://circleci.com/gh/terrestrial-io/terrestrial-cli.svg?style=shield)](https://circleci.com/gh/terrestrial-io/terrestrial-cli)
 
-If you have any questions, join us on [Slack](https://terrestrial-slack.herokuapp.com/)!
+Official Terrestrial command line tool. For documentation visit the [official docs](http://docs.terrestrial.io/).
+
+You can also join us on [Slack](https://terrestrial-slack.herokuapp.com/) to chat with the team directly.
 
 ## Installation
 
@@ -16,100 +18,6 @@ To get started with your project, cd to your project directory and run
 
 You can find your API key and the correct project ID by logging into [Terrestrial Mission Control](https://mission.terrestrial.io).	
 
-### First time localizing
-
-If you have not internationalized your app before, Terrestrial provides a tool for quickly extracting user-facing strings from your source code:
-
-	$ terrestrial flight
-	
-##### iOS
-	
-Flight will scan your source code and, using some clever heuristics, determine which strings can be shown to users. Terrestrial will list all the strings in terminal, and you are able to exclude any strings you wish not to internationalize.
-
-	... 
-	Page 5 of 5
-	+-------+------------------------------+------------------------------------------------+
-	| Index | String                       | File                                           |
-	+-------+------------------------------+------------------------------------------------+
-	| 40    | Home                         | InspectionMadeEasy/LeftMenuViewController.m:96 |
-	+-------+------------------------------+------------------------------------------------+
-	| 41    | Home                         | InspectionMadeEasy/MainViewController.m:23     |
-	+-------+------------------------------+------------------------------------------------+
-	-- Instructions --
-	- To exclude any strings from translation, type the index of each string.
-	-   e.g. 1,2,4
-	------------------
-	Any Exclusions? (press return to continue or 'q' to quit at any time)
-	
-	$ 
-
-After this, Terrestrial generates a **Base.lproj/Localizable.strings** file based on the selected strings, and updates your source code so that each occurence of each strings is properly referenced by ID:
-
-	# Source Code
-	label.text = @"This is my string"  =>  label.text = @"THIS_IS_MY_STRING".translated
-	
-	# The ID is generated based on the original string.
-	# The .translated method is simple syntactic sugar over NSLocalizedString, and you
-	# are able to fall back to native iOS localization APIs if needed.
-	
-**Note on Stroyboards:** Terrestrial allows you to easily use strings from your Localizable.strings files inside your Storyboards via IBInspectable properties. During the *flight* process, any strings in Storyboards will have the Terrestrial IBInspectable property turned on, and the string's ID included as a value in the properties. To see this in action, view the Attributed Inspector tab of a UI element in your Storyboards.
-	
-#### Android
-
-** Documentation coming soon **
-
-### Existing App
-
-If you have already translated your application, Terrestrial needs to know where to find your translation files. This is done via the **terrestrial.yml** file created when your project is initialized:
-
-	---
-	app_id: <app ID>
-	project_id: <project ID>
-	platform: <platform>
-	translation_files:
-	- /path/to
-	- /any/localization/files
-	
-Terrestrial will keep of the strings listed in the listed files.
-
-### Workflow
-
-As you add strings to you app, either in iOS's Localizable.strings or Android's strings.xml, you can track your changes with:
-
-	$ terrestrial scan
-	New Strings: 0
-	Removed Strings: 0
-	
-This will diff your local strings with the current strings stored in Terrestrial. You can see a breakdown of changes by running:
-
-	$ terrestrial scan --verbose
-	
-When you are ready to upload your local changes with Terrestrial for your translators to get to work, push your latest strings to Terrestrial:
-
-	$ terrestrial push
-
-We suggest running *push* as part of a standard build cycle.
-
-To get the latest translations for your app, run:
-
-	$ terrestrial pull
-
-This will update the necessary language files in your project automatically with updated translations.
-
-### Testing
-
-Terrestrial allows you to start your iOS simulator in a specified locale from the command line:
-
-	$ terrestrial ignite es  # Starts the simulator in Spanish
-
-
-To upload screenshots, along with metadata of string positions and styles, run the photoshoot command:
-
-	$ terrestrial photoshoot
-
-This will start the simulator and initialize the Terrestrial SDK in photoshoot mode. To upload screenshots to your web dashboard, just tap the injected screenshot button for each screen you wish to upload.
-
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/terrestrial-io/terrestrial-cli.

data/bin/terrestrial

@@ -32,7 +32,7 @@ OptionParser.new do |opts|
     options[:verbose] = true
   end
 
-  opts.on_tail("--version", "Show version") do
+  opts.on_tail("-v", "--version", "Show version") do
     puts "Terrestrial CLI: #{Terrestrial::Cli::VERSION}"
     exit
   end

data/lib/terrestrial/cli/dot_strings_formatter.rb

@@ -11,7 +11,7 @@ module Terrestrial
         entries.reject(&:placeholder?).each do |entry|
           # just id and string needed for translation
           # files. extra metadata is found in base.lproj.
-          result << "\"#{entry.identifier}\"=\"#{entry.string}\";"
+          result << id_and_string(entry)
           result << ""
         end
 
@@ -20,7 +20,7 @@ module Terrestrial
         entries.select(&:placeholder?).each do |entry|
           # just id and string needed for translation
           # files. extra metadata is found in base.lproj.
-          result << "\"#{entry.identifier}\"=\"#{entry.string}\";"
+          result << id_and_string(entry)
           result << ""
         end
         result.join("\n")
@@ -55,7 +55,15 @@ module Terrestrial
       end
 
       def id_and_string(entry)
-        ["\"#{entry.identifier}\"=\"#{entry.formatted_string}\";"]
+        if entry.respond_to? :formatted_string
+          ["\"#{entry.identifier}\"=\"#{escape_string(entry.formatted_string)}\";"]
+        else
+          ["\"#{entry.identifier}\"=\"#{escape_string(entry.string)}\";"]
+        end
+      end
+
+      def escape_string(string)
+        string.gsub("\"", "\\\"")
       end
 
       def spacing

data/lib/terrestrial/cli/dot_strings_parser.rb

@@ -1,138 +1,166 @@
 module Terrestrial
   module Cli
-    module DotStringsParser
+    class LocaliableStringsParserError < RuntimeError; end
+
+    class DotStringsParser
       class << self
 
         def parse_file(path)
-          entries = do_parse_file read_file_with_correct_encoding(path)
-          entries.each do |entry|
-            entry["type"] = "localizable.strings"
-            entry["file"] = path
-          end
+          new(path).parse
+        end
+      end
+
+      def initialize(path)
+        @path = path
+      end
+
+      def parse
+        entries = do_parse_file read_file_with_correct_encoding(path)
+        entries.each do |entry|
+          entry["type"] = "localizable.strings"
+          entry["file"] = path
         end
+      end
+
+      private
+
+      def path
+        @path
+      end
+
+      def do_parse_file(contents)
+        results = []
+        
+        multiline_comment = false
+        expecting_string  = false
+        multiline_string  = false
+        current = {}
+
+        contents.split("\n").each_with_index do |line, line_number|
+          @current_line = line
+          @current_line_number = line_number
+          line = line.rstrip
+          line = remove_comments(line) unless multiline_string
 
-        private
-
-        def do_parse_file(contents)
-          results = []
-          
-          multiline_comment = false
-          expecting_string  = false
-          multiline_string  = false
-          current = {}
-
-          contents.split("\n").each do |line|
-            line = line.rstrip
-            line = remove_comments(line) unless multiline_string
-
-            if !multiline_string && !multiline_comment && line == ""
-              # Just empty line between entries
-              next 
-            elsif line.start_with?("\"") && !line.end_with?(";")
-              # Start multiline string"
-              current_id = line.split("=").map(&:strip)[0][1..-1][0..-2]
-              current_string = line.split("=").map(&:strip)[1][1..-1]
-
-              current["identifier"] = current_id
-              current["string"] = current_string unless current_string.empty?
-              multiline_string = true
-            elsif multiline_string && !line.end_with?(";")
-              # Continuing multiline string
-              if current["string"].nil?
-                current["string"] = line.lstrip
-              else
-                current["string"] << "\n" + line
-              end
-            elsif multiline_string && line.end_with?(";")
-              # Ending multiline string
-              current["string"] << "\n#{line[0..-3]}"
-              multiline_string = false
-              results << current
-              current = {}
-            elsif !expecting_string && line.lstrip.start_with?("/*") && !line.end_with?("*/")
-              # Start multline comment
-              tmp_content = line[2..-1].strip
-              current["context"] = "\n" + tmp_content unless tmp_content.empty?
-              multiline_comment = true
-            elsif multiline_comment && !line.end_with?("*/")
-              # Continuing multline comment
-              if current["context"].nil?
-                current["context"] = line.lstrip
-              else
-                current["context"] << "\n" + line
-              end
-            elsif multiline_comment && line.end_with?("*/")
-              # Ending multline comment
-              tmp_content = line[0..-3].strip
-              current["context"] << (tmp_content.empty? ? "" : "\n#{tmp_content}")
-              multiline_comment = false
-              expecting_string  = true
-            elsif !expecting_string && line.start_with?("/*") && line.end_with?("*/")
-              # Single line comment
-              current["context"] = line[2..-1][0..-3].strip
-              expecting_string = true
-            elsif expecting_string && line.end_with?(";")
-              # Single line id/string pair after a comment
-              current_id, current_string = get_string_and_id(line)
-              current["identifier"] = current_id
-              current["string"] = current_string
-
-              expecting_string = false
-              results << current
-              current = {}
-            elsif !expecting_string && line.end_with?(";")
-              # id/string without comment first
-              current_id, current_string = get_string_and_id(line)
-              current["identifier"] = current_id
-              current["string"] = current_string
-
-              results << current
-              current = {}
+          if !multiline_string && !multiline_comment && line == ""
+            # Just empty line between entries
+            next 
+          elsif line.start_with?("\"") && !line.end_with?(";")
+            # Start multiline string"
+            current_id = line.split("=").map(&:strip)[0][1..-1][0..-2]
+            current_string = line.split("=").map(&:strip)[1][1..-1]
+
+            current["identifier"] = current_id
+            current["string"] = current_string unless current_string.empty?
+            multiline_string = true
+          elsif multiline_string && !line.end_with?(";")
+            # Continuing multiline string
+            if current["string"].nil?
+              current["string"] = line.lstrip
+            else
+              current["string"] << "\n" + line
+            end
+          elsif multiline_string && line.end_with?(";")
+            # Ending multiline string
+            current["string"] << "\n#{line[0..-3]}"
+            multiline_string = false
+            results << current
+            current = {}
+          elsif !expecting_string && line.lstrip.start_with?("/*") && !line.end_with?("*/")
+            # Start multline comment
+            tmp_content = line[2..-1].strip
+            current["context"] = "\n" + tmp_content unless tmp_content.empty?
+            multiline_comment = true
+          elsif multiline_comment && !line.end_with?("*/")
+            # Continuing multline comment
+            if current["context"].nil?
+              current["context"] = line.lstrip
             else
-              raise "Don't know what to do with '#{line.inspect}'"
+              current["context"] << "\n" + line
             end
+          elsif multiline_comment && line.end_with?("*/")
+            # Ending multline comment
+            tmp_content = line[0..-3].strip
+            current["context"] << (tmp_content.empty? ? "" : "\n#{tmp_content}")
+            multiline_comment = false
+            expecting_string  = true
+          elsif !expecting_string && line.start_with?("/*") && line.end_with?("*/")
+            # Single line comment
+            current["context"] = line[2..-1][0..-3].strip
+            expecting_string = true
+          elsif expecting_string && line.end_with?(";")
+            # Single line id/string pair after a comment
+            current_id, current_string = get_string_and_id(line)
+            current["identifier"] = current_id
+            current["string"] = current_string
+
+            expecting_string = false
+            results << current
+            current = {}
+          elsif !expecting_string && line.end_with?(";")
+            # id/string without comment first
+            current_id, current_string = get_string_and_id(line)
+            current["identifier"] = current_id
+            current["string"] = current_string
+
+            results << current
+            current = {}
+          else
+            raise LocaliableStringsParserError
           end
-          results
         end
+        results
+      rescue
+        puts "There was an error parsing #{path}:"
+        puts ""
+        puts "  line #{@current_line_number}: "
+        puts "  #{@current_line}"
+        Kernel.abort
+      end
 
-        def get_string_and_id(line)
-          id = line.split("=").map(&:strip)[0].gsub("\"", "")
-          string = line.split("=").map(&:strip)[1].gsub("\"", "")[0..-2]
-          [id, string]
+      def get_string_and_id(line)
+        cap = line.match(/"([^"]*)"\s*=\s*"([^"]*)";$/).captures
+        if cap[0].nil? || cap[1].nil?
+          raise LocaliableStringsParserError
+        else
+          cap
         end
+      end
 
-        def read_file_with_correct_encoding(path)
-          # Genstrings creates files with BOM UTF-16LE encoding.
-          # If we realise that we cannot operate on the content
-          # of the file assumin UTF-8, we try UTF-16!
-
-          content = File.read path
-          begin 
-            # Try performing an operation on the content
-            content.split("\n") 
-          rescue ArgumentError
-            # Failure! We think this is a UTF-16 file 
-
-            # Remove the byte order marker from the beginning
-            # of the file. We tried doing this with a simple
-            # sub! of \xFF\xFE, but we kept running into 
-            # more issues. We instead do it manually.
-            content = content.bytes[2..-1].pack('c*')
-
-            # Force UTF-16LE encoding as a setting (not actually
-            # changing any representations yet!), then encode from 
-            # that to UTF-8 again
-            content = content
-                        .force_encoding(Encoding::UTF_16LE)
-                        .encode!(Encoding::UTF_8)
-          end
-          content
-        end
+      def read_file_with_correct_encoding(path)
+        # Genstrings creates files with BOM UTF-16LE encoding.
+        # If we realise that we cannot operate on the content
+        # of the file assumin UTF-8, we try UTF-16!
+
+        content = File.read path
+        begin 
+          # Try performing an operation on the content
+          content.split("\n") 
+        rescue ArgumentError
+          # Failure! We think this is a UTF-16 file 
 
-        def remove_comments(line)
-          line = line.split("//")[0] || ""
-          line.rstrip
+          # Remove the byte order marker from the beginning
+          # of the file. We tried doing this with a simple
+          # sub! of \xFF\xFE, but we kept running into 
+          # more issues. We instead do it manually.
+          content = content.bytes[2..-1].pack('c*')
+
+          # Force UTF-16LE encoding as a setting (not actually
+          # changing any representations yet!), then encode from 
+          # that to UTF-8 again
+          content = content
+                      .force_encoding(Encoding::UTF_16LE)
+                      .encode!(Encoding::UTF_8)
         end
+        content
+      end
+
+      def remove_comments(line)
+        # Regex delightfully borrowed from
+        #   http://stackoverflow.com/questions/6462578/alternative-to-regex-match-all-instances-not-inside-quotes
+        double_slashes_not_inside_quotes = /\/\/(?=([^"\\]*(\\.|"([^"\\]*\\.)*[^"\\]*"))*[^"]*$)/
+        line = line.split(double_slashes_not_inside_quotes)[0] || ""
+        line.rstrip
       end
     end
   end

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

@@ -1,30 +1,129 @@
 # Common fixes for editors that use 
 # REXML
 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.
-  # We do this to avoid massive git diffs.
-  # Turns out that xcode is quite good at updating
-  # and reverting our formating changes though.
+  # Custom sorting of Storyboard element attributes.
+  # In order to prevent massive diffs in Storyboard files
+  # after flight, we need to try to match the Xcode
+  # XML generator as closely as possible.
   #
-  # Source: 
-  #   http://stackoverflow.com/questions/574724/rexml-preserve-attributes-order
+  # One big issue is the ordering of XML element attributes.
+  # Here we attempt to match the attribute ordering for each type
+  # of Storyboard element.
   #
-  #   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 old method 
+      alias _each_attribute each_attribute
+
+      # Redefine the each_attribute method to call our sorting
+      # method
+      def each_attribute(&b)
+        to_enum(:_each_attribute)
+          .sort_by {|x| xcode_index_for(x) }
+          .each(&b)
+      end
 
-  #     def each_attribute(&b)
-  #       to_enum(:_each_attribute).sort_by {|x| x.name}.each(&b)
-  #     end
-  #   end
-  #   super(elm, out)
-  # end
+      def _xcode_get_index(order, attr)
+        order.index(attr.name) || attr.name.length
+      end
+
+      # Define the order for each type of Xcode element
+      def xcode_index_for(attr)
+        element_type = attr.element.name
+        
+        case element_type
+        when 'userDefinedRuntimeAttribute'
+          index = _xcode_get_index(['type','keyPath','value'], attr)
+        when 'color'
+          index = _xcode_get_index(['key', 'red', 'green', 'blue', 'white', 'alpha', 'colorSpace', 
+                                    'customColorSpace'], attr)
+        when 'placeholder'
+          index = _xcode_get_index(['placeholderIdentifier', 'id', 'userLabel', 'sceneMemberID'], attr)
+        when 'fontDescription'
+          index = _xcode_get_index(['key', 'type', 'name', 'family', 'pointSize'], attr)
+        when 'rect'
+          index = _xcode_get_index(['key', 'x', 'y', 'width', 'height'], attr)
+        when 'label'
+          index = _xcode_get_index(['opaque', 'multipleTouchEnabled', 'userInteractionEnabled', 'contentMode', 
+                                    'horizontalHuggingPriority', 'verticalHuggingPriority', 'text',
+                                    'misplaced', 'textAlignment', 'lineBreakMode', 'numberOfLines', 
+                                    'baselineAdjustment', 'adjustsFontSizeToFit', 'minimumScaleFactor', 
+                                    'translatesAutoresizingMaskIntoConstraints', 'id', 
+                                    'customClass'], attr)
+        when 'button'
+          index = _xcode_get_index(['opaque', 'contentMode', 'contentHorizontalAlignment', 
+                                    'contentVerticalAlignment', 'buttonType', 'lineBreakMode', 
+                                    'id'], attr)
+        when 'viewController'
+          index = _xcode_get_index(['storyboardIdentifier', 'id', 'customClass', 'customModule', 
+                   'customModuleProvider', 'sceneMemberID'], attr)
+        when 'viewControllerLayoutGuide'
+          index = _xcode_get_index(['type', 'id'], attr)
+        when 'view'
+          index = _xcode_get_index(['autoresizesSubviews','clipsSubviews', 'alpha', 'key', 
+                                    'contentMode', 'id'], attr)
+        when 'autoresizingMask'
+          index = _xcode_get_index(['key', 'flexibleMaxX', 'flexibleMaxY', 'widthSizable', 
+                                    'heightSizable'], attr)
+        when 'document'
+          index = _xcode_get_index(['type', 'version', 'toolsVersion', 'systemVersion', 
+                                    'targetRuntime', 'propertyAccessControl', 'useAutolayout', 
+                                    'useTraitCollections', 'initialViewController'], attr)
+        when 'document'
+          index = _xcode_get_index(['type', 'version', 'toolsVersion', 'systemVersion', 
+                                    'targetRuntime', 'propertyAccessControl', 'useAutolayout', 
+                                    'useTraitCollections', 'initialViewController'], attr)
+        when 'image'
+          index = _xcode_get_index(['name', 'width', 'height'], attr)
+        when 'imageView'
+          index = _xcode_get_index(['clipsSubviews', 'userInteractionEnabled', 'alpha', 
+                                    'contentMode', 'horizontalHuggingPriority', 
+                                    'verticalHuggingPriority', 'image', 'id'], attr)
+        when 'segue'
+          index = _xcode_get_index(['destination', 'kind', 'relationship', 'id'], attr)
+        when 'navigationBar'
+          index = _xcode_get_index(['key', 'contentMode', 'id'], attr)
+        when 'navigationItem'
+          index = _xcode_get_index(['key', 'title', 'id'], attr)
+        when 'navigationController'
+          index = _xcode_get_index(['storyboardIdentifier', 'automaticallyAdjustsScrollViewInsets', 
+                                    'id', 'sceneMemberID'], attr)
+        when 'outlet'
+          index = _xcode_get_index(['property', 'destination', 'id'], attr)
+        when 'action'
+          index = _xcode_get_index(['selector', 'destination', 'id'], attr)
+        when 'barButtonItem'
+          index = _xcode_get_index(['key', 'title', 'id'], attr)
+        when 'tableViewController'
+          index = _xcode_get_index(['restorationIdentifier', 'storyboardIdentifier', 'id', 
+                                    'customClass', 'sceneMemberID'], attr)
+        when 'tableView'
+          index = _xcode_get_index(['key', 'clipsSubviews', 'contentMode', 'alwaysBounceVertical', 
+                                    'dataMode', 'style', 'separatorStyle', 'rowHeight', 
+                                    'sectionHeaderHeight', 'sectionFooterHeight', 'id'], attr)
+        when 'tableViewCellContentView'
+          index = _xcode_get_index(['key', 'opaque', 'clipsSubviews', 'multipleTouchEnabled', 
+                                    'contentMode', 'tableViewCell', 'id'], attr)
+        when 'tableViewCell'
+          index = _xcode_get_index(['key', 'opaque', 'clipsSubviews', 'multipleTouchEnabled', 
+                                    'contentMode', 'selectionStyle', 'accessoryType', 'indentationWidth', 
+                                    'textLabel', 'detailTextLabel', 'rowHeight', 'style', 'id'], attr)
+        when 'size'
+          index = _xcode_get_index(['key', 'width', 'height'], attr)
+        when 'textField'
+          index = _xcode_get_index(['opaque', 'clipsSubviews', 'contentMode', 'contentHorizontalAlignment', 
+                                    'contentVerticalAlignment', 'text', 'borderStyle', 'placeholder', 
+                                    'textAlignment', 'minimumFontSize', 'id'], attr)
+        else
+          index = attr.name
+        end
+        index
+      end
+    end
+    super(elm, out)
+  end
 
   # This genious is here to stop the damn thing from wrapping
   # lines over 80 chars long >.<
@@ -34,8 +133,6 @@ class CustomPrinter < REXML::Formatters::Pretty
   #
   def write_text( node, output )
     s = node.to_s()
-    s.gsub!(/\s/,' ')
-    s.squeeze!(" ")
 
     #The Pretty formatter code mistakenly used 80 instead of the @width variable
     #s = wrap(s, 80-@level)

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

@@ -63,6 +63,7 @@ module Terrestrial
 
         def save_document
           File.open(@path, "w") do |f|
+            f.write "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
             f.write format_document
           end 
         end

data/lib/terrestrial/cli/flight/ios_workflow.rb

@@ -56,7 +56,14 @@ module Terrestrial
 
         def detect_project_language(folder)
           info_plist = Dir[Config[:directory] + "/#{folder}/Info.plist"].first
-          `defaults read '#{info_plist}' CFBundleDevelopmentRegion`.gsub("\n", "").squeeze(" ")
+          lang = `defaults read '#{info_plist}' CFBundleDevelopmentRegion 2> /dev/null`.gsub("\n", "").squeeze(" ")
+
+          if lang.empty?
+            puts "Unable to detect project language. Defaulting to 'en'."
+            'en'
+          else
+            lang
+          end
         end
 
         def print_done_message(lproj_folder)

data/lib/terrestrial/cli/push.rb

@@ -7,6 +7,20 @@ module Terrestrial
         MixpanelClient.track("cli-push-command")
         load_string_registry
 
+        if string_registry.entries.any?
+          if duplicates.any?
+            show_duplicate_error_message
+          else
+            do_push
+          end
+        else
+          show_no_entries_error_message
+        end
+      end
+
+      private
+
+      def do_push
         response = web_client.push(Config[:project_id], Config[:app_id], format_entries)
 
         if response.success?
@@ -18,8 +32,6 @@ module Terrestrial
         end
       end
 
-      private
-
       def format_entries
         string_registry.entries.map do |entry|
           {
@@ -41,6 +53,36 @@ module Terrestrial
       def string_registry
         @string_registry
       end
+
+      def duplicates
+        @duplicates ||= string_registry
+                          .entries.group_by {|e| e["identifier"] }
+                          .select {|id, entries| entries.length > 1}
+      end
+
+      def show_duplicate_error_message
+        puts "- Push Failed"
+        puts "Terrestrial found some duplicate string identifiers:"
+        duplicates.each do |identifier, entries|
+          puts ""
+          puts "  '#{identifier}' found in"
+          entries.each_with_index do |entry, i|
+            puts "    #{i + 1}.) #{entry["file"]}"
+          end
+        end
+        puts ""
+        puts "String identifiers must be unique in each push. Make sure you remove any duplicates."
+        puts "If you are accidentally tracking you base language files as well as some foreign language files,"
+        puts "make sure you only track the base language."
+      end
+
+      def show_no_entries_error_message
+        puts "Terrestrial could not find any strings in your project."
+        puts "Are you tracking the correct files in terrestrial.yml?"
+        puts ""
+        puts "For more information, you can find our documentation at http://docs.terrestrial.io/"
+        puts "You can also jump on our Slack via https://terrestrial-slack.herokuapp.com/"
+      end
     end
   end
 end

data/lib/terrestrial/cli/scan.rb

@@ -19,16 +19,17 @@ module Terrestrial
       private
 
       def print_results
-        puts "New Strings: #{new_strings.count}"
-        puts "Removed Strings: #{removed_strings.count}"
-
         if opts[:verbose]
           print_diff
+          puts ""
         else
           if rand(10) == 1 # Show hint ~10% of the time
             puts "(Hint: add --verbose to the 'scan' command to view the diff of local and remote strings.)"
           end
         end
+
+        puts "New Strings: #{new_strings.count}"
+        puts "Removed Strings: #{removed_strings.count}"
       end
 
       def print_diff

data/lib/terrestrial/cli/string_registry.rb

@@ -5,15 +5,16 @@ module Terrestrial
       def self.load
         entries = Config[:translation_files].flat_map do |file|
           begin
-            if Config[:platform] == "ios"
-              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}")
+            entries = find_entries(file)
+            entries.each do |entry|
+              entry["file"] = file # Ensure paths are relative
             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." 
+            puts ""
+            puts "Could not find localization file."
+            puts "Looked in #{Config[:directory] + "/" + file}"
+            puts "If the file is no longer in your project, remove it from your tracked files in terrestrial.yml."
+            abort
           end
         end
 
@@ -27,6 +28,16 @@ module Terrestrial
       def entries
         @entries
       end
+
+      def self.find_entries(file)
+        if Config[:platform] == "ios"
+          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
+      end
     end
   end
 end

data/lib/terrestrial/cli/version.rb

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

data/lib/terrestrial/config.rb

@@ -32,7 +32,16 @@ module Terrestrial
       end
 
       def [](key)
-        values[key]
+        if key == :translation_files
+          # Translation files should be handed back as an
+          # empty array if it is nil.
+          # This can happen when users remove all translation
+          # files from terrestrial.yml instead of making 
+          # it a valid YAML empty list
+          values[:translation_files] || []
+        else
+          values[key]
+        end
       end
 
       def reset!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrestrial-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Niklas Begley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table