localeapp 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43785b36844af9847b8326daab04090d1ab40d49
-  data.tar.gz: 7156df0e8530172294d41302b545d34c2b4ed2a3
+SHA256:
+  metadata.gz: 805c6256d30038f1a1939798e4f26ac91f19f330b9741ed9c99c880c4baedafd
+  data.tar.gz: fd70529ab0d1df20710fd100ba9382e9451ac22d011a53dd047b42a25434d682
 SHA512:
-  metadata.gz: ca9c2892df8e20e6492885c65bfc479ca577af7a83e91e8a512fe87623c24f80168a9d9e1cd344ca3242614403ba326d1ff9ae107a0a6c9b46acb3a6a428d16d
-  data.tar.gz: b01a5cd563aafbdfd3e235a0eeb0a7ccb8ca433a79b4019f8d246eb229e3c709b552a1a24fc29b1bb107dd9210f4b43ca860b4474d5a1ec405684cd12e304498
+  metadata.gz: 957f7db15344c1406d2841581934e5be63bd795ddb3777bde5f928bee053df61dae6e5de25f813a0c07b81b4ae1eb843bc1713f039e81ec4f91490e4e7bfd2d0
+  data.tar.gz: 0d341f9b235d16688ce7f65de0dc5c129451823cb0562e446086d3f865a49ccede5b8a89789fc6ffd5e3ffe78f306c075871e635c6f9444788325ed7a6a88804

data/.gitignore

