crowdin-cli 0.0.14 → 0.0.15

data/bin/crowdin-cli

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'pp'
 require 'crowdin-cli'
 
 # Return +hierarchy+ of directories and files in Crowdin project
@@ -67,14 +66,16 @@ def export_pattern_to_path(path, export_pattern, lang, languages_mapping = nil)
     '%file_name%'              => file_name,
   }
 
+  placeholders = pattern.inject([]){ |memo, h| memo << h.first[/%(.*)%/, 1] }
+
   unless languages_mapping.nil?
-    pattern = Hash[pattern.map{|k, str| [
-      k,
-      (languages_mapping[k[/%(.*)%/, 1]][lang['crowdin_code']] rescue nil) || str]
+    pattern = Hash[pattern.map{|placeholder, str| [
+      placeholder,
+      (languages_mapping[placeholder[/%(.*)%/, 1]][lang['crowdin_code']] rescue nil) || str]
     }]
   end
 
-  export_pattern.gsub(/%.+?%/, pattern)
+  export_pattern.gsub(/%(#{placeholders.join('|')})%/, pattern)
 end
 
 def android_locale_code(locale_code)
@@ -87,6 +88,24 @@ def android_locale_code(locale_code)
   return locale_code.sub('-', '-r')
 end
 
+def get_invalid_placeholders(export_pattern)
+  valid_placeholders = [
+    '%language%',
+    '%two_letters_code%',
+    '%tree_letters_code%',
+    '%locale%',
+    '%locale_with_underscore%',
+    '%android_code%',
+    '%original_file_name%',
+    '%original_path%',
+    '%file_extension%',
+    '%file_name%'
+  ]
+
+  all_placeholders = export_pattern.scan(/%[a-z0-9_]*?%/)
+  invalid_placeholders = all_placeholders - valid_placeholders
+end
+
 # Return a string representing that part of the directory tree that is common to all the files
 #
 # @params [Array] paths set of strings representing directory paths
@@ -165,6 +184,10 @@ EOS
       dest_files = []
 
       @config['files'].each do |file|
+        get_invalid_placeholders(file['translation']).each do |placeholder|
+          puts "Warning: #{placeholder} is not valid variable supported by Crowdin. See http://crowdin.net/page/cli-client#configuration-file for more details."
+        end
+
         if File.exist?("#{@base_path}#{file['source']}")
           dest_files << file['source']
           local_files << { dest: file['source'], source: "#{@base_path}#{file['source']}", export_pattern: file['translation'] }
@@ -208,8 +231,13 @@ EOS
         files_for_upload = local_files.select{ |file| update_files.include?(file[:dest]) }
         files_for_upload.each do |file|
           print "Updating file `#{file[:dest]}'"
-          @crowdin.update_file([] << file)
-          puts "\rUpdating file `#{file[:dest]}' - OK"
+          resp = @crowdin.update_file([] << file)
+          case resp['files'].first[1]
+          when 'skipped'
+            puts "\rUpdating file `#{file[:dest]}' - Skipped"
+          when 'updated'
+            puts "\rUpdating file `#{file[:dest]}' - OK"
+          end
         end
       end
 
@@ -219,7 +247,7 @@ EOS
       files_for_add = local_files.select{ |file| add_files.include?(file[:dest]) }
       files_for_add.each do |file|
         print "Uploading file `#{file[:dest]}'"
-        @crowdin.add_file([] << file)
+        res = @crowdin.add_file([] << file)
         puts "\rUploading file `#{file[:dest]}' - OK"
       end
 
@@ -274,6 +302,10 @@ EOS
       dest_files = []
 
       @config['files'].each do |file|
+        get_invalid_placeholders(file['translation']).each do |placeholder|
+          puts "Warning: #{placeholder} is not valid variable supported by Crowdin. See http://crowdin.net/page/cli-client#configuration-file for more details."
+        end
+
         languages_mapping = file['languages_mapping']
 
         if File.exists?("#{@base_path}#{file['source']}")

data/lib/crowdin-cli.rb

@@ -3,7 +3,6 @@ require 'crowdin-cli/version.rb'
 # Add requires for other files you add to your project here, so
 # you just need to require this one file in your bin file
 
-require 'abbrev'
 require 'yaml'
 require 'json'
 require 'logger'

data/lib/crowdin-cli/version.rb

@@ -1,5 +1,5 @@
 module Crowdin
   module CLI
-    VERSION = '0.0.14'
+    VERSION = '0.0.15'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowdin-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement