crowdin-cli 0.4.6 → 0.5.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b1766fba397653217212230ca31f870469ead4e
-  data.tar.gz: f408557bf4dccdeae6a8c64f803b490254fdd7ca
+  metadata.gz: ea82b26b6c10089325ddbffcd1429c915dc67dd6
+  data.tar.gz: 0d6f374b2216d33ebc138d5afea0090d7c431913
 SHA512:
-  metadata.gz: 00d98f12a98e32c23e191cbeda55b88bec39ec55f583a2597e1d5522fd37495ef790739c27f7c363e3912db474d2738ff56d0ba6ee3c1744bfbb4fb36c911424
-  data.tar.gz: 163e14f379900c04c526efa76d683aeff6e2bb1a72c0eea7051163d05e255473148f7cc9a7b0a7c2d3b64882d34563fe7dfd8b80eff79e1b5df0ee9aa7f37333
+  metadata.gz: fdab714082fe77e71906c7a1b339828ae0a662ffab1ce729862aec2ba8aae9e5fe5ba646ed8b47c139dfb1eed2860532ab433dad41b5ba6690295de4bbce4f39
+  data.tar.gz: eb84df5ff216c5c43b4fc69aab971656936f2fb4e277c2975d14b6093d77b41e7c7dd9d7caef0cb0768decd152ca82f9cad4215788b1b0724ada425777e2de0e

data/README.md

@@ -406,7 +406,7 @@ Use help provided with an application to get more information about available co
 Tested with the following Ruby versions:
 
 - MRI 2.2.1
-- JRuby 9.0.0.0.pre2
+- JRuby 9.0.0.0
 
 ## Creating a JAR file
 
@@ -416,10 +416,10 @@ Installation/SystemRequirements:
 - Java
 - rvm
 
-Install JRuby 9.0.0.0.pre2 and Warbler gem:
+Install JRuby 9.0.0.0 and Warbler gem:
 
 ```
-$ rvm install jruby-9.0.0.0.pre2
+$ rvm install jruby-9.0.0.0
 $ gem install warbler --pre
 ```
 
@@ -428,7 +428,7 @@ Create a new file called `Gemfile` in new project directory, an specify `crowdin
 ```ruby
 source 'https://rubygems.org'
 gem 'crowdin-api', '=0.3.0'
-gem 'crowdin-cli', '=0.4.4'
+gem 'crowdin-cli', '=0.4.6'
 ```
 
 Create a new file called `bin/crowdin-cli`:

data/bin/crowdin-cli

@@ -5,6 +5,9 @@ require 'pp'
 require 'find'
 require 'crowdin-cli'
 
+# For development purposes only. Comment in production
+# require 'byebug'
+
 # GLI_DEBUG=true bundle exec bin/crowdin-cli
 
 # Setup i18n
@@ -20,6 +23,8 @@ I18n.locale = :en
 def get_remote_files_hierarchy(files, root = '/', hierarchy = { dirs: [], files: [] })
   files.each do |node|
     case node['node_type']
+    when 'branch'
+      get_remote_files_hierarchy(node['files'], root + node['name'] + '/', hierarchy)
     when 'directory'
       hierarchy[:dirs] << "#{root}#{node['name']}"
       get_remote_files_hierarchy(node['files'], root + node['name'] + '/', hierarchy)
@@ -349,7 +354,6 @@ default_value File.join(Dir.home, '.crowdin.yaml')
 arg_name '<s>'
 flag [:identity]
 
-
 desc I18n.t('app.commands.upload.desc')
 long_desc I18n.t('app.commands.upload.long_desc')
 command :upload do |c|
@@ -362,6 +366,10 @@ command :upload do |c|
     c.default_value true
     c.switch ['auto-update']
 
+    c.desc I18n.t('app.flags.branch.desc')
+    c.arg_name 'branch_name'
+    c.flag [:b, :branch]
+
     c.action do |global_options, options, args|
       project_info = @crowdin.project_info
 
@@ -371,7 +379,29 @@ command :upload do |c|
       supported_languages = @crowdin.supported_languages
       source_language = supported_languages.find { |lang| lang['crowdin_code'] == source_language }
 
-      remote_project_tree = get_remote_files_hierarchy(project_info['files'])
+      if @branch_name
+        branch = project_info['files'].find { |h| h['node_type'] == 'branch' && h['name'] == @branch_name }
+
+        if branch
+          branch_files = [] << branch
+        else
+          print "Creating a new branch `#{@branch_name}'"
+
+          @crowdin.add_directory(@branch_name, is_branch: '1')
+
+          puts "\rCreating a new branch `#{@branch_name}' - OK"
+          branch_files = []
+        end
+
+        remote_project_tree = get_remote_files_hierarchy(branch_files)
+
+        # Remove branch directory from a directory path string
+        remote_project_tree[:dirs].map! { |p| p.split('/')[2..-1].unshift('').join('/') }
+        remote_project_tree[:files].map! { |p| p.split('/')[2..-1].unshift('').join('/') }
+      else
+        # INFO it also includes all branches
+        remote_project_tree = get_remote_files_hierarchy(project_info['files'])
+      end
 
       local_files = []
       dest_files = []
