crowdin-cli 0.5.0.pre → 0.5.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea82b26b6c10089325ddbffcd1429c915dc67dd6
-  data.tar.gz: 0d6f374b2216d33ebc138d5afea0090d7c431913
+  metadata.gz: befb18bf581377776d503a2aec95c65efe68f281
+  data.tar.gz: 8b04486d86ab986221eb693f016a1763f99877d5
 SHA512:
-  metadata.gz: fdab714082fe77e71906c7a1b339828ae0a662ffab1ce729862aec2ba8aae9e5fe5ba646ed8b47c139dfb1eed2860532ab433dad41b5ba6690295de4bbce4f39
-  data.tar.gz: eb84df5ff216c5c43b4fc69aab971656936f2fb4e277c2975d14b6093d77b41e7c7dd9d7caef0cb0768decd152ca82f9cad4215788b1b0724ada425777e2de0e
+  metadata.gz: 88473e4a33402a1e87f94ecf9e766737e5070da9a12647793ca9eb44fea68652ec1b3833f442e6efe2c8bb8f660cc77f3e67da019af3161de8f3103d07fbe7d2
+  data.tar.gz: 35ff4bf6f393eb6c19fc638e3568dfdbb29ca9782a7349a01f94cd8b0f91aa98c194bbd855e4ac531c1982d5bf8881b77c8d6189e958a92000f768d6113676b9

data/bin/crowdin-cli

@@ -371,16 +371,14 @@ command :upload do |c|
     c.flag [:b, :branch]
 
     c.action do |global_options, options, args|
-      project_info = @crowdin.project_info
-
-      source_language = project_info['details']['source_language']['code']
+      source_language = @project_info['details']['source_language']['code']
 
       # Crowdin supported languages list
       supported_languages = @crowdin.supported_languages
       source_language = supported_languages.find { |lang| lang['crowdin_code'] == source_language }
 
       if @branch_name
-        branch = project_info['files'].find { |h| h['node_type'] == 'branch' && h['name'] == @branch_name }
+        branch = @project_info['files'].find { |h| h['node_type'] == 'branch' && h['name'] == @branch_name }
 
         if branch
           branch_files = [] << branch
@@ -400,7 +398,7 @@ command :upload do |c|
         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'])
+        remote_project_tree = get_remote_files_hierarchy(@project_info['files'])
       end
 
       local_files = []
@@ -571,10 +569,8 @@ command :upload do |c|
 
       language = options[:language]
 
-      project_info = @crowdin.project_info
-
       if @branch_name
-        branch = project_info['files'].find { |h| h['node_type'] == 'branch' && h['name'] == @branch_name }
+        branch = @project_info['files'].find { |h| h['node_type'] == 'branch' && h['name'] == @branch_name }
 
         if branch
           params[:branch] = @branch_name
@@ -589,10 +585,10 @@ command :upload do |c|
         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'])
+        remote_project_tree = get_remote_files_hierarchy(@project_info['files'])
       end
 
-      project_languages = project_info['languages'].collect { |h| h['code'] }
+      project_languages = @project_info['languages'].collect { |h| h['code'] }
 
       if language == 'all'
         # do nothing
@@ -606,7 +602,7 @@ command :upload do |c|
 
       supported_languages = @crowdin.supported_languages
 
-      source_language = project_info['details']['source_language']['code']
+      source_language = @project_info['details']['source_language']['code']
       source_language = supported_languages.find { |lang| lang['crowdin_code'] == source_language }
 
       translation_languages = supported_languages.select { |lang| project_languages.include?(lang['crowdin_code']) }
@@ -735,13 +731,21 @@ command :download do |c|
   c.switch ['ignore-match'], negatable: false
 
   c.action do |global_options, options, args|