@@ -9,3 +9,4 @@ doc/*
 tmp/*
 .ruby-version
 .ruby-gemsets
+.rvmrc

data/.travis.yml

@@ -11,10 +11,10 @@ rvm:
   - jruby-9.1.15.0
 gemfile:
   - Gemfile
-  - gemfiles/i18n_0.4.gemfile
-  - gemfiles/i18n_0.5.gemfile
-  - gemfiles/i18n_0.6.gemfile
-  - gemfiles/i18n_0.7.gemfile
+  - spec/gemfiles/i18n_0.7.gemfile
+  - spec/gemfiles/i18n_0.8.gemfile
+  - spec/gemfiles/i18n_0.9.gemfile
+  - spec/gemfiles/i18n_1.0.gemfile
 notifications:
   slack:
     secure: JryUWfe2JR0cfNT+TIHwryy8NS8m9/hbRhg+5UqwuYWuEp6gtcWCA05wKsajQyRrGaNGYKu81RA9jpQrirgQWzDUJl5o3sEWbqKZv3pW0ybn8Tx52N1mxW3Puar5KLZ8TPRphKKIJ8/1EhAh4zpC5Mtxv8Sz1/AHuqnlu6l+bb4=

data/CHANGELOG.md

@@ -1,13 +1,24 @@
 # master
 
+# Version 3.0.0
+
+* drop support for i18n 0.4, 0.5 and 0.6 (ℹ️ Rails [dropped those in July 2014](https://github.com/rails/rails/commit/cd7d414e48f537278043bfc77cfb4217e8c89c24)))
+* add official support for i18n 0.8, 0.9 and 1.0
+* prevent users to use dependencies impacted by some vulnerabilities:
+  * OSVDB-101157
+  * CVE-2015-3448 / OSVDB-117461
+  * CVE-2013-0269 / OSVDB-101137
+  * CVE-2015-1820 / OSVDB-119878
+* fix a bug introduced in 2.5.0 where the exception handler was crashing with `TypeMismatch` error when `blacklisted_keys_pattern` was not explicitly configured
+
 # Version 2.5.0
 
-* Show fully-scoped keys in `ExceptionHandler` log messages (thanks to @leonhooijer)
-* Don't force raising an exception for blacklisted keys (thanks to @leonhooijer)
+* Show fully-scoped keys in `ExceptionHandler` log messages (thanks to [@leonhooijer](https://github.com/leonhooijer))
+* Don't force raising an exception for blacklisted keys (thanks to [@leonhooijer](https://github.com/leonhooijer))
 
 # Version 2.4.0
 
-* Support pulling of single locales
+* Support pulling of single locales (thanks to [@full-of-foo](https://github.com/full-of-foo))
 
 # Version 2.3.0
 
@@ -35,7 +46,7 @@
 
 # Version 1.0.2
 
-* Fix a XSS vulnerability where translations keys could contain unescaped HTML (@grekko)
+* Fix a XSS vulnerability where translations keys could contain unescaped HTML (thanks to [@grekko](https://github.com/grekko))
 
 # Version 1.0.1
 
@@ -71,7 +82,7 @@
 
 # Version 0.8.0
 
-* Fix problem with line ending in three dots. (@holli)
+* Fix problem with line ending in three dots. (thanks to [@holli](https://github.com/holli))
 * Change deprecated File.exists? to File.exist?
 * Fix "install --github" so it appends README.md. Before it truncated the README.md file with new content, now it appends content in a more correct manner.
 * Fix .gitignore injection so it ensures a newline.
@@ -130,7 +141,7 @@
 
 # Version 0.6.9
 
-* Make rack a dependency as we actually use it (Thanks @martoche)
+* Make rack a dependency as we actually use it (thanks to [@martoche](https://github.com/martoche))
 
 # Version 0.6.8
 
@@ -190,21 +201,21 @@
 
 # Version 0.4.3
 
-* Make sure Psych is fully loaded before using it (Thanks @tenderlove)
+* Make sure Psych is fully loaded before using it (thanks to [@tenderlove](https://github.com/tenderlove))
 
 # Version 0.4.2
 
-* Improve compatibility of Psych with ruby 1.9.2 (Thanks @ardpac)
+* Improve compatibility of Psych with ruby 1.9.2 (thanks to [@ardpac](https://github.com/ardpac))
 
 # Version 0.4.1
 
-* Ignore HUP when backgrounded. (Thanks @xijo)
+* Ignore HUP when backgrounded. (thanks to [@xijo](https://github.com/xijo))
 * Add --standalone option to install to generate a .localeapp/ config directory. This enables usage outside of rails.
 
 # Version 0.4.0
 
 * Use Psych to generate the yaml if it's available (This will completely change your yaml the first time you do a localeapp pull and Psych is available)
-* Report when the directory to write the yml to doesn't exist (Thanks Robin Mehner)
+* Report when the directory to write the yml to doesn't exist (thanks to [@rmehner](https://github.com/rmehner))
 
 # Version 0.3.2
 
@@ -213,13 +224,13 @@
 # Version 0.3.1
 
 * Handle SocketError so we don't cause errors in client apps when they're not connected to the network
-* Fix bug with empty log file (Thanks Robin Mehner)
+* Fix bug with empty log file (thanks to [@rmehner](https://github.com/rmehner))
 
 # Version 0.3.0
 
 * Allow symbols for environment names in config file
-* `localeapp push` will now push all yaml files in a directory if it's given a directory instead of a file. (Thanks Bartłomiej Danek)
-* Better daemon support. `daemon_pid_file` and `daemon_log_file` configuration options. (Thanks again Bartłomiej Danek)
+* `localeapp push` will now push all yaml files in a directory if it's given a directory instead of a file (thanks to [@bartlomiejdanek](https://github.com/bartlomiejdanek))
+* Better daemon support. `daemon_pid_file` and `daemon_log_file` configuration options (thanks to [@bartlomiejdanek](https://github.com/bartlomiejdanek))
 
 # Version 0.2.0
 

data/lib/localeapp/rails/force_exception_handler_in_translation_helper.rb

@@ -14,7 +14,8 @@
 module Localeapp
   module ForceExceptionHandlerInTranslationHelper
     def translate(key, options = {})
-      if [options[:scope], key].compact.join(".").match?(Localeapp.configuration.blacklisted_keys_pattern)
+      full_key = [options[:scope], key].compact.join(".")
+      if full_key =~ Localeapp.configuration.blacklisted_keys_pattern
         super(key, options)
       else
         super(key, {:raise => false}.merge(options))

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "2.5.0"
+  VERSION = "3.0.0"
 end

data/localeapp.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.1"
 
-  s.add_dependency('i18n', '~> 0.4')
-  s.add_dependency('json')
-  s.add_dependency('rest-client')
+  s.add_dependency('i18n', '>= 0.7', '< 2')
+  s.add_dependency('json', '>= 1.1.0')
+  s.add_dependency('rest-client', '>= 1.8.0')
   s.add_dependency('gli')
 
   s.add_development_dependency('rake')
@@ -33,5 +33,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency('aruba', '~> 0.8')
   s.add_development_dependency('cucumber', '~> 2.0')
   s.add_development_dependency('fakeweb')
-  s.add_development_dependency('appraisal')
 end

data/{gemfiles → spec/gemfiles}/i18n_0.7.gemfile

@@ -1,5 +1,3 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "i18n", "~> 0.7.0"
@@ -8,4 +6,4 @@ platforms :jruby do
   gem "jruby-openssl", "~> 0.6"
 end
 
-gemspec :path => "../"
+gemspec :path => "../.."

data/{gemfiles/i18n_0.4.gemfile → spec/gemfiles/i18n_0.8.gemfile}

@@ -1,11 +1,9 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "i18n", "~> 0.4.0"
+gem "i18n", "~> 0.8.0"
 
 platforms :jruby do
   gem "jruby-openssl", "~> 0.6"
 end
 
-gemspec :path => "../"
+gemspec :path => "../.."

data/{gemfiles/i18n_0.5.gemfile → spec/gemfiles/i18n_0.9.gemfile}

@@ -1,11 +1,9 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "i18n", "~> 0.5.0"
+gem "i18n", "~> 0.9.0"
 
 platforms :jruby do
   gem "jruby-openssl", "~> 0.6"
 end
 
-gemspec :path => "../"
+gemspec :path => "../.."

data/{gemfiles/i18n_0.6.gemfile → spec/gemfiles/i18n_1.0.gemfile}

@@ -1,11 +1,9 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "i18n", "~> 0.6.0"
+gem "i18n", "~> 1.0.0"
 
 platforms :jruby do
   gem "jruby-openssl", "~> 0.6"
 end
 
-gemspec :path => "../"
+gemspec :path => "../.."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Christopher Dell
@@ -10,50 +10,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -152,20 +158,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Synchronizes i18n translation keys and content with localeapp.com so
   you don't have to manage translations by hand.
 email:
@@ -180,7 +172,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -207,10 +198,6 @@ files:
 - features/support/env.rb
 - features/support/hooks.rb
 - features/update.feature
-- gemfiles/i18n_0.4.gemfile
-- gemfiles/i18n_0.5.gemfile
-- gemfiles/i18n_0.6.gemfile
-- gemfiles/i18n_0.7.gemfile
 - lib/localeapp.rb
 - lib/localeapp/api_call.rb
 - lib/localeapp/api_caller.rb
@@ -256,6 +243,10 @@ files:
 - spec/fixtures/es.yml
 - spec/fixtures/string_log.yml
 - spec/fixtures/symbol_log.yml
+- spec/gemfiles/i18n_0.7.gemfile
+- spec/gemfiles/i18n_0.8.gemfile
+- spec/gemfiles/i18n_0.9.gemfile
+- spec/gemfiles/i18n_1.0.gemfile
 - spec/localeapp/api_call_spec.rb
 - spec/localeapp/api_caller_spec.rb
 - spec/localeapp/cli/add_spec.rb
@@ -302,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: localeapp
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Easy i18n translation management with localeapp.com

data/Appraisals

@@ -1,15 +0,0 @@
-appraise "i18n-0.4" do
-  gem "i18n", "~> 0.4.0"
-end
-
-appraise "i18n-0.5" do
-  gem "i18n", "~> 0.5.0"
-end
-
-appraise "i18n-0.6" do
-  gem "i18n", "~> 0.6.0"
-end
-
-appraise "i18n-0.7" do
-  gem "i18n", "~> 0.7.0"
-end