@@ -443,8 +473,15 @@ command :upload do |c|
       #
       create_dirs = local_project_tree[:dirs] - remote_project_tree[:dirs]
       create_dirs.each do |dir|
-        puts "Creating directory `#{dir}`"
-        @crowdin.add_directory(dir)
+        # FIXME if directory path starts with / Crowdin returns an error:
+        # 17: Specified directory was not found
+        dir.slice!(0) if dir.start_with?('/')
+
+        print "Creating directory `#{dir}'"
+
+        @crowdin.add_directory(dir, branch: @branch_name)
+
+        puts "\rCreating directory `#{dir}' - OK"
       end
 
       if options['auto-update']
@@ -454,13 +491,17 @@ command :upload do |c|
         update_files = local_project_tree[:files] & remote_project_tree[:files]
         files_for_upload = local_files.select { |file| update_files.include?(file[:dest]) }
         files_for_upload.each do |file|
-          print "Updating source file `#{file[:dest]}'"
+          file[:dest].slice!(0) if file[:dest].start_with?('/')
 
           params = {}
+          params[:branch] = @branch_name if @branch_name
+
           @allowed_options.each do |option|
             params[option.to_sym] = file.delete(option.to_sym)
           end
 
+          print "Updating source file `#{file[:dest]}'"
+
           resp = @crowdin.update_file([] << file, params)
 
           case resp['files'].first[1]
@@ -477,16 +518,22 @@ command :upload do |c|
       add_files = local_project_tree[:files] - remote_project_tree[:files]
       files_for_add = local_files.select { |file| add_files.include?(file[:dest]) }
       files_for_add.each do |file|
-        print "Uploading source file `#{file[:dest]}'"
+        # If file path starts with / Crowdin returns error
+        # 17: Specified directory was not found
+        # make sure that file[:dest] not start with '/'
+        file[:dest].slice!(0) if file[:dest].start_with?('/')
 
         params = {}
         params[:type] = file.delete(:type) if file[:type]
+        params[:branch] = @branch_name if @branch_name
 
         @allowed_options.each do |option|
           params[option.to_sym] = file.delete(option.to_sym)
         end
 
-        resp = @crowdin.add_file([] << file, params)
+        print "Uploading source file `#{file[:dest]}'"
+
+        @crowdin.add_file([] << file, params)
 
         puts "\rUploading source file `#{file[:dest]}' - OK"
       end
@@ -503,6 +550,10 @@ command :upload do |c|
     c.arg_name 'crowdin_language_code'
     c.flag [:l, :language]
 
+    c.desc I18n.t('app.flags.branch.desc')
+    c.arg_name 'branch_name'
+    c.flag [:b, :branch]
+
     c.desc I18n.t('app.commands.upload.commands.translations.switches.import_duplicates.desc')
     c.switch ['import-duplicates']
 
@@ -522,7 +573,24 @@ command :upload do |c|
 
       project_info = @crowdin.project_info
 
-      remote_project_tree = get_remote_files_hierarchy(project_info['files'])
+      if @branch_name
+        branch = project_info['files'].find { |h| h['node_type'] == 'branch' && h['name'] == @branch_name }
+
+        if branch
+          params[:branch] = @branch_name
+          branch_files = [] << branch
+        else
+          exit_now!("branch '#{@branch_name}' doesn't exist in the project")
+        end
+
+        remote_project_tree = get_remote_files_hierarchy(branch_files)
+
+        # Remove branch directory from a directory path string
+        remote_project_tree[:dirs].map! { |p| p.split('/')[2..-1].unshift('').join('/') }
+        remote_project_tree[:files].map! { |p| p.split('/')[2..-1].unshift('').join('/') }
+      else
+        remote_project_tree = get_remote_files_hierarchy(project_info['files'])
+      end
 
       project_languages = project_info['languages'].collect { |h| h['code'] }
 
@@ -614,26 +682,33 @@ command :upload do |c|
       translated_files.each_pair do |language, files|
         files.each do |file|
           file[:dest] = file[:dest].sub(common_dir, '')
+          source_file = file[:source].sub(/\A#{Regexp.escape(@base_path)}/, '')
 
           if remote_project_tree[:files].include?(file[:dest])
             if File.exist?(file[:source])
-              print "Uploading translation file `#{file[:source].sub(/\A#{Regexp.escape(@base_path)}/, '')}'"
+              # If file path starts with / Crowdin returns error
+              # 17: Specified directory was not found
+              # make sure that file[:dest] not start with '/'
+              file[:dest].slice!(0) if file[:dest].start_with?('/')
+
+              print "Uploading translation file `#{source_file}'"
 
               resp = @crowdin.upload_translation([] << file, language, params)
+
               case resp['files'].first[1]
               when 'skipped'
-                puts "\rUploading translation file `#{file[:source].sub(/\A#{Regexp.escape(@base_path)}/, '')}' - Skipped"
+                puts "\rUploading translation file `#{source_file}' - Skipped"
               when 'uploaded'
-                puts "\rUploading translation file `#{file[:source].sub(/\A#{Regexp.escape(@base_path)}/, '')}' - OK"
+                puts "\rUploading translation file `#{source_file}' - OK"
               when 'not_allowed'
-                puts "\rUploading translation file `#{file[:source].sub(/\A#{Regexp.escape(@base_path)}/, '')}' - is not possible"
+                puts "\rUploading translation file `#{source_file}' - is not possible"
               end
             else
               puts "Warning: Local file `#{file[:source]}' does not exist"
             end
           else
             # if source file does not exist, don't upload translations
-            puts "Warning: Skip `#{file[:source].sub(/\A#{Regexp.escape(@base_path)}/, '')}'. Translation can not be uploaded for a non-existent source file `#{file[:dest]}'. Please upload sources first."
+            puts "Warning: Skip `#{source_file}'. Translation can not be uploaded for a non-existent source file `#{file[:dest]}'. Please upload sources first."
           end
         end
       end
@@ -652,10 +727,13 @@ command :download do |c|
   c.arg_name 'language_code'
   c.flag [:l, :language], default_value: 'all'
 
+  c.desc I18n.t('app.flags.branch.desc')
+  c.arg_name 'branch_name'
+  c.flag [:b, :branch]
+
   c.desc I18n.t('app.commands.download.switches.ignore_match.desc')
   c.switch ['ignore-match'], negatable: false
 
-
   c.action do |global_options, options, args|
     language = options[:language]
 
@@ -681,9 +759,12 @@ command :download do |c|
       end
     end
 
+    params = {}
+    params[:branch] = @branch_name if @branch_name
+
     # use export API method before to download the most recent translations
     print 'Building ZIP archive with the latest translations '
-    export_translations = @crowdin.export_translations
+    export_translations = @crowdin.export_translations(params)
     if export_translations['success']
       if export_translations['success']['status'] == 'built'
         puts "- OK"
@@ -753,11 +834,15 @@ command :download do |c|
       end # if
     end # @config['files']
 
-    ##
     tempfile = Tempfile.new(language)
     zipfile_name = tempfile.path
+
+    params = {}
+    params[:output] = zipfile_name
+    params[:branch] = @branch_name if @branch_name
+
     begin
-      @crowdin.download_translation(language, output: zipfile_name)
+      @crowdin.download_translation(language, params)
 
       unzip_file_with_translations(zipfile_name, @base_path, downloadable_files_hash, options['ignore-match'])
     ensure
@@ -777,9 +862,20 @@ command :list do |ls_cmd|
     proj_cmd.desc I18n.t('app.commands.list.switches.tree.desc')
     proj_cmd.switch ['tree'], negatable: false
 
+    proj_cmd.desc I18n.t('app.flags.branch.desc')
+    proj_cmd.arg_name 'branch_name'
+    proj_cmd.flag [:b, :branch]
+
     proj_cmd.action do |global_options, options, args|
       project_info = @crowdin.project_info
-      remote_project_tree = get_remote_files_hierarchy(project_info['files'])
+
+      if @branch_name
+        branch = project_info['files'].find { |h| h['node_type'] == 'branch' && h['name'] == @branch_name }
+        branch_files = branch ? [] << branch : []
+        remote_project_tree = get_remote_files_hierarchy(branch_files)
+      else
+        remote_project_tree = get_remote_files_hierarchy(project_info['files'])
+      end
 
       if options[:tree]
         tree = build_hash_tree(remote_project_tree[:files])
@@ -795,6 +891,10 @@ command :list do |ls_cmd|
     src_cmd.desc I18n.t('app.commands.list.switches.tree.desc')
     src_cmd.switch ['tree'], negatable: false
 
+    src_cmd.desc I18n.t('app.flags.branch.desc')
+    src_cmd.arg_name 'branch_name'
+    src_cmd.flag [:b, :branch]
+
     src_cmd.action do |global_options, options, args|
       local_files = []
       dest_files = []
@@ -865,6 +965,10 @@ command :list do |ls_cmd|
     trans_cmd.desc I18n.t('app.commands.list.switches.tree.desc')
     trans_cmd.switch ['tree'], negatable: false
 
+    trans_cmd.desc I18n.t('app.flags.branch.desc')
+    trans_cmd.arg_name 'branch_name'
+    trans_cmd.flag [:b, :branch]
+
     trans_cmd.action do |global_options, options, args|
       project_info = @crowdin.project_info
 
@@ -1064,6 +1168,15 @@ pre do |globals ,command, options, args|
     EOS
   end
 
+  @branch_name = options[:branch] || nil
+  @base_path = @branch_name ? File.join(@base_path, @branch_name) : @base_path
+
+  unless Dir.exists?(@base_path)
+    exit_now! <<-EOS.strip_heredoc
+      No such directory `#{@base_path}`. Please make sure that the `base_path` or a branch name is properly set.
+    EOS
+  end
+
   @preserve_hierarchy = false
   if @config['preserve_hierarchy']
     @preserve_hierarchy = case @config['preserve_hierarchy']

data/lib/crowdin-cli/version.rb

@@ -1,5 +1,5 @@
 module Crowdin
   module CLI
-    VERSION = '0.4.6'
+    VERSION = '0.5.0.pre'
   end
 end

data/locales/en.yml

@@ -9,6 +9,8 @@ en:
         desc: Project-specific configuration file
       identity:
         desc: User-specific configuration file with API credentials
+      branch:
+        desc: Defines branch name.
     switches:
       verbose:
         desc: Be verbose

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crowdin-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0.pre
 platform: ruby
 authors:
 - Crowdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.0.pre
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -145,12 +145,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Crowdin CLI.