smartling_xcode 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2e987cc48f6afbfcdc9987bdea64119f4db52b4
-  data.tar.gz: 97ff450c8d607ecee5e11947ca531a7de9988e9a
+  metadata.gz: fd8109b6538b3512dfecf179841422d88d788d31
+  data.tar.gz: b1ee650d51f1dde4cd9e41f45e5d409fc3225f14
 SHA512:
-  metadata.gz: d5dc4d20e66b14b1de8e228665dcf62f0c6e701a0537e1deeb180b06b2cfa724f8a37402f00e1c5c260aded82d8f3809ca466f93c813415805c2839bb3ac4a20
-  data.tar.gz: 7b9863476afb109b49a6d574c23c93bb00f3f9e5eee30f5d164565b7a0c103d829c47859b45e3c10fba0854aee8fb688f7990b42875b9a9829fd4ce103e64612
+  metadata.gz: a45eb744de29013ba281a183ccdb89595027a502be0ec50e060a0bc8dc3d575f23a5ffdad345c046acf02a5f9ea88a55695a404bf4b3c2791e8a6ee219787f3a
+  data.tar.gz: cc1dff99bc4a14d35090958e26d73e758c3cfd931f9a5af245ec18a5b8af7433def339c3097320c4f8ebf07628b4537770a79d439c56a338c5a916057cffae2a

data/bin/smartling_xcode

@@ -2,67 +2,40 @@
 
 require "smartling_xcode"
 
-# Parse options
-USAGE = <<ENDUSAGE
-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] [-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.
-
-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
+sl = SmartlingXcode::Project.new()
 command = nil
-version = nil
 version_is_next = false
+
+# Parse CLI arguments
 ARGV.each do |arg|
     case arg
     # Flags
     when '-v'
         version_is_next = true
     when '-h', '--help'
-        puts USAGE
+        puts SmartlingXcode::USAGE
         Kernel.exit(0)
+    when '-s'
+        sl.sandbox = true
 
     # Commands
     when 'init', 'extract', 'push'  then command = arg
     
     else
         if command.nil?
-            Kernel.abort(USAGE)
+            Kernel.abort(SmartlingXcode::USAGE)
         elsif version_is_next
-            version = arg
+            sl.version = arg
             version_is_next = false
         else
-            project_path = arg
+            sl.project_path = arg
         end
     end
 end
 
-result = SmartlingXcode.execute(command, project_path, version)
-if result != 0
-    Kernel.abort(USAGE)
+# Execute command
+unless command.nil?
+    sl.send(command)
+else
+    Kernel.abort(SmartlingXcode::USAGE)
 end

data/lib/smartling_xcode/backend.rb

@@ -3,89 +3,110 @@ require 'json'
 require 'shellwords'
 
 module SmartlingXcode
-    CREDFILE = './.smartling.json'
-
-    def self.requestCredentials
-        # Check for existing credentials
-        if File.exist?(CREDFILE)
-            puts "Credentials found in this directory. Overwrite? (y/N)"
-            confirm = STDIN.gets.chomp
-            case confirm
-            when 'y', 'Y'
-                # Continue
+    class API
+        CREDFILE = './.smartling.json'    
+        attr_accessor :userId, :userSecret, :projectId, :sandbox
+
+        def initialize(args = {})
+          @sandbox = args[:sandbox]
+        end
+
+        def fileApi
+            if @sandbox
+                return Smartling::File.sandbox(:userId => @userId, :userSecret => @userSecret, :projectId => @projectId)
             else
-                Kernel.abort("⚠️  Init cancelled")  
+                return Smartling::File.new(:userId => @userId, :userSecret => @userSecret, :projectId => @projectId)
             end
         end
 
-        # Prompt for credentials
-        puts "Smartling API Key:"
-        api_key = STDIN.gets.chomp
+        def requestCredentials
+            # Check for existing credentials
+            if File.exist?(CREDFILE)
+                puts "Credentials found in this directory. Overwrite? (y/N)"
+                confirm = STDIN.gets.chomp
+                case confirm
+                when 'y', 'Y'
+                    # Continue
+                else
+                    Kernel.abort("⚠️  Init cancelled")
+                end
+            end
 
-        puts "Smartling Project ID:"
-        project_id = STDIN.gets.chomp
+            # Prompt for credentials
+            puts "Smartling User ID:"
+            @userId = STDIN.gets.chomp
 
-        # Dummy request to validate creds
-        puts "Validating credentials..."
-        begin
-            sl = Smartling::File.new(:apiKey => api_key, :projectId => project_id)
-            res = sl.list
-        rescue
-            Kernel.abort("⚠️  Invalid credentials")
-        end
+            puts "Smartling User Secret:"
+            @userSecret = STDIN.gets.chomp
 
-        File.open(CREDFILE, "w") do |f|
-            f.write({api_key: api_key, project_id: project_id}.to_json)
-            puts "Credentials saved"
-        end
-    end
+            puts "Smartling Project ID:"
+            @projectId = STDIN.gets.chomp
 
-    def self.loadCredentials
-        if File.exist?(CREDFILE)
-            file = File.read(CREDFILE)
-            creds = JSON.parse(file)
-            if creds['api_key'].nil? || creds['project_id'].nil?
-                Kernel.abort("⚠️  Invalid credentials") 
-            else
-                return creds
+            # Dummy request to validate creds
+            puts "Validating credentials..."
+            begin
+                sl = fileApi()
+                res = sl.list
+            rescue
+                Kernel.abort("⚠️  Invalid credentials")
+            end
+
+            File.open(CREDFILE, "w") do |f|
+                f.write({:userId => @userId, :userSecret => @userSecret, :projectId => @projectId}.to_json)
+                puts "Credentials saved"
             end
-        else
-            Kernel.abort("⚠️  Credentials not found. Please run smartling_xcode init.")
         end
-    end
 
-    def self.pushStringsFromFiles(files, version, creds)
-        sl = Smartling::File.new(:apiKey => creds['api_key'], :projectId => creds['project_id'])        
-        files.each do |f|
+        def loadCredentials
+            if File.exist?(CREDFILE)
+                file = File.read(CREDFILE)
+                creds = JSON.parse(file)
 
-            # Check if file exists
-            if !f || !File.exist?(f)
-                puts "File not found #{f}"
-                next
-            end
+                @userId = creds['userId']
+                @userSecret = creds['userSecret']
+                @projectId = creds['projectId']
 
-            # 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 @userId.nil? || @userSecret.nil? || @projectId.nil?
+                    Kernel.abort("⚠️  Invalid credentials") 
+                end
+            else
+                Kernel.abort("⚠️  Credentials not found. Please run smartling_xcode init.")
             end
+        end
 
-            remote_path = "/#{version}/#{f.to_s.split('/').last}"
+        def pushStringsFromFiles(files, version)
+            sl = fileApi()
+            files.each do |f|
 
-            # Upload
-            begin
-                res = sl.upload(f.to_s, remote_path, "ios", {:approved => true})
-                if res 
-                    puts "Uploaded #{res['stringCount']} strings from #{f}"
+                # Check if file exists
+                if !f || !File.exist?(f)
+                    puts "File not found #{f}"
+                    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
                 end
-            rescue Exception => e
-                puts "⚠️  Upload failed for #{f}"
-                if e.message
-                    puts e.message
+
+                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
         end
     end
-end
+end

data/lib/smartling_xcode/version.rb

@@ -1,3 +1,34 @@
 module SmartlingXcode
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
+  USAGE = <<ENDUSAGE
+Smartling utility to extract strings from an Xcode project 
+and add them to a Smartling project.
+Version #{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.
+
+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.
+  -s             Use the sandbox server.
+
+ENDUSAGE
+
 end

data/lib/smartling_xcode/xcode.rb

@@ -1,91 +1,93 @@
 require 'xcodeproj'
 
-module SmartlingXcode
-    def self.openProject(path)
-        # Get .xcodeproj path
-        if path.nil?
-            project_file = Dir.entries('./').select {|f| f.end_with?(".xcodeproj") }.first
-            path = "./#{project_file}"
-        end
+module Xcodeproj
 
-        if !path.nil? && File.exist?(path)
-            # Open project
-            begin
-                project = Xcodeproj::Project.open(path)
-            rescue
-                Kernel.abort("⚠️  Failed to open project file")
-            end    
+    class Project
 
-            return project
-        else
-            Kernel.abort("⚠️  No .xcodeproj file found")
-        end
-    end
+        def self.find(path)
+            # Get .xcodeproj path
+            if path.nil?
+                project_file = Dir.entries('./').select {|f| f.end_with?(".xcodeproj") }.first
+                path = "./#{project_file}"
+            end
 
-    # Returns true if the file is from Base localization or unlocalized
-    def self.fromBase(path)
-        if path.include?('.lproj')
-            return path.include?('Base.lproj')
-        else 
-            return true
+            if !path.nil? && File.exist?(path)
+                # Open project
+                begin
+                    return Xcodeproj::Project.open(path)
+                rescue
+                    Kernel.abort("⚠️  Failed to open project file")
+                end    
+            else
+                Kernel.abort("⚠️  No .xcodeproj file found")
+            end
         end
-    end
-
-    def self.extract(project)
-        strings_files = []
 
-        # Loop on IB files from Base localization
-        project.files.select{|f| 
-            f.path.end_with?(".xib", ".storyboard") && fromBase(f.path)
-        }.each do |f|
-            output_name = f.path.gsub(/[\/\.]/, '_')
-            output_path = "/tmp/#{output_name}.strings"
-            puts "Extracting strings from #{f.path} into #{output_path}"
-            Kernel.system("ibtool --generate-strings-file \"#{output_path}\" \"#{f.real_path}\"")
-            strings_files.push(output_path)
+        # Returns true if the file is from Base localization or unlocalized
+        def self.fromBase(path)
+            if path.include?('.lproj')
+                return path.include?('Base.lproj')
+            else 
+                return true
+            end
         end
 
-        # Loop on .strings files
-        project.files.select{|f| 
-            f.path.end_with?(".strings") && fromBase(f.path)    
-        }.each do |f|
-            strings_files.push(f.real_path)
-        end
+        def extract
+            strings_files = []
 
-        return strings_files
-    end
+            # Loop on IB files from Base localization
+            self.files.select{|f| 
+                f.path.end_with?(".xib", ".storyboard") && Project.fromBase(f.path)
+            }.each do |f|
+                output_name = f.path.gsub(/[\/\.]/, '_')
+                output_path = "/tmp/#{output_name}.strings"
+                puts "Extracting strings from #{f.path} into #{output_path}"
+                Kernel.system("ibtool --generate-strings-file \"#{output_path}\" \"#{f.real_path}\"")
+                strings_files.push(output_path)
+            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})
+            # Loop on .strings files
+            self.files.select{|f| 
+                f.path.end_with?(".strings") && Project.fromBase(f.path)    
+            }.each do |f|
+                strings_files.push(f.real_path)
             end
+
+            return strings_files
         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_with_index do |v, i|
-                puts "#{i}. #{v[:version]} from #{v[:file]}"
+        def getVersion
+            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})
+                end
             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]
+
+            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_with_index do |v, i|
+                    puts "#{i}. #{v[:version]} from #{v[: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
 
+    end
 end

data/lib/smartling_xcode.rb

@@ -3,29 +3,31 @@ require "smartling_xcode/backend"
 require "smartling_xcode/version"
 
 module SmartlingXcode
-    def self.execute(command, project_path, version)
-        # Execute commands
-        case command
-        when 'init'
-            requestCredentials
-            return 0
-        when 'extract'
-            files = extract(openProject(project_path))
+    class Project
+        attr_accessor :projectPath, :version, :sandbox
+
+        def init
+            api = API.new({:sandbox => @sandbox})
+            api.requestCredentials
+        end
+
+        def extract
+            project = Xcodeproj::Project.find(@projectPath)
+            files = project.extract
             puts "\nOutput:"
             puts files
-            return 0
-        when 'push'
-            creds = loadCredentials
-            project = openProject(project_path)
-            files = extract(project)
-            if version.nil?
-                version = getVersion(project)
+        end
+
+        def push
+            api = API.new({:sandbox => @sandbox})
+            api.loadCredentials()
+            project = Xcodeproj::Project.find(@projectPath)
+            files = project.extract
+            if @version.nil?
+                @version = project.getVersion
             end
-            pushStringsFromFiles(files, version, creds)
+            api.pushStringsFromFiles(files, @version)
             puts "\nYour files are now available in the Files section of your Smartling project."
-            return 0
-        else 
-            return 1
         end
     end
 end

data/smartling_xcode.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "xcodeproj", ">= 1.1"
   spec.add_dependency "json", ">= 1.8.1"
-  spec.add_dependency "smartling", ">= 1.0.1"
+  spec.add_dependency "smartling", ">= 2.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartling_xcode
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Emilien Huet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Smartling utility to extract strings from an Xcode project and add them to