gettext-setup 0.30 → 0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 55e7c36131dbc622484fd2d752352dc235c82cf7
-  data.tar.gz: ef5a82547c41f8336cbcaa251ba4e1c0a0278d89
+SHA256:
+  metadata.gz: 12e71aa5e0dfcabd81f9815b7288de5edea56295600b5b82fce740614374b948
+  data.tar.gz: c42ce6ef320c3999fcfa6895d9c2d7ceaab93980459cfd8985a19a389eb6a08a
 SHA512:
-  metadata.gz: 634692fe3c69bc1ab9dca17f1460dc3013ac32054757c7553531e316dd7de6fbe937396d898db50cfb155d3315bb6119c000642f07e15fd5862dd803f5f4e335
-  data.tar.gz: 9e9b644e6baa63327de33e7ce2ca46cebeda5533f28acea6cc9afc47289065db878c9d2a28672b0e7762b50fad2bc8218f09a27b1702268d2dc09df7c667602b
+  metadata.gz: 1ee5e91fd99697e94de0f11bf162c5353e32cb86d273da51e6188e821a95065674d68aaad626c0c21a3f6e2c1ef10999c74228b62e2eb18c87b84ef97e55148a
+  data.tar.gz: 5b384a1a0ef825e3d591fba2ce46a6356a0fb2cdfe6b03b0de89b1863db66ccc3666bb1aa79643f64974ba2f911fd81c1ba83fb26152ed390eef710c392c0302

data/lib/gettext-setup/gettext_setup.rb

@@ -58,6 +58,7 @@ module GettextSetup
 
   def self.config?
     raise NoConfigFoundError, File.join(locales_path, 'config.yaml') unless @config
+
     @config
   end
 
@@ -113,9 +114,11 @@ module GettextSetup
   # return the default locale
   def self.negotiate_locale(accept_header)
     unless @config
-      raise ArgumentError, 'No config.yaml found! Use `GettextSetup.initialize(locales_path)` to locate your config.yaml'
+      raise ArgumentError, 'No config.yaml found! Use ' \
+        '`GettextSetup.initialize(locales_path)` to locate your config.yaml'
     end
     return FastGettext.default_locale if accept_header.nil?
+
     available_locales = accept_header.split(',').map do |locale|
       pair = locale.strip.split(';q=')
       pair << '1.0' unless pair.size == 2

data/lib/gettext-setup/metadata_pot.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'json'
+require 'date'
 
 module GettextSetup
   module MetadataPot
@@ -13,7 +14,7 @@ module GettextSetup
 
     def self.metadata(metadata_file = 'metadata.json')
       if File.exist?(metadata_file)
-        file = open(metadata_file)
+        file = File.open(metadata_file)
         json = file.read
         JSON.parse(json)
       else
@@ -28,7 +29,7 @@ module GettextSetup
     end
 
     def self.generate_metadata_pot(pot_metadata = metadata, path = metadata_path)
-      open(path, 'w') do |f|
+      File.open(path, 'w') do |f|
         f << pot_string(pot_metadata)
       end
     end

data/lib/gettext-setup/pot.rb

@@ -25,28 +25,39 @@ module GettextSetup
 
     def self.pot_file_path
       return if GettextSetup.locales_path.nil?
+
       return if GettextSetup.config['project_name'].nil?
+
       File.join(GettextSetup.locales_path, GettextSetup.config['project_name'] + '.pot')
     end
 
     def self.po_file_path(language)
       return if GettextSetup.locales_path.nil?
+
       return if GettextSetup.config['project_name'].nil?
+
       return if language.nil?
+
       File.join(GettextSetup.locales_path, language, GettextSetup.config['project_name'] + '.po')
     end
 
     def self.string_changes?(old_pot, new_pot)
       # Warnings will be in another language if locale is not set to en_US
       _, stderr, status = Open3.capture3("LANG=en_US msgcmp --use-untranslated '#{old_pot}' '#{new_pot}'")
-      if status.exitstatus == 1 || /this message is not used/.match(stderr) || /this message is used but not defined/.match(stderr)
+      return true if status.exitstatus == 1 || \
+                     /this message is not used/.match(stderr) || \
+                     /this message is used but not defined/.match(stderr)
+
+      if stderr =~ /msgcmp: command not found/
+        puts 'Warning - msgcmp is not present on the system'
         return true
       end
-      return false
+
+      false
     rescue IOError
       # probably means msgcmp is not present on the system
       # so return true to be on the safe side
-      return true
+      true
     end
 
     # @param [:locales_path] opts
@@ -176,6 +187,7 @@ module GettextSetup
       _, _, _, wait = Open3.popen3(cmd)
       exitstatus = wait.value
       raise 'PO files failed to merge' unless exitstatus.success?
+
       puts "PO files have been successfully merged, #{target_filename} has been created."
       exitstatus
     end

data/spec/lib/gettext-setup/gettext_setup_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'rspec/expectations'
 require_relative '../../spec_helper'
 

data/spec/lib/gettext-setup/pot_spec.rb

@@ -164,7 +164,7 @@ describe GettextSetup::Pot do
     before :all do
       { 'ruby' => 'ruby.pot', 'puppet' => 'puppet.pot', 'metadata' => 'metadata.pot' }.each do |pot_type, pot_name|
         File.open(File.join(merge_locales_path, pot_name), 'w') do |file|
-          file.write <<-POT
+          file.write <<POT
   # Copyright (C) 2017 Puppet, Inc.
   # This file is distributed under the same license as the puppetlabs-mysql package.
   # FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
@@ -186,7 +186,7 @@ describe GettextSetup::Pot do
   #: ../lib/puppet/parser/functions/mysql_strip_hash.rb:11
   msgid "this is a #{pot_type} string"
   msgstr ""
-        POT
+POT
         end
       end
     end

data/spec/spec_helper.rb

@@ -10,9 +10,9 @@ end
 def cmd_present?(cmd)
   # Try to call out to msgcmp, if it doesn't error, we have the tool
   `#{cmd} --version`
-  return true
+  true
 rescue IOError
-  return false
+  false
 end
 
 def msgcmp_present?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext-setup
 version: !ruby/object:Gem::Version
-  version: '0.30'
+  version: '0.31'
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -223,32 +223,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A gem to ease internationalization with fast_gettext
 test_files:
+- spec/spec_helper.rb
+- spec/lib/tasks/gettext_rake_spec.rb
+- spec/lib/gettext-setup/pot_spec.rb
+- spec/lib/gettext-setup/metadata_pot_spec.rb
+- spec/lib/gettext-setup/gettext_setup_spec.rb
+- spec/fixtures/fixture_locales/test_strings.rb
 - spec/fixtures/fixture_locales/config.yaml
 - spec/fixtures/fixture_locales/fixture_locales.pot
 - spec/fixtures/fixture_locales/jp/fixture_locales.po
-- spec/fixtures/fixture_locales/test_strings.rb
+- spec/fixtures/locales/sinatra-i18n.pot
 - spec/fixtures/locales/config.yaml
 - spec/fixtures/locales/de/sinatra-i18n.po
-- spec/fixtures/locales/sinatra-i18n.pot
 - spec/fixtures/merge_locales/config.yaml
-- spec/fixtures/spec_locales/config.yaml
-- spec/fixtures/spec_locales/sinatra-i18n.pot
-- spec/fixtures/string_changes/add.pot
-- spec/fixtures/string_changes/change.pot
 - spec/fixtures/string_changes/non_string_changes.pot
-- spec/fixtures/string_changes/old.pot
 - spec/fixtures/string_changes/remove.pot
+- spec/fixtures/string_changes/old.pot
+- spec/fixtures/string_changes/change.pot
+- spec/fixtures/string_changes/add.pot
+- spec/fixtures/spec_locales/sinatra-i18n.pot
+- spec/fixtures/spec_locales/config.yaml
+- spec/fixtures/tmp_locales/sinatra-i18n.pot
 - spec/fixtures/tmp_locales/config.yaml
 - spec/fixtures/tmp_locales/de/sinatra-i18n.po
-- spec/fixtures/tmp_locales/sinatra-i18n.pot
-- spec/lib/gettext-setup/gettext_setup_spec.rb
-- spec/lib/gettext-setup/metadata_pot_spec.rb
-- spec/lib/gettext-setup/pot_spec.rb
-- spec/lib/tasks/gettext_rake_spec.rb
-- spec/spec_helper.rb