web_translate_it 1.9.0 → 1.9.1

data/bin/wti

@@ -3,27 +3,32 @@
 require 'trollop'
 require 'web_translate_it'
 
-SUB_COMMANDS = %w(pull push match add addlocale server status st init)
-global_options = Trollop::options do
-  stop_on SUB_COMMANDS
-  banner <<-EOS
+show_commands = <<-EOS
+A CLI for syncing files with WebTranslateIt.com
 
 Usage: wti <command> [options]+
-  
+
 The most commonly used wti commands are:
-  
-  pull        Pull target language file(s)
-  push        Push master language file(s)
-  match       Display matching of local files with File Manager
-  add         Create and push a new master language file
-  addlocale   Add a new locale to the project
-  status      Fetch and display project statistics
-  init        Configure your project to sync      
+
+pull        Pull target language file(s)
+push        Push master language file(s)
+match       Display matching of local files with File Manager
+add         Create and push a new master language file
+rm          Delete a master language file from a project
+addlocale   Add a new locale to the project
+rmlocale    Delete a locale from a project
+status      Fetch and display project statistics
+init        Configure your project to sync
 
 See `wti <command> --help` for more information on a specific command.
-  
+
 [options] are:
 EOS
+
+SUB_COMMANDS = %w(pull push match add addlocale server status st init)
+global_options = Trollop::options do
+  stop_on SUB_COMMANDS
+  banner show_commands
   version "Web Translate It v#{WebTranslateIt::Util.version}"
 end
 
@@ -103,7 +108,12 @@ EOS
       opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
     end
   else
-    Trollop::die "Unknown subcommand #{command.inspect}"
+    if command.nil?
+      puts show_commands
+      exit
+    else
+      Trollop::die "Unknown subcommand #{command.inspect}"
+    end
   end
 
 begin

data/history.md

@@ -1,3 +1,10 @@
+## Version 1.9.1 / 2011-12-08
+
+* Add `wti rm` and `wti rmlocale` to CLI help.
+* Sort files by name in `wti push`.
+* Improve command-line interface. Executing `wti` should now give help.
+* Bug fix: TranslationFile timeouts, #77. (@bray).
+
 ## Version 1.9.0 / 2011-11-23
 
 * Deprecate `wti server`. This feature was introducing a hard dependency on Sinatra, which is not desirable when embedding `web_translate_it` on a Rails application. `wti server` now lives in a separate gem, `web_translate_it_server`, which depends on the `web_translate_it` gem. To keep using `wti server`, execute: `gem install web_translate_it_server` and run: `wti-server`. 

data/lib/web_translate_it/command_line.rb

@@ -51,7 +51,7 @@ module WebTranslateIt
       puts StringUtil.titleize("Pushing files")
       WebTranslateIt::Util.http_connection do |http|
         fetch_locales_to_push(configuration).each do |locale|
-          configuration.files.find_all{ |file| file.locale == locale }.each do |file|
+          configuration.files.find_all{ |file| file.locale == locale }.sort{|a,b| a.file_path <=> b.file_path} .each do |file|
             file.upload(http, command_options[:merge], command_options.ignore_missing, command_options.label, command_options.low_priority)
           end
         end

data/lib/web_translate_it/translation_file.rb

@@ -50,13 +50,13 @@ module WebTranslateIt
             response = http_connection.request(request)
             File.open(self.file_path, 'wb'){ |file| file << response.body } if response.code.to_i == 200 and response.body != ''
             display.push Util.handle_response(response)
+          rescue Timeout::Error
+            puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
+            sleep(5)
+            retry
           rescue
             display.push StringUtil.failure("An error occured: #{$!}")
           end
-        rescue Timeout::Error
-          puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
-          sleep(5)
-          fetch(http_connection, force)
         end
       else
         display.push StringUtil.success("Skipped")
@@ -90,7 +90,7 @@ module WebTranslateIt
           rescue Timeout::Error
             puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
             sleep(5)
-            upload(merge, ignore_missing, label, low_priority)
+            retry
           end
         end
       else
@@ -124,7 +124,7 @@ module WebTranslateIt
           rescue Timeout::Error
             puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
             sleep(5)
-            create
+            retry
           end
         end
       else
@@ -149,7 +149,7 @@ module WebTranslateIt
           rescue Timeout::Error
             puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
             sleep(5)
-            delete
+            retry
           end
         end
       else

data/version.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 9
-:patch: 0
+:patch: 1
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000 Z
+date: 2011-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70172331071400 !ruby/object:Gem::Requirement
+  requirement: &70346835324020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70172331071400
+  version_requirements: *70346835324020
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70172331070900 !ruby/object:Gem::Requirement
+  requirement: &70346835323520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70172331070900
+  version_requirements: *70346835323520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172331070440 !ruby/object:Gem::Requirement
+  requirement: &70346835323060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70172331070440
+  version_requirements: *70346835323060
 description: 
 email: edouard@atelierconvivialite.com
 executables: