terrestrial-cli 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e281351eb1f04aa6331e79dcb3c229569c7886be
-  data.tar.gz: 782805e8aafda3c9fbc1af5120b59b969b7f800c
+  metadata.gz: eff2d2337528b5b9713b26919a393b2b145f6d2c
+  data.tar.gz: 1c12b3c56e54a0e81832ca9807ecb1ff8ba35a0a
 SHA512:
-  metadata.gz: 791442b2416b61b88c2ee69daee39a8c25600e5b74f3ff2a1a74cc86a5f25326452a8c175224ec80365ee02219d15892f26cf5b74c614c6c942701f5ef742419
-  data.tar.gz: eec81b09adaa373bcef0ce1ee419721a0fe40091d61c9b8270443fd7f2a7b7e297e611d794474f9491b7bb6b0062491511167696ffead0c8b6a80a3695cfb919
+  metadata.gz: c05e9799ac90e76144055d2ad37efeffbb7416e4edfe6647fa07470a41dd0912f3b89ebdb19dfc20d3f0b1c22cce35026becaecc11570bfb2e8684a331964d2a
+  data.tar.gz: b759606eef9ea8b17bb48e993331bf9053057ba65d0e96f8da0fe34d89e40cef6c98416aa5b5a77cae15db27e1cda0fade66d020bd9173a367faa267ad455f24

data/lib/terrestrial/cli/bootstrapper.rb

@@ -81,7 +81,6 @@ module Terrestrial
 
     class Bootstrapper
       class Entry
-        MAX_IDENTIFIER_LENGTH = 10 # words
 
         def initialize(string, occurences = [])
           @string = string
@@ -104,12 +103,7 @@ module Terrestrial
         end
 
         def identifier
-          formatted_string
-            .gsub(/%\d\$@/, '')
-            .gsub(/[^0-9a-z ]/i, '')
-            .split(" ")[0..(MAX_IDENTIFIER_LENGTH - 1)]
-            .join("_")
-            .upcase
+          @identifier ||= IdGenerator.generate(formatted_string)
         end
 
         def string
@@ -179,6 +173,56 @@ module Terrestrial
           end
         end
       end
+
+      class IdGenerator
+        MAX_IDENTIFIER_LENGTH = 10 # words
+
+        class << self
+          def generate(string)
+            id = do_generate_id(string)
+
+            attempt = 1
+            while id_already_exists?(id)
+              id = increment_id(id, attempt)
+              attempt += 1
+            end
+            id_history << id
+            id
+          end
+
+          def reset!
+            @history = []
+          end
+
+          private
+
+          def increment_id(id, attempt)
+            if id[-1] == (attempt).to_s
+              id[-1] = (attempt + 1).to_s
+              id
+            else
+              id << "_#{attempt + 1}"
+            end
+          end
+
+          def do_generate_id(string)
+            string
+              .gsub(/%\d\$@/, '')
+              .gsub(/[^0-9a-z ]/i, '')
+              .split(" ")[0..(MAX_IDENTIFIER_LENGTH - 1)]
+              .join("_")
+              .upcase
+          end
+
+          def id_already_exists?(id)
+            id_history.any? {|previous| previous == id }
+          end
+
+          def id_history
+            @history ||= []
+          end
+        end
+      end
     end
   end
 end

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

@@ -57,19 +57,17 @@ module Terrestrial
           puts "------------------------------------"
           puts "-- Done!"
           puts "- Created Base.lproj in #{lproj_folder}."
+          puts "- All strings in source substituted with IDs."
           puts "- Remember to include the new localization files in your project!"
         end
 
         def print_instructions
-          puts "- Terrestrial will add #{results.length} strings to your base Localizable.strings."
-          puts ""
           puts "------------------------------------"
           puts "-- Source Code" 
-          puts "- Would you like Terrestrial to also modify the selected strings in your"
-          puts "- source code to call .translated?"
+          puts "- Next Terrestrial will modify your source code to reference all the selected strings via IDs."
           puts "-   e.g.  \"This is my string\"  =>  \"This is my string\".translated"
           puts ""
-          puts "y/n?"
+          puts "Continue? y/n?"
         end
 
         def results

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

@@ -12,8 +12,6 @@ module Terrestrial
         end
 
         def run
-          print_instructions
-
           exclusions = []
           i = 0
 
@@ -56,8 +54,9 @@ module Terrestrial
           puts "-- Instructions --"
           puts "- To exclude any strings from translation, type the index of each string."
           puts "-   e.g. 1,2,4"
+          puts "- Press return to continue, or 'q' to quit at any time."
           puts "------------------"
-          puts "Any Exclusions? (press return to continue or 'q' to quit at any time)"
+          puts "Any Exclusions?"
         end
 
         def file_name_with_line_number(string)

data/lib/terrestrial/cli/flight.rb

@@ -31,28 +31,21 @@ module Terrestrial
         end
 
         puts "------------------------------------"
-        puts "- Found #{strings.count} strings"
+        puts "- Found #{strings.all_occurences.count} strings"
         puts ""
         exclusions = TableWorkflow.new(strings).run
+        strings.exclude_occurences(exclusions)
+
         puts "------------------------------------"
         puts "- Done!"
