web_translate_it 1.10.0 → 1.10.1

data/bin/wti

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$PROGRAM_NAME = 'wti'
+
 require 'trollop'
 require 'web_translate_it'
 

data/history.md

@@ -1,7 +1,15 @@
+## Version 1.10.1 / 2012-04-10
+
+* New: Prevent existing master files from being added again on `wti add`.
+  This allows to run something like: `ls *.xml | grep -v "\.en" | xargs wti add` without worrying about adding files a second time. Patch submitted by Ivan Kolesnikov <ik@playtox.ru>.
+* New: Better error messages. #82.
+* New: Add process name to command line tool. #81.
+* Fix: Prevents `wti status` from crashing, #83.
+
 ## Version 1.10.0 / 2012-03-07
 
-* New: `wti push` only push local files having a different checksum than the ones on WTI server.
-* New: `wti push --force` lets you force push files.
+* New: `wti push` only push local files having a different checksum than the ones on WTI server. Patch submitted by Ivan Kolesnikov <ik@playtox.ru>.
+* New: `wti push --force` lets you force push files. Patch submitted by Ivan Kolesnikov <ik@playtox.ru>.
 
 ## Version 1.9.6 / 2012-03-01
 

data/lib/web_translate_it/command_line.rb

@@ -2,6 +2,7 @@
 module WebTranslateIt
   class CommandLine
     require 'fileutils'
+    require 'set'
     attr_accessor :configuration, :global_options, :command_options, :parameters
     
     def initialize(command, command_options, global_options, parameters, project_path)
@@ -71,7 +72,8 @@ module WebTranslateIt
         exit
       end
       WebTranslateIt::Util.http_connection do |http|
-        parameters.each do |param|
+	      added = configuration.files.find_all{ |file| file.locale == configuration.source_locale}.collect {|file| File.absolute_path(file.file_path) }.to_set
+        parameters.reject{ |param| added.include?(File.absolute_path(param))}.each do |param|
           file = TranslationFile.new(nil, param, nil, configuration.api_key)
           file.create(http, command_options.low_priority)
         end
@@ -171,13 +173,13 @@ module WebTranslateIt
       stats = YAML.load(Project.fetch_stats(configuration.api_key))
       stale = false
       stats.each do |locale, values|
-        percent_translated = Util.calculate_percentage(values['count_strings_to_proofread'] + values['count_strings_done'] + values['count_strings_to_verify'], values['count_strings'])
-        percent_completed  = Util.calculate_percentage(values['count_strings_done'], values['count_strings'])
-        puts "#{locale}: #{percent_translated}% translated, #{percent_completed}% completed #{values['stale'] ? "Stale" : ""}"
+        percent_translated = Util.calculate_percentage(values['count_strings_to_proofread'].to_i + values['count_strings_done'].to_i + values['count_strings_to_verify'].to_i, values['count_strings'].to_i)
+        percent_completed  = Util.calculate_percentage(values['count_strings_done'].to_i, values['count_strings'].to_i)
+        puts "#{locale}: #{percent_translated}% translated, #{percent_completed}% completed #{values['stale'] ? "Out of date" : ""}"
         stale = true if values['stale']
       end
       if stale
-        self.status if Util.ask_yes_no("Some of these stats are stale. Would you like to refresh?", true)
+        self.status if Util.ask_yes_no("Some of these stats are out of date. Would you like to refresh?", true)
       end
     end
     

data/lib/web_translate_it/project.rb

@@ -20,7 +20,7 @@ module WebTranslateIt
       rescue Timeout::Error
         puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
         sleep(5)
-        self.fetch_info(api_key)
+        retry
       end
     end
     
@@ -35,7 +35,7 @@ module WebTranslateIt
       rescue Timeout::Error
         puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
         sleep(5)
-        self.fetch_stats(api_key)
+        retry
       end
     end
     
@@ -51,7 +51,7 @@ module WebTranslateIt
       rescue Timeout::Error
         puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
         sleep(5)
-        self.create_locale(api_key, locale_code)
+        retry
       end
     end
     
@@ -66,7 +66,7 @@ module WebTranslateIt
       rescue Timeout::Error
         puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
         sleep(5)
-        self.delete_locale(api_key, locale_code)
+        retry
       end
     end
   end

data/lib/web_translate_it/util.rb

@@ -56,7 +56,11 @@ module WebTranslateIt
     
     def self.handle_response(response, return_response = false)
       if response.code.to_i >= 400 and response.code.to_i < 500
-        StringUtil.failure("Error: Can't find project with this API key.")
+        if response.body
+          StringUtil.failure(response.body)
+        else
+          StringUtil.failure("Error: Can't find project with this API key.")
+        end
       elsif response.code.to_i == 500
         StringUtil.failure("Error: Server temporarily unavailable. Please try again shortly.")
       else

data/version.yml

@@ -1,4 +1,4 @@
 :major: 1
 :minor: 10
-:patch: 0
+:patch: 1
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70226362190540 !ruby/object:Gem::Requirement
+  requirement: &70323206904100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70226362190540
+  version_requirements: *70323206904100
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70226362189940 !ruby/object:Gem::Requirement
+  requirement: &70323206903180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70226362189940
+  version_requirements: *70323206903180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70226362189380 !ruby/object:Gem::Requirement
+  requirement: &70323206902480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70226362189380
+  version_requirements: *70323206902480
 description: 
 email: edouard@atelierconvivialite.com
 executables: