web_translate_it 1.8.3 → 1.8.4

data/bin/wti

@@ -61,11 +61,21 @@ EOS
       opt :low_priority, "WTI will process this file with a low priority"
       opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
     end
+  when "rm"
+    Trollop::options do
+      banner "Delete a master language file"
+      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+    end
   when "addlocale"
     Trollop::options do
       banner "Add a new locale to the project"
       opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
     end
+  when "rmlocale"
+    Trollop::options do
+      banner "Delete a locale from the project"
+      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
+    end
   when "server"
     Trollop::options do
       banner <<-EOS

data/history.md

@@ -1,3 +1,9 @@
+## Version 1.8.4 / 2011-11-14
+
+* Add new command `wti rmlocale locale_code_1 locale_code_2 ...` to delete a locale from a project.
+* Add new command `wti rm path_to_file1 path_to_file2 ...` to delete a master file from a project.
+* `wti` sends client name and version in custom headers. #73.
+
 ## Version 1.8.3 / 2011-11-14
 
 * Bring back `-c` option to specify a configuration file with a specific name. `wti pull -c config/translations.yml` for instance. See #67 and #71.

data/lib/web_translate_it/command_line.rb

@@ -63,7 +63,7 @@ module WebTranslateIt
       STDOUT.sync = true
       if parameters == []
         puts StringUtil.failure("No master file given.")
-        puts "Usage: wti add master_file1 master_file2 ..."
+        puts "Usage: wti add master_file_1 master_file_2 ..."
         exit
       end
       WebTranslateIt::Util.http_connection do |http|
@@ -74,12 +74,36 @@ module WebTranslateIt
       end
       puts StringUtil.success("Master file added.")
     end
+
+    def rm
+      STDOUT.sync = true
+      if parameters == []
+        puts StringUtil.failure("No master file given.")
+        puts "Usage: wti rm master_file_1 master_file_2 ..."
+        exit
+      end
+      WebTranslateIt::Util.http_connection do |http|
+        parameters.each do |param|
+          if Util.ask_yes_no("Are you certain you want to delete the master file #{param} and its attached target files and translations?", false)
+            configuration.files.find_all{ |file| file.file_path == param }.each do |master_file|
+              master_file.delete(http)
+              # delete files
+              File.delete(master_file.file_path) if File.exists?(master_file.file_path)
+              configuration.files.find_all{ |file| file.master_id == master_file.id }.each do |target_file|
+                File.delete(target_file.file_path) if File.exists?(target_file.file_path)
+              end
+            end
+          end
+        end
+      end
+      puts StringUtil.success("Master file deleted.")
+    end
     
     def addlocale
       STDOUT.sync = true
       if parameters == []
         puts StringUtil.failure("No locale code given.")
-        puts "Usage: wti addlocale locale1 locale2 ..."
+        puts "Usage: wti addlocale locale_code_1 locale_code_2 ..."
         exit
       end
       parameters.each do |param|
@@ -88,11 +112,26 @@ module WebTranslateIt
       end
       puts "Done!"
     end
+    
+    def rmlocale
+      STDOUT.sync = true
+      if parameters == []
+        puts StringUtil.failure("No locale code given.")
+        puts "Usage: wti rmlocale locale_code_1 locale_code_2 ..."
+        exit
+      end
+      parameters.each do |param|
+        if Util.ask_yes_no("Are you certain you want to delete the locale #{param} and its attached target files and translations?", false)
+          print StringUtil.success("Deleting locale #{param}... ")
+          puts WebTranslateIt::Project.delete_locale(configuration.api_key, param)
+        end
+      end
+      puts "Done!"
+    end
         
     def init
       api_key = Util.ask("Project API Key:")
       path = Util.ask("Configuration file path:", '.wti')
-      puts path.split('/')[0..path.split('/').size-2].join('/')
       FileUtils.mkpath(path.split('/')[0..path.split('/').size-2].join('/')) unless path.split('/').count == 1
       project = YAML.load WebTranslateIt::Project.fetch_info(api_key)
       project_info = project['project']
@@ -171,7 +210,6 @@ module WebTranslateIt
     
     def configuration_file_path
       if self.command_options.config
-        puts self.command_options.config
         return self.command_options.config
       else
         if File.exists?('config/translation.yml')

data/lib/web_translate_it/project.rb

@@ -6,6 +6,8 @@ module WebTranslateIt
       begin
         WebTranslateIt::Util.http_connection do |http|
           request = Net::HTTP::Get.new("/api/projects/#{api_key}.yaml")
+          request.add_field("X-Client-Name", "web_translate_it")
+          request.add_field("X-Client-Version", WebTranslateIt::Util.version)
           response = http.request(request)
           if response.is_a?(Net::HTTPSuccess)
             return response.body
@@ -26,6 +28,8 @@ module WebTranslateIt
       begin
         WebTranslateIt::Util.http_connection do |http|
           request = Net::HTTP::Get.new("/api/projects/#{api_key}/stats.yaml")
+          request.add_field("X-Client-Name", "web_translate_it")
+          request.add_field("X-Client-Version", WebTranslateIt::Util.version)
           Util.handle_response(http.request(request), true)
         end
       rescue Timeout::Error
@@ -39,6 +43,8 @@ module WebTranslateIt
       begin
         WebTranslateIt::Util.http_connection do |http|
           request = Net::HTTP::Post.new("/api/projects/#{api_key}/locales")
+          request.add_field("X-Client-Name", "web_translate_it")
+          request.add_field("X-Client-Version", WebTranslateIt::Util.version)
           request.set_form_data({ 'id' => locale_code }, ';')
           Util.handle_response(http.request(request), true)
         end
@@ -48,5 +54,20 @@ module WebTranslateIt
         self.create_locale(api_key, locale_code)
       end
     end
+    
+    def self.delete_locale(api_key, locale_code)
+      begin
+        WebTranslateIt::Util.http_connection do |http|
+          request = Net::HTTP::Delete.new("/api/projects/#{api_key}/locales/#{locale_code}")
+          request.add_field("X-Client-Name", "web_translate_it")
+          request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+          Util.handle_response(http.request(request), true)
+        end
+      rescue Timeout::Error
+        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+        sleep(5)
+        self.delete_locale(api_key, locale_code)
+      end
+    end
   end
 end

data/lib/web_translate_it/translation_file.rb

@@ -42,9 +42,12 @@ module WebTranslateIt
       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)
+          request = Net::HTTP::Get.new(api_url)
+          request.add_field("X-Client-Name", "web_translate_it")
+          request.add_field("X-Client-Version", WebTranslateIt::Util.version)
           FileUtils.mkpath(self.file_path.split('/')[0..-2].join('/')) unless File.exist?(self.file_path) or self.file_path.split('/')[0..-2].join('/') == ""
           begin
+            response = http_connection.request(request)
             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
@@ -80,6 +83,8 @@ module WebTranslateIt
         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 })
+            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
@@ -93,7 +98,7 @@ module WebTranslateIt
       end
     end
     
-    # Create a language file to Web Translate It by performing a POST Request.
+    # Create a master language file to Web Translate It by performing a POST Request.
     #
     # Example of implementation:
     #
@@ -105,14 +110,15 @@ module WebTranslateIt
     # actually takes place. This is due to the fact that language file imports are handled by background processing.
     #
     def create(http_connection, low_priority=false)
-      puts low_priority
       display = []
       display.push file_path
       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), "low_priority" => low_priority })
+            request = Net::HTTP::Post::Multipart.new(api_url_for_create, { "name" => self.file_path, "file" => UploadIO.new(file, "text/plain", file.path), "low_priority" => low_priority })
+            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
@@ -125,7 +131,32 @@ module WebTranslateIt
         puts StringUtil.failure("\nFile #{self.file_path} doesn't exist!")
       end
     end
-        
+    
+    # Delete a master language file from Web Translate It by performing a DELETE Request.
+    #
+    def delete(http_connection)
+      display = []
+      display.push file_path
+      # 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::Delete.new(api_url_for_delete)
+            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)
+            delete
+          end
+        end
+      else
+        puts StringUtil.failure("\nFile #{self.file_path} doesn't exist!")
+      end
+    end
+
     def exists?
       File.exists?(file_path)
     end
@@ -150,6 +181,10 @@ module WebTranslateIt
         "/api/projects/#{self.api_key}/files"
       end
       
+      def api_url_for_delete
+        "/api/projects/#{self.api_key}/files/#{self.id}"
+      end
+      
       def local_checksum
         require 'digest/sha1'
         begin

data/version.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 8
-:patch: 3
+:patch: 4
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-14 00:00:00.000000000 Z
+date: 2011-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70137380190740 !ruby/object:Gem::Requirement
+  requirement: &70301606155960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70137380190740
+  version_requirements: *70301606155960
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70137380190240 !ruby/object:Gem::Requirement
+  requirement: &70301606155360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70137380190240
+  version_requirements: *70301606155360
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70137380189780 !ruby/object:Gem::Requirement
+  requirement: &70301606154700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70137380189780
+  version_requirements: *70301606154700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70137380189320 !ruby/object:Gem::Requirement
+  requirement: &70301606153740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70137380189320
+  version_requirements: *70301606153740
 description: 
 email: edouard@atelierconvivialite.com
 executables:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A CLI to sync locale files with webtranslateit.com.