terrestrial-cli 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19809fc36efca682a72fa29685608946f2497e03
-  data.tar.gz: f61adc168c76bfd95be3dcf1af38e93e3cf35c76
+  metadata.gz: fc57490459267dbe6b4c2df4e559a120027a12be
+  data.tar.gz: d27387494081c26bea5e60c1855af88882918eff
 SHA512:
-  metadata.gz: d1918ad3963dcd5e562326fdc9ead7252176611c2db7aa75a34e7a45510ba85c6044c0caec5787244d3d38e06ff88088dfe676b92adf648d19bac896c6dcfaae
-  data.tar.gz: 35c563e0a6c36ac769119e5b42e16d98bf1d60255f147f75ff50e5a25b37beb7b865a336ece743e7bdad669eca1dc01af0c4bc777b972da74261ae521f299ea5
+  metadata.gz: 93030b56a6442be1d388838042a35cbf9cae43de63a2e8f1abbcdab21a9f4f3df24f35e7783abf6ab5850341da3a30d81fd5d31afe8954039272e78ade245c6e
+  data.tar.gz: c684228655afbef79bd750e03c5e810ef064935a12eb3540215b8dae1c36e59d5a88805c3e7a723f8c0393250e817c793f8cab927d886f5897a19563dbfd64a3

data/circle.yml

@@ -4,7 +4,8 @@ machine:
 
 dependencies:
   pre:
-    - gem update bundler
+    - rvm install rubygems 2.4.8 --force                   
+    - gem install bundler -v 1.11.2
 
 test:
   override:

data/lib/terrestrial/cli/ignite.rb

@@ -7,9 +7,32 @@ module Terrestrial
       def run
         Config.load!
         MixpanelClient.track("cli-ignite-command")
-        lang   = opts[:language] 
-        scheme = opts[:scheme] 
+        @lang   = opts[:language]
+        @scheme = opts[:scheme]
 
+        validate_inputs!
+        print_progress_message
+
+        TerminalUI.show_spinner do
+          launcher = SimulatorLauncher.new(scheme: scheme, args: {
+            'AppleLanguages' => "(#{lang})",
+          })
+
+          launcher.run
+        end
+      end
+
+      private
+
+      def lang
+        @lang
+      end
+
+      def scheme
+        @scheme
+      end
+
+      def validate_inputs!
         if Config[:platform] != "ios"
           abort "Unfortunately launching your app in a locale via 'ignite' is only supported on iOS at this time."
         end
@@ -17,55 +40,14 @@ module Terrestrial
         if lang.nil? || lang.empty?
           abort "Please provide a locale to launch the simulator in.\n  e.g. 'terrestrial ignite es'"
         end
+      end
 
+      def print_progress_message
         if scheme
           puts "Starting simulator in locale \"#{lang}\" with scheme \"#{scheme}\"..."
         else
           puts "Starting simulator in locale \"#{lang}\"..."
         end
-
-        TerminalUI.show_spinner do
-          ensure_var_folder_exists
-
-          workspace = Dir["#{Config[:directory]}/*.xcworkspace"][0]
-          project = Dir["#{Config[:directory]}/*.xcodeproj"][0]
-
-          # Kill simulator and 
-          system("killall \"Simulator\" &> /dev/null")
-          `rm -rf #{WORKING_DIR}`
-
-          if workspace 
-            # If a workspace exists we want to build it instead of the project.
-            # We assume the scheme we want to use is simply the application name
-            app_name = File.basename(workspace).split(".").first
-            `xcodebuild -workspace "#{workspace}" -destination 'platform=iOS Simulator,name=iPhone 6s' -scheme #{scheme || app_name} -configuration Debug clean build CONFIGURATION_BUILD_DIR=#{WORKING_DIR}`
-          else
-            app_name = File.basename(project).split(".").first
-            `xcodebuild -project "#{project}" -destination 'platform=iOS Simulator,name=iPhone 6s' -scheme #{scheme || app_name} -configuration Debug clean build CONFIGURATION_BUILD_DIR=#{WORKING_DIR}`
-          end
-          `open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app`
-
-          # Here we literally sleep until the Simulator has been booted
-          wait_until_booted = %{
-            count=`xcrun simctl list | grep Booted | wc -l | sed -e 's/ //g'`
-            while [ $count -lt 1 ]
-            do
-                sleep 1
-                count=`xcrun simctl list | grep Booted | wc -l | sed -e 's/ //g'`
-            done
-          }
-          `#{wait_until_booted}`
-
-          # Here we magically find the bundle identifier of the app
-          command = "defaults read \"#{Dir[WORKING_DIR + '/*.app/Info.plist'].first}\" CFBundleIdentifier"
-          bundle_name = `#{command}`.chop
-
-          # Reinstall the app,
-          # Run it with the locale we want
-          `xcrun simctl uninstall booted #{bundle_name}`
-          `xcrun simctl install booted "#{Dir[WORKING_DIR + "/" + app_name + ".app"].first}"`
-          `xcrun simctl launch booted #{bundle_name} --args -AppleLanguages \\(#{lang}\\)`
-        end
       end
 
       def ensure_var_folder_exists

data/lib/terrestrial/cli/init.rb

@@ -8,48 +8,48 @@ module Terrestrial
         Config.load!({}, project: false)
         
         if Config.project_config_exist?
-          abort "Looks like there already exists a project in this directory. Are you in the correct folder?"
+          abort 'Looks like there already exists a project in this directory. Are you in the correct folder?'
         end
 
         check_arguments
         detect_platform
 
-        puts "-- Terrestrial Initializing"
-        puts "Adding new app! Searching for localization files..."
+        puts '-- Terrestrial Initializing'
+        puts 'Adding new app! Searching for localization files...'
 
         TerminalUI.show_spinner do
           # Otherwise the whole process is too quick for the eye
           sleep 2 unless Config.testing?
         end
-        puts ""
+        puts ''
 
         select_translation_files
         create_app_in_web
 
         if @response.success?
           update_config
-          MixpanelClient.track("cli-init-command")
+          MixpanelClient.track('cli-init-command')
 
-          puts "-- Success!"
-          puts "App platform added to project! You can view your app at https://mission.terrestrial.io/projects/#{Config[:project_id]}/apps/#{Config[:app_id]}"
-          puts ""
-          puts "-- What to do next?"
+          puts '-- Success!'
+          puts 'App platform added to project! You can view your app at https://mission.terrestrial.io/'
+          puts ''
+          puts '-- What to do next?'
 
           if @translation_files.any?
-            puts "Run 'terrestrial scan' to see which strings Terrestrial is currently tracking."
-            puts "When you're ready to upload your strings for translation, run 'terrestrial push'!"
-          elsif @translation_files.none? && @platform == "ios"
-            puts "To get started localizing your app, run 'terrestrial flight'."
-            puts "Terrestrial will scan your code for strings, and generate the necessary localization files."
-          elsif @translation_files.none? && @platform == "android"
-            puts "Looks like Terrestrial does not know which strings.xml files to track."
-            puts "To continue, add your base language strings.xml file to terrestrial.yml."
-            puts "When you're ready, run 'terrestrial scan' to see which strings Terrestrial is tracking, and 'terrestrial push' to upload."
+            puts 'Run "terrestrial scan" to see which strings Terrestrial is currently tracking.'
+            puts 'When you\'re ready to upload your strings for translation, run "terrestrial push"!'
+          elsif @translation_files.none? && @platform == 'ios'
+            puts 'To get started localizing your app, run "terrestrial flight".'
+            puts 'Terrestrial will scan your code for strings, and generate the necessary localization files.'
+          elsif @translation_files.none? && @platform == 'android'
+            puts 'Looks like Terrestrial does not know which strings.xml files to track.'
+            puts 'To continue, add your base language strings.xml file to terrestrial.yml.'
+            puts 'When you\'re ready, run "terrestrial scan" to see which strings Terrestrial is tracking, and "terrestrial push" to upload.'
           end
-          puts ""
-          puts "For more information, see http://docs.terrestrial.io or jump on Slack at https://terrestrial-slack.herokuapp.com/ if you have any questions."
+          puts ''
+          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 'Oh snap. There was an error initializing your project.'
           puts @response.body.inspect
           abort
         end
@@ -70,16 +70,16 @@ module Terrestrial
             puts "Tracking #{@translation_files.count} files!"
           end
         else
-          puts "Could not find any localization files to track."
+          puts 'Could not find any localization files to track.'
         end
       end
 
       def find_platform_translation_files
-        if @platform == "ios"
-          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"
+        if @platform == 'ios'
+          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}"
@@ -88,7 +88,7 @@ module Terrestrial
 
       def update_config
         Terrestrial::Config.load({
-          app_id: @response.body["data"]["id"],
+          app_id: @response.body['data']['id'],
           project_id: @project_id,
           platform: @platform,
           api_key: @api_key,
@@ -106,11 +106,11 @@ module Terrestrial
 
       def check_arguments
         @api_key = opts[:api_key] || Config[:api_key] || 
-                 abort("No api key provided. You can find your API key at https://mission.terrestrial.io/.")
+                 abort('No api key provided. You can find your API key at https://mission.terrestrial.io/.')
 
         @project_id = opts.fetch(:project_id) { abort(
-          "No project ID provided. Terrestrial needs to know which project this app belongs to.\n" +
-          "Visit https://mission.terrestrial.io to find your project ID."
+          'No project ID provided. Terrestrial needs to know which project this app belongs to.\n' +
+          'Visit https://mission.terrestrial.io to find your project ID.'
         )}
       end
 

data/lib/terrestrial/cli/language_name.rb

@@ -1,6 +1,6 @@
 module Terrestrial
   module Cli
-    module LanguageName
+    class LanguageName
 
       LANGUAGES = {
         "af" => "Afrikaans",

data/lib/terrestrial/cli/photoshoot.rb

@@ -2,66 +2,45 @@ module Terrestrial
   module Cli
     class Photoshoot < Command
 
-      WORKING_DIR = '/usr/local/var/terrestrial'
-
       def run
         Config.load!
         MixpanelClient.track("cli-photoshoot-command")
-        scheme = opts[:scheme] 
+        @scheme = opts[:scheme]
+
+        validate_inputs!
+        print_progress_message
+
+        TerminalUI.show_spinner do
+          launcher = SimulatorLauncher.new(scheme: scheme, args: {
+            'TerrestrialScreenShotMode' => true,
+            'TerrestrialAPIToken' => Config[:api_key],
+            'TerrestrialAppId' => Config[:app_id],
+            'TerrestrialProjectId' => Config[:project_id],
+            'TerrestrialURL' => Config[:api_url]
+          })
+
+          launcher.run
+        end
+      end
+
+      private
 
+      def scheme
+        @scheme
+      end
+
+      def validate_inputs!
         if Config[:platform] != "ios"
           abort "Unfortunately photoshoot mode is only supported on iOS at this time."
         end
+      end
 
+      def print_progress_message
         if scheme
           puts "Starting simulator in photoshoot mode with scheme \"#{scheme}\"..."
         else
           puts "Starting simulator in photoshoot mode..."
         end
-        ensure_var_folder_exists
-
-        workspace = Dir["#{Config[:directory]}/*.xcworkspace"][0]
-        project = Dir["#{Config[:directory]}/*.xcodeproj"][0]
-
-        # Kill simulator and 
-        system("killall \"Simulator\" &> /dev/null")
-        `rm -rf #{WORKING_DIR}`
-
-        if workspace 
-          # If a workspace exists we want to build it instead of the project.
-          # We assume the scheme we want to use is simply the application name
-          app_name = File.basename(workspace).split(".").first
-          `xcodebuild -workspace "#{workspace}" -destination 'platform=iOS Simulator,name=iPhone 6s' -scheme #{scheme || app_name} -configuration Debug clean build CONFIGURATION_BUILD_DIR=#{WORKING_DIR}`
-        else
-          app_name = File.basename(project).split(".").first
-          `xcodebuild -project "#{project}" -destination 'platform=iOS Simulator,name=iPhone 6s' -scheme #{scheme || app_name} -configuration Debug clean build CONFIGURATION_BUILD_DIR=#{WORKING_DIR}`
-        end
-        `open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app`
-
-        # Here we literally sleep until the Simulator has been booted
-        wait_until_booted = %{
-          count=`xcrun simctl list | grep Booted | wc -l | sed -e 's/ //g'`
-          while [ $count -lt 1 ]
-          do
-              sleep 1
-              count=`xcrun simctl list | grep Booted | wc -l | sed -e 's/ //g'`
-          done
-        }
-        `#{wait_until_booted}`
-
-        # Here we magically find the bundle identifier of the app
-        command = "defaults read \"#{Dir[WORKING_DIR + '/*.app/Info.plist'].first}\" CFBundleIdentifier"
-        bundle_name = `#{command}`.chop
-
-        # Reinstall the app,
-        # Run it with the locale we want
-        `xcrun simctl uninstall booted #{bundle_name}`
-        `xcrun simctl install booted "#{Dir[WORKING_DIR + "/" + app_name + ".app"].first}"`
-        `xcrun simctl launch booted #{bundle_name} --args -TerrestrialScreenShotMode YES -TerrestrialAPIToken "#{Config[:api_key]}" -TerrestrialAppId "#{Config[:app_id]}" -TerrestrialProjectId "#{Config[:project_id]}" -TerrestrialURL "#{Config[:api_url]}"`
-      end
-
-      def ensure_var_folder_exists
-        `mkdir -p #{WORKING_DIR}`
       end
     end
   end

data/lib/terrestrial/cli/pull.rb

@@ -42,7 +42,7 @@ module Terrestrial
         elsif Config[:platform] == "android"
           android_translation_file_path(language) 
         elsif Config[:platform] == "unity"
-          Config[:directory] + "/Assets/Terrestrial/" + human_readable_language_name(language) + ".xml"
+          unity_translation_file_path(language)
         end
       end
 
@@ -66,6 +66,14 @@ module Terrestrial
         folder + "/strings.xml"
       end
 
+      def unity_translation_file_path(language)
+        folder = Pathname.new(Config[:directory] + "/" + Config[:translation_files].first)
+                  .parent
+                  .to_s 
+
+        folder + "/" + human_readable_language_name(language) + ".xml"
+      end
+
       def write_translation_file(path, translations)
         File.open(path, "w+") do |f|
           if Config[:platform] == "ios"

data/lib/terrestrial/cli/simulator_launcher.rb

@@ -0,0 +1,135 @@
+module Terrestrial
+  module Cli
+    class SimulatorLauncher
+
+      WORKING_DIR = '/usr/local/var/terrestrial'
+
+      def initialize(args: nil, scheme: nil)
+        @scheme = scheme
+        @args = args
+      end
+
+      def run
+        cleanup_simulator
+        build_app
+        launch_simulator
+        wait_until_simulator_booted
+
+        reinstall_app
+        launch_app_with_args
+      end
+
+      private
+
+      def cleanup_simulator
+        ensure_var_folder_exists
+
+        system("killall \"Simulator\" &> /dev/null")
+        `rm -rf #{WORKING_DIR}`
+      end
+
+      def build_app
+        c = "xcodebuild #{is_workspace? ? '-workspace' : '-project' } \"#{project_path}\" " +
+            "-destination 'platform=iOS Simulator,name=iPhone 6s' " +
+            "-scheme #{scheme} " +
+            "-configuration Debug clean build CONFIGURATION_BUILD_DIR=#{WORKING_DIR}"
+
+        `#{c}`
+      end
+
+      def launch_simulator
+        `open /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app`
+      end
+
+      def wait_until_simulator_booted
+        wait_until_booted = %{
+          count=`xcrun simctl list | grep Booted | wc -l | sed -e 's/ //g'`
+          while [ $count -lt 1 ]
+          do
+              sleep 1
+              count=`xcrun simctl list | grep Booted | wc -l | sed -e 's/ //g'`
+          done
+        }
+        `#{wait_until_booted}`
+      end
+
+      def reinstall_app
+        `xcrun simctl uninstall booted #{bundle_identifer}`
+        `xcrun simctl install booted "#{Dir[WORKING_DIR + "/" + (bundle_name) + ".app"].first}"`
+      end
+
+      def launch_app_with_args
+        c = "xcrun simctl launch booted #{bundle_identifer} --args " + LaunchArgsBuilder.build(args)
+
+        `#{c}`
+      end
+
+      def project_path
+        # Try to find a workspace, fall back to project, finally fail
+        @project_path ||= Dir["#{Config[:directory]}/*.xcworkspace"][0] || 
+                        Dir["#{Config[:directory]}/*.xcodeproj"][0] || 
+                        raise('Could not find workspace or project in folder')
+      end
+
+      def scheme
+        @scheme || app_name
+      end
+
+      def app_name
+        @app_name ||= File.basename(project_path).split(".").first
+      end
+
+      def args
+        @args ||= {}
+      end
+
+      def is_workspace?
+        project_path.end_with?('xcworkspace')
+      end
+
+      def ensure_var_folder_exists
+        `mkdir -p #{WORKING_DIR}`
+      end
+
+      def bundle_identifer
+        # Fetch the bundle identifier from the project's Info.plist folder
+        @bundle_identifer ||= `defaults read \"#{Dir[WORKING_DIR + '/*.app/Info.plist'].first}\" CFBundleIdentifier`.chomp
+      end
+
+      def bundle_name
+        # Fetch the bundle display name from the project's Info.plist folder
+        @bundle_name ||= `defaults read \"#{Dir[WORKING_DIR + '/*.app/Info.plist'].first}\" CFBundleName`.chomp
+      end
+    end
+  end
+end
+
+module Terrestrial
+  module Cli
+    class SimulatorLauncher
+      class LaunchArgsBuilder
+
+        def self.build(args)
+          result = []
+
+          args.each do |key, value|
+            result << "-#{key}"
+            result << build_value(value)
+          end
+
+          result.join(" ")
+        end
+
+        def self.build_value(value)
+          if value.class == TrueClass
+            'YES'
+          elsif value.class == FalseClass
+            'NO'
+          else
+            "\"#{value}\""
+          end
+        end
+      end
+    end
+  end
+end

data/lib/terrestrial/cli/unity_parser.rb

@@ -10,6 +10,7 @@ module Terrestrial
         # to be unity instead of the Android default.
         result.map do |entry|
           entry["type"] = "unity"
+          entry
         end
       end
     end

data/lib/terrestrial/cli/version.rb

@@ -1,5 +1,5 @@
 module Terrestrial
   module Cli
-    VERSION = "0.6.5"
+    VERSION = "0.6.6"
   end
 end

data/lib/terrestrial/cli/version_checker.rb

@@ -1,23 +1,57 @@
 require 'json'
+require 'net/http'
+require 'uri'
 
 module Terrestrial
   module Cli
     class VersionChecker
     
-      URL = 'https://api.github.com/repos/terrestrial-io/terrestrial-cli/releases/latest'
+      URL = URI('https://api.github.com/repos/terrestrial-io/terrestrial-cli/releases/latest')
 
       def self.run
-        response = Net::HTTP.get_response(URI(URL))
+        http = Net::HTTP.new(URL.host, URL.port)
+        http.read_timeout = 3
+        http.open_timeout = 3
+
+        response = http.start() {|client|
+          client.get(URL.path)
+        }
+
         json = JSON.load(response.body)
 
         # Ignore the "v" in "v1.1.1"
-        version = json["tag_name"][1..-1]
+        begin 
+          version = json["tag_name"][1..-1]
+        rescue NoMethodError => e
+          # Github ratelimiting will change the JSON response.
+          # Keep calm and carry on.
+
+          version = Terrestrial::Cli::VERSION
+        end
 
-        if version != Terrestrial::Cli::VERSION
+        if higher_version?(version, Terrestrial::Cli::VERSION)
           puts "There is an update for Terrestrial: #{version} (your version: #{Terrestrial::Cli::VERSION})"
           puts "Run 'gem update terrestrial-cli' to update."
           puts ""
         end
+      rescue JSON::ParserError => e
+        # Don't worry about JSON parsing errors - just carry on
+      rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+               Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+        # Don't worry about Net HTTP errors - just carry on
+      end
+
+      def self.higher_version?(v1, v2)
+        # Is v1 a higher semantic versioning number than v2?
+        v1 = v1.split('.').reject {|i| i.to_i.to_s != i }.map(&:to_i)
+        v2 = v2.split('.').reject {|i| i.to_i.to_s != i }.map(&:to_i)
+
+        v1.each_with_index do |e, i|
+          if e > v2[i] 
+            return true
+          end
+        end
+        false
       end
     end
   end

data/lib/terrestrial/cli.rb

@@ -5,6 +5,7 @@ require "terrestrial/cli/scan"
 require "terrestrial/cli/ignite"
 require "terrestrial/cli/push"
 require "terrestrial/cli/pull"
+require "terrestrial/cli/simulator_launcher"
 require "terrestrial/cli/photoshoot"
 require "terrestrial/cli/version_checker"
 require "terrestrial/cli/version"

data/lib/terrestrial/web.rb

@@ -52,6 +52,8 @@ module Terrestrial
       request["AUTHENTICATE"] = @token
 
       Response.new(http.request(request))
+    rescue Errno::ECONNREFUSED, SocketError
+      abort 'Unable to connect to Terrestrial Mission Control. Are you connected to the internet?'
     end
 
     def get(path)
@@ -63,6 +65,8 @@ module Terrestrial
       request["AUTHENTICATE"] = @token
 
       Response.new(http.request(request))
+    rescue Errno::ECONNREFUSED, SocketError
+      abort 'Unable to connect to Terrestrial Mission Control. Are you connected to the internet?'
     end
 
     def base_url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrestrial-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Niklas Begley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
@@ -153,6 +153,7 @@ files:
 - lib/terrestrial/cli/pull/processes_translations.rb
 - lib/terrestrial/cli/push.rb
 - lib/terrestrial/cli/scan.rb
+- lib/terrestrial/cli/simulator_launcher.rb
 - lib/terrestrial/cli/string_registry.rb
 - lib/terrestrial/cli/terminal_ui.rb
 - lib/terrestrial/cli/unity_formatter.rb