web_translate_it 1.7.2.1 → 1.7.3.0

data/bin/wti

@@ -3,7 +3,7 @@
 require 'trollop'
 require 'web_translate_it'
 
-SUB_COMMANDS = %w(pull push add addlocale server stats status st autoconf init)
+SUB_COMMANDS = %w(pull push add addlocale server status st init)
 global_options = Trollop::options do
   banner <<-EOS
   wti is a command line tool to sync your local translation files
@@ -44,10 +44,8 @@ command_options = case command
       opt :port, "Run server on a specific port", :default => 4000, :short => "-p"
       opt :host, "Run server on a specific host", :default => "0.0.0.0", :short => "-h"
     end
-  when "stats"
   when "status"
   when "st"
-  when "autoconf"
   when "init"
   else
     Trollop::die "unknown subcommand #{command.inspect}"

data/examples/en.yml

@@ -1,10 +1,18 @@
-en:
+fr:
   activerecord:
     errors:
+      models:
+        invitation:
+          attributes:
+            email:
+              user_already_invited: "This user has already been invited"
+              user_already_member: "This user is already a member"
+        project_file:
+          attributes:
+            file:
+              file_format_not_supported: "Sorry, we currenly support only Gettext .pot/.po, .yml/.yaml and .strings"
       templates:
         header:
-          one: "1 error prohibited this {{model}} from being saved"
-          other: "{{count}} errors prohibited this {{model}} from being saved"
           body: "there were problems with the following fields:"
           messages:
             accepted: "must be accepted"
@@ -25,14 +33,11 @@ en:
             taken: "is already taken"
             too_long: "is too long (maximum is {{count}} characters)"
             too_short: "is too short (minimum is {{count}} characters)"
-            wrong_length: "is the wrong length (should be {{count}} characters)" 
-      models:
-        invitation:
-          attributes:
-            email:
-              user_already_invited: "This user has already been invited"
-              user_already_member: "This user is already a member"
-        project_file:
-          attributes:
-            file:
-              file_format_not_supported: "Sorry, we currenly support only Gettext .pot/.po, .yml/.yaml and .strings"
+            wrong_length: "is the wrong length (should be {{count}} characters)"
+          one: "1 error prohibited this {{model}} from being saved"
+          other: "{{count}} errors prohibited this {{model}} from being saved"
+  another_one: dskjdks
+  another_string: "this is another string"
+  hello: "Hello world!!"
+  new_string: hehe
+  test: " & & "

data/history.md

@@ -1,3 +1,10 @@
+## Version 1.7.3.0 / 2011-04-12
+
+* New: Compare local file checksum with file checksum from WTI API to determine if file needs downloading.
+  We were previously using the date of last modification which can be a little bit unreliable.
+* Remove `wti autoconf` and `wti stats`.
+  These commands were deprecated in favour of `wti init` and `wti status` (and its alias `wti st`).
+
 ## Version 1.7.2.1 / 2011-03-31
 
 * Bug fix: `wti init` fails when configuration file doesn’t exist.

data/lib/web_translate_it/command_line.rb

@@ -16,7 +16,7 @@ module WebTranslateIt
       `#{configuration.before_pull}` if configuration.before_pull
       fetch_locales_to_pull.each do |locale|
         configuration.files.find_all{ |file| file.locale == locale }.each do |file|
-          print "Pulling #{file.file_path}... "
+          print "Pulling #{file.file_path}: "
           puts file.fetch(command_options.force)
         end
       end
@@ -63,17 +63,7 @@ module WebTranslateIt
       end
       puts "Done!"
     end
-    
-    def autoconf
-      puts ""
-      puts "============================================"
-      puts " Warning: `wti autoconf` will be deprecated."
-      puts " Please use `wti init` instead."
-      puts "============================================"
-      puts ""
-      init
-    end
-    
+        
     def init
       puts "This command configures your project."
       api_key = Util.ask("Enter your project API Key:")
@@ -103,17 +93,7 @@ module WebTranslateIt
         puts "Check `wti --help` for more information."
       end
     end
-    
-    def stats
-      puts ""
-      puts "============================================="
-      puts " Warning: `wti stats` will be deprecated."
-      puts " Please use `wti status` or `wti st` instead."
-      puts "============================================="
-      puts ""
-      status
-    end
-    
+        
     def status
       stats = YAML.load(Project.fetch_stats(configuration.api_key))
       stale = false

data/lib/web_translate_it/configuration.rb

@@ -49,7 +49,7 @@ module WebTranslateIt
         if project_file['name'].nil? or project_file['name'].strip == ''
           puts "File #{project_file['id']} not set up"
         else
-          self.files.push TranslationFile.new(project_file['id'], project_file['name'], project_file['locale_code'], self.api_key, project_file['updated_at'])
+          self.files.push TranslationFile.new(project_file['id'], project_file['name'], project_file['locale_code'], self.api_key, project_file['updated_at'], project_file['hash_file'])
         end
       end
     end

data/lib/web_translate_it/translation_file.rb

@@ -12,14 +12,15 @@ module WebTranslateIt
     require 'time'
     require 'fileutils'
     
-    attr_accessor :id, :file_path, :locale, :api_key, :updated_at
+    attr_accessor :id, :file_path, :locale, :api_key, :updated_at, :remote_checksum
     
-    def initialize(id, file_path, locale, api_key, updated_at = nil)
+    def initialize(id, file_path, locale, api_key, updated_at = nil, remote_checksum = "")
       self.id         = id
       self.file_path  = file_path
       self.locale     = locale
       self.api_key    = api_key
       self.updated_at = updated_at
+      self.remote_checksum = remote_checksum
     end
     
     # Fetch a language file.
@@ -35,11 +36,11 @@ module WebTranslateIt
     #   file.fetch(true) # force to re-download the file, will return the content of the file with a 200 OK
     #
     def fetch(force = false)
-      if !File.exist?(self.file_path) or force or self.updated_at >= last_modification.utc
+      print "#{self.local_checksum.checksumify}...#{self.remote_checksum.checksumify}  "
+      if !File.exist?(self.file_path) or force or self.remote_checksum != self.local_checksum
         begin
           WebTranslateIt::Util.http_connection do |http|
             request = Net::HTTP::Get.new(api_url)
-            request.add_field('If-Modified-Since', last_modification.rfc2822) if File.exist?(self.file_path) and !force
             response = http.request(request)
             FileUtils.mkpath(self.file_path.split('/')[0..-2].join('/')) unless File.exist?(self.file_path) or self.file_path.split('/')[0..-2].join('/') == ""
             begin
@@ -142,5 +143,14 @@ module WebTranslateIt
       def api_url_for_create
         "/api/projects/#{self.api_key}/files"
       end
+      
+      def local_checksum
+        require 'digest/sha1'
+        begin
+          Digest::SHA1.hexdigest(File.open(file_path) { |f| f.read })
+        rescue
+          ""
+        end
+      end
   end
 end

data/lib/web_translate_it/util.rb

@@ -154,4 +154,11 @@ class String
   def failure
     self.background(:red).foreground(:white)
   end
+  
+  ##
+  # trucated, gray foreground for checksums
+  
+  def checksumify
+    self[0..6].foreground(:yellow)
+  end
 end

data/spec/web_translate_it/translation_file_spec.rb

@@ -28,13 +28,6 @@ describe WebTranslateIt::TranslationFile do
       translation_file.fetch(true).should include "200 OK"
     end
     
-    it "should prepare a HTTP request and get a 304 OK if the language file is fresh" do
-      file = mock(File)
-      file.stub(:puts => true, :close => true)
-      File.stub(:exist? => true, :mtime => Time.now, :new => file)
-      translation_file.fetch.should include "304 Not Modified"
-    end
-    
     it "should prepare a HTTP request and get a 200 OK if the language file is fresh using the force download parameter" do
       file = mock(File)
       file.stub(:puts => true, :close => true)

data/version.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 7
-:tiny: 2
-:patch: 1
+:tiny: 3
+:patch: 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: web_translate_it
 version: !ruby/object:Gem::Version 
-  hash: 109
+  hash: 107
   prerelease: 
   segments: 
   - 1
   - 7
-  - 2
-  - 1
-  version: 1.7.2.1
+  - 3
+  - 0
+  version: 1.7.3.0
 platform: ruby
 authors: 
 - "\xC3\x89douard Bri\xC3\xA8re"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 +02:00
+date: 2011-04-12 00:00:00 +02:00
 default_executable: wti
 dependencies: 
 - !ruby/object:Gem::Dependency