twine 0.10.1 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dcdb67ead79faa41f6f4849e7ae0e187ea98b92
-  data.tar.gz: 11ca78a313a5d092dc107b2100abb95f3ac4cc5b
+  metadata.gz: 107f74e29483071d8a72edba115daa2dbea7d1c9
+  data.tar.gz: 4b81eccc076aa40a7649d6779ef4ccac51fbf0dc
 SHA512:
-  metadata.gz: 0e097325df41ef943e72ecc58e663c5b7261a46103fd7d27f4e187c1f2c1bbdd03e49fb11dd6d2b5534c3bfde939cf28f4725a458c444b935ba519f0aecf219c
-  data.tar.gz: 71d7c5d2e9c61b7038f69d9780f0f1137314a44be5849152fd39baddfa0312799cc6a887ce13f9b66ba13dca470d398b4c3b6311be80e78ce5c527826583cd3f
+  metadata.gz: 3173909e712d67f0e63e2ce0dadf3c6bc39d287208d159f798ee29ed220ab87b69cc49692b0472a9961589eda36ce0f31f2d402aab67c736ab4458d8beddcf4e
+  data.tar.gz: a2d07cfa6b89a6650aed7ee25a3cb2944a83c63b8ac1b5918a64f2804e4485e91b1d26ab329e381a3f4892b38dd76902639dab73f9ecb8445c512fd74477e8f3

data/README.md

@@ -1,26 +1,15 @@
 # Twine
 
+[![Continuous Integration by CircleCI](https://circleci.com/gh/teespring/twine.svg?style=shield)](https://circleci.com/gh/teespring/twine)
+
 Twine is a command line tool for managing your strings and their translations. These are all stored in a master text file and then Twine uses this file to import and export localization files in a variety of types, including iOS and Mac OS X `.strings` files, Android `.xml` files, gettext `.po` files, and [jquery-localize][jquerylocalize] `.json` files. This allows individuals and companies to easily share translations across multiple projects, as well as export localization files in any format the user wants.
 
 ## Install
 
-### As a Gem
-
 Twine is most easily installed as a Gem.
 
 	$ gem install twine
 
-### From Source
-
-You can also run Twine directly from source. However, it requires [rubyzip][rubyzip] in order to create and read standard zip files.
-
-	$ gem install rubyzip
-	$ git clone git://github.com/mobiata/twine.git
-	$ cd twine
-	$ ./twine --help
-
-Make sure you run the `twine` executable at the root of the project as it properly sets up your Ruby library path. The `bin/twine` executable does not.
-
 ## Twine File Format
 
 Twine stores everything in a single file, the Twine data file. The format of this file is a slight variant of the [Git][git] config file format, which itself is based on the old [Windows INI file][INI] format. The entire file is broken up into sections, which are created by placing the section name between two pairs of square brackets. Sections are optional, but they are the recommended way of grouping your definitions into smaller, more manageable chunks.
@@ -48,39 +37,39 @@ If you want a definition to inherit the values of another definition, you can us
 ### Example
 
 ```ini
-	[[General]]
-		[yes]
-			en = Yes
-			es = Sí
-			fr = Oui
-			ja = はい
-		[no]
-			en = No
-			fr = Non
-			ja = いいえ
-
-	[[Errors]]
-		[path_not_found_error]
-			en = The file '%@' could not be found.
-			tags = app1,app6
-			comment = An error describing when a path on the filesystem could not be found.
-		[network_unavailable_error]
-			en = The network is currently unavailable.
-			tags = app1
-			comment = An error describing when the device can not connect to the internet.
-		[dismiss_error]
-			ref = yes
-			en = Dismiss
-
-	[[Escaping Example]]
-		[list_item_separator]
-			en = `, `
-			tags = mytag
-			comment = A string that should be placed between multiple items in a list. For example: Red, Green, Blue
-		[grave_accent_quoted_string]
-			en = ``%@``
-			tags = myothertag
-			comment = This string will evaluate to `%@`.
+[[General]]
+	[yes]
+		en = Yes
+		es = Sí
+		fr = Oui
+		ja = はい
+	[no]
+		en = No
+		fr = Non
+		ja = いいえ
+
+[[Errors]]
+	[path_not_found_error]
+		en = The file '%@' could not be found.
+		tags = app1,app6
+		comment = An error describing when a path on the filesystem could not be found.
+	[network_unavailable_error]
+		en = The network is currently unavailable.
+		tags = app1
+		comment = An error describing when the device can not connect to the internet.
+	[dismiss_error]
+		ref = yes
+		en = Dismiss
+
+[[Escaping Example]]
+	[list_item_separator]
+		en = `, `
+		tags = mytag
+		comment = A string that should be placed between multiple items in a list. For example: Red, Green, Blue
+	[grave_accent_quoted_string]
+		en = ``%@``
+		tags = myothertag
+		comment = This string will evaluate to `%@`.
 ```
 
 ## Supported Output Formats
@@ -89,6 +78,7 @@ Twine currently supports the following output formats:
 
 * [iOS and OS X String Resources][applestrings] (format: apple)
 * [Android String Resources][androidstrings] (format: android)
+    * Supports [basic styling][androidstyling] with \<b\>, \<i\>, \<u\> and \<a\> links. These tags will *not* be escaped. Use [`getText()`](https://developer.android.com/reference/android/content/res/Resources.html#getText(int)) to read these strings. Also tags inside `<![CDATA[` won't be escaped. See [\#212](https://github.com/scelis/twine/issues/212) for details.
 * [Gettext PO Files][gettextpo] (format: gettext)
 * [jquery-localize Language Files][jquerylocalize] (format: jquery)
 * [Django PO Files][djangopo] (format: django)
@@ -182,11 +172,11 @@ Now, whenever you build your application, Xcode will automatically invoke Twine
 Add the following task at the top level in app/build.gradle:
 ```
 task generateLocalizations {
-    String script = 'if hash twine 2>/dev/null; then twine generate-localization-file twine.txt ./src/main/res/values/generated_strings.xml; fi'
-    exec {
-        executable "sh"
-        args '-c', script
-    }
+	String script = 'if hash twine 2>/dev/null; then twine generate-localization-file twine.txt ./src/main/res/values/generated_strings.xml; fi'
+	exec {
+		executable "sh"
+		args '-c', script
+	}
 }
 ```
 
@@ -196,7 +186,6 @@ Now every time you build your app the localization files are generated from the
 ## User Interface
 
 * [Twine TextMate 2 Bundle](https://github.com/mobiata/twine.tmbundle) — This [TextMate 2](https://github.com/textmate/textmate) bundle will make it easier for you to work with Twine files. In particular, it lets you use code folding to easily collapse and expand both definitions and sections.
-* [twine_ui](https://github.com/Daij-Djan/twine_ui) — A user interface for Twine written by [Dominik Pich](https://github.com/Daij-Djan/). Consider using this if you would prefer to use Twine without dropping to a command line.
 
 ## Extending Twine
 
@@ -224,9 +213,10 @@ Many thanks to all of the contributors to the Twine project, including:
 [INI]: http://en.wikipedia.org/wiki/INI_file
 [applestrings]: http://developer.apple.com/documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html
 [androidstrings]: http://developer.android.com/guide/topics/resources/string-resource.html
+[androidstyling]: http://developer.android.com/guide/topics/resources/string-resource.html#FormattingAndStyling
 [gettextpo]: http://www.gnu.org/savannah-checkouts/gnu/gettext/manual/html_node/PO-Files.html
 [jquerylocalize]: https://github.com/coderifous/jquery-localize
 [djangopo]: https://docs.djangoproject.com/en/dev/topics/i18n/translation/
 [tizen]: https://developer.tizen.org/documentation/articles/localization
 [flash]: http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/mx/resources/IResourceManager.html#getString()
-[printf]: https://en.wikipedia.org/wiki/Printf_format_string
+[printf]: https://en.wikipedia.org/wiki/Printf_format_string

data/lib/twine/cli.rb

@@ -22,7 +22,7 @@ module Twine
       create_folders: {
         switch: ['-r', '--[no-]create-folders'],
         description: <<-DESC,
-          This flag may be used to create output folders for all languages, if they  don't exist yet.
+          This flag may be used to create output folders for all languages, if they don't exist yet.
           As a result all languages will be exported, not only the ones where an output folder already exists.
         DESC
         boolean: true
@@ -220,21 +220,25 @@ module Twine
       command = args.select { |a| a[0] != '-' }[0]
       args = args.reject { |a| a == command }
 
+      if args.any? { |a| a == '--version' }
+        Twine::stdout.puts "Twine version #{Twine::VERSION}"
+        return false
+      end
+
       mapped_command = DEPRECATED_COMMAND_MAPPINGS[command]
       if mapped_command
-        Twine::stderr.puts "WARNING: Twine commands names have changed. `#{command}` is now `#{mapped_command}`. The old command is deprecated will soon stop working. For more information please check the documentation at https://github.com/mobiata/twine"
+        Twine::stderr.puts "WARNING: Twine commands names have changed. `#{command}` is now `#{mapped_command}`. The old command is deprecated and will soon stop working. For more information please check the documentation at https://github.com/mobiata/twine"
         command = mapped_command
       end
 
-      unless COMMANDS.keys.include? command
-        Twine::stderr.puts "Invalid command: #{command}" unless command.nil?
+      if command.nil?
         print_help(args)
-        abort
+        return false
+      elsif not COMMANDS.keys.include? command
+        raise Twine::Error.new "Invalid command: #{command}"
       end
 
-      options = parse_command_options(command, args)
-
-      return options
+      parse_command_options(command, args)
     end
 
     private
@@ -352,8 +356,6 @@ module Twine
             parser.define(*option[:switch]) do |value|
               if option[:repeated]
                 result[option_name] = (result[option_name] || []) << value
-              elsif option[:boolean]
-                result[option_name] = true
               else
                 result[option_name] = value
               end
@@ -363,8 +365,8 @@ module Twine
       end
 
       parser.define('-h', '--help', 'Show this message.') do
-        puts parser.help
-        exit
+        Twine::stdout.puts parser.help
+        return false
       end
 
       parser.separator ''

data/lib/twine/formatters/android.rb

@@ -32,7 +32,7 @@ module Twine
             # The language is defined by a two-letter ISO 639-1 language code, optionally followed by a two letter ISO 3166-1-alpha-2 region code (preceded by lowercase "r").
             # see http://developer.android.com/guide/topics/resources/providing-resources.html#AlternativeResources
             match = /^values-([a-z]{2}(-r[a-z]{2})?)$/i.match(segment)
-            
+
             return match[1].sub('-r', '-') if match
           end
         end
@@ -41,7 +41,7 @@ module Twine
       end
 
       def output_path_for_language(lang)
-        "values-#{lang}"
+        "values-#{lang}".gsub(/-(\p{Lu})/, '-r\1')
       end
 
       def set_translation_for_key(key, lang, value)
@@ -99,12 +99,28 @@ module Twine
         "\t<string name=\"%{key}\">%{value}</string>"
       end
 
+      def gsub_unless(text, pattern, replacement)
+        text.gsub(pattern) do |match|
+          match_start_position = Regexp.last_match.offset(0)[0]
+          yield(text[0, match_start_position]) ? match : replacement
+        end
+      end
+
+      # http://developer.android.com/guide/topics/resources/string-resource.html#FormattingAndStyling
       def escape_value(value)
-        # escape double and single quotes, & signs and tags
-        value = escape_quotes(value)
-        value.gsub!("'", "\\\\'")
-        value.gsub!(/&/, '&amp;')
-        value.gsub!('<', '&lt;')
+        inside_cdata = /<\!\[CDATA\[((?!\]\]>).)*$/       # opening CDATA tag ('<![CDATA[') not followed by a closing tag (']]>')
+        inside_opening_anchor_tag = /<a\s?((?!>).)*$/     # anchor tag start ('<a ') not followed by a '>'
+
+        # escape double and single quotes and & signs
+        value = gsub_unless(value, '"', '\\"') { |substring| substring =~ inside_cdata || substring =~ inside_opening_anchor_tag }
+        value = gsub_unless(value, "'", "\\'") { |substring| substring =~ inside_cdata }
+        value = gsub_unless(value, /&/, '&amp;') { |substring| substring =~ inside_cdata || substring =~ inside_opening_anchor_tag }
+
+        # escape opening angle brackes unless it's a supported styling tag
+        # https://github.com/scelis/twine/issues/212
+        # https://stackoverflow.com/questions/3235131/#18199543
+        angle_bracket = /<(?!(\/?(b|u|i|a|\!\[CDATA)))/   # matches all `<` but <b>, <u>, <i>, <a> and <![CDATA
+        value = gsub_unless(value, angle_bracket, '&lt;') { |substring| substring =~ inside_cdata }
 
         # escape non resource identifier @ signs (http://developer.android.com/guide/topics/resources/accessing-resources.html#ResourcesFromXml)
         resource_identifier_regex = /@(?!([a-z\.]+:)?[a-z+]+\/[a-zA-Z_]+)/   # @[<package_name>:]<resource_type>/<resource_name>

data/lib/twine/formatters/apple.rb

@@ -22,7 +22,9 @@ module Twine
         path_arr.each do |segment|
           match = /^(.+)\.lproj$/.match(segment)
           if match
-            if match[1] != "Base"
+            if match[1] == "Base"
+              return @options[:developer_language]
+            else
               return match[1]
             end
           end

data/lib/twine/formatters/django.rb

@@ -16,7 +16,7 @@ module Twine
       def determine_language_given_path(path)
         path_arr = path.split(File::SEPARATOR)
         path_arr.each do |segment|
-          match = /(..)\.po$/.match(segment)
+          match = /([a-z]{2}(-[A-Za-z]{2})?)\.po$/.match(segment)
           return match[1] if match
         end
         

data/lib/twine/formatters/gettext.rb

@@ -18,10 +18,8 @@ module Twine
       def determine_language_given_path(path)
         path_arr = path.split(File::SEPARATOR)
         path_arr.each do |segment|
-          match = /(..)\.po$/.match(segment)
-          if match
-            return match[1]
-          end
+          match = /([a-z]{2}(-[A-Za-z]{2})?)\.po$/.match(segment)
+          return match[1] if match
         end
 
         return

data/lib/twine/placeholders.rb

@@ -3,7 +3,7 @@ module Twine
     extend self
 
     # Note: the ` ` (single space) flag is NOT supported
-    PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH = '([-+0#])?(\d+|\*)?(\.(\d+|\*))?(hh?|ll?|L|z|j|t)?'
+    PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH = '([-+0#])?(\d+|\*)?(\.(\d+|\*))?(hh?|ll?|L|z|j|t|q)?'
     PLACEHOLDER_PARAMETER_FLAGS_WIDTH_PRECISION_LENGTH = '(\d+\$)?' + PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH
     PLACEHOLDER_TYPES = '[diufFeEgGxXoscpaA]'
 

data/lib/twine/runner.rb

@@ -7,6 +7,8 @@ module Twine
   class Runner
     def self.run(args)
       options = CLI.parse(args)
+
+      return unless options
       
       twine_file = TwineFile.new
       twine_file.read options[:twine_file]
@@ -282,8 +284,13 @@ module Twine
     end
 
     def find_formatter(&block)
-      formatter = Formatters.formatters.find &block
-      return nil unless formatter
+      formatters = Formatters.formatters.select &block
+      if formatters.empty?
+        return nil
+      elsif formatters.size > 1
+        raise Twine::Error.new("Unable to determine format. Candidates are: #{formatters.map(&:format_name).join(', ')}. Please specify the format you want using '--format'")
+      end
+      formatter = formatters.first
       formatter.twine_file = @twine_file
       formatter.options = @options
       formatter

data/lib/twine/version.rb

@@ -1,3 +1,3 @@
 module Twine
-  VERSION = '0.10.1'
+  VERSION = '1.0'
 end

data/test/command_test.rb

@@ -1,13 +1,13 @@
 require 'twine_test'
 
 class CommandTest < TwineTest
-  def prepare_mock_formatter(formatter_class)
+  def prepare_mock_formatter(formatter_class, clear_other_formatters = true)
     twine_file = Twine::TwineFile.new
     twine_file.language_codes.concat KNOWN_LANGUAGES
 
     formatter = formatter_class.new
     formatter.twine_file = twine_file
-    Twine::Formatters.formatters.clear
+    Twine::Formatters.formatters.clear if clear_other_formatters
     Twine::Formatters.formatters << formatter
     formatter
   end

data/test/test_cli.rb

@@ -17,14 +17,24 @@ class CLITest < TwineTest
     raise "you need to implement `parse_with` in your test class"
   end
 
+  def assert_help
+    parse_with '--help'
+    assert_equal @options, false
+    assert_match /Usage: twine.*Examples:/m, Twine::stdout.string
+  end
+
   def assert_option_consume_all
     parse_with '--consume-all'
     assert @options[:consume_all]
+    parse_with '--no-consume-all'
+    refute @options[:consume_all]
   end
 
   def assert_option_consume_comments
     parse_with '--consume-comments'
     assert @options[:consume_comments]
+    parse_with '--no-consume-comments'
+    refute @options[:consume_comments]
   end
 
   def assert_option_developer_language
@@ -99,11 +109,35 @@ class CLITest < TwineTest
   def assert_option_untagged
     parse_with '--untagged'
     assert @options[:untagged]
+    parse_with '--no-untagged'
+    refute @options[:untagged]
   end
 
   def assert_option_validate
     parse_with "--validate"
     assert @options[:validate]
+    parse_with "--no-validate"
+    refute @options[:validate]
+  end
+end
+
+class TestCLI < CLITest
+  def test_version
+    parse "--version"
+
+    assert_equal @options, false
+    assert_equal "Twine version #{Twine::VERSION}\n", Twine::stdout.string
+  end
+
+  def test_help
+    parse ""
+    assert_match 'Usage: twine', Twine::stdout.string
+  end
+
+  def test_invalid_command
+    assert_raises Twine::Error do
+      parse "not a command"
+    end
   end
 end
 
@@ -133,6 +167,7 @@ class TestGenerateLocalizationFileCLI < CLITest
   end
 
   def test_options
+    assert_help
     assert_option_developer_language
     assert_option_encoding
     assert_option_format
@@ -171,6 +206,7 @@ class TestGenerateAllLocalizationFilesCLI < CLITest
   end
 
   def test_options
+    assert_help
     assert_option_developer_language
     assert_option_encoding
     assert_option_format
@@ -183,6 +219,8 @@ class TestGenerateAllLocalizationFilesCLI < CLITest
   def test_option_create_folders
     parse_with '--create-folders'
     assert @options[:create_folders]
+    parse_with '--no-create-folders'
+    refute @options[:create_folders]
   end
 
   def test_option_file_name
@@ -218,6 +256,7 @@ class TestGenerateLocalizationArchiveCLI < CLITest
   end
 
   def test_options
+    assert_help
     assert_option_developer_language
     assert_option_encoding
     assert_option_include
@@ -269,6 +308,7 @@ class TestConsumeLocalizationFileCLI < CLITest
   end
 
   def test_options
+    assert_help
     assert_option_consume_all
     assert_option_consume_comments
     assert_option_developer_language
@@ -307,6 +347,7 @@ class TestConsumeAllLocalizationFilesCLI < CLITest
   end
 
   def test_options
+    assert_help
     assert_option_consume_all
     assert_option_consume_comments
     assert_option_developer_language
@@ -343,6 +384,7 @@ class TestConsumeLocalizationArchiveCLI < CLITest
   end
 
   def test_options
+    assert_help
     assert_option_consume_all
     assert_option_consume_comments
     assert_option_developer_language
@@ -388,11 +430,14 @@ class TestValidateTwineFileCLI < CLITest
   end
 
   def test_options
+    assert_help
     assert_option_developer_language
   end
 
   def test_option_pedantic
     parse "validate-twine-file #{@twine_file_path} --pedantic"
     assert @options[:pedantic]
+    parse "validate-twine-file #{@twine_file_path} --no-pedantic"
+    refute @options[:pedantic]
   end
 end

data/test/test_formatters.rb

@@ -39,14 +39,33 @@ end
 class TestAndroidFormatter < FormatterTest
   def setup
     super Twine::Formatters::Android
-    
+
     @escape_test_values = {
       'this & that'               => 'this &amp; that',
       'this < that'               => 'this &lt; that',
       "it's complicated"          => "it\\'s complicated",
       'a "good" way'              => 'a \"good\" way',
-      '<b>bold</b>'               => '&lt;b>bold&lt;/b>',
-      '<a href="target">link</a>' => '&lt;a href=\"target\">link&lt;/a>',
+
+      '<b>bold</b>'               => '<b>bold</b>',
+      '<i>italic</i>'             => '<i>italic</i>',
+      '<u>underline</u>'          => '<u>underline</u>',
+
+      '<span>inline</span>'       => '&lt;span>inline&lt;/span>',
+      '<p>paragraph</p>'          => '&lt;p>paragraph&lt;/p>',
+
+      '<a href="target">link</a>'     => '<a href="target">link</a>',
+      '<a href="target">"link"</a>'   => '<a href="target">\"link\"</a>',
+      '<a href="target"></a>"out"'    => '<a href="target"></a>\"out\"',
+      '<a href="http://url.com?param=1&param2=3&param3=%20">link</a>'   =>   '<a href="http://url.com?param=1&param2=3&param3=%20">link</a>',
+
+      '<p>escaped</p><![CDATA[]]>'    => '&lt;p>escaped&lt;/p><![CDATA[]]>',
+      '<![CDATA[]]><p>escaped</p>'    => '<![CDATA[]]>&lt;p>escaped&lt;/p>',
+      '<![CDATA[<p>unescaped</p>]]>'  => '<![CDATA[<p>unescaped</p>]]>',
+      '<![CDATA[]]><![CDATA[<p>unescaped</p>]]>'  => '<![CDATA[]]><![CDATA[<p>unescaped</p>]]>',
+
+      '<![CDATA[&]]>'  => '<![CDATA[&]]>',
+      '<![CDATA[\']]>' => '<![CDATA[\']]>',
+      '<![CDATA["]]>'  => '<![CDATA["]]>',
 
       '<xliff:g></xliff:g>' => '<xliff:g></xliff:g>',
       '<xliff:g>untouched</xliff:g>' => '<xliff:g>untouched</xliff:g>',
@@ -157,6 +176,10 @@ class TestAndroidFormatter < FormatterTest
   def test_output_path_is_prefixed
     assert_equal 'values-en', @formatter.output_path_for_language('en')
   end
+
+  def test_output_path_with_region
+    assert_equal 'values-en-rGB', @formatter.output_path_for_language('en-GB')
+  end
 end
 
 class TestAppleFormatter < FormatterTest
@@ -170,6 +193,16 @@ class TestAppleFormatter < FormatterTest
     assert_file_contents_read_correctly
   end
 
+  def test_deducts_language_from_resource_folder
+    language = %w(en de fr).sample
+    assert_equal language, @formatter.determine_language_given_path("#{language}.lproj/Localizable.strings")
+  end
+
+  def test_deducts_base_language_from_resource_folder
+    @formatter.options = { consume_all: true, consume_comments: true, developer_language: 'en' }
+    assert_equal 'en', @formatter.determine_language_given_path('Base.lproj/Localizations.strings')
+  end
+
   def test_reads_quoted_keys
     @formatter.read StringIO.new('"key" = "value"'), 'en'
     assert_equal 'value', @empty_twine_file.definitions_by_key['key'].translations['en']
@@ -267,7 +300,6 @@ class TestJQueryFormatter < FormatterTest
 end
 
 class TestGettextFormatter < FormatterTest
-
   def setup
     super Twine::Formatters::Gettext
   end
@@ -290,6 +322,10 @@ class TestGettextFormatter < FormatterTest
     assert_equal content('formatter_gettext.po'), formatter.format_file('en')
   end
 
+  def test_deducts_language_and_region
+    language = "en-GB"
+    assert_equal language, @formatter.determine_language_given_path("#{language}.po")
+  end
 end
 
 class TestTizenFormatter < FormatterTest
@@ -329,6 +365,11 @@ class TestDjangoFormatter < FormatterTest
     formatter.twine_file = @twine_file
     assert_equal content('formatter_django.po'), formatter.format_file('en')
   end
+
+  def test_deducts_language_and_region
+    language = "en-GB"
+    assert_equal language, @formatter.determine_language_given_path("#{language}.po")
+  end
 end
 
 class TestFlashFormatter < FormatterTest

data/test/test_generate_localization_file.rb

@@ -41,6 +41,24 @@ class TestGenerateLocalizationFile < CommandTest
     new_runner('fr', 'fr.po').generate_localization_file
   end
 
+  def test_deducts_django_format_from_output_path
+    prepare_mock_format_file_formatter Twine::Formatters::Django
+
+    new_runner('fr', 'fr.po').generate_localization_file
+  end
+
+  def test_returns_error_for_ambiguous_output_path
+    # both Gettext and Django use .po
+    gettext_formatter = prepare_mock_formatter(Twine::Formatters::Gettext)
+    gettext_formatter.stubs(:format_file).returns(true)
+    django_formatter = prepare_mock_formatter(Twine::Formatters::Django, false)
+    django_formatter.stubs(:format_file).returns(true)
+
+    assert_raises Twine::Error do
+      new_runner('fr', 'fr.po').generate_localization_file
+    end
+  end
+
   def test_deducts_language_from_output_path
     random_language = KNOWN_LANGUAGES.sample
     formatter = prepare_mock_formatter Twine::Formatters::Android

data/test/twine_test.rb

@@ -30,7 +30,7 @@ class TwineTest < Minitest::Test
   end
 
   def execute(command)
-    command += "  -o #{@output_path}"
+    command += " -o #{@output_path}"
     Twine::Runner.run(command.split(" "))
   end
 

metadata

@@ -1,83 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: twine
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: '1.0'
 platform: ruby
 authors:
 - Sebastian Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-10-16 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.4'
 - !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
@@ -91,13 +105,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- LICENSE
 - README.md
-- bin/twine
-- lib/twine.rb
+- LICENSE
 - 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
@@ -106,12 +117,15 @@ files:
 - lib/twine/formatters/gettext.rb
 - lib/twine/formatters/jquery.rb
 - lib/twine/formatters/tizen.rb
+- lib/twine/formatters.rb
 - lib/twine/output_processor.rb
 - lib/twine/placeholders.rb
 - lib/twine/plugin.rb
 - lib/twine/runner.rb
 - lib/twine/twine_file.rb
 - lib/twine/version.rb
+- lib/twine.rb
+- bin/twine
 - test/command_test.rb
 - test/fixtures/consume_localization_archive.zip
 - test/fixtures/enc_utf16be.dummy
@@ -153,17 +167,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Manage strings and their translations for your iOS, Android and other projects.