+        puts "- Terrestrial will add #{strings.all_occurences.count} strings to your base Localizable.strings."
+        puts ""
 
-        strings.exclude_occurences(exclusions)
-
-        if Config[:platform] == "ios"
-          IosWorkflow.new(strings).run
-        elsif Config[:platform] == 'android'
-          android_workflow
-        end
+        IosWorkflow.new(strings).run
       end
 
       private
 
-      def android_workflow
-        puts "- Terrestrial will annotate the selected strings in your strings.xml file:"
-        puts "-  e.g.  <string name='my_name'>My string!</string>  =>  <string terrestrial='true' name='my_name'>My string</string>"
-      end
-
       def find_new_strings
         @strings = Bootstrapper.find_new_strings(Config[:directory])
       end
@@ -84,8 +77,6 @@ module Terrestrial
           puts ""
           puts "For more information, visit http://docs.terrestrial.io/, or jump on our Slack via https://terrestrial-slack.herokuapp.com/"
           abort
-        else 
-          # TODO
         end
       end
     end

data/lib/terrestrial/cli/init.rb

@@ -57,16 +57,16 @@ module Terrestrial
       private
       
       def select_translation_files
-        @tranlation_files = [] 
+        @translation_files = [] 
 
         files = find_platform_translation_files
         if files.any?
-          @tranlation_files = FilePicker.run(files, @platform)
+          @translation_files = FilePicker.run(files, @platform)
           
-          if @tranlation_files.count == 1
-            puts "Tracking #{@tranlation_files.count} file!"
+          if @translation_files.count == 1
+            puts "Tracking #{@translation_files.count} file!"
           else
-            puts "Tracking #{@tranlation_files.count} files!"
+            puts "Tracking #{@translation_files.count} files!"
           end
         end
       end
@@ -87,7 +87,7 @@ module Terrestrial
           project_id: @project_id,
           platform: @platform,
           api_key: @api_key,
-          translation_files: @tranlation_files
+          translation_files: @translation_files
         })
 
         Terrestrial::Config.update_global_config

data/lib/terrestrial/cli/parser/objc.rb

@@ -102,6 +102,8 @@ module Terrestrial
           without_strings.include?("DLog") || 
           without_strings.include?("NSLog") || 
           without_strings.include?("NSAssert") ||
+          without_strings.downcase.include?(".translated") || 
+          without_strings.downcase.include?("nslocalizedstring") || 
           without_strings.downcase.include?("uistoryboard") ||
           without_strings.downcase.include?("instantiateviewcontrollerwithidentifier") ||
           without_strings.downcase.include?("uiimage") ||

data/lib/terrestrial/cli/parser/swift.rb

@@ -79,9 +79,12 @@ module Terrestrial
         def self.looks_suspicious(line)
           without_strings = line.gsub(STRING_REGEX, "")
           without_strings.include?("_LOG") || 
+          without_strings.include?("_LOG") || 
           without_strings.include?("DLog") || 
           without_strings.include?("NSLog") || 
           without_strings.include?("NSAssert") ||
+          without_strings.downcase.include?(".translated") || 
+          without_strings.downcase.include?("nslocalizedstring") || 
           without_strings.downcase.include?("uistoryboard") ||
           without_strings.downcase.include?("instantiateviewcontrollerwithidentifier") ||
           without_strings.downcase.include?("uiimage") ||

data/lib/terrestrial/cli/push.rb

@@ -7,9 +7,15 @@ module Terrestrial
         MixpanelClient.track("cli-push-command")
         load_string_registry
 
-        web_client.push(Config[:project_id], Config[:app_id], format_entries)
-
-        puts "Success!"
+        response = web_client.push(Config[:project_id], Config[:app_id], format_entries)
+
+        if response.success?
+          puts "Strings uploaded!"
+        else
+          puts "There was an error uploading your translations:"
+          puts response.inspect
+          puts "If the problem persists, contact us at team@terrestrial.io, or on Slack at https://terrestrial-slack.herokuapp.com/"
+        end
       end
 
       private

data/lib/terrestrial/cli/scan.rb

@@ -34,14 +34,14 @@ module Terrestrial
       def print_diff
         puts "--- Diff"
         puts "- New Strings"
-        print_table(new_strings)
+        puts create_table(new_strings)
         puts ""
         puts "- Removed Strings"
-        print_table(removed_strings)
+        puts create_table(removed_strings)
       end
 
-      def print_table(strings)
-        puts Terminal::Table.new(headings: ['Identifier', 'String', 'Comment']) do |t|
+      def create_table(strings)
+        Terminal::Table.new(headings: ['Identifier', 'String', 'Comment']) do |t|
           size = strings.count
           strings.each_with_index do |string, i|
             t.add_row([string["identifier"], string["string"], string["context"]])
@@ -60,8 +60,8 @@ module Terrestrial
 
       def fetch_current_strings_from_web
         web_client
-          .get_app_strings(Config[:project_id], Config[:app_id])
-          .body["data"]["strings"]
+        .get_app_strings(Config[:project_id], Config[:app_id])
+        .body["data"]["strings"]
       end
 
       def web_client

data/lib/terrestrial/cli/version.rb

@@ -1,5 +1,5 @@
 module Terrestrial
   module Cli
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

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