smartling_xcode 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd8109b6538b3512dfecf179841422d88d788d31
-  data.tar.gz: b1ee650d51f1dde4cd9e41f45e5d409fc3225f14
+  metadata.gz: ac0f92fc6ca6cfe0e3d5a53537ee75a73de59907
+  data.tar.gz: b51eb2b809d3603b0605562ae4f99ab3dfd95bca
 SHA512:
-  metadata.gz: a45eb744de29013ba281a183ccdb89595027a502be0ec50e060a0bc8dc3d575f23a5ffdad345c046acf02a5f9ea88a55695a404bf4b3c2791e8a6ee219787f3a
-  data.tar.gz: cc1dff99bc4a14d35090958e26d73e758c3cfd931f9a5af245ec18a5b8af7433def339c3097320c4f8ebf07628b4537770a79d439c56a338c5a916057cffae2a
+  metadata.gz: 2f7eed95202dc8d3c0300518e3951acf462273b56da5b78563cefe7a8f647c97ebdfd4875130ac75b697a95aa84d7f403654621b113b078e95d5a93403f67cca
+  data.tar.gz: 2a6b48f94b520dfb83706527584c869356fdcb0514bd9630c6048570f8b31c68b1d93ba357abae84a44ba1dab6b440e84528fc100fd0aeec83c1c2e689942618

data/bin/smartling_xcode

@@ -19,7 +19,7 @@ ARGV.each do |arg|
         sl.sandbox = true
 
     # Commands
-    when 'init', 'extract', 'push'  then command = arg
+    when 'init', 'extract', 'push', 'getversion'  then command = arg
     
     else
         if command.nil?
@@ -28,7 +28,7 @@ ARGV.each do |arg|
             sl.version = arg
             version_is_next = false
         else
-            sl.project_path = arg
+            sl.projectPath = arg
         end
     end
 end

data/lib/smartling_xcode.rb

@@ -29,5 +29,11 @@ module SmartlingXcode
             api.pushStringsFromFiles(files, @version)
             puts "\nYour files are now available in the Files section of your Smartling project."
         end
+
+        def getversion
+            project = Xcodeproj::Project.find(@projectPath)
+            @version = project.getVersion
+            puts "Version #{@version} will be used."
+        end
     end
 end

data/lib/smartling_xcode/backend.rb

@@ -75,7 +75,6 @@ module SmartlingXcode
         end
 
         def pushStringsFromFiles(files, version)
-            sl = fileApi()
             files.each do |f|
 
                 # Check if file exists
@@ -84,29 +83,58 @@ module SmartlingXcode
                     next
                 end
 
-                # Check if file contains at least one string
-                file = File.open(f)
-                line = file.read.scrub.tr("\000", '').gsub(/\s+/, "")
-                if !line.include?('=')
-                    puts "No strings in #{f}"
-                    next
+                if f.to_s.end_with?(".strings")
+                    pushStringsFile(f, version)
+                elsif 
+                    pushStringsdictFile(f, version)
+                end
+            end
+        end
+
+        def pushStringsFile(f, version) 
+            sl = fileApi()
+
+            # Check if file contains at least one string
+            file = File.open(f)
+            line = file.read.scrub.tr("\000", '').gsub(/\s+/, "")
+            if !line.include?('=')
+                puts "No strings in #{f}"
+                return
+            end
+
+            remote_path = "/#{version}/#{f.to_s.split('/').last}"
+
+            # Upload
+            begin
+                res = sl.upload(f.to_s, remote_path, "ios", {:authorize => true})
+                if res 
+                    puts "Uploaded #{res['stringCount']} strings from #{f}"
+                end
+            rescue Exception => e
+                puts "⚠️  Upload failed for #{f}"
+                if e.message
+                    puts e.message
                 end
+            end
+        end
 
-                remote_path = "/#{version}/#{f.to_s.split('/').last}"
-
-                # Upload
-                begin
-                    res = sl.upload(f.to_s, remote_path, "ios", {:authorize => true})
-                    if res 
-                        puts "Uploaded #{res['stringCount']} strings from #{f}"
-                    end
-                rescue Exception => e
-                    puts "⚠️  Upload failed for #{f}"
-                    if e.message
-                        puts e.message
-                    end
+        def pushStringsdictFile(f, version) 
+            sl = fileApi()
+            remote_path = "/#{version}/#{f.to_s.split('/').last}"
+
+            # Upload
+            begin
+                res = sl.upload(f.to_s, remote_path, "stringsdict", {:authorize => true})
+                if res 
+                    puts "Uploaded #{f}"
+                end
+            rescue Exception => e
+                puts "⚠️  Upload failed for #{f}"
+                if e.message
+                    puts e.message
                 end
             end
         end
+
     end
 end

data/lib/smartling_xcode/version.rb

@@ -1,5 +1,5 @@
 module SmartlingXcode
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
   USAGE = <<ENDUSAGE
 Smartling utility to extract strings from an Xcode project 
 and add them to a Smartling project.

data/lib/smartling_xcode/xcode.rb

@@ -7,11 +7,17 @@ module Xcodeproj
         def self.find(path)
             # Get .xcodeproj path
             if path.nil?
-                project_file = Dir.entries('./').select {|f| f.end_with?(".xcodeproj") }.first
-                path = "./#{project_file}"
+                path = './'
             end
 
-            if !path.nil? && File.exist?(path)
+            if File.exist?(path)
+                if !path.end_with?(".xcodeproj")
+                    project_file = Dir.entries(path).select {|f| f.end_with?(".xcodeproj") }.first
+                    path = "#{path}/#{project_file}".gsub("//", "/")
+                end
+
+                puts "Using project #{path}"
+
                 # Open project
                 begin
                     return Xcodeproj::Project.open(path)
@@ -46,9 +52,9 @@ module Xcodeproj
                 strings_files.push(output_path)
             end
 
-            # Loop on .strings files
+            # Loop on .strings and .stringsdict files
             self.files.select{|f| 
-                f.path.end_with?(".strings") && Project.fromBase(f.path)    
+                Project.fromBase(f.path) && f.path.end_with?(".strings", ".stringsdict")
             }.each do |f|
                 strings_files.push(f.real_path)
             end
@@ -57,11 +63,12 @@ module Xcodeproj
         end
 
         def getVersion
+            puts "Looking for an app version number to use for the strings files upload..."
             versions = []
             self.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})
+                    versions.push({:version => contents['CFBundleShortVersionString'], :file => f.hierarchy_path})
                 end
             end
 
@@ -71,13 +78,16 @@ module Xcodeproj
                 version = STDIN.gets.chomp
                 return version
             when 1
-                return versions.first[:version]
+                file = versions.first
+                version = file[:version]
+                puts "Using #{version} found in #{file[:file]}"
+                return version
             else
-                puts "Multiple Info.plist files found."
+                puts "Multiple Info.plist files found. Please select which version number to use:"
                 versions.each_with_index do |v, i|
                     puts "#{i}. #{v[:version]} from #{v[:file]}"
                 end
-                puts "Please select which version number to use:"
+                puts "Selection: "
                 choice = nil
                 while choice.nil?
                     choice = STDIN.gets.chomp.to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartling_xcode
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Emilien Huet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj