smartling_xcode 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a28e04a4e2341fca2af30b77383428cdec69c30
-  data.tar.gz: d779c2b54abb8997a8b1c70121752ca37668af11
+  metadata.gz: 53fca9c7b7ea263102d71839d84c897eeef271e4
+  data.tar.gz: 667cc5a69305e6c6ab0ddc9db1a96ea116a95d89
 SHA512:
-  metadata.gz: a62c2cda9df56c354e8508b0424b86df7027531c14c4b10402f3317112cd2cf0c1923b264344b9f57b827ca06dfa6f4f8cf4daf831992201dd09f3c539e45fde
-  data.tar.gz: ed1724e98b35eb5c8c9cccce40cc9ec903d843471f118ee74ea3b4310f4b2a9f3f4f8e3d42abac1a4d2ac7b69a7d22fdbcbc9b1bee0a6b1334393dd464598df1
+  metadata.gz: 8964deb3083a1c24892da436234c07bdc1033e939696279e072f3fa7079d4cf1db3899dd54e817d16f76d470bd6eabef57457f366cf3ba73db1f9953017bb6d2
+  data.tar.gz: dd0d473efce5db5908b8a9360600a2348225316f949f57d8c15b36a2d29c73463f6429960e1d6451e1b808383bcebabf11b93e929f335f60b297bc03a47e1b32

data/bin/smartling_xcode

@@ -4,33 +4,45 @@ require "smartling_xcode"
 
 # Parse options
 USAGE = <<ENDUSAGE
-Smartling utility to extract strings from an Xcode project and add them to a Smartling project.
+Smartling utility to extract strings from an Xcode project 
+and add them to a Smartling project.
 Version #{SmartlingXcode::VERSION}
 
-  Usage:
-    smartling_xcode command [project path]
-    smartling_xcode -h/--help
-    smartling_xcode -v/--version
+Usage:
+  smartling_xcode command [project_path] [-v version]
+  smartling_xcode -h/--help
 
-  Commands:
-    init        Configure the current folder with Smartling project credentials to be able to push strings.
-    extract     Extract all strings from the Xcode project and print out the list of .strings files.
-    push        Extract all strings from the Xcode project and send them to your Smartling project.
+Commands:
+  init        Configure the current folder with Smartling
+              project credentials to be able to push 
+              strings.
+  extract     Extract all strings from the Xcode project 
+              and print out the list of .strings files.
+  push        Extract all strings from the Xcode project 
+              and send them to your Smartling project.
 
-  Options:
-    [project path]  Specify a path for the Xcode project. Uses the first .xcodeproj file in the current directory by default.
+Options:
+  project_path   Specify a path for the Xcode project. 
+                 Uses the first .xcodeproj file in the 
+                 current directory by default.
+  -v version     Specify an app version for the strings 
+                 files upload. Uses the version found in 
+                 the project's info.plist file by default, 
+                 but will prompt for a choice if multiple 
+                 plist files are found.
 
 ENDUSAGE
 
 # Parse CLI arguments
 project_path = nil
 command = nil
+version = nil
+version_is_next = false
 ARGV.each do |arg|
     case arg
     # Flags
-    when '-v', '--version'
-        puts "smartling_xcode version #{SmartlingXcode::VERSION}"
-        Kernel.exit(0)
+    when '-v'
+        version_is_next = true
     when '-h', '--help'
         puts USAGE
         Kernel.exit(0)
@@ -41,13 +53,16 @@ ARGV.each do |arg|
     else
         if command.nil?
             Kernel.abort(USAGE)
-        else 
+        elsif version_is_next
+            version = arg
+            version_is_next = false
+        else
             project_path = arg
         end
     end
 end
 
-result = SmartlingXcode.execute(command, project_path)
+result = SmartlingXcode.execute(command, project_path, version)
 if result != 0
     Kernel.abort(USAGE)
 end

data/lib/smartling_xcode/backend.rb

@@ -1,5 +1,6 @@
 require 'smartling'
 require 'json'
+require 'shellwords'
 
 module SmartlingXcode
     CREDFILE = './.smartling.json'
@@ -53,11 +54,13 @@ module SmartlingXcode
         end
     end
 
-    def self.pushStringsFromFiles(files, creds)
+    def self.pushStringsFromFiles(files, version, creds)
         sl = Smartling::File.new(:apiKey => creds['api_key'], :projectId => creds['project_id'])        
         files.each do |f|
+
             # Check if file exists
-            if !File.exist?(f)
+            if !f || !File.exist?(f)
+                puts "File not found #{f}"
                 next
             end
 
@@ -69,9 +72,11 @@ module SmartlingXcode
                 next
             end
 
+            remote_path = "/#{version}/#{f.to_s.split('/').last}"
+
             # Upload
             begin
-                res = sl.upload(f, f.split('/').last, "ios")
+                res = sl.upload(f.to_s, remote_path, "ios", {:approved => true})
                 if res 
                     puts "Uploaded #{res['stringCount']} strings from #{f}"
                 end

data/lib/smartling_xcode/version.rb

@@ -1,3 +1,3 @@
 module SmartlingXcode
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/smartling_xcode/xcode.rb

@@ -54,4 +54,38 @@ module SmartlingXcode
 
         return strings_files
     end
+
+    def self.getVersion(project)
+        versions = []
+        project.files.select{|f| f.path.end_with?(".plist")}.each do |f|
+            contents = Xcodeproj::Plist.read_from_path(f.real_path)
+            if contents['CFBundleShortVersionString']
+                versions.push({:version => contents['CFBundleShortVersionString'], :file => f.path})
+            end
+        end
+
+        case versions.count
+        when 0
+            puts "No app version found in project.\nPlease enter a version number:"
+            version = STDIN.gets.chomp
+            return version
+        when 1
+            return versions.first[:version]
+        else
+            puts "Multiple Info.plist files found."
+            versions.each do |v, i|
+                puts "#{i}. #{v[:version]} from #{:file}"
+            end
+            puts "Please select which version number to use:"
+            choice = nil
+            while choice.nil?
+                choice = STDIN.gets.chomp.to_i
+                if choice < versions.count
+                    return versions[choice][:version]
+                end
+                choice = nil
+            end
+        end
+    end
+
 end

data/lib/smartling_xcode.rb

@@ -3,21 +3,25 @@ require "smartling_xcode/backend"
 require "smartling_xcode/version"
 
 module SmartlingXcode
-    def self.execute(command, project_path)
+    def self.execute(command, project_path, version)
         # Execute commands
         case command
         when 'init'
             requestCredentials
             return 0
         when 'extract'
-            files = extract openProject project_path
+            files = extract(openProject(project_path))
             puts "\nOutput:"
             puts files
             return 0
         when 'push'
             creds = loadCredentials
-            files = extract openProject project_path
-            pushStringsFromFiles(files, creds)
+            project = openProject(project_path)
+            files = extract(project)
+            if version.nil?
+                version = getVersion(project)
+            end
+            pushStringsFromFiles(files, version, creds)
             puts "\nYour files are now available in the Files section of your Smartling project."
             return 0
         else 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartling_xcode
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Emilien Huet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj