web_translate_it 1.7.3.1 → 1.8.0.0

data/lib/web_translate_it/command_line.rb

@@ -17,10 +17,12 @@ module WebTranslateIt
       puts ""
       puts " Pulling files ".bright
       puts ""
-      fetch_locales_to_pull.each do |locale|
-        configuration.files.find_all{ |file| file.locale == locale }.each do |file|
-          print " * #{file.file_path}: "
-          puts file.fetch(command_options.force)
+      WebTranslateIt::Util.http_connection do |http|
+        fetch_locales_to_pull.each do |locale|
+          configuration.files.find_all{ |file| file.locale == locale }.each do |file|
+            print " * #{file.file_path}: "
+            puts file.fetch(http, command_options.force)
+          end
         end
       end
       `#{configuration.after_pull}` if configuration.after_pull
@@ -32,10 +34,12 @@ module WebTranslateIt
       puts ""
       puts " Pushing files ".bright
       puts ""
-      fetch_locales_to_push(configuration).each do |locale|
-        configuration.files.find_all{ |file| file.locale == locale }.each do |file|
-          print " * #{file.file_path}... "
-          puts file.upload(command_options[:merge], command_options.ignore_missing, command_options.label, command_options.low_priority)
+      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|
+            print " * #{file.file_path}... "
+            puts file.upload(http, command_options[:merge], command_options.ignore_missing, command_options.label, command_options.low_priority)
+          end
         end
       end
       `#{configuration.after_push}` if configuration.after_push
@@ -48,10 +52,12 @@ module WebTranslateIt
         puts "Usage: wti add master_file1 master_file2 ..."
         exit
       end
-      parameters.each do |param|
-        file = TranslationFile.new(nil, param, nil, configuration.api_key)
-        print "Creating #{file.file_path}... "
-        puts file.create
+      WebTranslateIt::Util.http_connection do |http|
+        parameters.each do |param|
+          file = TranslationFile.new(nil, param, nil, configuration.api_key)
+          print "Creating #{file.file_path}... "
+          puts file.create(http)
+        end
       end
       puts "Master file added.".success
     end
@@ -76,6 +82,10 @@ module WebTranslateIt
       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.writable?(path)
+        puts "Error: #{path} is not writable.".failure
+        exit
+      end
       File.open(path, 'w'){ |file| file << generate_configuration(api_key, project_info) }
       error = false
       project_info['project_files'].each do |file|

data/lib/web_translate_it/project.rb

@@ -6,7 +6,14 @@ module WebTranslateIt
       begin
         WebTranslateIt::Util.http_connection do |http|
           request = Net::HTTP::Get.new("/api/projects/#{api_key}.yaml")
-          Util.handle_response(http.request(request), true)
+          response = http.request(request)
+          if response.is_a?(Net::HTTPSuccess)
+            return response.body
+          else
+            puts "An error occured while fetching the project information:"
+            puts response.body.failure
+            exit
+          end
         end
       rescue Timeout::Error
         puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."

data/lib/web_translate_it/translation_file.rb

@@ -35,25 +35,22 @@ module WebTranslateIt
     #   file.fetch # returns nothing, with a status 304 Not Modified
     #   file.fetch(true) # force to re-download the file, will return the content of the file with a 200 OK
     #
-    def fetch(force = false)
+    def fetch(http_connection, force = false)
       print "#{self.local_checksum.to_s.checksumify}...#{self.remote_checksum.to_s.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)
-            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
-              File.open(self.file_path, 'wb'){ |file| file << response.body } if response.code.to_i == 200 and response.body != ''
-              Util.handle_response(response)
-            rescue
-              "/!\\ An error occured: #{$!}".failure
-            end
+          response = http_connection.get(api_url)
+          FileUtils.mkpath(self.file_path.split('/')[0..-2].join('/')) unless File.exist?(self.file_path) or self.file_path.split('/')[0..-2].join('/') == ""
+          begin
+            File.open(self.file_path, 'wb'){ |file| file << response.body } if response.code.to_i == 200 and response.body != ''
+            Util.handle_response(response)
+          rescue
+            "/!\\ An error occured: #{$!}".failure
           end
         rescue Timeout::Error
           puts "Request timeout. Will retry in 5 seconds.".failure
           sleep(5)
-          fetch(force)
+          fetch(http_connection, force)
         end
       else
         return "Skipped (up to date)".success
@@ -71,14 +68,12 @@ module WebTranslateIt
     #
     # Note that the request might or might not eventually be acted upon, as it might be disallowed when processing
     # actually takes place. This is due to the fact that language file imports are handled by background processing.
-    def upload(merge=false, ignore_missing=false, label=nil, low_priority=false)
+    def upload(http_connection, merge=false, ignore_missing=false, label=nil, low_priority=false)
       if File.exists?(self.file_path)
         File.open(self.file_path) do |file|
           begin
-            WebTranslateIt::Util.http_connection do |http|
-              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 })
-              Util.handle_response(http.request(request))
-            end
+            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 })
+            Util.handle_response(http_connection.request(request))
           rescue Timeout::Error
             puts "Request timeout. Will retry in 5 seconds.".failure
             sleep(5)
@@ -101,14 +96,12 @@ module WebTranslateIt
     # Note that the request might or might not eventually be acted upon, as it might be disallowed when processing
     # actually takes place. This is due to the fact that language file imports are handled by background processing.
     #
-    def create
+    def create(http_connection)
       if File.exists?(self.file_path)
         File.open(self.file_path) do |file|
           begin
-            WebTranslateIt::Util.http_connection do |http|
-              request  = Net::HTTP::Post::Multipart.new(api_url_for_create, { "name" => self.file_path, "file" => UploadIO.new(file, "text/plain", file.path) })
-              Util.handle_response(http.request(request))
-            end
+            request  = Net::HTTP::Post::Multipart.new(api_url_for_create, { "name" => self.file_path, "file" => UploadIO.new(file, "text/plain", file.path) })
+            Util.handle_response(http_connection.request(request))
           rescue Timeout::Error
             puts "Request timeout. Will retry in 5 seconds.".failure
             sleep(5)

data/lib/web_translate_it/util.rb

@@ -11,7 +11,7 @@ module WebTranslateIt
     # Return a string representing the gem version
     # For example "1.4.4.1"
     def self.version
-      hash = YAML.load_file File.join(File.dirname(__FILE__), '..', '..' '/version.yml')
+      hash = YAML.load_file File.expand_path('../../../version.yml', __FILE__)
       [hash[:major], hash[:minor], hash[:tiny], hash[:patch]].join('.')
     end
     
@@ -30,9 +30,10 @@ module WebTranslateIt
       proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
       http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new('webtranslateit.com', 443)
       http.use_ssl      = true
-      http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
+      http.verify_mode  = OpenSSL::SSL::VERIFY_PEER
+      http.ca_file      = File.expand_path('cacert.pem', __FILE__)
       http.open_timeout = http.read_timeout = 30
-      yield http
+      yield http.start
     end
         
     def self.calculate_percentage(processed, total)

data/lib/web_translate_it.rb

@@ -6,7 +6,6 @@ require 'web_translate_it/translation_file'
 require 'web_translate_it/auto_fetch'
 require 'web_translate_it/command_line'
 require 'web_translate_it/project'
-require 'web_translate_it/tasks'
 require 'web_translate_it/server'
 
 module WebTranslateIt

data/version.yml

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: web_translate_it
 version: !ruby/object:Gem::Version 
-  hash: 105
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
-  - 7
-  - 3
-  - 1
-  version: 1.7.3.1
+  - 8
+  - 0
+  - 0
+  version: 1.8.0.0
 platform: ruby
 authors: 
 - "\xC3\x89douard Bri\xC3\xA8re"
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +02:00
+date: 2011-05-31 00:00:00 +02:00
 default_executable: wti
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -43,7 +41,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 83
         segments: 
         - 1
         - 16
@@ -59,7 +56,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 2
@@ -75,7 +71,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 1
         - 1
@@ -91,7 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -99,7 +93,7 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id005
-description: An ruby executable, a sinatra app and a handful of rake tasks to sync your translations between your app and webtranslateit.com.
+description: An ruby executable and a handful of tools to sync your translations between your app and webtranslateit.com.
 email: edouard@atelierconvivialite.com
 executables: 
 - wti
@@ -117,12 +111,12 @@ files:
 - 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
 - lib/web_translate_it/configuration.rb
 - lib/web_translate_it/project.rb
 - lib/web_translate_it/public/screen.css
 - lib/web_translate_it/server.rb
-- lib/web_translate_it/tasks.rb
 - lib/web_translate_it/translation_file.rb
 - lib/web_translate_it/util.rb
 - lib/web_translate_it/views/index.erb
@@ -158,7 +152,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -167,14 +160,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Sync your translations between your app and Web Translate It

data/lib/web_translate_it/tasks.rb

@@ -1,40 +0,0 @@
-# encoding: utf-8
-require 'rake'
-require 'web_translate_it'
-namespace :trans do  
-  desc "Fetch translation files from Web Translate It"
-  task :fetch, :locale do |task, args|
-    WebTranslateIt::Util.welcome_message
-    puts "Fetching file for locale #{args.locale}..."
-    configuration = WebTranslateIt::Configuration.new
-    configuration.files.find_all{ |file| file.locale == args.locale }.each do |file|
-      puts file.file_path + ": " + file.fetch
-    end
-  end
-  
-  namespace :fetch do
-    desc "Fetch all the translation files from Web Translate It"
-    task :all do
-      WebTranslateIt::Util.welcome_message
-      configuration = WebTranslateIt::Configuration.new
-      locales = configuration.target_locales
-      configuration.ignore_locales.each{ |locale_to_ignore| locales.delete(locale_to_ignore) }
-      puts "Fetching all files for all locales..."
-      locales.each do |locale|
-        configuration.files.find_all{ |file| file.locale == locale }.each do |file|
-          puts file.file_path + " " + file.fetch
-        end
-      end
-    end
-  end
-  
-  desc "Upload the translation files for a locale to Web Translate It"
-  task :upload, :locale do |task, args|
-    WebTranslateIt::Util.welcome_message
-    puts "Uploading file for locale #{args.locale}..."
-    configuration = WebTranslateIt::Configuration.new
-    configuration.files.find_all{ |file| file.locale == args.locale }.each do |file|
-      puts file.file_path + " " + file.upload
-    end
-  end
-end