gettext-setup 0.28 → 0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26b13ff0d0fa9a44b156dbc8d9196fa7f0ec2974
-  data.tar.gz: df14184c767513cf61870658ef8968c5e8d76fbc
+  metadata.gz: f8da8fd9251397ed014f16b48dea5b14640d800c
+  data.tar.gz: d627fbab3ccae583c2762a035138446afb01648e
 SHA512:
-  metadata.gz: 74b6d2e5689e91e796a0c8c75e767c1fbffc955b752d4dd340abdfa5a25391ca1d29649efd6cea16fbb5d58a23e85da9f04ff0dc955719419eb93614aff79856
-  data.tar.gz: 35d1f5cf80a0674c907add49aff503c5965cf9c6c3939be9ff8956548bdb7aeb8ae391b43732c8125527191cb0df4a3cd6d080e3500358daaff9f9f0889ce06c
+  metadata.gz: 1e628881df88dfc63c0626b1aa807175c8a3d9cb12a42da9e10fef82beb7fd8fb7b7e3f7c4c032eeea1cf58397eccdb9bf8da94f34174a4d810d07c6ab839b56
+  data.tar.gz: 22de28a46e580a41f0e8322b0ebf88349f8de4ac46124537b579d8406ce837a0ebd52cb8021765e59a1879fb9981f6fc4e54dbddde3396b4477300ae3b74dbcf

data/lib/gettext-setup/gettext_setup.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require 'fast_gettext'
 require 'yaml'
 require 'locale'
@@ -23,11 +21,7 @@ module GettextSetup
   # valid `options` fields:
   # :file_format - one of the supported backends for fast_gettext (e.g. :po, :mo, :yaml, etc.)
   def self.initialize(locales_path = 'locales', options = {})
-    config_path = File.absolute_path('config.yaml', locales_path)
-    File.exist?(config_path) || raise(NoConfigFoundError, config_path)
-
-    @config = YAML.load_file(config_path)['gettext']
-    @locales_path = locales_path
+    GettextSetup.initialize_config(locales_path)
 
     # Make the translation methods available everywhere
     Object.send(:include, FastGettext::Translation)
@@ -49,6 +43,18 @@ module GettextSetup
     Locale.set_default(default_locale)
   end
 
+  # Sets up the config class variables.
+  #
+  # Call this without calling initialize when you only need to deal with the
+  # translation files and you don't need runtime translation.
+  def self.initialize_config(locales_path = 'locales')
+    config_path = File.absolute_path('config.yaml', locales_path)
+    File.exist?(config_path) || raise(NoConfigFoundError, config_path)
+
+    @config = YAML.load_file(config_path)['gettext']
+    @locales_path = locales_path
+  end
+
   def self.config?
     raise NoConfigFoundError, File.join(locales_path, 'config.yaml') unless @config
     @config

data/lib/gettext-setup/metadata_pot.rb

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require 'erb'
 require 'json'
 

data/lib/gettext-setup/pot.rb

@@ -1,7 +1,6 @@
-# -*- encoding: utf-8 -*-
-
 require 'open3'
 require 'English'
+require 'tempfile'
 
 module GettextSetup
   module Pot
@@ -54,10 +53,18 @@ module GettextSetup
     #   The directory for the locales.
     # @param [:target_path] opts
     #   The output path for the new POT file.
+    # @param [:header_only] opts
+    #   Set to true to create a .pot file with only a header
     def self.generate_new_pot(opts = {})
       locales_path = opts[:locales_path] || GettextSetup.locales_path
-      GettextSetup.initialize(locales_path)
+      GettextSetup.initialize_config(locales_path)
       target_path = opts[:target_path] || pot_file_path
+      input_files = if opts[:header_only]
+                      tmpfile = Tempfile.new('gettext-setup.tmp')
+                      tmpfile.path
+                    else
+                      files_to_translate.join(' ')
+                    end
       config = GettextSetup.config
       package_name = config['package_name']
       bugs_address = config['bugs_address']
@@ -69,14 +76,15 @@ module GettextSetup
              "--add-comments#{comments_tag.to_s == '' ? '' : '=' + comments_tag} --msgid-bugs-address '#{bugs_address}' " \
              "--package-name '#{package_name}' " \
              "--package-version '#{version}' " \
-             "--copyright-holder='#{copyright_holder}' --copyright-year=#{Time.now.year} " +
-             files_to_translate.join(' '))
+             "--copyright-holder='#{copyright_holder}' --copyright-year=#{Time.now.year} " \
+             "#{input_files}")
+      tmpfile.unlink if tmpfile
       $CHILD_STATUS.success?
     end
 
     def self.generate_new_po(language, locales_path = GettextSetup.locales_path,
                              pot_file = nil, po_file = nil)
-      GettextSetup.initialize(locales_path)
+      GettextSetup.initialize_config(locales_path)
       language ||= ENV['LANGUAGE']
       pot_file ||= GettextSetup::Pot.pot_file_path
       po_file ||= GettextSetup::Pot.po_file_path(language)
@@ -116,7 +124,7 @@ module GettextSetup
     end
 
     def self.update_pot(locales_path = GettextSetup.locales_path, path = nil)
-      GettextSetup.initialize(locales_path)
+      GettextSetup.initialize_config(locales_path)
       path ||= pot_file_path
 
       if !File.exist? path
@@ -147,7 +155,7 @@ module GettextSetup
     #   The directory for the locales.
     def self.merge(opts = {})
       locales_path = opts[:locales_path] || GettextSetup.locales_path
-      GettextSetup.initialize(locales_path)
+      GettextSetup.initialize_config(locales_path)
       target_filename = GettextSetup.config['project_name'] + '.pot'
       target_path = File.expand_path(target_filename, locales_path)
       oldpot_dir = File.expand_path('oldpot', locales_path)
@@ -156,9 +164,9 @@ module GettextSetup
       if File.exist? target_path
         FileUtils.mkdir_p(oldpot_dir)
         begin
-          FileUtils.mv(target_path, oldpot_path)
-        rescue
-          raise "There was a problem creating .pot backup #{oldpot_path}, merge failed."
+          FileUtils.cp(target_path, oldpot_path)
+        rescue Errno::ENOENT => e
+          raise "There was a problem creating .pot backup #{oldpot_path}, merge failed: #{e.message}"
         end
         puts "Warning - #{target_filename} already exists and will be relocated to oldpot/old_#{target_filename}."
       end

data/lib/tasks/gettext.rake

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require_relative '../gettext-setup/gettext_setup'
 require_relative '../gettext-setup/pot'
 require_relative '../gettext-setup/metadata_pot'

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'rspec/expectations'
 require_relative '../../spec_helper'
 

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

@@ -62,6 +62,17 @@ describe GettextSetup::Pot do
       expect(contents).to match(/Puppet, LLC/)
       expect(contents).to match(/test_strings.rb:1/)
     end
+    it 'builds a POT file with :header_only' do
+      path = File.join(Dir.mktmpdir, 'new.pot')
+      expect do
+        GettextSetup::Pot.generate_new_pot(locales_path: fixture_locales_path, target_path: path, header_only: true)
+      end.to output('').to_stdout # STDOUT is determined in `update_pot`
+      contents = File.read(path)
+      expect(contents).to_not match(/Hello, world/)
+      expect(contents).to match(/Fixture locales/)
+      expect(contents).to match(/docs@puppetlabs.com/)
+      expect(contents).to match(/Puppet, LLC/)
+    end
   end
 
   context 'generate_new_po' do
@@ -153,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 <<-EOF
+          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.
@@ -175,7 +186,7 @@ describe GettextSetup::Pot do
   #: ../lib/puppet/parser/functions/mysql_strip_hash.rb:11
   msgid "this is a #{pot_type} string"
   msgstr ""
-        EOF
+        POT
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext-setup
 version: !ruby/object:Gem::Version
-  version: '0.28'
+  version: '0.29'
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem to ease internationalization with fast_gettext