translation 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 438a297a6cc07e0af97053bf03b98e5c5c0613dd
-  data.tar.gz: 433b5ab03bdd59005cf81dfc4c042e0aefb7ab0d
+  metadata.gz: dd5685e820858ee9272a66b6cefb5d85d82f01d8
+  data.tar.gz: 547c098280bc7db216d336c6bf676c0ec738a1c3
 SHA512:
-  metadata.gz: 0fac9fb66470320c386ea22792953ccf164f1a05d2d759b2ec994fae468e6c6d9b96b12109ec0f379f2c2ec48ae391215d5d92c69569270b85fc63d62ca5718e
-  data.tar.gz: 2f88d12ab1f5cb1c724086b0cfc40bfe7c3bff4cca05d4078c90d5fef8e1c2ceb913d513eb677d7f317290bd7bdfe79a7a861370979af3ab08c37f6cd130ee56
+  metadata.gz: 2f404426ef37f123acbf9957c9d96acc522c6e0f32e749b957ca0c9eca3204a0dba3c8791b109d42e2fcd20687a9902a249bed9f6a9d2bc8ddf230717febd080
+  data.tar.gz: 90d29c39095fb4234d850f8e34b1d4cf22b1fd06629f057481fe673e8cf78028bd0fd69ff9363c846fa022cfbc7b2e9e4715962048b07e07332bf5f7e3cd6b8f

data/lib/translation_io/client/base_operation.rb

@@ -1,3 +1,4 @@
+require 'translation_io/client/base_operation/update_pot_file_step'
 require 'translation_io/client/base_operation/save_new_po_files_step'
 require 'translation_io/client/base_operation/create_new_mo_files_step'
 require 'translation_io/client/base_operation/save_new_yaml_files_step'
@@ -41,7 +42,7 @@ module TranslationIO
             $stderr.puts "[Error] #{parsed_response['error']}"
             exit
           else
-            $stderr.puts "[Error] Unknown error."
+            $stderr.puts "[Error] Unknown error from the server: #{response.code}."
             exit
           end
         rescue Errno::ECONNREFUSED
@@ -52,6 +53,10 @@ module TranslationIO
 
       def cleanup
         FileUtils.rm_rf(File.join('tmp', 'translation'))
+
+        if TranslationIO.config.disable_gettext
+          FileUtils.rm_rf(TranslationIO.config.locales_path)
+        end
       end
     end
   end

data/lib/translation_io/client/base_operation/dump_haml_gettext_keys_step.rb

@@ -16,7 +16,9 @@ module TranslationIO
               file_path = File.join('tmp', 'translation', "haml-gettext-#{index.to_s.rjust(8,'0')}.rb")
 
               File.open(file_path, 'w') do |file|
-                file.puts "#{entry}"
+                file.puts "def fake"
+                file.puts "  #{entry}"
+                file.puts "end"
               end
             end
           end

data/lib/translation_io/client/base_operation/dump_slim_gettext_keys_step.rb

@@ -16,7 +16,9 @@ module TranslationIO
               file_path = File.join('tmp', 'translation', "slim-gettext-#{index.to_s.rjust(8,'0')}.rb")
 
               File.open(file_path, 'w') do |file|
-                file.puts "#{entry}"
+                file.puts "def fake"
+                file.puts "  #{entry}"
+                file.puts "end"
               end
             end
           end

data/lib/translation_io/client/{init_operation → base_operation}/update_pot_file_step.rb

@@ -1,14 +1,20 @@
 module TranslationIO
   class Client
-    class InitOperation < BaseOperation
+    class BaseOperation
       class UpdatePotFileStep
         def initialize(pot_path, source_files)
-          @pot_path     = pot_path
-          @source_files = source_files + Dir['tmp/translation/*.rb']
+          @pot_path = pot_path
+
+          if TranslationIO.config.disable_gettext
+            @source_files = empty_source_files
+          else
+            @source_files = source_files + Dir['tmp/translation/*.rb']
+          end
         end
 
         def run(params)
           TranslationIO.info "Updating POT file."
+
           FileUtils.mkdir_p(File.dirname(@pot_path))
           GetText::Tools::XGetText.run(*@source_files, '-o', @pot_path,
                                        '--msgid-bugs-address', TranslationIO.config.pot_msgid_bugs_address,
@@ -17,7 +23,19 @@ module TranslationIO
                                        '--copyright-holder',   TranslationIO.config.pot_copyright_holder,
                                        '--copyright-year',     TranslationIO.config.pot_copyright_year.to_s)
 
-          params["pot_data"] = File.read(@pot_path)
+          FileUtils.rm_f(@tmp_empty_file) if @tmp_empty_file.present?
+
+          params['pot_data'] = File.read(@pot_path)
+        end
+
+        private
+
+        def empty_source_files
+          @tmp_empty_file = 'tmp/empty-gettext-file.rb'
+          FileUtils.mkdir_p('tmp')
+          FileUtils.touch(@tmp_empty_file)
+
+          [@tmp_empty_file]
         end
       end
     end

data/lib/translation_io/client/init_operation.rb

@@ -1,4 +1,3 @@
-require 'translation_io/client/init_operation/update_pot_file_step'
 require 'translation_io/client/init_operation/update_and_collect_po_files_step'
 require 'translation_io/client/init_operation/create_yaml_po_files_step'
 require 'translation_io/client/init_operation/cleanup_yaml_files_step'
@@ -19,8 +18,10 @@ module TranslationIO
         yaml_locales_path = config.yaml_locales_path
         yaml_file_paths   = config.yaml_file_paths
 
-        BaseOperation::DumpHamlGettextKeysStep.new(haml_source_files).run
-        BaseOperation::DumpSlimGettextKeysStep.new(slim_source_files).run
+        unless config.disable_gettext
+          BaseOperation::DumpHamlGettextKeysStep.new(haml_source_files).run
+          BaseOperation::DumpSlimGettextKeysStep.new(slim_source_files).run
+        end
 
         UpdatePotFileStep.new(pot_path, source_files).run(params)
         UpdateAndCollectPoFilesStep.new(target_locales, pot_path, locales_path).run(params)
@@ -32,8 +33,13 @@ module TranslationIO
         yaml_locales_difference = (all_used_yaml_locales) - target_locales.sort.map(&:to_s)
 
         if yaml_locales_difference.any?
-          TranslationIO.info("[error] Your `config.target_locales` are [#{target_locales.join(', ')}] and we have found some YAML keys for [#{all_used_yaml_locales.join(', ')}] and they does not match.")
-          TranslationIO.info("[error] Do you really want to continue? (y/N)")
+          puts
+          puts "----------"
+          puts "Your `config.target_locales` are [#{target_locales.join(', ')}]."
+          puts "We have found some YAML keys for [#{all_used_yaml_locales.join(', ')}] and they don't match."
+          puts "Some of these locales may be coming from your gems."
+          puts "----------"
+          puts "Do you want to continue? (y/N)"
 
           print "> "
           input = STDIN.gets.strip

data/lib/translation_io/client/init_operation/create_yaml_po_files_step.rb

@@ -5,9 +5,9 @@ module TranslationIO
         attr_accessor :all_used_yaml_locales
 
         def initialize(source_locale, target_locales, yaml_file_paths)
-          @source_locale    = source_locale
-          @target_locales   = target_locales
-          @yaml_file_paths  = yaml_file_paths
+          @source_locale         = source_locale
+          @target_locales        = target_locales
+          @yaml_file_paths       = yaml_file_paths
           @all_used_yaml_locales = Set.new
         end
 

data/lib/translation_io/client/sync_operation.rb

@@ -1,4 +1,3 @@
-require 'translation_io/client/sync_operation/update_and_collect_pot_file_step'
 require 'translation_io/client/sync_operation/create_yaml_pot_file_step'
 require 'translation_io/client/sync_operation/apply_yaml_source_edits_step'
 
@@ -20,10 +19,12 @@ module TranslationIO
 
         ApplyYamlSourceEditsStep.new(yaml_file_paths, source_locale).run(params)
 
-        BaseOperation::DumpHamlGettextKeysStep.new(haml_source_files).run
-        BaseOperation::DumpSlimGettextKeysStep.new(slim_source_files).run
+        unless config.disable_gettext
+          BaseOperation::DumpHamlGettextKeysStep.new(haml_source_files).run
+          BaseOperation::DumpSlimGettextKeysStep.new(slim_source_files).run
+        end
 
-        UpdateAndCollectPotFileStep.new(pot_path, source_files).run(params)
+        UpdatePotFileStep.new(pot_path, source_files).run(params)
         CreateYamlPotFileStep.new(source_locale, yaml_file_paths).run(params)
 
         if purge

data/lib/translation_io/config.rb

@@ -8,6 +8,7 @@ module TranslationIO
     attr_accessor :ignored_key_prefixes
     attr_accessor :ignored_source_files
     attr_accessor :localization_key_prefixes
+    attr_accessor :disable_gettext
     attr_accessor :charset
     attr_accessor :metadata_path
 
@@ -28,6 +29,7 @@ module TranslationIO
       self.ignored_key_prefixes      = []
       self.ignored_source_files      = [] # Files not parsed for GetText entries
       self.localization_key_prefixes = []
+      self.disable_gettext           = false
       self.charset                   = 'UTF-8'
       self.metadata_path             = File.join('config', 'locales', '.translation_io')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -85,15 +85,14 @@ files:
 - lib/translation_io/client/base_operation/save_new_po_files_step.rb
 - lib/translation_io/client/base_operation/save_new_yaml_files_step.rb
 - lib/translation_io/client/base_operation/save_special_yaml_files_step.rb
+- lib/translation_io/client/base_operation/update_pot_file_step.rb
 - lib/translation_io/client/init_operation.rb
 - lib/translation_io/client/init_operation/cleanup_yaml_files_step.rb
 - lib/translation_io/client/init_operation/create_yaml_po_files_step.rb
 - lib/translation_io/client/init_operation/update_and_collect_po_files_step.rb
-- lib/translation_io/client/init_operation/update_pot_file_step.rb
 - lib/translation_io/client/sync_operation.rb
 - lib/translation_io/client/sync_operation/apply_yaml_source_edits_step.rb
 - lib/translation_io/client/sync_operation/create_yaml_pot_file_step.rb
-- lib/translation_io/client/sync_operation/update_and_collect_pot_file_step.rb
 - lib/translation_io/config.rb
 - lib/translation_io/controller.rb
 - lib/translation_io/extractor.rb

data/lib/translation_io/client/sync_operation/update_and_collect_pot_file_step.rb

@@ -1,25 +0,0 @@
-module TranslationIO
-  class Client
-    class SyncOperation < BaseOperation
-      class UpdateAndCollectPotFileStep
-        def initialize(pot_path, source_files)
-          @pot_path     = pot_path
-          @source_files = source_files + Dir['tmp/translation/*.rb']
-        end
-
-        def run(params)
-          TranslationIO.info "Updating POT file."
-
-          GetText::Tools::XGetText.run(*@source_files, '-o', @pot_path,
-                                       '--msgid-bugs-address', TranslationIO.config.pot_msgid_bugs_address,
-                                       '--package-name',       TranslationIO.config.pot_package_name,
-                                       '--package-version',    TranslationIO.config.pot_package_version,
-                                       '--copyright-holder',   TranslationIO.config.pot_copyright_holder,
-                                       '--copyright-year',     TranslationIO.config.pot_copyright_year.to_s)
-
-          params['pot_data'] = File.read(@pot_path)
-        end
-      end
-    end
-  end
-end