twine 0.1.1 → 0.1.2

data/README.md

@@ -70,7 +70,7 @@ Whitepace in this file is mostly ignored. If you absolutely need to put spaces a
 
 ## Usage
 
-	Usage: twine COMMAND STRINGS_FILE [INPUT_OR_OUTPUT_PATH] [--lang LANG1,LANG2...] [--tag TAG1,TAG2,TAG3...] [--format FORMAT]
+	Usage: twine COMMAND STRINGS_FILE [INPUT_OR_OUTPUT_PATH] [--lang LANG1,LANG2...] [--tags TAG1,TAG2,TAG3...] [--format FORMAT]
 	
 ### Commands
 
@@ -78,15 +78,15 @@ Whitepace in this file is mostly ignored. If you absolutely need to put spaces a
 
 This command creates an Apple or Android strings file from the master strings data file.
 
-	$ twine generate-string-file /path/to/strings.txt values-ja.xml --tag common,app1
-	$ twine generate-string-file /path/to/strings.txt Localizable.strings --lang ja --tag mytag
+	$ twine generate-string-file /path/to/strings.txt values-ja.xml --tags common,app1
+	$ twine generate-string-file /path/to/strings.txt Localizable.strings --lang ja --tags mytag
 	$ twine generate-string-file /path/to/strings.txt all-english.strings --lang en
 
 #### `generate-all-string-files`
 
 This command is a convenient way to call `generate-string-file` multiple times. It uses standard Mac OS X, iOS, and Android conventions to figure out exactly which files to create given a parent directory. For example, if you point it to a parent directory containing `en.lproj`, `fr.lproj`, and `ja.lproj` subdirectories, Twine will create a `Localizable.strings` file of the appropriate language in each of them. This is often the command you will want to execute during the build phase of your project.
 
-	$ twine generate-all-string-files /path/to/strings.txt /path/to/project/locales/directory --tag common,app1
+	$ twine generate-all-string-files /path/to/strings.txt /path/to/project/locales/directory --tags common,app1
 
 #### `consume-string-file`
 
@@ -101,7 +101,7 @@ This command slurps all of the strings from a `.strings` or `.xml` file and inco
 This command is a convenient way to generate a zip file containing files created by the `generate-string-file` command. It is often used for creating a single zip containing a large number of strings in all languages which you can then hand off to your translation team.
 
 	$ twine generate-loc-drop /path/to/strings.txt LocDrop1.zip
-	$ twine generate-loc-drop /path/to/strings.txt LocDrop2.zip --lang en,fr,ja,ko --tag common,app1
+	$ twine generate-loc-drop /path/to/strings.txt LocDrop2.zip --lang en,fr,ja,ko --tags common,app1
 
 #### `consume-loc-drop`
 

data/bin/twine

@@ -1,3 +1,8 @@
 #!/usr/bin/env ruby
 require 'twine'
-Twine::Runner.run(ARGV)
+begin
+  Twine::Runner.run(ARGV)
+rescue Twine::Error => e
+  STDERR.puts e.message
+  abort
+end

data/lib/twine/cli.rb

@@ -12,8 +12,8 @@ module Twine
     end
 
     def parse_args
-      parser = OptionParser.new(@args) do |opts|
-        opts.banner = 'Usage: twine COMMAND STRINGS_FILE [INPUT_OR_OUTPUT_PATH] [--lang LANG1,LANG2...] [--tag TAG1,TAG2,TAG3...] [--format FORMAT]'
+      parser = OptionParser.new do |opts|
+        opts.banner = 'Usage: twine COMMAND STRINGS_FILE [INPUT_OR_OUTPUT_PATH] [--lang LANG1,LANG2...] [--tags TAG1,TAG2,TAG3...] [--format FORMAT]'
         opts.separator ''
         opts.separator 'The purpose of this script is to convert back and forth between multiple data formats, allowing us to treat our strings (and translations) as data stored in a text file. We can then use the data file to create drops for the localization team, consume similar drops returned by the localization team, generate reports on the strings, as well as create iOS and Android string files to ship with our products.'
         opts.separator ''
@@ -36,7 +36,7 @@ module Twine
         opts.on('-l', '--lang LANGUAGES', Array, 'The language code(s) to use for the specified action.') do |langs|
           @options[:languages] = langs
         end
-        opts.on('-t', '--tag TAGS', Array, 'The tag(s) to use for the specified action. Only strings with that tag will be processed.') do |tags|
+        opts.on('-t', '--tags TAGS', Array, 'The tag(s) to use for the specified action. Only strings with that tag will be processed.') do |tags|
           @options[:tags] = tags
         end
         opts.on('-f', '--format FORMAT', 'The file format to read or write (iOS, Android). Additional formatters can be placed in the formats/ directory.') do |format|
@@ -49,10 +49,16 @@ module Twine
             end
           end
           if !found_format
-            puts "Invalid format: #{format}"
+            STDERR.puts "Invalid format: #{format}"
           end
           @options[:format] = lformat
         end
+        opts.on('-a', '--all', 'Normally, when consuming a string file, Twine will ignore any string keys that do not exist in your master file. This flag will force those missing strings to be added to your master file.') do |a|
+          @options[:consume_all] = true
+        end
+        opts.on('-o', '--output-file OUTPUT_FILE', 'Write the new strings database to this file instead of replacing the original file. This flag is only useful when running the consume-string-file or consume-loc-drop commands.') do |o|
+          @options[:output_path] = o
+        end
         opts.on('-h', '--help', 'Show this message.') do |h|
           puts opts.help
           exit
@@ -64,14 +70,14 @@ module Twine
         opts.separator ''
         opts.separator 'Examples:'
         opts.separator ''
-        opts.separator '> twine generate-string-file strings.txt ko.xml --tag FT'
-        opts.separator '> twine generate-all-string-files strings.txt Resources/Locales/ --tag FT,FB'
+        opts.separator '> twine generate-string-file strings.txt ko.xml --tags FT'
+        opts.separator '> twine generate-all-string-files strings.txt Resources/Locales/ --tags FT,FB'
         opts.separator '> twine consume-string-file strings.txt ja.strings'
-        opts.separator '> twine generate-loc-drop strings.txt LocDrop5.zip --tag FT,FB --format android --lang de,en,en-GB,ja,ko'
+        opts.separator '> twine generate-loc-drop strings.txt LocDrop5.zip --tags FT,FB --format android --lang de,en,en-GB,ja,ko'
         opts.separator '> twine consume-loc-drop strings.txt LocDrop5.zip'
         opts.separator '> twine generate-report strings.txt'
       end
-      parser.parse!
+      parser.parse! @args
 
       if @args.length == 0
         puts parser.help
@@ -81,13 +87,11 @@ module Twine
       @options[:command] = @args[0]
 
       if !VALID_COMMANDS.include? @options[:command]
-        puts "Invalid command: #{@options[:command]}"
-        exit
+        raise Twine::Error.new "Invalid command: #{@options[:command]}"
       end
 
       if @args.length == 1
-        puts 'You must specify your strings file.'
-        exit
+        raise Twine::Error.new 'You must specify your strings file.'
       end
 
       @options[:strings_file] = @args[1]
@@ -97,68 +101,54 @@ module Twine
         if @args.length == 3
           @options[:output_path] = @args[2]
         elsif @args.length > 3
-          puts "Unknown argument: #{@args[3]}"
-          exit
+          raise Twine::Error.new "Unknown argument: #{@args[3]}"
         else
-          puts 'Not enough arguments.'
-          exit
+          raise Twine::Error.new 'Not enough arguments.'
         end
         if @options[:languages] and @options[:languages].length > 1
-          puts 'Please only specify a single language for the generate-string-file command.'
-          exit
+          raise Twine::Error.new 'Please only specify a single language for the generate-string-file command.'
         end
       when 'generate-all-string-files'
         if ARGV.length == 3
           @options[:output_path] = @args[2]
         elsif @args.length > 3
-          puts "Unknown argument: #{@args[3]}"
-          exit
+          raise Twine::Error.new "Unknown argument: #{@args[3]}"
         else
-          puts 'Not enough arguments.'
-          exit
+          raise Twine::Error.new 'Not enough arguments.'
         end
       when 'consume-string-file'
         if @args.length == 3
           @options[:input_path] = @args[2]
         elsif @args.length > 3
-          puts "Unknown argument: #{@args[3]}"
-          exit
+          raise Twine::Error.new "Unknown argument: #{@args[3]}"
         else
-          puts 'Not enough arguments.'
-          exit
+          raise Twine::Error.new 'Not enough arguments.'
         end
         if @options[:languages] and @options[:languages].length > 1
-          puts 'Please only specify a single language for the consume-string-file command.'
-          exit
+          raise Twine::Error.new 'Please only specify a single language for the consume-string-file command.'
         end
       when 'generate-loc-drop'
         if @args.length == 3
           @options[:output_path] = @args[2]
         elsif @args.length > 3
-          puts "Unknown argument: #{@args[3]}"
-          exit
+          raise Twine::Error.new "Unknown argument: #{@args[3]}"
         else
-          puts 'Not enough arguments.'
-          exit
+          raise Twine::Error.new 'Not enough arguments.'
         end
         if !@options[:format]
-          puts 'You must specify a format.'
-          exit
+          raise Twine::Error.new 'You must specify a format.'
         end
       when 'consume-loc-drop'
         if @args.length == 3
           @options[:input_path] = @args[2]
         elsif @args.length > 3
-          puts "Unknown argument: #{@args[3]}"
-          exit
+          raise Twine::Error.new "Unknown argument: #{@args[3]}"
         else
-          puts 'Not enough arguments.'
-          exit
+          raise Twine::Error.new 'Not enough arguments.'
         end
       when 'generate-report'
         if @args.length > 2
-          puts "Unknown argument: #{@args[2]}"
-          exit
+          raise Twine::Error.new "Unknown argument: #{@args[2]}"
         end
       end
     end

data/lib/twine/formatters/abstract.rb

@@ -1,10 +1,41 @@
 module Twine
   module Formatters
     class Abstract
+      attr_accessor :strings
+      attr_accessor :options
+
       def self.can_handle_directory?(path)
         return false
       end
 
+      def initialize(strings, options)
+        @strings = strings
+        @options = options
+      end
+
+      def set_translation_for_key(key, lang, value)
+        if @strings.strings_map.include?(key)
+          @strings.strings_map[key].translations[lang] = value
+        elsif @options[:consume_all]
+          STDERR.puts "Adding new string '#{key}' to strings data file."
+          arr = @strings.sections.select { |s| s.name == 'Uncategorized' }
+          current_section = arr ? arr[0] : nil
+          if !current_section
+            current_section = StringsSection.new('Uncategorized')
+            @strings.sections.insert(0, current_section)
+          end
+          current_row = StringsRow.new(key)
+          current_section.rows << current_row
+          @strings.strings_map[key] = current_row
+          @strings.strings_map[key].translations[lang] = value
+        else
+          STDERR.puts "Warning: '#{key}' not found in strings data file."
+        end
+        if !@strings.language_codes.include?(lang)
+          @strings.add_language_code(lang)
+        end
+      end
+
       def default_file_name
         raise NotImplementedError.new("You must implement default_file_name in your formatter class.")
       end
@@ -13,15 +44,15 @@ module Twine
         raise NotImplementedError.new("You must implement determine_language_given_path in your formatter class.")
       end
 
-      def read_file(path, lang, strings)
+      def read_file(path, lang)
         raise NotImplementedError.new("You must implement read_file in your formatter class.")
       end
 
-      def write_file(path, lang, tags, strings)
+      def write_file(path, lang)
         raise NotImplementedError.new("You must implement write_file in your formatter class.")
       end
 
-      def write_all_files(path, tags, strings)
+      def write_all_files(path)
         if !File.directory?(path)
           raise Twine::Error.new("Directory does not exist: #{path}")
         end
@@ -29,29 +60,9 @@ module Twine
         Dir.foreach(path) do |item|
           lang = determine_language_given_path(item)
           if lang
-            write_file(File.join(path, item, default_file_name), lang, tags, strings)
-          end
-        end
-      end
-
-      def row_matches_tags?(row, tags)
-        if tags == nil || tags.length == 0
-          return true
-        end
-
-        if tags != nil && row.tags != nil
-          tags.each do |tag|
-            if row.tags.include? tag
-              return true
-            end
+            write_file(File.join(path, item, default_file_name), lang)
           end
         end
-
-        return false
-      end
-
-      def translated_string_for_row_and_lang(row, lang, default_lang)
-        row.translations[lang] || row.translations[default_lang]
       end
     end
   end

data/lib/twine/formatters/android.rb

@@ -21,7 +21,7 @@ module Twine
       def determine_language_given_path(path)
         path_arr = path.split(File::SEPARATOR)
         path_arr.each do |segment|
-          match = /^values-(.*)$/.match(path_arr)
+          match = /^values-(.*)$/.match(segment)
           if match
             lang = match[1]
             lang.sub!('-r', '-')
@@ -32,33 +32,31 @@ module Twine
         return
       end
 
-      def read_file(path, lang, strings)
+      def read_file(path, lang)
         File.open(path, 'r:UTF-8') do |f|
+          current_section = nil
           doc = REXML::Document.new(f)
           doc.elements.each('resources/string') do |ele|
             key = ele.attributes["name"]
-            if strings.strings_map.include? key
-              value = ele.text
-              value.gsub!('\\\'', '\'')
-              value.gsub!('%s', '%@')
-              strings.strings_map[key].translations[lang] = value
-            else
-              puts "#{key} not found in strings data file."
-            end
+            value = ele.text || ''
+            value.gsub!('\\\'', '\'')
+            value.gsub!(/\n/, '')
+            value.gsub!('%s', '%@')
+            set_translation_for_key(key, lang, value)
           end
         end
       end
 
-      def write_file(path, lang, tags, strings)
-        default_lang = strings.language_codes[0]
+      def write_file(path, lang)
+        default_lang = @strings.language_codes[0]
         File.open(path, 'w:UTF-8') do |f|
           f.puts "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<!-- Android Strings File -->\n<!-- Generated by Twine -->\n<!-- Language: #{lang} -->"
           f.write '<resources>'
-          strings.sections.each do |section|
+          @strings.sections.each do |section|
             printed_section = false
             section.rows.each do |row|
-              if row_matches_tags?(row, tags)
-                unless printed_section
+              if row.matches_tags?(options[:tags])
+                if !printed_section
                   f.puts ''
                   if section.name && section.name.length > 0
                     section_name = section.name.gsub('--', '—')
@@ -70,7 +68,7 @@ module Twine
                 key = row.key
                 key = CGI.escapeHTML(key)
 
-                value = translated_string_for_row_and_lang(row, lang, default_lang)
+                value = row.translated_string_for_lang(lang, default_lang)
                 value.gsub!('\'', '\\\\\'')
                 value.gsub!('%@', '%s')
                 value = CGI.escapeHTML(value)

data/lib/twine/formatters/apple.rb

@@ -25,34 +25,30 @@ module Twine
         return
       end
 
-      def read_file(path, lang, strings)
+      def read_file(path, lang)
         File.open(path, 'r:UTF-8') do |f|
           while line = f.gets
-            match = /"((?:[^"\\]|\\.)+)"\s*=\s*"((?:[^"\\]|\\.)*)/.match(line)
+            match = /"((?:[^"\\]|\\.)+)"\s*=\s*"((?:[^"\\]|\\.)*)"/.match(line)
             if match
               key = match[1]
               key.gsub!('\\"', '"')
-              if strings.strings_map.include? key
-                value = match[2]
-                value.gsub!('\\"', '"')
-                strings.strings_map[key].translations[lang] = value
-              else
-                puts "#{key} not found in strings data file."
-              end
+              value = match[2]
+              value.gsub!('\\"', '"')
+              set_translation_for_key(key, lang, value)
             end
           end
         end
       end
 
-      def write_file(path, lang, tags, strings)
-        default_lang = strings.language_codes[0]
+      def write_file(path, lang)
+        default_lang = @strings.language_codes[0]
         File.open(path, 'w:UTF-8') do |f|
           f.puts "/**\n * iOS Strings File\n * Generated by Twine\n * Language: #{lang}\n */"
-          strings.sections.each do |section|
+          @strings.sections.each do |section|
             printed_section = false
             section.rows.each do |row|
-              if row_matches_tags?(row, tags)
-                unless printed_section
+              if row.matches_tags?(options[:tags])
+                if !printed_section
                   f.puts ''
                   if section.name && section.name.length > 0
                     f.puts "/* #{section.name} */"
@@ -63,7 +59,7 @@ module Twine
                 key = row.key
                 key = key.gsub('"', '\\\\"')
 
-                value = translated_string_for_row_and_lang(row, lang, default_lang)
+                value = row.translated_string_for_lang(lang, default_lang)
                 value = value.gsub('"', '\\\\"')
 
                 comment = row.comment

data/lib/twine/runner.rb

@@ -16,13 +16,8 @@ module Twine
     def run
       # Parse all CLI arguments.
       CLI::parse_args(@args, @options)
-
-      begin
-        read_strings_data
-        execute_command
-      rescue Twine::Error => e
-        puts e.message
-      end
+      read_strings_data
+      execute_command
     end
 
     def read_strings_data
@@ -53,7 +48,7 @@ module Twine
         lang = @options[:languages][0]
       end
 
-      read_write_string_file(@options[:output_path], false, lang, @options[:format], @options[:tags])
+      read_write_string_file(@options[:output_path], false, lang)
     end
 
     def generate_all_string_files
@@ -71,7 +66,7 @@ module Twine
 
       formatter = formatter_for_format(format)
 
-      formatter.write_all_files(@options[:output_path], @options[:tags], @strings)
+      formatter.write_all_files(@options[:output_path])
     end
 
     def consume_string_file
@@ -80,15 +75,17 @@ module Twine
         lang = @options[:languages][0]
       end
 
-      read_write_string_file(@options[:input_path], true, lang, @options[:format], nil)
-      @strings.write(@options[:strings_file])
+      read_write_string_file(@options[:input_path], true, lang)
+      output_path = @options[:output_path] || @options[:strings_file]
+      @strings.write(output_path)
     end
 
-    def read_write_string_file(path, is_read, lang, format, tags)
+    def read_write_string_file(path, is_read, lang)
       if is_read && !File.file?(path)
         raise Twine::Error.new("File does not exist: #{path}")
       end
 
+      format = @options[:format]
       if !format
         format = determine_format_given_path(path)
       end
@@ -108,10 +105,14 @@ module Twine
         raise Twine::Error.new "Unable to determine language for #{path}"
       end
 
+      if !@strings.language_codes.include? lang
+        @strings.language_codes << lang
+      end
+
       if is_read
-        formatter.read_file(path, lang, @strings)
+        formatter.read_file(path, lang)
       else
-        formatter.write_file(path, lang, tags, @strings)
+        formatter.write_file(path, lang)
       end
     end
 
@@ -162,13 +163,14 @@ module Twine
               real_path = File.join(dir, entry.name)
               FileUtils.mkdir_p(File.dirname(real_path))
               zipfile.extract(entry.name, real_path)
-              read_write_string_file(real_path, true, nil, nil, @options[:tags])
+              read_write_string_file(real_path, true, nil)
             end
           end
         end
       end
-      
-      @strings.write @options[:strings_file]
+
+      output_path = @options[:output_path] || @options[:strings_file]
+      @strings.write(output_path)
     end
 
     def generate_report
@@ -255,7 +257,7 @@ module Twine
     def formatter_for_format(format)
       Formatters::FORMATTERS.each do |formatter|
         if formatter::FORMAT_NAME == format
-          return formatter.new
+          return formatter.new(@strings, @options)
         end
       end
 

data/lib/twine/stringsfile.rb

@@ -21,6 +21,28 @@ module Twine
       @tags = nil
       @translations = {}
     end
+    
+    def matches_tags?(tags)
+      if @tags == nil || @tags.length == 0
+        # This row has no tags. Never match
+        return false
+      elsif tags == nil || tags.length == 0
+        # The user did not specify any tags. Everything passes.
+        return true
+      else
+        tags.each do |tag|
+          if @tags.include? tag
+            return true
+          end
+        end
+      end
+
+      return false
+    end
+    
+    def translated_string_for_lang(lang, default_lang=nil)
+      @translations[lang] || @translations[default_lang]
+    end
   end
 
   class StringsFile
@@ -87,7 +109,7 @@ module Twine
                 current_row.tags = value.split(',')
               else
                 if !@language_codes.include? key
-                  @language_codes << key
+                  add_language_code(key)
                 end
                 current_row.translations[key] = value
               end
@@ -99,12 +121,6 @@ module Twine
             raise Twine::Error.new("Unable to parse line #{line_num} of #{path}: #{line}")
           end
         end
-
-        # Developer Language
-        dev_lang = @language_codes[0]
-        @language_codes.delete(dev_lang)
-        @language_codes.sort!
-        @language_codes.insert(0, dev_lang)
       end
     end
 
@@ -120,13 +136,17 @@ module Twine
           f.puts "[[#{section.name}]]"
 
           section.rows.each do |row|
+            f.puts "\t[#{row.key}]"
             value = row.translations[dev_lang]
-            if value[0,1] == ' ' || value[-1,1] == ' ' || (value[0,1] == '`' && value[-1,1] == '`')
-              value = '`' + value + '`'
+            if !value
+              puts "Warning: #{row.key} does not exist in developer language '#{dev_lang}'"
+            else
+              if value[0,1] == ' ' || value[-1,1] == ' ' || (value[0,1] == '`' && value[-1,1] == '`')
+                value = '`' + value + '`'
+              end
+              f.puts "\t\t#{dev_lang} = #{value}"
             end
 
-            f.puts "\t[#{row.key}]"
-            f.puts "\t\t#{dev_lang} = #{value}"
             if row.tags && row.tags.length > 0
               tag_str = row.tags.join(',')
               f.puts "\t\ttags = #{tag_str}"
@@ -147,5 +167,17 @@ module Twine
         end
       end
     end
+
+    def add_language_code(code)
+      if @language_codes.length == 0
+        @language_codes << code
+      elsif !@language_codes.include?(code)
+        dev_lang = @language_codes[0]
+        @language_codes << code
+        @language_codes.delete(dev_lang)
+        @language_codes.sort!
+        @language_codes.insert(0, dev_lang)
+      end
+    end
   end
 end

data/lib/twine/version.rb

@@ -1,3 +1,3 @@
 module Twine
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/fixtures/en-1.strings

@@ -0,0 +1,10 @@
+/**
+ * iOS Strings File
+ * Generated by Twine
+ * Language: en
+ */
+
+/* My Strings */
+"key1" = "key1-english";
+"key3" = "key3-english";
+"key5" = "A new string";

data/test/fixtures/fr-1.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Android Strings File -->
+<!-- Generated by Twine -->
+<!-- Language: fr -->
+<resources>
+	<string name="key1">key1-french</string>
+	<string name="key2">key2-french</string>
+	<string name="key3">key3-french</string>
+</resources>

data/test/fixtures/strings-1.txt

@@ -0,0 +1,16 @@
+[[My Strings]]
+	[key1]
+		en = key1-english
+		tags = tag1
+		es = key1-spanish
+		fr = key1-french
+	[key2]
+		en = key2-english
+		tags = tag2
+		fr = key2-french
+	[key3]
+		en = key3-english
+		tags = tag1,tag2
+		es = key3-spanish
+	[key4]
+		en = key4-english

data/test/fixtures/test-output-1.txt

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Android Strings File -->
+<!-- Generated by Twine -->
+<!-- Language: fr -->
+<resources>
+	<!-- My Strings -->
+	<string name="key1">key1-french</string>
+	<string name="key2">key2-french</string>
+	<string name="key3">key3-english</string>
+</resources>

data/test/fixtures/test-output-2.txt

@@ -0,0 +1,9 @@
+/**
+ * iOS Strings File
+ * Generated by Twine
+ * Language: en
+ */
+
+/* My Strings */
+"key1" = "key1-english";
+"key3" = "key3-english";

data/test/fixtures/test-output-3.txt

@@ -0,0 +1,17 @@
+[[My Strings]]
+	[key1]
+		en = key1-english
+		tags = tag1
+		es = key1-spanish
+		fr = key1-french
+	[key2]
+		en = key2-english
+		tags = tag2
+		fr = key2-french
+	[key3]
+		en = key3-english
+		tags = tag1,tag2
+		es = key3-spanish
+		fr = key3-french
+	[key4]
+		en = key4-english

data/test/fixtures/test-output-4.txt

@@ -0,0 +1,20 @@
+[[Uncategorized]]
+	[key5]
+		en = A new string
+
+[[My Strings]]
+	[key1]
+		en = key1-english
+		tags = tag1
+		es = key1-spanish
+		fr = key1-french
+	[key2]
+		en = key2-english
+		tags = tag2
+		fr = key2-french
+	[key3]
+		en = key3-english
+		tags = tag1,tag2
+		es = key3-spanish
+	[key4]
+		en = key4-english

data/test/twine_test.rb

@@ -0,0 +1,40 @@
+require 'test/unit'
+require 'twine'
+
+class TwineTest < Test::Unit::TestCase
+  def test_generate_string_file_1
+    Dir.mktmpdir do |dir|
+      output_path = File.join(dir, 'fr.xml')
+      Twine::Runner.run(%W(generate-string-file test/fixtures/strings-1.txt #{output_path}))
+      assert_equal(File.read('test/fixtures/test-output-1.txt'), File.read(output_path))
+    end
+  end
+
+  def test_generate_string_file_2
+    Dir.mktmpdir do |dir|
+      output_path = File.join(dir, 'en.strings')
+      Twine::Runner.run(%W(generate-string-file test/fixtures/strings-1.txt #{output_path} -t tag1))
+      assert_equal(File.read('test/fixtures/test-output-2.txt'), File.read(output_path))
+    end
+  end
+
+  def test_consume_string_file_1
+    Dir.mktmpdir do |dir|
+      output_path = File.join(dir, 'strings.txt')
+      Twine::Runner.run(%W(consume-string-file test/fixtures/strings-1.txt test/fixtures/fr-1.xml -o #{output_path} -l fr))
+      assert_equal(File.read('test/fixtures/test-output-3.txt'), File.read(output_path))
+    end
+  end
+
+  def test_consume_string_file_2
+    Dir.mktmpdir do |dir|
+      output_path = File.join(dir, 'strings.txt')
+      Twine::Runner.run(%W(consume-string-file test/fixtures/strings-1.txt test/fixtures/en-1.strings -o #{output_path} -l en -a))
+      assert_equal(File.read('test/fixtures/test-output-4.txt'), File.read(output_path))
+    end
+  end
+  
+  def test_generate_report_1
+    Twine::Runner.run(%w(generate-report test/fixtures/strings-1.txt))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twine
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70309529145320 !ruby/object:Gem::Requirement
+  requirement: &70180596581660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,18 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *70309529145320
+  version_requirements: *70180596581660
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70180596581180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *70180596581180
 description: ! "  Twine is a command line tool for managing your strings and their
   translations.\n  \n  It is geared toward Mac OS X, iOS, and Android developers.\n"
 email: twine@mobiata.com
@@ -43,6 +54,14 @@ files:
 - lib/twine/version.rb
 - lib/twine.rb
 - bin/twine
+- test/fixtures/en-1.strings
+- test/fixtures/fr-1.xml
+- test/fixtures/strings-1.txt
+- test/fixtures/test-output-1.txt
+- test/fixtures/test-output-2.txt
+- test/fixtures/test-output-3.txt
+- test/fixtures/test-output-4.txt
+- test/twine_test.rb
 homepage: https://github.com/mobiata/twine
 licenses: []
 post_install_message: 
@@ -54,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -67,4 +86,5 @@ rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Manage strings and their translations for your iOS and Android projects.
-test_files: []
+test_files:
+- test/twine_test.rb