localeapp 2.0.0 → 2.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmVhOTI1MWRmMGYwM2YzNWYyNDU4NmM4N2Y1NGJkYWZjNTkxMmZmYQ==
-  data.tar.gz: !binary |-
-    NDQ5NmMyYjJkNjk5OWNjNjAyZjhjNGEzNmFkN2VkNjM4NjQzYjJlNA==
+SHA1:
+  metadata.gz: aa4be6175321c54223254c903fbd6d3aabc54ce7
+  data.tar.gz: 35724de360f6c231c97f6ace6c5eea7c0ab1b1ad
 SHA512:
-  metadata.gz: !binary |-
-    MDAyMDU3Y2NiMjYxYzE1N2Q0OGE5ZjdlYjY5NWYxZTM0MGQzMmRiOGM5M2Rj
-    MzEwYzVmYjhhNTRkNGZmOWNiODFlN2VkNTk0NThjYmIyZDBhNTkxNTIyMDZm
-    MWQzYWZjZmIzYjVlZTljMTJmMDI5Y2M3YmQ2NTU4Njk5MmRmZjM=
-  data.tar.gz: !binary |-
-    NDQxNDMwZjg3MzA2MjYyODAwOWU0ZTgwMTJiYWQ0MGRjN2JhNjIyZDEwYThm
-    YjVmYzkwODUwY2IwNTg3NjRjNjZlYjFmMzI0YjEzMzQyODU0NzBiMzkwOTc1
-    YTZkNDc4ODEwNWU3ZGRlNzc1NzNkYmI4Y2Y3ZWMxMmRhZDQ5OWY=
+  metadata.gz: a67e48d93e0b15d065e577afebe94abd38e6317ce8f5892cd93bc771e334a7b9e403fc91ed00673a0dce2296fdc3a2d1b9acbe6b246617c688b626caa2e978b6
+  data.tar.gz: '081fd0e9a6510a04b4ab4cba44c27976b50dcfacbc600952e57e003035c6f9f8e96b16836e2815dfacaa7fd30e02ffedc8ece7775df7cb5ef71f1aaeabf31e0b'

data/.travis.yml

@@ -1,14 +1,12 @@
+sudo: required
+dist: trusty
 before_install:
   - gem install bundler
-  - gem update bundler
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.1
+  - 2.3.3
+  - 2.2.6
+  - 2.1.10
   - jruby
-  - jruby-head
 gemfile:
   - gemfiles/i18n_0.4.gemfile
   - gemfiles/i18n_0.5.gemfile

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # master
 
+* Drop ruby 1.9 and ruby 2.0 support
+
+# Version 2.0.0
+
 * Drop i18n 0.3.x and rails 2.x support
 * Remove rack dependency
 

data/README.md

@@ -137,10 +137,6 @@ You can invite other developers and translators via localeapp.com.  Developers h
 
 If we find an unknown locale during an import we'll add it to your project. You can also add a new locale to a project via localeapp.com. This will create missing translations for every translation key. You will need to restart any listeners completely to pick up the new locale.
 
-## Syck, Psych, and creating YAML
-
-Since ruby 1.9.3-p0 Psych has been the default YAML engine in Ruby. Psych is based on libyaml and fixes a number of issues with the previous YAML library, Syck. localeapp.com uses 1.9.3 and Psych for all its YAML processing. The localeapp gem will use Psych if it is available but falls back to the ya2yaml library if not. ya2yaml supports UTF-8 (which Syck doesn't handle very well) but it does write YAML differently to Psych so you will notice differences between exporting directly from localeapp.com and doing localeapp pull on the command line unless you're using 1.9.3+ or have installed Psych as a gem.
-
 ## Proxies
 
 If you need to go through a proxy server, you can configure it with:

data/bin/localeapp

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 
 require 'localeapp'
 

data/lib/localeapp.rb

@@ -1,5 +1,6 @@
 require 'i18n'
 require 'i18n/core_ext/hash'
+require 'yaml'
 
 require 'localeapp/i18n_shim'
 require 'localeapp/version'
@@ -25,11 +26,6 @@ require 'localeapp/cli/remove'
 require 'localeapp/cli/rename'
 require 'localeapp/cli/daemon'
 
-# AUDIT: Will this work on ruby 1.9.x
-$KCODE="UTF8" if RUBY_VERSION < '1.9'
-
-require 'ya2yaml'
-
 module Localeapp
   API_VERSION = "1"
   LOG_PREFIX = "** [Localeapp] "
@@ -103,11 +99,7 @@ module Localeapp
         raise Localeapp::PotentiallyInsecureYaml if contents =~ /!ruby\//
       end
 
-      if defined?(Psych) && defined?(Psych::VERSION)
-        Psych.load(contents)
-      else
-        normalize_results(YAML.load(contents))
-      end
+      YAML.load(contents)
     end
 
     def load_yaml_file(filename)
@@ -123,21 +115,5 @@ module Localeapp
       end
       false
     end
-
-    def normalize_results(results)
-      if private_null_type(results)
-        nil
-      elsif results.is_a?(Array)
-        results.each_with_index do |value, i|
-          results[i] = normalize_results(value)
-        end
-      elsif results.is_a?(Hash)
-        results.each_pair do |key, value|
-          results[key] = normalize_results(value)
-        end
-      else
-        results
-      end
-    end
   end
 end

data/lib/localeapp/updater.rb

@@ -43,11 +43,7 @@ module Localeapp
     private
 
     def generate_yaml(translations)
-      if defined?(Psych) && defined?(Psych::VERSION)
-        Psych.dump(translations, :line_width => -1)[4..-1]
-      else
-        translations.ya2yaml[5..-1]
-      end
+      YAML.dump(translations, :line_width => -1)[4..-1]
     end
 
     def remove_flattened_key!(hash, locale, key)

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/localeapp.gemspec

@@ -20,17 +20,16 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('mime-types', '~> 2.6')
+  s.required_ruby_version = ">= 2.1"
+
   s.add_dependency('i18n', '~> 0.4')
-  s.add_dependency('json', '~> 1.8')
-  s.add_dependency('rest-client', '~> 1.8')
-  s.add_dependency('ya2yaml')
+  s.add_dependency('json')
+  s.add_dependency('rest-client')
   s.add_dependency('gli')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '~> 3.3')
   s.add_development_dependency('yard')
-  s.add_development_dependency('RedCloth', '< 4.3')
   s.add_development_dependency('aruba', '~> 0.8')
   s.add_development_dependency('cucumber', '~> 2.0')
   s.add_development_dependency('fakeweb')

data/spec/localeapp/updater_spec.rb

@@ -122,8 +122,8 @@ describe Localeapp::Updater, ".update(data)" do
     expect(File.exist?(File.join(@yml_dir, 'ja.yml'))).to be false
   end
 
-  if defined?(Psych) && defined?(Psych::VERSION) && Psych::VERSION >= "1.1.0" && !RUBY_PLATFORM == 'jruby'
-    it "doesn't try to wrap long lines in the output" do
+  if RUBY_PLATFORM != "java"
+    it "doesn't wrap long lines in the output" do
       do_update({
         'translations' => {
           'en' => { 'foo' => ('bar ' * 30) }
@@ -131,7 +131,8 @@ describe Localeapp::Updater, ".update(data)" do
          'locales' => ['en'],
          'deleted' => []
       })
-      expect(File.read(File.join(@yml_dir, 'en.yml'))).to match(/foo: ! 'bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar '/m)
+      expect(File.read(File.join(@yml_dir, "en.yml")))
+        .to match /foo:.*(?:bar ){30,}/m
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Christopher Dell
@@ -10,202 +10,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: ya2yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: yard
   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'
-- !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   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'
 - !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
@@ -219,11 +177,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".autotest"
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -329,19 +287,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: localeapp
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easy i18n translation management with localeapp.com
 test_files: []
-has_rdoc: