web_translate_it 1.7.1.7 → 1.7.2.0

data/lib/web_translate_it/command_line.rb

@@ -2,45 +2,44 @@
 module WebTranslateIt
   class CommandLine
     require 'fileutils'
-    attr_accessor :configuration, :options, :parameters
-        
-    def initialize(command, options, path, parameters)
-      self.options = options
+    attr_accessor :configuration, :global_options, :command_options, :parameters
+    
+    def initialize(command, command_options, global_options, parameters, project_path)
+      self.command_options = command_options
       self.parameters = parameters
-      if command == 'autoconf'
-        autoconf
-        exit
-      end
-      self.configuration = WebTranslateIt::Configuration.new(path, options.config)
+      self.configuration = WebTranslateIt::Configuration.new(project_path, global_options.config)
       self.send(command)
     end
         
     def pull
       STDOUT.sync = true
+      `#{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}... "
-          puts file.fetch(ARGV.index('--force'))
+          puts file.fetch(command_options.force)
         end
       end
+      `#{configuration.after_pull}` if configuration.after_pull
     end
     
     def push
       STDOUT.sync = true
+      `#{configuration.before_push}` if configuration.before_push
       fetch_locales_to_push(configuration).each do |locale|
-        merge = !(ARGV.index('--merge')).nil?
-        ignore_missing = !(ARGV.index('--ignore_missing')).nil?
         configuration.files.find_all{ |file| file.locale == locale }.each do |file|
           print "Pushing #{file.file_path}... "
-          puts file.upload(merge, ignore_missing, options.label, options.low_priority)
+          puts file.upload(command_options[:merge], command_options.ignore_missing, command_options.label, command_options.low_priority)
         end
       end
+      `#{configuration.after_push}` if configuration.after_push
     end
     
     def add
       STDOUT.sync = true
-      if parameters.nil?
-        puts "Usage: wti add file1 file2"
+      if parameters == []
+        puts "No master file given."
+        puts "Usage: wti add master_file1 master_file2 ..."
         exit
       end
       parameters.each do |param|
@@ -48,12 +47,13 @@ module WebTranslateIt
         print "Creating #{file.file_path}... "
         puts file.create
       end
-      puts "Master file added. Use `wti push --all` to send your existing translations."
+      puts "Master file added."
     end
     
     def addlocale
       STDOUT.sync = true
-      if parameters.nil?
+      if parameters == []
+        puts "No locale code given."
         puts "Usage: wti addlocale locale1 locale2 ..."
         exit
       end
@@ -65,9 +65,19 @@ module WebTranslateIt
     end
     
     def autoconf
-      puts "We will attempt to configure your project automagically"
-      api_key = Util.ask("Please enter your project API Key")
-      path = Util.ask("Where should we create the configuration file?", 'config/translation.yml')
+      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:")
+      path = Util.ask("Where should we put the configuration file?", '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']
@@ -75,13 +85,13 @@ module WebTranslateIt
       error = false
       project_info['project_files'].each do |file|
         if file['name'].nil? or file['name'].strip == ''
-          puts "Project File #{file['id']} doesn’t seem to be set up."
+          puts "Project File #{file['id']} doesn’t seem to be set up.".failure
           error = true
         elsif !File.exists?(file['name'])
-          puts "Could not find file `#{file['name']}`."
+          puts "Could not find file `#{file['name']}`.".failure
           error = true
         else
-          puts "Found #{file['name']}."
+          puts "Found #{file['name']}.".success
         end
       end
       if error
@@ -95,6 +105,16 @@ module WebTranslateIt
     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
       stats.each do |locale, values|
@@ -104,12 +124,14 @@ module WebTranslateIt
         stale = true if values['stale']
       end
       if stale
-        self.stats if Util.ask_yes_no("Some statistics displayed above are stale. Would you like to refresh?", true)
+        self.status if Util.ask_yes_no("Some of these stats are stale. Would you like to refresh?", true)
       end
     end
     
+    alias :st :status
+    
     def server
-      WebTranslateIt::Server.start(options.host, options.port)
+      WebTranslateIt::Server.start(command_options.host, command_options.port)
     end
     
     def method_missing(m, *args, &block)
@@ -117,23 +139,23 @@ module WebTranslateIt
     end
         
     def fetch_locales_to_pull
-      if options.locale
-        locales = [Util.sanitize_locale(options.locale)]
+      if command_options.locale
+        locales = command_options.locale.split.map{ |locale| Util.sanitize_locale(locale) }
       else
         locales = configuration.target_locales
         configuration.ignore_locales.each{ |locale_to_delete| locales.delete(locale_to_delete) }
       end
-      locales.push(configuration.source_locale) if options.all
+      locales.push(configuration.source_locale) if command_options.all
       return locales.uniq
     end
         
     def fetch_locales_to_push(configuration)
-      if options.locale
-        locales = [Util.sanitize_locale(options.locale)]
+      if command_options.locale
+        locales = command_options.locale.split.map{ |locale| Util.sanitize_locale(locale) }
       else
         locales = [configuration.source_locale]
       end
-      locales += configuration.target_locales if options.all
+      locales += configuration.target_locales if command_options.all
       return locales.uniq
     end
     
@@ -145,12 +167,15 @@ api_key: #{api_key}
 # eg. [:en, :fr] or just 'en'
 # ignore_locales: '#{project_info["source_locale"]["code"]}'
 
-# Optional, only used by wti server
+# 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
 
 FILE
       return file
-    end
+    end    
   end
 end

data/lib/web_translate_it/configuration.rb

@@ -10,7 +10,7 @@ module WebTranslateIt
   class Configuration
     require 'yaml'
     require 'fileutils'
-    attr_accessor :path, :api_key, :source_locale, :target_locales, :files, :ignore_locales, :logger, :before_pull, :after_pull
+    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")
@@ -20,6 +20,8 @@ module WebTranslateIt
       self.api_key        = configuration['api_key']
       self.before_pull    = configuration['before_pull']
       self.after_pull     = configuration['after_pull']
+      self.before_push    = configuration['before_push']
+      self.after_push     = configuration['after_push']
       project_info        = YAML.load WebTranslateIt::Project.fetch_info(api_key)
       set_locales_to_ignore(configuration)
       set_files(project_info['project'])

data/lib/web_translate_it/server.rb

@@ -36,18 +36,12 @@ module WebTranslateIt
     end
     
     post '/pull/' do
-      @config = WebTranslateIt::Configuration.new('.')
-      `#{config.before_pull}` if config.before_pull
       `wti pull`
-      `#{config.after_pull}` if config.after_pull
       redirect "/"
     end
     
     post '/pull/:locale' do
-      @config = WebTranslateIt::Configuration.new('.')
-      `#{config.before_pull}` if config.before_pull
       `wti pull -l #{params[:locale]}`
-      `#{config.after_pull}` if config.after_pull
       redirect "/#{params[:locale]}"
     end
     

data/lib/web_translate_it/translation_file.rb

@@ -46,16 +46,16 @@ module WebTranslateIt
               File.open(self.file_path, 'wb'){ |file| file << response.body } if response.code.to_i == 200 and response.body != ''
               Util.handle_response(response)
             rescue
-              "\n/!\\ An error occured: #{$!}"
+              "\n/!\\ An error occured: #{$!}".failure
             end
           end
         rescue Timeout::Error
-          puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+          puts "The request timed out. The service may be overloaded. We will retry in 5 seconds.".failure
           sleep(5)
           fetch(force)
         end
       else
-        return "Not needed"
+        return "Not needed".success
       end
     end
     
@@ -79,13 +79,13 @@ module WebTranslateIt
               Util.handle_response(http.request(request))
             end
           rescue Timeout::Error
-            puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+            puts "The request timed out. The service may be overloaded. We will retry in 5 seconds.".failure
             sleep(5)
             upload(merge, ignore_missing)
           end
         end
       else
-        puts "\nFile #{self.file_path} doesn't exist."
+        puts "\nFile #{self.file_path} doesn't exist.".failure
       end
     end
     
@@ -109,13 +109,13 @@ module WebTranslateIt
               Util.handle_response(http.request(request))
             end
           rescue Timeout::Error
-            puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+            puts "The request timed out. The service may be overloaded. We will retry in 5 seconds.".failure
             sleep(5)
             create
           end
         end
       else
-        puts "\nFile #{self.file_path} doesn't exist!"
+        puts "\nFile #{self.file_path} doesn't exist!".failure
       end
     end
         

data/lib/web_translate_it/util.rb

@@ -41,20 +41,20 @@ module WebTranslateIt
     end
     
     def self.welcome_message
-      puts "Web Translate It v#{WebTranslateIt::Util.version}"
+      puts "Web Translate It v#{version}"
     end
     
     def self.handle_response(response, return_response = false)
       if response.code.to_i >= 400 and response.code.to_i < 500
-        "We had a problem connecting to Web Translate It with this API key. Make sure it is correct."
+        "Can't fetch project with this API key. Make sure it is correct.".failure
       elsif response.code.to_i >= 500
-        "Web Translate It is temporarily unavailable and has been notified of this issue. Please try again shortly."
+        "Web Translate It is temporarily unavailable. We've been notified of this issue. Please try again shortly.".failure
       else
         return response.body if return_response
-        return "200 OK" if response.code.to_i == 200
-        return "201 Created" if response.code.to_i == 201
-        return "202 Accepted" if response.code.to_i == 202
-        return "304 Not Modified" if response.code.to_i == 304
+        return "200 OK".success if response.code.to_i == 200
+        return "201 Created".success if response.code.to_i == 201
+        return "202 Accepted".success if response.code.to_i == 202
+        return "304 Not Modified".success if response.code.to_i == 304
       end
     end
     
@@ -134,7 +134,24 @@ module WebTranslateIt
 
     def self.sanitize_locale(locale)
       locale.gsub('_', '-')
-    end
-    
+    end    
+  end
+end
+
+class String
+  require 'rainbow'
+  
+  ##
+  # Green foreground for success
+  
+  def success
+    self.foreground(:green)
+  end
+  
+  ##
+  # Red foreground for failure
+  
+  def failure
+    self.background(:red).foreground(:white)
   end
 end

data/man/wti.1

@@ -1,10 +1,10 @@
-.\" generated with Ronn/v0.4.1
-.\" http://github.com/rtomayko/ronn/
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "WTI" "1" "March 2010" "Atelier Convivialité" "Web Translate It"
+.TH "WTI" "1" "March 2011" "Atelier Convivialité" "Web Translate It"
 .
 .SH "NAME"
-\fBwti\fR \-\- WebTranslateIt.com from the command line
+\fBwti\fR \- WebTranslateIt\.com from the command line
 .
 .SH "SYNOPSIS"
 \fBwti\fR \fICOMMAND\fR \fIOPTIONS\fR
@@ -16,66 +16,63 @@
 \fBwti pull\fR [\fB\-l\fR] \fIOPTIONS\fR
 .
 .SH "DESCRIPTION"
-\fBwti\fR is an utility to help you sync language files between the
-WebTranslateIt.com service and your computer/server.
+\fBwti\fR is an utility to help you sync language files between the WebTranslateIt\.com service and your computer/server\.
 .
 .P
-\fBwti push\fR will push your master language file to Web Translate It. It means it will
-update the strings hosted at Web Translate It by the strings from the file you push.
+\fBwti push\fR will push your master language file to Web Translate It\. It means it will update the strings hosted at Web Translate It by the strings from the file you push\.
 .
 .P
-\fBwti pull\fR will pull the target language files from Web Translate It. It will download
-and update your file with the latest translations from Web Translate It.
+\fBwti pull\fR will pull the target language files from Web Translate It\. It will download and update your file with the latest translations from Web Translate It\.
 .
 .P
-\fBwti stats\fR fetch and display translation statistics from Web Translate It.
+\fBwti status\fR fetch and display translation statistics from Web Translate It\.
 .
 .SH "OPTIONS"
-\fBwti\fR's default mode of operation is to push only the master language file and to only
-pull target language files.
+\fBwti\fR\'s default mode of operation is to push only the master language file and to only pull target language files\.
 .
 .P
 These options can be used to change this behaviour:
 .
 .TP
 \fB\-\-all\fR
-Push or pull all. For example, \fBwti push \-\-all\fR will push master and target language files. \fBwti pull \-\-all\fR will pull master and target language files
+Push or pull all\. For example, \fBwti push \-\-all\fR will push master and target language files\. \fBwti pull \-\-all\fR will pull master and target language files
 .
 .TP
 \fB\-l\fR, \fB\-\-locale\fR
-Set the locale to push or pull explicitly. For example \fBwti pull \-l fr\fR will only pull
-the French language file.
+Set the locale to push or pull explicitly\. For example \fBwti pull \-l fr\fR will only pull the French language file\.
 .
 .TP
 \fB\-\-force\fR
-The Web Translate It API use HTTP caching to be efficient, and check if your file needs
-to be updated by checking its modification date against the project’s latest activity.
-Use this option to bypass this check.
+The Web Translate It API use HTTP caching to be efficient, and check if your file needs to be updated by checking its modification date against the project’s latest activity\. Use this option to bypass this check\.
 .
 .P
 You may additionally ask for help:
 .
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-Print help.
+Print help\.
 .
 .SH "CONFIGURATION"
-The first \fBwti\fR is used on a project, it must be configured.
+The first \fBwti\fR is used on a project, it must be configured\.
 .
 .P
-\fBwti autoconf\fR will help you create a configuration file to sync with
-Web Translate It.
+\fBwti init\fR will help you create a configuration file to sync with Web Translate It\.
 .
 .SH "EXAMPLES"
 .
 .nf
+
 $ wti push
-Pushing ./config/locales/app/en.yml…
-Pushing ./config/locales/defaults/en.yml…
+Pushing \./config/locales/app/en\.yml…
+Pushing \./config/locales/defaults/en\.yml…
+
+
 $ wti pull \-l fr
-Pulling ./config/locales/app/fr.yml…
-Pulling ./config/locales/defaults/fr.yml…
-$ wti stats
+Pulling \./config/locales/app/fr\.yml…
+Pulling \./config/locales/defaults/fr\.yml…
+
+
+$ wti status
 fr: 100% translated, 90% completed
 ru: 10% translated, 10% completed
 pt_BR: 0% translated, 0% completed
@@ -84,7 +81,7 @@ en: 100% translated, 90% completed
 .fi
 .
 .SH "BUGS"
-\fIhttp://github.com/atelierConvivialite/webtranslateit/issues\fR
+\fIhttp://github\.com/atelierConvivialite/webtranslateit/issues\fR
 .
 .SH "AUTHOR"
-Édouard Brière :: edouard@atelierconvivialite.com
+Édouard Brière :: edouard@atelierconvivialite\.com