+    if @branch_name
+      branch = @project_info['files'].find { |h| h['node_type'] == 'branch' && h['name'] == @branch_name }
+
+      unless branch
+        exit_now! <<-EOS.strip_heredoc
+            path `#{@branch_name}' did not match any branch known to Crowdin
+        EOS
+      end
+    end
+
     language = options[:language]
 
     supported_languages = @crowdin.supported_languages
 
-    project_info = @crowdin.project_info
-
-    project_languages = project_info['languages'].collect{ |h| h['code'] }
+    project_languages = @project_info['languages'].collect { |h| h['code'] }
 
     if language == 'all'
       if @jipt_language
@@ -774,7 +778,7 @@ command :download do |c|
       end
     end
 
-    source_language = project_info['details']['source_language']['code']
+    source_language = @project_info['details']['source_language']['code']
     source_language = supported_languages.find { |lang| lang['crowdin_code'] == source_language }
 
     translation_languages = supported_languages.select { |lang| project_languages.include?(lang['crowdin_code']) }
@@ -858,23 +862,29 @@ long_desc I18n.t('app.commands.list.long_desc')
 command :list do |ls_cmd|
 
   ls_cmd.desc I18n.t('app.commands.list.commands.project.desc')
-  ls_cmd.command :project do |proj_cmd|
-    proj_cmd.desc I18n.t('app.commands.list.switches.tree.desc')
-    proj_cmd.switch ['tree'], negatable: false
+  ls_cmd.command :project do |prj_cmd|
+    prj_cmd.desc I18n.t('app.commands.list.switches.tree.desc')
+    prj_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
+    prj_cmd.desc I18n.t('app.flags.branch.desc')
+    prj_cmd.arg_name 'branch_name'
+    prj_cmd.flag [:b, :branch]
 
+    prj_cmd.action do |global_options, options, args|
       if @branch_name
-        branch = project_info['files'].find { |h| h['node_type'] == 'branch' && h['name'] == @branch_name }
-        branch_files = branch ? [] << branch : []
+        branch = @project_info['files'].find { |h| h['node_type'] == 'branch' && h['name'] == @branch_name }
+
+        unless branch
+          exit_now! <<-EOS.strip_heredoc
+            path `#{@branch_name}' did not match any branch known to Crowdin
+          EOS
+        end
+
+        branch_files = [] << branch
+
         remote_project_tree = get_remote_files_hierarchy(branch_files)
       else
-        remote_project_tree = get_remote_files_hierarchy(project_info['files'])
+        remote_project_tree = get_remote_files_hierarchy(@project_info['files'])
       end
 
       if options[:tree]
@@ -891,10 +901,6 @@ 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 = []
@@ -965,14 +971,8 @@ 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
-
-      project_languages = project_info['languages'].collect{ |h| h['code'] }
+      project_languages = @project_info['languages'].collect { |h| h['code'] }
 
       supported_languages = @crowdin.supported_languages
       translation_languages = supported_languages.select { |lang| project_languages.include?(lang['crowdin_code']) }
@@ -1029,7 +1029,7 @@ command :list do |ls_cmd|
   #ls_cmd.default_command :project
 end # list
 
-pre do |globals ,command, options, args|
+pre do |globals, command, options, args|
   # Pre logic here
   # Return true to proceed; false to abourt and not call the
   # chosen command
@@ -1169,11 +1169,11 @@ pre do |globals ,command, options, args|
   end
 
   @branch_name = options[:branch] || nil
-  @base_path = @branch_name ? File.join(@base_path, @branch_name) : @base_path
+  # @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.
+      No such directory `#{@base_path}`. Please make sure that the `base_path` is properly set.
     EOS
   end
 
@@ -1202,7 +1202,7 @@ pre do |globals ,command, options, args|
   @crowdin = Crowdin::API.new(api_key: @config['api_key'], project_id: @config['project_identifier'], base_url: base_url)
 
   begin
-    @crowdin.project_info
+    @project_info = @crowdin.project_info
   rescue Crowdin::API::Errors::Error => err
     raise err
   rescue

data/lib/crowdin-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crowdin-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre
+  version: 0.5.0.pre1
 platform: ruby
 authors:
 - Crowdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake