twine 1.0.3 → 1.1.1

data/test/test_generate_all_localization_files.rb

@@ -24,10 +24,6 @@ class TestGenerateAllLocalizationFiles < CommandTest
     def setup
       super
       Dir.mkdir File.join @output_dir, 'values-en'
-
-      # both Android and Tizen can handle folders containing `values-en`
-      android_formatter = prepare_mock_formatter(Twine::Formatters::Android)
-      tizen_formatter = prepare_mock_formatter(Twine::Formatters::Tizen, false)
     end
 
     def new_runner(options = {})
@@ -47,8 +43,8 @@ class TestGenerateAllLocalizationFiles < CommandTest
   end
 
   class TestDoNotCreateFolders < TestGenerateAllLocalizationFiles
-    def new_runner(twine_file = nil)
-      super(false, twine_file)
+    def new_runner(twine_file = nil, options = {})
+      super(false, twine_file, options)
     end
 
     def test_fails_if_output_folder_does_not_exist
@@ -60,39 +56,53 @@ class TestGenerateAllLocalizationFiles < CommandTest
     def test_does_not_create_language_folders
       Dir.mkdir File.join @output_dir, 'en.lproj'
       new_runner.generate_all_localization_files
-      refute File.exists?(File.join(@output_dir, 'es.lproj')), "language folder should not be created"
+      refute File.exist?(File.join(@output_dir, 'es.lproj')), "language folder should not be created"
     end
 
     def test_prints_empty_file_warnings
       Dir.mkdir File.join @output_dir, 'en.lproj'
       empty_twine_file = build_twine_file('en') {}
       new_runner(empty_twine_file).generate_all_localization_files
-      assert_match "Skipping file at path", Twine::stderr.string
+      assert_match "Skipping file at path", Twine::stdout.string
+    end
+
+    def test_does_not_print_empty_file_warnings_if_quite
+      Dir.mkdir File.join @output_dir, 'en.lproj'
+      empty_twine_file = build_twine_file('en') {}
+      new_runner(empty_twine_file, quite: true).generate_all_localization_files
+      refute_match "Skipping file at path", Twine::stdout.string
     end
   end
 
   class TestCreateFolders < TestGenerateAllLocalizationFiles
-    def new_runner(twine_file = nil)
-      super(true, twine_file)
+    def new_runner(twine_file = nil, options = {})
+      super(true, twine_file, options)
     end
 
     def test_creates_output_folder
       FileUtils.remove_entry_secure @output_dir
       new_runner.generate_all_localization_files
-      assert File.exists? @output_dir
+      assert File.exist? @output_dir
     end
 
     def test_creates_language_folders
       new_runner.generate_all_localization_files
-      assert File.exists?(File.join(@output_dir, 'en.lproj')), "language folder 'en.lproj' should be created"
-      assert File.exists?(File.join(@output_dir, 'es.lproj')), "language folder 'es.lproj' should be created"
+      assert File.exist?(File.join(@output_dir, 'en.lproj')), "language folder 'en.lproj' should be created"
+      assert File.exist?(File.join(@output_dir, 'es.lproj')), "language folder 'es.lproj' should be created"
     end
 
     def test_prints_empty_file_warnings
       empty_twine_file = build_twine_file('en') {}
       new_runner(empty_twine_file).generate_all_localization_files
 
-      assert_match "Skipping file at path", Twine::stderr.string
+      assert_match "Skipping file at path", Twine::stdout.string
+    end
+
+    def test_does_not_print_empty_file_warnings_if_quite
+      empty_twine_file = build_twine_file('en') {}
+      new_runner(empty_twine_file, quite: true).generate_all_localization_files
+
+      refute_match "Skipping file at path", Twine::stdout.string
     end
   end
 

data/test/test_generate_localization_archive.rb

@@ -1,8 +1,7 @@
 require 'command_test'
 
 class TestGenerateLocalizationArchive < CommandTest
-  def new_runner(twine_file = nil)
-    options = {}
+  def new_runner(twine_file = nil, options = {})
     options[:output_path] = @output_path
     options[:format] = 'apple'
 
@@ -20,7 +19,7 @@ class TestGenerateLocalizationArchive < CommandTest
   def test_generates_zip_file
     new_runner.generate_localization_archive
 
-    assert File.exists?(@output_path), "zip file should exist"
+    assert File.exist?(@output_path), "zip file should exist"
   end
 
   def test_zip_file_structure
@@ -45,7 +44,13 @@ class TestGenerateLocalizationArchive < CommandTest
   def test_prints_empty_file_warnings
     empty_twine_file = build_twine_file('en') {}
     new_runner(empty_twine_file).generate_localization_archive
-    assert_match "Skipping file", Twine::stderr.string
+    assert_match "Skipping file", Twine::stdout.string
+  end
+
+  def test_does_not_print_empty_file_warnings_if_quite
+    empty_twine_file = build_twine_file('en') {}
+    new_runner(empty_twine_file, quite: true).generate_localization_archive
+    refute_match "Skipping file", Twine::stdout.string
   end
 
   class TestValidate < CommandTest

data/test/test_placeholders.rb

@@ -122,4 +122,21 @@ class PlaceholderTest < TwineTest
       assert_equal "some %@ more %@ text %@", from_flash("some {0} more {1} text {2}")
     end
   end
+
+  class PythonPlaceholder < PlaceholderTest
+    def test_negative_for_regular_placeholders
+      assert_equal false, Twine::Placeholders.contains_python_specific_placeholder(placeholder)
+    end
+
+    def test_positive_for_named_placeholders
+      inputs = [
+        "%(language)s has",
+        "For %(number)03d quotes",
+        "bought on %(app_name)s"
+      ]
+      inputs.each do |input|
+        assert_equal true, Twine::Placeholders.contains_python_specific_placeholder(input)
+      end
+    end
+  end
 end

data/test/test_validate_twine_file.rb

@@ -58,4 +58,12 @@ class TestValidateTwineFile < CommandTest
       Twine::Runner.new(@options.merge(pedantic: true), @twine_file).validate_twine_file
     end
   end
+
+  def test_reports_python_specific_placeholders
+    random_definition.translations["en"] = "%(python_only)s"
+
+    assert_raises Twine::Error do
+      Twine::Runner.new(@options, @twine_file).validate_twine_file
+    end
+  end
 end

data/test/twine_test.rb

@@ -1,6 +1,6 @@
 require 'erb'
 require 'minitest/autorun'
-require "mocha/mini_test"
+require "mocha/minitest"
 require 'securerandom'
 require 'stringio'
 require 'twine'
@@ -23,7 +23,7 @@ class TwineTest < Minitest::Test
   end
 
   def teardown
-    FileUtils.remove_entry_secure @output_dir if File.exists? @output_dir
+    FileUtils.remove_entry_secure @output_dir if File.exist? @output_dir
     Twine::Formatters.formatters.clear
     Twine::Formatters.formatters.concat @formatters
     super

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: twine
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.1
 platform: ruby
 authors:
 - Sebastian Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
 - !ruby/object:Gem::Dependency
   name: minitest-ci
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: |2
@@ -105,59 +105,60 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- README.md
 - LICENSE
+- README.md
+- bin/twine
 - lib/twine.rb
-- lib/twine/placeholders.rb
-- lib/twine/plugin.rb
+- lib/twine/cli.rb
+- lib/twine/encoding.rb
+- lib/twine/formatters.rb
+- lib/twine/formatters/abstract.rb
+- lib/twine/formatters/android.rb
 - lib/twine/formatters/apple.rb
-- lib/twine/formatters/jquery.rb
+- lib/twine/formatters/django.rb
 - lib/twine/formatters/flash.rb
-- lib/twine/formatters/android.rb
-- lib/twine/formatters/tizen.rb
 - lib/twine/formatters/gettext.rb
-- lib/twine/formatters/django.rb
-- lib/twine/formatters/abstract.rb
-- lib/twine/cli.rb
-- lib/twine/twine_file.rb
-- lib/twine/encoding.rb
+- lib/twine/formatters/jquery.rb
+- lib/twine/formatters/tizen.rb
 - lib/twine/output_processor.rb
-- lib/twine/version.rb
-- lib/twine/formatters.rb
+- lib/twine/placeholders.rb
+- lib/twine/plugin.rb
 - lib/twine/runner.rb
-- bin/twine
-- test/test_formatters.rb
-- test/test_output_processor.rb
-- test/test_consume_localization_file.rb
-- test/test_consume_localization_archive.rb
-- test/test_abstract_formatter.rb
-- test/test_cli.rb
-- test/test_twine_file.rb
-- test/test_generate_localization_file.rb
-- test/test_generate_all_localization_files.rb
-- test/twine_test.rb
-- test/test_generate_localization_archive.rb
+- lib/twine/twine_file.rb
+- lib/twine/version.rb
 - test/command_test.rb
-- test/twine_file_dsl.rb
-- test/test_twine_definition.rb
-- test/fixtures/formatter_apple.strings
+- test/fixtures/consume_localization_archive.zip
+- test/fixtures/enc_utf16be.dummy
 - test/fixtures/enc_utf16be_bom.dummy
-- test/fixtures/gettext_multiline.po
+- test/fixtures/enc_utf16le.dummy
+- test/fixtures/enc_utf16le_bom.dummy
 - test/fixtures/enc_utf8.dummy
 - test/fixtures/formatter_android.xml
-- test/fixtures/consume_localization_archive.zip
-- test/fixtures/twine_accent_values.txt
-- test/fixtures/enc_utf16be.dummy
+- test/fixtures/formatter_apple.strings
 - test/fixtures/formatter_django.po
-- test/fixtures/enc_utf16le.dummy
-- test/fixtures/formatter_tizen.xml
-- test/fixtures/formatter_jquery.json
-- test/fixtures/formatter_gettext.po
 - test/fixtures/formatter_flash.properties
-- test/fixtures/enc_utf16le_bom.dummy
+- test/fixtures/formatter_gettext.po
+- test/fixtures/formatter_gettext_quotes.po
+- test/fixtures/formatter_jquery.json
+- test/fixtures/formatter_tizen.xml
+- test/fixtures/gettext_multiline.po
+- test/fixtures/twine_accent_values.txt
+- test/test_abstract_formatter.rb
+- test/test_cli.rb
+- test/test_consume_localization_archive.rb
+- test/test_consume_localization_file.rb
+- test/test_formatters.rb
+- test/test_generate_all_localization_files.rb
+- test/test_generate_localization_archive.rb
+- test/test_generate_localization_file.rb
+- test/test_output_processor.rb
 - test/test_placeholders.rb
+- test/test_twine_definition.rb
+- test/test_twine_file.rb
 - test/test_validate_twine_file.rb
-homepage: https://github.com/mobiata/twine
+- test/twine_file_dsl.rb
+- test/twine_test.rb
+homepage: https://github.com/scelis/twine
 licenses:
 - BSD-3-Clause
 metadata: {}
@@ -167,17 +168,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Manage strings and their translations for your iOS, Android and other projects.