web_translate_it 1.8.2.0 → 1.8.2.1

data/bin/wti

@@ -80,7 +80,7 @@ EOS
 begin
   WebTranslateIt::CommandLine.new(command, command_options, global_options, ARGV, File.expand_path("."))
 rescue Interrupt => e
-  puts "\nQuitting...".failure
+  puts StringUtil.failure("\nQuitting...")
   exit 1
 end
   

data/history.md

@@ -1,3 +1,14 @@
+## Version 1.8.2.1 / 2011-10-14
+
+* Fix frozen string bug on ruby 1.9.3 (thanks @mikian for the patch).
+* Fix: arrays of symbols `ignore_locales: [:en, :fr]` are not being parsed by Psych.
+  People should use an array of strings (`ignore_locales: ['en', 'fr']`) or the longer version instead:
+  ``` yaml
+  ignore_locales:
+    - :en
+    - :fr
+  ```
+
 ## Version 1.8.2.0 / 2011-09-12
 
 * `wti pull` downloads files in parallel, using up to 20 threads.

data/lib/web_translate_it.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 require 'web_translate_it/util'
+require 'web_translate_it/util/array_util'
+require 'web_translate_it/util/string_util'
 require 'web_translate_it/configuration'
 require 'web_translate_it/translation_file'
 require 'web_translate_it/auto_fetch'

data/lib/web_translate_it/command_line.rb

@@ -16,7 +16,7 @@ module WebTranslateIt
     def pull
       STDOUT.sync = true
       `#{configuration.before_pull}` if configuration.before_pull
-      puts "Pulling files".titleize
+      puts StringUtil.titleize("Pulling files")
 
       # Selecting files to pull
       files = []
@@ -28,7 +28,7 @@ module WebTranslateIt
       threads = []
       n_threads = (files.count.to_f/3).ceil >= 20 ? 20 : (files.count.to_f/3).ceil
       puts "Using up to #{n_threads} threads"
-      files.chunk(n_threads).each do |file_array|
+      ArrayUtil.chunk(files, n_threads).each do |file_array|
         unless file_array.empty?
           threads << Thread.new(file_array) do |file_array|
             WebTranslateIt::Util.http_connection do |http|
@@ -48,7 +48,7 @@ module WebTranslateIt
     def push
       STDOUT.sync = true
       `#{configuration.before_push}` if configuration.before_push
-      puts "Pushing files".titleize
+      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|
@@ -62,7 +62,7 @@ module WebTranslateIt
     def add
       STDOUT.sync = true
       if parameters == []
-        puts "No master file given.".failure
+        puts StringUtil.failure("No master file given.")
         puts "Usage: wti add master_file1 master_file2 ..."
         exit
       end
@@ -72,18 +72,18 @@ module WebTranslateIt
           file.create(http)
         end
       end
-      puts "Master file added.".success
+      puts StringUtil.success("Master file added.")
     end
     
     def addlocale
       STDOUT.sync = true
       if parameters == []
-        puts "No locale code given.".failure
+        puts StringUtil.failure("No locale code given.")
         puts "Usage: wti addlocale locale1 locale2 ..."
         exit
       end
       parameters.each do |param|
-        print "Adding locale #{param}... ".success
+        print StringUtil.success("Adding locale #{param}... ")
         puts WebTranslateIt::Project.create_locale(configuration.api_key, param)
       end
       puts "Done!"
@@ -94,7 +94,7 @@ module WebTranslateIt
       project = YAML.load WebTranslateIt::Project.fetch_info(api_key)
       project_info = project['project']
       if File.exists?('.wti') && !File.writable?('.wti')
-        puts "Error: `.wti` file is not writable.".failure
+        puts StringUtil.failure("Error: `.wti` file is not writable.")
         exit
       end
       File.open('.wti', 'w'){ |file| file << generate_configuration(api_key, project_info) }
@@ -104,16 +104,16 @@ module WebTranslateIt
     end
     
     def match
-      puts "Matching local files with File Manager".titleize
+      puts StringUtil.titleize("Matching local files with File Manager")
       configuration.files.find_all{ |mf| mf.locale == configuration.source_locale }.each do |master_file|
         if !File.exists?(master_file.file_path)
-          puts master_file.file_path.failure + " (#{master_file.locale})"
+          puts StringUtil.failure(master_file.file_path) + " (#{master_file.locale})"
         else
-          puts master_file.file_path.important + " (#{master_file.locale})"
+          puts StringUtil.important(master_file.file_path) + " (#{master_file.locale})"
         end
         configuration.files.find_all{ |f| f.master_id == master_file.id }.each do |file|
           if !File.exists?(file.file_path)
-            puts "- #{file.file_path}".failure + " (#{file.locale})"
+            puts StringUtil.failure("- #{file.file_path}") + " (#{file.locale})"
           else
             puts "- #{file.file_path}" + " (#{file.locale})"
           end
@@ -190,7 +190,8 @@ module WebTranslateIt
 api_key: #{api_key}
 
 # Optional: locales not to sync with Web Translate It.
-# eg. [:en, :fr] or just 'en'
+# Takes a string, a symbol, or an array of string or symbol.
+# More information here: https://github.com/AtelierConvivialite/webtranslateit/wiki
 # ignore_locales: '#{project_info["source_locale"]["code"]}'
 
 # Optional

data/lib/web_translate_it/translation_file.rb

@@ -39,7 +39,7 @@ module WebTranslateIt
     def fetch(http_connection, force = false)
       display = []
       display.push(self.file_path)
-      display.push "#{self.local_checksum.to_s.checksumify}..#{self.remote_checksum.to_s.checksumify}"
+      display.push "#{StringUtil.checksumify(self.local_checksum.to_s)}..#{StringUtil.checksumify(self.remote_checksum.to_s)}"
       if !File.exist?(self.file_path) or force or self.remote_checksum != self.local_checksum
         begin
           response = http_connection.get(api_url)
@@ -48,17 +48,17 @@ module WebTranslateIt
             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
-            display.push "An error occured: #{$!}".failure
+            display.push StringUtil.failure("An error occured: #{$!}")
           end
         rescue Timeout::Error
-          puts "Request timeout. Will retry in 5 seconds.".failure
+          puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
           sleep(5)
           fetch(http_connection, force)
         end
       else
-        display.push "Skipped".success
+        display.push StringUtil.success("Skipped")
       end
-      puts display.to_columns
+      puts ArrayUtil.to_columns(display)
     end
     
     # Update a language file to Web Translate It by performing a PUT Request.
@@ -75,21 +75,21 @@ module WebTranslateIt
     def upload(http_connection, merge=false, ignore_missing=false, label=nil, low_priority=false)
       display = []
       display.push(self.file_path)
-      display.push "#{self.local_checksum.to_s.checksumify}..#{self.remote_checksum.to_s.checksumify}"
+      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 })
             display.push Util.handle_response(http_connection.request(request))
-            puts display.to_columns
+            puts ArrayUtil.to_columns(display)
           rescue Timeout::Error
-            puts "Request timeout. Will retry in 5 seconds.".failure
+            puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
             sleep(5)
             upload(merge, ignore_missing, label, low_priority)
           end
         end
       else
-        puts "Can't push #{self.file_path}. File doesn't exist.".failure
+        puts StringUtil.failure("Can't push #{self.file_path}. File doesn't exist.")
       end
     end
     
@@ -107,21 +107,21 @@ module WebTranslateIt
     def create(http_connection)
       display = []
       display.push file_path
-      display.push "#{self.local_checksum.to_s.checksumify}..[     ]"
+      display.push "#{StringUtil.checksumify(self.local_checksum.to_s)}..[     ]"
       if File.exists?(self.file_path)
         File.open(self.file_path) do |file|
           begin
             request  = Net::HTTP::Post::Multipart.new(api_url_for_create, { "name" => self.file_path, "file" => UploadIO.new(file, "text/plain", file.path) })
             display.push Util.handle_response(http_connection.request(request))
-            puts display.to_columns
+            puts ArrayUtil.to_columns(display)
           rescue Timeout::Error
-            puts "Request timeout. Will retry in 5 seconds.".failure
+            puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
             sleep(5)
             create
           end
         end
       else
-        puts "\nFile #{self.file_path} doesn't exist!".failure
+        puts StringUtil.failure("\nFile #{self.file_path} doesn't exist!")
       end
     end
         

data/lib/web_translate_it/util.rb

@@ -56,16 +56,16 @@ module WebTranslateIt
     
     def self.handle_response(response, return_response = false)
       if response.code.to_i >= 400 and response.code.to_i < 500
-        "Error: Can't find project for this API key.".failure
+        StringUtil.failure("Error: Can't find project for this API key.")
       elsif response.code.to_i >= 500
-        "Error: Server temporarily unavailable. Please try again shortly.".failure
+        StringUtil.failure("Error: Server temporarily unavailable. Please try again shortly.")
       else
         return response.body if return_response
-        return "Server currently processing file. Please retry later.".failure if response.code.to_i == 102
-        return "OK".success if response.code.to_i == 200
-        return "Created".success if response.code.to_i == 201
-        return "Accepted".success if response.code.to_i == 202
-        return "Not Modified".success if response.code.to_i == 304
+        return StringUtil.failure("Server currently processing file. Please retry later.") if response.code.to_i == 102
+        return StringUtil.success("OK") if response.code.to_i == 200
+        return StringUtil.success("Created") if response.code.to_i == 201
+        return StringUtil.success("Accepted") if response.code.to_i == 202
+        return StringUtil.success("Not Modified") if response.code.to_i == 304
       end
     end
     
@@ -131,58 +131,4 @@ module WebTranslateIt
       !RUBY_PLATFORM.downcase.include?("mingw32")
     end
   end
-end
-
-class Array
-  def to_columns
-    " #{self[0].backward_truncate} | #{self[1]}  #{self[2]}"
-  end
-  
-  def chunk(pieces=2)
-    len = self.length;
-    mid = (len/pieces)
-    chunks = []
-    start = 0
-    1.upto(pieces) do |i|
-      last = start+mid
-      last = last-1 unless len%pieces >= i
-      chunks << self[start..last] || []
-      start = last+1
-    end
-    chunks
-  end
-  
-end
-
-class String
-  
-  def backward_truncate
-    if length <= 50
-      spaces = ""
-      (50-length).times{ spaces << " " }
-      return self << spaces
-    else
-      return "..." << self[self.length-50+3..self.length]
-    end
-  end
-  
-  def success
-    WebTranslateIt::Util.can_display_colors? ? "\e[32m#{self}\e[0m" : self
-  end
-  
-  def failure
-    WebTranslateIt::Util.can_display_colors? ? "\e[31m#{self}\e[0m" : self
-  end
-  
-  def checksumify
-    WebTranslateIt::Util.can_display_colors? ? "\e[33m#{self[0..6]}\e[0m" : self[0..6]
-  end
-  
-  def titleize
-    WebTranslateIt::Util.can_display_colors? ? "\e[1m#{self}\e[0m\n\n" : self
-  end
-  
-  def important
-    WebTranslateIt::Util.can_display_colors? ? "\e[1m#{self}\e[0m" : self
-  end
-end
+end

data/lib/web_translate_it/util/array_util.rb

@@ -0,0 +1,19 @@
+class ArrayUtil
+  def self.to_columns(arr)
+    " #{StringUtil.backward_truncate(arr[0])} | #{arr[1]}  #{arr[2]}"
+  end
+
+  def self.chunk(arr, pieces=2)
+    len = arr.length;
+    mid = (len/pieces)
+    chunks = []
+    start = 0
+    1.upto(pieces) do |i|
+      last = start+mid
+      last = last-1 unless len%pieces >= i
+      chunks << arr[start..last] || []
+      start = last+1
+    end
+    chunks
+  end
+end

data/lib/web_translate_it/util/string_util.rb

@@ -0,0 +1,32 @@
+class StringUtil
+
+  def self.backward_truncate(str)
+    if str.length <= 50
+      spaces = ""
+      (50-str.length).times{ spaces << " " }
+      return str.dup << spaces
+    else
+      return "..." << str[str.length-50+3..str.length]
+    end
+  end
+
+  def self.success(str)
+    WebTranslateIt::Util.can_display_colors? ? "\e[32m#{str}\e[0m" : str
+  end
+
+  def self.failure(str)
+    WebTranslateIt::Util.can_display_colors? ? "\e[31m#{str}\e[0m" : str
+  end
+
+  def self.checksumify(str)
+    WebTranslateIt::Util.can_display_colors? ? "\e[33m#{str[0..6]}\e[0m" : str[0..6]
+  end
+
+  def self.titleize(str)
+    WebTranslateIt::Util.can_display_colors? ? "\e[1m#{str}\e[0m\n\n" : str
+  end
+
+  def self.important(str)
+    WebTranslateIt::Util.can_display_colors? ? "\e[1m#{str}\e[0m" : str
+  end
+end

data/version.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 8
 :tiny: 2
-:patch: 0
+:patch: 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 1.8.2.0
+  version: 1.8.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000 Z
+date: 2011-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70229730325800 !ruby/object:Gem::Requirement
+  requirement: &70362462653320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70229730325800
+  version_requirements: *70362462653320
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70229730325300 !ruby/object:Gem::Requirement
+  requirement: &70362462652660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70229730325300
+  version_requirements: *70362462652660
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70229730324840 !ruby/object:Gem::Requirement
+  requirement: &70362462651680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70229730324840
+  version_requirements: *70362462651680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70229730324380 !ruby/object:Gem::Requirement
+  requirement: &70362462649880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70229730324380
+  version_requirements: *70362462649880
 description: 
 email: edouard@atelierconvivialite.com
 executables:
@@ -65,7 +65,7 @@ extra_rdoc_files:
 - readme.md
 files:
 - history.md
-- licence
+- license
 - readme.md
 - version.yml
 - examples/locale.rb
@@ -77,6 +77,8 @@ files:
 - lib/web_translate_it/public/screen.css
 - lib/web_translate_it/server.rb
 - lib/web_translate_it/translation_file.rb
+- lib/web_translate_it/util/array_util.rb
+- lib/web_translate_it/util/string_util.rb
 - lib/web_translate_it/util.rb
 - lib/web_translate_it/views/index.erb
 - lib/web_translate_it.rb