beaker-i18n_helper 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a92eea0c2995ff9bfc05eb14dbd7a4fe8866cee
-  data.tar.gz: 05c9e958e3b13ef6c201b8f47ecfe2d82957d7e8
+  metadata.gz: 8b6547b333dd953c1304275229cf57bf3c2107d7
+  data.tar.gz: 1ea4ff06d011413473f5bd517867238ed46d87a0
 SHA512:
-  metadata.gz: 6f33cf0b421c770fe240de47b386ac41e1504f275ebeb29e5918bdcaf513a5419189983df95b46fac2de7eab0cfa7cdbff59ecd82c6001e3a40f699e4bec6f26
-  data.tar.gz: d84552e8412a7a7982ae46a697ce298bff0f5c429bdff6b1f7d6f7706dae2917e15562a64539d08b4606b8e38d15e4e70cdfcabed0b48473407b270bba425bbf
+  metadata.gz: df767bbe65daf3f8132d7ab1c8843f6476bc09a410218df49db34916885cd758c41fae858d1106940e8a0f49cd9af7dac01523168983e259e7357294c0f8a255
+  data.tar.gz: a333af940775587c403166fcce537d2710751bcb58e8162174832b5cda384e41f9fc0c671bc94c524733d9023bd568743ca31890366a19679232a01513ecd426

data/.gitignore

@@ -7,6 +7,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/log/
+*.gem
 
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [1.1.0]
+### Summary
+This release contains a fix and a public API change.
+
+#### Changed
+- `install_language_pack_on` method is now called `install_language_on`
+
+#### Fixed
+- issue where language packs aren't available on Debian. Installs 'locales-all' instead.
+
 ## [1.0.1]
 ### Summary
 This release fixes the `change_locale_on` method and makes some README updates.
@@ -14,5 +24,6 @@ This release fixes the `change_locale_on` method and makes some README updates.
 ### Summary
 This is the first release of this gem.
 
+[1.1.0]:https://github.com/puppetlabs/beaker-i18n_helper/compare/1.0.1...1.1.0
 [1.0.1]:https://github.com/puppetlabs/beaker-i18n_helper/compare/1.0.0...1.0.1
 [1.0.0]:https://github.com/puppetlabs/beaker-i18n_helper/tags/1.0.0

data/README.md

@@ -25,7 +25,7 @@ c.before :suite do
     # Required for binding tests.
     if fact('osfamily') == 'Debian'
       #install language pack on debian systems
-      install_language_pack_on(host, "ja_JP.utf-8")
+      install_language_on(host, "ja_JP.utf-8")
     end
     if fact('osfamily') == 'RedHat'
       if fact('operatingsystemmajrelease') =~ /7/ || fact('operatingsystem') =~ /Fedora/
@@ -42,21 +42,21 @@ end
 
 ## Reference
 
-#### install_language_pack_on(host, lang)
+#### install_language_on(hosts, lang)
 
-Uses Beaker's `install_package` to install a language pack for the desired language. Takes the host and `lang`, a POSIX locale identifier ([lang]_[region].[charset])
+Uses Beaker's `install_package` to install a language pack for the desired language. Takes a hosts array and `lang`, a POSIX locale identifier ([lang]_[region].[charset])
 
 ```ruby
-install_language_pack_on(host, 'ja_JP.utf-8')
+install_language_on(hosts, 'ja_JP.utf-8')
 ```
 Usually only needed for Debian systems, RHEL installs all language packs by default.
 
-#### change_locale_on(host, lang)
+#### change_locale_on(hosts, lang)
 
-Takes in a POSIX locale identifier, `lang`, and sets $LANG, $LANGUAGE, and on the target host to `#{lang}`.
+Takes in a POSIX locale identifier, `lang`, and sets $LANG, $LANGUAGE, and on the target hosts to `#{lang}`.
 
 ```ruby
-change_locale_on(host, "de_DE.utf-8")
+change_locale_on(hosts, "de_DE.utf-8")
 ```
 
 ## Limitations

data/lib/beaker/i18n_helper.rb

@@ -1,16 +1,26 @@
 require 'beaker'
 
-# Setting up the module
+# Beaker i18n Helper
 module Beaker::I18nHelper # rubocop:disable Style/ClassAndModuleChildren
   include Beaker::DSL
   include Beaker::DSL::Helpers::FacterHelpers
 
+  # Validates POSIX locale identifier format
+  #
+  # @param lang [String] the identifier as a string, e.g. 'ja_JP.utf8'
+  # @return [Boolean] true if it's a valid identifier
+  #
   def valid_lang_string?(lang)
     lang_regex = %r{^[a-zA-Z][a-zA-Z](\_|\-)[a-zA-Z][a-zA-Z](\..*)?$}
     raise "Please use correct format for lang: #{lang_regex}" unless lang.match lang_regex
     true
   end
 
+  # Parses a given POSIX locale identifier into parts for the other functions to consume
+  #
+  # @param lang [String] the identifier as a string, e.g. 'ja_JP.utf8'
+  # @return [Array] the identifier as an array of [{lang},{region},{charset}]
+  #
   def parse_lang(lang)
     lang = lang.split('.')[0] if lang =~ %r{\.\S}
 
@@ -23,20 +33,36 @@ module Beaker::I18nHelper # rubocop:disable Style/ClassAndModuleChildren
     lang
   end
 
-  def install_language_pack_on(hsts, lang)
+  # Installs the language pack on each host for a given language (if necessary)
+  #
+  # @param hsts [Array] beaker hosts array
+  # @param lang [String] the POSIX locale identifier as a string, e.g. 'ja_JP.utf8'
+  # @return [nil]
+  #
+  def install_language_on(hsts, lang)
     valid_lang_string?(lang)
     lang = parse_lang(lang)
 
     Array(hsts).each do |host|
       begin
-        install_package(host, 'systemd-services') unless shell('file /sbin/init').stdout =~ %r{systemd}
-        install_package(host, "language-pack-#{lang[0]}")
+        case fact('operatingsystem')
+        when 'Debian'
+          install_locales_all_on(host)
+        when 'Ubuntu'
+          install_language_pack_on(host, lang)
+        end
       rescue RuntimeError
         raise "Unable to install language pack for #{lang[0]} on #{host}"
       end
     end
   end
 
+  # Changes the locale on each host to the given language
+  #
+  # @param hsts [Array] beaker hosts array
+  # @param lang [String] the POSIX locale identifier as a string, e.g. 'ja_JP.utf8'
+  # @return [nil]
+  #
   def change_locale_on(hsts, lang)
     valid_lang_string?(lang)
     Array(hsts).each do |host|
@@ -50,6 +76,28 @@ module Beaker::I18nHelper # rubocop:disable Style/ClassAndModuleChildren
       end
     end
   end
+
+  private
+
+  # Installs the 'locales-all' package on the target host unless it is already installed
+  #
+  # @param host [Beaker::Host] beaker host
+  # @return [nil]
+  #
+  def install_locales_all_on(host)
+    install_package(host, 'locales-all') unless check_for_package(host, 'locales-all')
+  end
+
+  # Installs the language pack on the target host for a given language (if necessary)
+  #
+  # @param host [Beaker::Host] beaker host
+  # @param lang [String] the POSIX locale identifier as a string, e.g. 'ja_JP.utf8'
+  # @return [nil]
+  #
+  def install_language_pack_on(host, lang)
+    install_package(host, "language-pack-#{lang[0]}")
+    install_package(host, 'systemd-services') unless shell('file /sbin/init').stdout =~ %r{systemd}
+  end
 end
 
 include Beaker::I18nHelper

data/lib/beaker/i18n_helper/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module I18nHelper
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-i18n_helper
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Eric Putnam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop