crowdin-cli 0.0.3 → 0.0.4

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2012 Anton Maminov
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,108 @@
+# Crowdin-CLI
+
+A Command-Line Interface to sync files between your computer/server and [Crowdin](crowdin.net).
+
+It is cross-platform and runs in a terminal (Linux, MacOS X) or in cmd.exe (Windows).
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```
+gem 'crowdin-cli'
+```
+
+And then execute:
+```
+$ bundle
+```
+
+Or install it yourself as:
+```
+$ gem install crowdin-cli
+```
+
+## Configuration
+
+Now that the tool in installed, you'll have to configure your project. Basically, `crowdin-cli` is to be run on a project directory, and looks for a `crowdin.yaml` file containing your project information.
+
+Create a `crowdin.yaml` YAML file in your root project directory with the following structure:
+
+```
+---
+project_id: test
+api_key: KeepTheAPIkeySecret
+base_url: http://api.crowdin.net
+base_path: /path/to/your/project
+
+files:
+  -
+    source: /locale/en/LC_MESSAGES/messages.po
+    translation: /locale/%two_letter_code%/LC_MESSAGES/%original_file_name%
+```
+
+* `api_key` - Crowdin Project API key
+* `project_id` - Crowdin project name
+* `base_url` - (default: http://api.crowdin.net)
+* `base_path` - defines what directory we have to scan(default: current directory)
+* `files`
+  * `source` - defines only files we will upload as sources
+  * `translation` - attribute defines where translations should be placed after downloading (also we have to check those path to detect and upload existing translations)
+    
+        Use the following placeholders to put appropriate variables into the resulting file name:
+      * `%language%` - Language name (i.e. Ukrainian)
+      * `%two_letter_code%` - Language code ISO 639-1 (i.e. uk)
+      * `%three_letter_code%` - Language code ISO 639-2/T (i.e. ukr)
+      * `%locale%` - Locale (like uk-UA)
+      * `%locale_with_underscore%` - Locale (i.e. uk_UA)
+      * `%original_file_name%` - Original file name
+      * `%android_code%` - Android Locale identifier used to name "values-" directories
+      * `%original_path%` - Take parent folders names in Crowdin project to build file path in resulted bundle
+      * `%file_extension%` - Original file extension
+      * `%file_name%` - File name without extension
+
+         Example for Android projects:
+          ```
+          /values-%android_code%/%original_file_name%
+          ```
+         Example for Gettext projects:
+          ```
+          /locale/%two_letter_code%/LC_MESSAGES/%original_file_name%
+          ```
+
+Also you can add and upload all directories mathing the pattern including all nested files and localizable files.
+
+Create a `crowdin.yaml` YAML file in your root project directory with the following structure:
+```
+---
+project_id: test
+api_key: KeepTheAPIkeySecret
+base_url: http://api.crowdin.net
+base_path: /path/to/your/project
+
+files:
+  -
+    source: /locale/en/**/*.po
+    translation: /locale/%two_letter_code%/**/%original_file_name%
+```
+## Usage
+
+
+## Supported Rubies
+
+Tested with the following Ruby versions:
+
+- MRI 1.9.3
+- JRuby 1.7.0
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## License
+
+This library is distributed under the MIT license.  Please see the LICENSE file.

data/bin/crowdin-cli

@@ -1,13 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'pp'
-require 'json'
-require 'gli'
-require 'zip/zip'
-require 'crowdin-api'
 require 'crowdin-cli'
 
-# повертає структуру директорій на сервері
+# using for upload source files
+# return existing directory structure in Crowdin project
 #
 def walk_remote_tree(files, root = '/', result = { dirs: [], files: [] })
   files.each do |node|
@@ -23,20 +20,18 @@ def walk_remote_tree(files, root = '/', result = { dirs: [], files: [] })
   return result
 end
 
-
-# Повертає локальну структуру директорій
-# На вході масив файлів, наприклад:
-# ['/path/to/admin/en.xml', '/path/to/user/settings/strings.xml']
-# Результат хеш { dirs:[послідовний масив директорій для створення], files: [] }
+# using for upload source files
+# return local directory structute
+# first argument: ['/path/to/admin/en.xml', '/path/to/user/settings/strings.xml']
 #
 def walk_local_tree(files, result = { dirs: [], files: [] })
   result[:files] = files
 
-  files = files.inject([]){ |res, a|
-    res << a.split('/').drop(1).inject([]){ |res, s|
+  files = files.inject([]) do |res, a|
+    res << a.split('/').drop(1).inject([]) do |res, s|
       res << res.last.to_s + '/' + s
-    }
-  }
+    end
+  end
   # Ex: files = [["/path", "/path/to", "/path/to/admin", "/path/to/admin/en.xml"], ... ]
 
   files.map(&:pop) # delete last element from each array
@@ -69,7 +64,6 @@ def android_locale_code(locale_code)
   return locale_code.sub('-', '-r')
 end
 
-
 ###
 include GLI::App
 
@@ -85,7 +79,6 @@ default_value File.join(Dir.pwd, 'crowdin.yaml')
 arg_name '<s>'
 flag [:c, :config]
 
-
 desc 'Upload existing translations to Crowdin project'
 #arg_name 'Describe arguments to upload here'
 command :upload do |c|
@@ -109,27 +102,53 @@ command :upload do |c|
   c.desc 'Upload source files'
   c.command :sources do |c|
     c.action do |global_options, options, args|
-      project_info = @crowdin.project_info(:json)
-      project_info = JSON.parse(project_info)
+      project_info = @crowdin.project_info
 
-      remote_project_tree = walk_remote_tree(project_info['files'])
+      #source_language = project_info['info']['source_language']
+      source_language =  'en'
+
+      # Crowdin supported languages list
+      supported_languages = @crowdin.supported_languages['languages']
+      source_language = supported_languages.find{ |lang| lang['crowdin_code'] == source_language }
+
+      remote_project_tree = walk_remote_tree(project_info['info']['files']['items'])
 
       local_files = []
       @config['files'].each do |file|
-        local_file = "#{@local_path}#{@sources_root}#{file['source']}"
-
-        if File.exist?(local_file)
-          local_files << { dest: file['source'], source: local_file, export_pattern: file['translation'] }
+        if File.exist?("#{@base_path}#{file['source']}")
+          local_files << { dest: file['source'], source: "#{@base_path}#{file['source']}", export_pattern: file['translation'] }
         else
-          Dir.glob(local_file).each do |f|
-            local_files << { dest: f.sub("#{@local_path}#{@sources_root}", ''), source: f, export_pattern: file['translation'] }
+          Dir.glob("#{@base_path}#{file['source']}").each do |source|
+            dest = source.sub("#{@base_path}", '') # relative path in Crowdin
+            original_path      = File.dirname(dest)
+            original_file_name = File.basename(dest)
+            file_extension     = File.extname(dest)
+            file_name          = File.basename(dest, file_extension)
+
+            file_pattern = file['translation'].gsub(/%.+?%/, {
+              '%language%'               => source_language['name'],
+              '%two_letter_code%'        => source_language['iso_639_1'],
+              '%tree_letter_code%'       => source_language['iso_639_3'],
+              '%locale%'                 => source_language['locale'],
+              '%locale_with_underscore%' => source_language['locale'].gsub('-', '_'),
+              '%original_file_name%'     => original_file_name,
+              '%android_code%'           => android_locale_code(source_language['locale']),
+              '%original_path%'          => original_path,
+              '%file_extension%'         => file_extension,
+              '%file_name%'              => file_extension,
+            })
+
+            diff = (dest.split('/') - file_pattern.split('/')).join('/')
+            export_pattern = file['translation'].sub('**', diff)
+
+            local_files << { dest: dest, source: source, export_pattern: export_pattern }
           end
+
         end
       end
 
       local_project_tree = walk_local_tree(local_files.collect{ |h| h[:dest] })
 
-#=begin
       # Create directory tree
       #
       create_dirs = local_project_tree[:dirs] - remote_project_tree[:dirs]
@@ -157,12 +176,10 @@ command :upload do |c|
         puts "Add new file `#{file[:dest]}`"
         @crowdin.add_file([] << file)
       end
-#=end
 
     end # action
   end # command
 
-
   c.desc 'Upload translation files'
   c.command :translations do |c|
 
@@ -184,46 +201,34 @@ command :upload do |c|
     c.action do |global_options, options, args|
       language = options[:language]
 
-      project_info = @crowdin.project_info(:json)
-      project_info = JSON.parse(project_info)
+      project_info = @crowdin.project_info
+
+      remote_project_tree = walk_remote_tree(project_info['info']['files']['items'])
 
-      # Array of project languages
       if language == 'all'
-        project_languages = project_info['languages'].collect{ |h| h['code'] }
+        project_languages = project_info['info']['languages']['items'].collect{ |h| h['code'] }
       else
         project_languages = [] << language
       end
 
-      # Crowdin supported languages list
-      supported_languages = @crowdin.supported_languages(:json)
-      supported_languages = JSON.parse(supported_languages)
-      supported_languages.select!{ |lang| project_languages.include?(lang['crowdin_code']) }
+      supported_languages = @crowdin.supported_languages['languages']
+      translation_languages = supported_languages.select{ |lang| project_languages.include?(lang['crowdin_code']) }
+
+      source_language =  'en'
+      source_language = supported_languages.find{ |lang| lang['crowdin_code'] == source_language }
 
       translated_files = Hash.new{ |hash, key| hash[key] = Array.new }
 
-      # Тут робиться багато припіздатєнької роботи :)
-      # TODO тут тре всьо нахуй переписати!!! НЕНАВИСТЬ
       @config['files'].each do |file|
-        translation = file['translation']
-        source = file['source'] # relative path to source file in Crowdin project
-
-        sources = []
-        if File.exists?("#{@local_path}#{@sources_root}#{source}")
-          sources << source
-        else
-          Dir.glob("#{@local_path}#{@sources_root}#{source}").each do |f|
-            sources << f.sub("#{@local_path}#{@sources_root}", '')
-          end
-        end
-
-        sources.each do |source|
-          original_path      = source.split('/')[1...-1].join('/')
-          original_file_name = source.split('/').last
-          file_extension     = original_file_name.split('.').last
-          file_name          = original_file_name.split('.').shift
-
-          supported_languages.each do |lang|
-            file = translation.gsub(/%.+?%/, {
+        if File.exists?("#{@base_path}#{file['source']}")
+          dest = file['source'].sub("#{@base_path}", '')
+          original_path      = File.dirname(dest)
+          original_file_name = File.basename(dest)
+          file_extension     = File.extname(dest)[1..-1]
+          file_name          = File.basename(dest, file_extension)
+
+          translation_languages.each do |lang|
+            source = file['translation'].gsub(/%.+?%/, {
               '%language%'               => lang['name'],
               '%two_letter_code%'        => lang['iso_639_1'],
               '%tree_letter_code%'       => lang['iso_639_3'],
@@ -235,18 +240,60 @@ command :upload do |c|
               '%file_extension%'         => file_extension,
               '%file_name%'              => file_extension,
             })
-            translated_files[lang['crowdin_code']] << { source: @local_path + file, dest: source }
+
+            translated_files[lang['crowdin_code']] << { source: "#{@base_path}#{source}", dest: dest }
           end
+        else
+          Dir.glob("#{@base_path}#{file['source']}").each do |source|
+            dest = source.sub("#{@base_path}", '')
+            original_path      = File.dirname(dest)
+            original_file_name = File.basename(dest)
+            file_extension     = File.extname(dest)
+            file_name          = File.basename(dest, file_extension)
+
+            file_pattern = file['translation'].gsub(/%.+?%/, {
+              '%language%'               => source_language['name'],
+              '%two_letter_code%'        => source_language['iso_639_1'],
+              '%tree_letter_code%'       => source_language['iso_639_3'],
+              '%locale%'                 => source_language['locale'],
+              '%locale_with_underscore%' => source_language['locale'].gsub('-', '_'),
+              '%original_file_name%'     => original_file_name,
+              '%android_code%'           => android_locale_code(source_language['locale']),
+              '%original_path%'          => original_path,
+              '%file_extension%'         => file_extension,
+              '%file_name%'              => file_extension,
+            })
 
-        end
+            diff = (dest.split('/') - file_pattern.split('/')).join('/')
+            export_pattern = file['translation'].sub('**', diff)
+
+            translation_languages.each do |lang|
+              source = export_pattern.gsub(/%.+?%/, {
+                '%language%'               => lang['name'],
+                '%two_letter_code%'        => lang['iso_639_1'],
+                '%tree_letter_code%'       => lang['iso_639_3'],
+                '%locale%'                 => lang['locale'],
+                '%locale_with_underscore%' => lang['locale'].gsub('-', '_'),
+                '%original_file_name%'     => original_file_name,
+                '%android_code%'           => android_locale_code(lang['locale']),
+                '%original_path%'          => original_path,
+                '%file_extension%'         => file_extension,
+                '%file_name%'              => file_extension,
+              })
+
+              translated_files[lang['crowdin_code']] << { source: "#{@base_path}#{source}", dest: dest }
+            end
 
-      end
+          end
+        end # if
+      end # @config['files']
 
       params = {}
       params[:import_duplicates]     = options[:import_dublicates]     ? 1 : 0
       params[:import_eq_suggestions] = options[:import_eq_suggestions] ? 1 : 0
       params[:auto_approve_imported] = options[:auto_approve_imported] ? 1 : 0
 
+
       translated_files.each do |language, files|
         files.each do |file|
           if File.exist?(file[:source])
@@ -263,7 +310,6 @@ command :upload do |c|
 
 end
 
-
 desc 'Download existing translations'
 #arg_name 'Describe arguments to download here'
 command :download do |c|
@@ -281,7 +327,7 @@ command :download do |c|
     file = Tempfile.new(language)
     begin
       @crowdin.download_translation(language, :output => file)
-      unzip_file(file, @local_path)
+      unzip_file(file, @base_path)
     ensure
       file.close
       file.unlink # delete the temp file
@@ -299,20 +345,18 @@ pre do |global ,command, options, args|
 
   @config = YAML.load_file(global[:config])
 
-  #@local_path = @config['local_path'] || Dir.pwd
-  if @config['local_path']
-    if @config['local_path'].start_with?('/')
-      @local_path = @config['local_path']
+  #@base_path = @config['base_path'] || Dir.pwd
+  if @config['base_path']
+    if @config['base_path'].start_with?('/')
+      @base_path = @config['base_path']
     else
-      @local_path = Dir.pwd + '/' + @config['local_path']
+      @base_path = Dir.pwd + '/' + @config['base_path']
     end
   else
-    @local_path = Dir.pwd
+    @base_path = Dir.pwd
   end
 
-  @sources_root = @config['sources_root']
-
-  @crowdin = Crowdin::API.new(api_key: @config['api_key'], project_id: @config['project_id'], base_url: @config['base_url'])
+  @crowdin = Crowdin::API.new(api_key: @config['api_key'], project_id: @config['project_id'], base_url: @config['base_url'] || 'http://api.crowdin.net')
 
   puts "Executing #{command.name}" if global[:v]
   true

data/lib/crowdin-cli.rb

@@ -4,3 +4,7 @@ require 'crowdin-cli/version.rb'
 # you just need to require this one file in your bin file
 
 require 'yaml'
+require 'json'
+require 'gli'
+require 'zip/zip'
+require 'crowdin-api'

data/lib/crowdin-cli/version.rb

@@ -1,5 +1,5 @@
 module Crowdin
   module CLI
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowdin-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,30 +106,25 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 description: 
-email: anton.linux@gmail.com
+email:
+- anton.linux@gmail.com
 executables:
 - crowdin-cli
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- crowdin-cli.rdoc
+extra_rdoc_files: []
 files:
 - bin/crowdin-cli
 - lib/crowdin-cli/version.rb
 - lib/crowdin-cli.rb
-- README.rdoc
-- crowdin-cli.rdoc
+- README.md
+- LICENSE
 homepage: https://github.com/mamantoha/crowdin-cli
-licenses: []
+licenses:
+- LICENSE
 post_install_message: 
-rdoc_options:
-- --title
-- crowdin-cli
-- --main
-- README.rdoc
-- -ri
+rdoc_options: []
 require_paths:
 - lib
 - lib
@@ -138,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,5 +145,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A description of your project
+summary: Crowdin CLI
 test_files: []

data/README.rdoc

@@ -1,21 +0,0 @@
-= crowdin-cli
-
-Describe your project here
-
-== Configuration
-Create a `.crowdin` YAML file in your root project directory with the following structure:
-
-```yaml
----
-project_id: ''
-api_key: ''
-server: 'http://api.crowdin.net'
-
-files:
-  -
-    source-file-path: locale/en/LC_MESSAGES/messages.po
-    translations: locale/<two-letters-code>/LC_MESSAGES/<original-file-name>
-```
-
-:include:crowdin-cli.rdoc
-

data/crowdin-cli.rdoc

@@ -1,5 +0,0 @@
-= crowdin-cli
-
-Generate this with
-    crowdin-cli rdoc
-After you have described your command line interface