web_translate_it 1.9.6 → 1.10.0

data/bin/wti

@@ -53,6 +53,7 @@ Push master language file(s)
 EOS
       opt :locale, "ISO code of locale(s) to push", :type => :string
       opt :all,    "Upload all files"
+      opt :force,  "Force push (bypass conditional requests to WTI)"
       opt :low_priority, "WTI will process this file with a low priority"
       opt :merge,  "Force WTI to merge this file"
       opt :ignore_missing, "Force WTI to not obsolete missing strings"
@@ -122,4 +123,4 @@ rescue Interrupt => e
   puts StringUtil.failure("\nQuitting...")
   exit 1
 end
-  
+ 

data/history.md

@@ -1,3 +1,8 @@
+## 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.
+
 ## Version 1.9.6 / 2012-03-01
 
 * Support for new `minor_changes` flag on File API. Use with `wti push --minor`.

data/lib/web_translate_it/command_line.rb

@@ -56,7 +56,7 @@ module WebTranslateIt
       WebTranslateIt::Util.http_connection do |http|
         fetch_locales_to_push(configuration).each do |locale|
           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, command_options[:minor])
+            file.upload(http, command_options[:merge], command_options.ignore_missing, command_options.label, command_options.low_priority, command_options[:minor], command_options.force)
           end
         end
       end

data/lib/web_translate_it/translation_file.rb

@@ -75,24 +75,28 @@ module WebTranslateIt
     #
     # Note that the request might or might not eventually be acted upon, as it might be disallowed when processing
     # actually takes place. This is due to the fact that language file imports are handled by background processing.
-    def upload(http_connection, merge=false, ignore_missing=false, label=nil, low_priority=false, minor_changes=false)
+    def upload(http_connection, merge=false, ignore_missing=false, label=nil, low_priority=false, minor_changes=false, force=false)
       display = []
       display.push(self.file_path)
       display.push "#{StringUtil.checksumify(self.local_checksum.to_s)}..#{StringUtil.checksumify(self.remote_checksum.to_s)}"
       if File.exists?(self.file_path)
-        File.open(self.file_path) do |file|
-          begin
-            request = Net::HTTP::Put::Multipart.new(api_url, {"file" => UploadIO.new(file, "text/plain", file.path), "merge" => merge, "ignore_missing" => ignore_missing, "label" => label, "low_priority" => low_priority, "minor_changes" => minor_changes })
-            request.add_field("X-Client-Name", "web_translate_it")
-            request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-            display.push Util.handle_response(http_connection.request(request))
-            puts ArrayUtil.to_columns(display)
-          rescue Timeout::Error
-            puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
-            sleep(5)
-            retry
+	      if force or self.remote_checksum != self.local_checksum
+          File.open(self.file_path) do |file|
+            begin
+              request = Net::HTTP::Put::Multipart.new(api_url, {"file" => UploadIO.new(file, "text/plain", file.path), "merge" => merge, "ignore_missing" => ignore_missing, "label" => label, "low_priority" => low_priority, "minor_changes" => minor_changes })
+              request.add_field("X-Client-Name", "web_translate_it")
+              request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+              display.push Util.handle_response(http_connection.request(request))
+            rescue Timeout::Error
+              puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
+              sleep(5)
+              retry
+            end
           end
+        else
+          display.push StringUtil.success("Skipped")
         end
+        puts ArrayUtil.to_columns(display)
       else
         puts StringUtil.failure("Can't push #{self.file_path}. File doesn't exist.")
       end

data/version.yml

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

metadata

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