web_translate_it 1.8.1.9 → 1.8.2.0

data/bin/wti

@@ -26,7 +26,6 @@ See `wti <command> --help` for more information on a specific command.
 [options] are:
 EOS
   version "Web Translate It v#{WebTranslateIt::Util.version}"
-  opt :config, "Path to a translation.yml file", :short => "-c", :default => "config/translation.yml"
 end
 
 command = ARGV.shift # get the subcommand

data/generators/webtranslateit/webtranslateit_generator.rb

@@ -13,7 +13,7 @@ class WebtranslateitGenerator < Rails::Generator::Base
     record do |m|
       if options[:api_key]
         project_details = YAML.load WebTranslateIt::Project.fetch_info(options[:api_key])
-        m.template 'translation.yml', 'config/translation.yml',
+        m.template '.wti', '.wti',
           :assigns => { :api_key => options[:api_key], :project => project_details["project"] }
         m.append_to 'Rakefile', "require 'web_translate_it' rescue LoadError"
       end

data/history.md

@@ -1,8 +1,15 @@
-## Version 1.8.1.9 / 2011-07-29
+## Version 1.8.2.0 / 2011-09-12
+
+* `wti pull` downloads files in parallel, using up to 20 threads.
+  This makes syncing much faster for projects containing many files (up to 65 files/sec). 
+* Default configuration file was renamed `.wti`. #67.
+  The upgrade process should be seamless. Config file will be renamed if a `config/translation.yml` file is detected.
+
+## Version 1.8.1.9 / 2011-09-07
 
 * Possible fix for encoding issue in .gemspec file, #66
-* Removed dependancy on ansi gem, so wti can now install smoothly on Windows machines.
-  Windows users had to manually install an extra `win32console` gem. #62.
+* Removed dependency on `ansi` gem, so wti now installs smoothly on Windows machines.
+  Prior to that Windows users had to manually install the `win32console` gem. #62.
 
 ## Version 1.8.1.8 / 2011-07-29
 
@@ -12,16 +19,16 @@
 
 ## Version 1.8.1.7 / 2011-07-29
 
-* Add dependancy on `win32console` for Microsoft Windows users.
+* Add dependency on `win32console` for Microsoft Windows users.
 
 ## Version 1.8.1.6 / 2011-07-25
 
-* Update multipart-post dependancy.
+* Update multipart-post dependency.
 * Only include CA cert of WTI’s SSL certificate issuer. #61.
 
 ## Version 1.8.1.5 / 2011-07-19
 
-* Update ansi dependancy.
+* Update ansi dependency.
 * Bug fix: re-recreate http connection from scratch after SSL certificate verification failure.
 
 ## Version 1.8.1.4 / 2011-06-29

data/lib/web_translate_it/command_line.rb

@@ -7,28 +7,48 @@ module WebTranslateIt
     def initialize(command, command_options, global_options, parameters, project_path)
       self.command_options = command_options
       self.parameters = parameters
-      self.configuration = WebTranslateIt::Configuration.new(project_path, global_options.config) unless command == 'init'
+      unless command == 'init'
+        self.configuration = WebTranslateIt::Configuration.new(project_path, configuration_file_path)
+      end
       self.send(command)
     end
         
     def pull
       STDOUT.sync = true
       `#{configuration.before_pull}` if configuration.before_pull
-      puts "Pulling files ".titleize
-      WebTranslateIt::Util.http_connection do |http|
-        fetch_locales_to_pull.each do |locale|
-          configuration.files.find_all{ |file| file.locale == locale }.each do |file|
-            file.fetch(http, command_options.force)
+      puts "Pulling files".titleize
+
+      # Selecting files to pull
+      files = []
+      fetch_locales_to_pull.each do |locale|
+        files.concat configuration.files.find_all{ |file| file.locale == locale }
+      end
+      # Now actually pulling files
+      time = Time.now
+      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|
+        unless file_array.empty?
+          threads << Thread.new(file_array) do |file_array|
+            WebTranslateIt::Util.http_connection do |http|
+              file_array.each do |file|
+                file.fetch(http, command_options.force)
+              end
+            end
           end
         end
       end
+      threads.each { |thread| thread.join }
+      time = Time.now - time
+      puts "Pulled #{files.count} files in #{time} seconds at #{files.count/time} files/sec."
       `#{configuration.after_pull}` if configuration.after_pull
     end
     
     def push
       STDOUT.sync = true
       `#{configuration.before_push}` if configuration.before_push
-      puts "Pushing files ".titleize
+      puts "Pushing files".titleize
       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|
@@ -71,15 +91,13 @@ module WebTranslateIt
         
     def init
       api_key = Util.ask("Project API Key:")
-      path = Util.ask("Configuration file path:", 'config/translation.yml')
-      FileUtils.mkpath(path.split('/')[0..path.split('/').size-2].join('/'))
       project = YAML.load WebTranslateIt::Project.fetch_info(api_key)
       project_info = project['project']
-      if File.exists?(path) && !File.writable?(path)
-        puts "Error: #{path} is not writable.".failure
+      if File.exists?('.wti') && !File.writable?('.wti')
+        puts "Error: `.wti` file is not writable.".failure
         exit
       end
-      File.open(path, 'w'){ |file| file << generate_configuration(api_key, project_info) }
+      File.open('.wti', 'w'){ |file| file << generate_configuration(api_key, project_info) }
       puts ""
       puts "Done! You can now use `wti` to push and pull your language files."
       puts "Check `wti --help` for help."
@@ -87,7 +105,6 @@ module WebTranslateIt
     
     def match
       puts "Matching local files with File Manager".titleize
-      puts ""
       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})"
@@ -149,6 +166,25 @@ module WebTranslateIt
       return locales.uniq
     end
     
+    def configuration_file_path
+      if File.exists?('config/translation.yml')
+        puts "Warning: `config/translation.yml` is deprecated in favour of a `.wti` file."
+        if Util.ask_yes_no("Would you like to migrate your configuration now?", true)
+          require 'fileutils'
+          if FileUtils.mv('config/translation.yml', '.wti')
+            return '.wti'
+          else
+            puts "Couldn’t move `config/translation.yml`."
+            return false
+          end
+        else
+          return 'config/translation.yml'
+        end
+      else
+        return '.wti'
+      end
+    end
+    
     def generate_configuration(api_key, project_info)
       file = <<-FILE
 api_key: #{api_key}

data/lib/web_translate_it/configuration.rb

@@ -3,7 +3,7 @@ module WebTranslateIt
   
   # Handles the configuration of your project, both via the the configuration file
   # and via the API.
-  # Implementation example, assuming you have a valid config/translation.yml file:
+  # Implementation example, assuming you have a valid .wti file:
   #
   #   configuration = WebTranslateIt::Configuration.new
   #
@@ -13,7 +13,7 @@ module WebTranslateIt
     attr_accessor :path, :api_key, :source_locale, :target_locales, :files, :ignore_locales, :logger, :before_pull, :after_pull, :before_push, :after_push
     
     # Load configuration file from the path.
-    def initialize(root_path = Rails.root, path_to_config_file = "config/translation.yml")
+    def initialize(root_path = Rails.root, path_to_config_file = ".wti")
       self.path           = root_path
       self.logger         = logger
       configuration       = YAML.load_file(File.join(self.path, path_to_config_file))

data/lib/web_translate_it/util.rb

@@ -137,6 +137,21 @@ 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

data/readme.md

@@ -9,7 +9,7 @@ Web Translate It
 
 `web_translate_it` is a rubygem providing tools to sync your language files with [Web Translate It](https://webtranslateit.com), a web-based translation software.
 
-![Web Translate It](http://s3.amazonaws.com:80/edouard.baconfile.com/web_translate_it%2Fwti3.png)
+![Web Translate It](http://f.cl.ly/items/2X3m0h0g0I1O1U07163o/wti_example.jpg)
 
 This gem provides:
 
@@ -59,8 +59,6 @@ Execute `wti --help` to see the usage:
     See `wti <command> --help` for more information on a specific command.
   
     [options] are:
-      --config, -c <s>:   Path to a translation.yml file (default:
-                          config/translation.yml)
          --version, -v:   Print version and exit
             --help, -h:   Show this message
 
@@ -141,12 +139,16 @@ Sample Commands
     <td>wti status</td>
     <td>View project statistics</td>
   </tr>
+  <tr>
+    <td>wti match</td>
+    <td>Show matching between files on local computer and the ones in Web Translate It’s File Manager</td>
+  </tr>
 </table>
 
 Hooks
 -----
 
-It is sometimes useful to hook a command or a script before or after a push or a pull. One use-case would be to launch a build after pulling language files. You can do that by implementing hooks in your `translation.yml` file.
+It is sometimes useful to hook a command or a script before or after a push or a pull. One use-case would be to launch a build after pulling language files. You can do that by implementing hooks in your `.wti` file.
 
 There are 4 hooks:
 
@@ -155,12 +157,12 @@ There are 4 hooks:
 * `before_push`
 * `after_push`
 
-Check the [sample `translation.yml`](https://github.com/AtelierConvivialite/webtranslateit/blob/master/examples/translation.yml#L9..L13) file for implementation.
+Check the [sample `.wti`](https://github.com/AtelierConvivialite/webtranslateit/blob/master/examples/.wti#L9..L13) file for implementation.
 
 Web Translate It Synchronisation Console
 ----------------------------------------
 
-![Web Translate It](http://s3.amazonaws.com:80/edouard.baconfile.com/web_translate_it%2Fadmin_console2.png)
+![Web Translate It](http://f.cl.ly/items/2Z413Q3A2b331c0O2m04/wti_server.png)
 
 `wti` contains a server you can use to run a friendly web interface to sync your translations. It allows a translation team to refresh the language files on a staging server without asking the developers to manually `wti pull`.
 
@@ -172,7 +174,7 @@ By default, it starts an application on localhost on the port 4000. You will fin
 
 Should you need to use another host or port, you can use the `-h` and `-p` options. For example: `wti server -p 1234`.
 
-You may want to run some commands before or after syncing translations. You can use the hooks to do so. For instance, you could add the following in your `translation.yml` file:
+You may want to run some commands before or after syncing translations. You can use the hooks to do so. For instance, you could add the following in your `.wti` file:
 
     before_pull: "echo 'some unix command'"
     after_pull:  "touch tmp/restart.txt"

data/spec/web_translate_it/configuration_spec.rb

@@ -14,7 +14,7 @@ describe WebTranslateIt::Configuration do
         "ignore_locales" => "en_GB"
       }
       YAML.should_receive(:load_file).and_return(config_hash)
-      WebTranslateIt::Configuration.new(File.dirname(__FILE__) + '/../..', 'examples/translation.yml')
+      WebTranslateIt::Configuration.new(File.dirname(__FILE__) + '/../..', '.wti')
     end
         
     it "should assign the API key, files" do

data/version.yml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 1.8.1.9
+  version: 1.8.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000 Z
+date: 2011-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70281540470320 !ruby/object:Gem::Requirement
+  requirement: &70229730325800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70281540470320
+  version_requirements: *70229730325800
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70281540468760 !ruby/object:Gem::Requirement
+  requirement: &70229730325300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70281540468760
+  version_requirements: *70229730325300
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70281540467180 !ruby/object:Gem::Requirement
+  requirement: &70229730324840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70281540467180
+  version_requirements: *70229730324840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70281540459200 !ruby/object:Gem::Requirement
+  requirement: &70229730324380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70281540459200
+  version_requirements: *70229730324380
 description: 
 email: edouard@atelierconvivialite.com
 executables:
@@ -69,7 +69,6 @@ files:
 - readme.md
 - version.yml
 - examples/locale.rb
-- examples/translation.yml
 - lib/web_translate_it/auto_fetch.rb
 - lib/web_translate_it/cacert.pem
 - lib/web_translate_it/command_line.rb
@@ -82,7 +81,6 @@ files:
 - lib/web_translate_it/views/index.erb
 - lib/web_translate_it.rb
 - generators/webtranslateit/lib/insert_commands.rb
-- generators/webtranslateit/templates/translation.yml
 - generators/webtranslateit/webtranslateit_generator.rb
 - bin/wti
 - man/wti.1

data/examples/translation.yml

@@ -1,13 +0,0 @@
-# The Project API Token from Web Translate It
-api_key: SECRET
-
-# Optional: locales not to sync with Web Translate It.
-# eg. [:en, :fr] or just 'en'
-# ignore_locales: :en
-
-# Optional
-# before_pull: "echo 'some unix command'"   # Command executed before pulling files
-# after_pull:  "touch tmp/restart.txt"      # Command executed after pulling files
-#
-# before_push: "echo 'some unix command'"   # Command executed before pushing files
-# after_push:  "touch tmp/restart.txt"      # Command executed after pushing files

data/generators/webtranslateit/templates/translation.yml

@@ -1,6 +0,0 @@
-# The Project API Token from Web Translate It
-api_key: '<%= api_key %>'
-
-# Optional: locales not to sync with Web Translate It.
-# eg. [:en, :fr] or just 'en'
-# ignore_locales: '<%= project["source_locale"]["code"] %>'