babelish 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: be34046268e439e572bf6a6a2396d5a7f4eb4144
-  data.tar.gz: b303dbab56fbc3a9fb05cdf8ee8b96ad492f7a48
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Nzk3MzY5NzE0NzhmMDBiZmFlMmQ2OTJhMzdiZjE4YjFjMDU2YzUwZA==
+  data.tar.gz: !binary |-
+    MGUxMTM3OGI3OTU4M2I3M2FjYWEwNTRmMDljZjJkZTUxZDQxZDBkNQ==
 SHA512:
-  metadata.gz: 05b8e867c1393e9c71b44000fcac86879313b863b698d349596920fabc17f2b231044c6a482f4f15ecc4476f1956c26aed7b7c20f9c1600e1850bc76d3fd4cbf
-  data.tar.gz: 534309b822c8587a37ab88aaea78e739db384c15aa39408a0b0393ed58e17f06489815ef18608c9980e8e4c56b9cd546ca2cb364924c45fff2cc6521a383c583
+  metadata.gz: !binary |-
+    NzljNjRjMDk4MmEyOGI0MmZjYmUzMGVlYTEwZTBjMzZkZjJjNGU3NWU3NDI1
+    MjFjNmRhOGRlNmE0NGU5NTU2NjdlOTM0MDZhZDgwNTIyYjE1MzkwODNkMWUx
+    NGQ2Y2Q5ODhjZGM5ZDkyNjYwMWExOTY0OGU5Y2UxOTQ5NDBiYjI=
+  data.tar.gz: !binary |-
+    NjRiMDk1NDI1Y2M3OTc0OTUzNjA2ODAzNDllZjQ5MGQ2YzQxZTdlZDViNDIx
+    ZWNiODdlMTY2MzUzNjQ5NjY3ZjBiNmY3MjViZjUwMWE2ZGEzNGI3Y2IyMDI1
+    MGFhMzhkYzBkNmQxNmU0NzY5OTdmN2YxOTY3NzVkM2RkMGY3ZGM=

data/.babelish.sample

@@ -13,19 +13,20 @@ filenames: ["test/data/test_en.strings", "test/data/test_fr.strings"]
 # CSV2Base
 
 ## required
-filename: test/data/test_data.csv  # CSV file (CSV_FILENAME) to convert from or name of file in Google Drive
-langs:                             # Languages to convert. i.e. English:en
+filename: test/data/test_data.csv    # CSV file (CSV_FILENAME) to convert from or name of file in Google Drive
+langs:                               # Languages to convert. i.e. English:en
   English: "en"
 
 ## optional
 # fetch: true                        # set to true to get file(filename) from google drive
-# excluded-states: ["Images", "Xib"] # Exclude rows with given state
-# state-column: 3                    # Position of column for state if any
-# keys-column: 0                     # Position of column for keys
-# default-lang: "English"            # Default language to use for empty values if any
-# output-dir: "resources/"         # Path of output files
-# output-file: "myOnlyFile.strings"  # --IGNORED-- Path of a single output file. Overrides 'output_dir'
-# output-basenames:
-#   - Localizable
-#   - info
-# ignore_lang_path: true            # does not care about lang component path. i.e: en.lproj/
+# excluded_states: ["Images", "Xib"] # Exclude rows with given state
+# state_column: 3                    # Position of column for state if any
+# keys_column: 0                     # Position of column for keys
+# default_lang: "English"            # Header name of column containing fallback value if value is empty
+# output_dir: "resources/"           # Path of output files
+# output_basenames:                  # Basename of output files
+#  - Localizable
+#  - info
+# ignore_lang_path: true             # does not care about lang component path. i.e: en.lproj/
+# sheet: 0                           # Index of worksheet to download. First index is 0.
+# macros_filename: Babelish.h        # File to output the defines of localized strings

data/.gitignore

@@ -9,6 +9,7 @@
 
 # Config file
 .babelish
+.babelish.token
 
 # SimpleCov
 coverage
@@ -27,4 +28,5 @@ Gemfile.lock
 *.sublime-project
 
 doc
-.yardoc
+.yardoc
+

data/.travis.yml

@@ -9,5 +9,5 @@ deploy:
     secure: Xjq+v+jEU6wK4BtyfnV1elegNcxK6Ah/O99Sn9c2IlkCmJ1wxLBouqzEiSorSJ4IOMa5H2y3gwo5GXOr6Y7d8huyGrPuBeCSGqAmH77wNCIv7G+jnLiYb1sRZbtKcPW2QaN6JF81qDIelwyspMfo6/ug1qN1x323UaxZl7f7nUE=
   gem: babelish
   on:
-    tags: true
     repo: netbe/Babelish
+    all_branches: true

data/babelish.gemspec

@@ -6,7 +6,7 @@ require 'babelish/version'
 Gem::Specification.new do |s|
   s.name        = 'babelish'
   s.version     = Babelish::VERSION
-  s.date        = '2014-05-07'
+  s.date        = '2014-09-24'
   s.summary     = "CSV converter for localization files"
   s.description = "This set of commands converts a CSV file to the following formats:
                   - .strings (iOS)
@@ -15,12 +15,12 @@ Gem::Specification.new do |s|
                   - .php"
   s.authors     = ["François Benaiteau", "Markus Paeschke"]
   s.email       = ['francois.benaiteau@gmail.com', 'markus.paeschke@gmail.com']
-  s.homepage    = 'https://github.com/netbe/CSV-to-iOS-Localizable.strings-converter'
+  s.homepage    = 'http://netbe.github.io/Babelish/'
   s.license = 'MIT'
 
   s.add_dependency "thor"
 
-  s.add_dependency "google_drive"
+  s.add_dependency "google_drive", "~> 0.3.10"
   # google_drive dependency to ask for mail and password
   s.add_dependency "highline"
 

data/lib/babelish/commandline.rb

@@ -23,8 +23,12 @@ class Commandline < Thor
     method_option :default_lang, :type => :string, :aliases => "-l", :desc => "Default language to use for empty values if any"
     method_option :output_dir, :type => :string, :aliases => "-d", :desc => "Path of output files"
     method_option :output_basenames, :type => :array, :aliases => "-o", :desc => "Basename of output files"
-    method_option :ignore_lang_path, :type => :boolean, :aliases => "-I", :default => false, :desc => "Ignore the path component of langs"
+    method_option :ignore_lang_path, :type => :boolean, :aliases => "-I", :lazy_default => false, :desc => "Ignore the path component of langs"
     method_option :fetch, :type => :boolean, :desc => "Download file from Google Drive"
+    method_option :sheet, :type => :numeric, :desc => "Index of worksheet to download. First index is 0"
+    if klass[:name] == "CSV2Strings"
+      method_option :macros_filename, :type => :boolean, :aliases => "-m", :lazy_default => false, :desc => "Filename containing defines of localized keys"
+    end
     define_method("#{klass[:name].downcase}") do
       csv2base(klass[:name])
     end
@@ -93,7 +97,7 @@ class Commandline < Thor
         files = [file_path].compact
       else
         files = gd.download filename.to_s
-        file_path = files.join("\n")
+        file_path = files.join("\n") unless files.empty?
       end
 
       if file_path
@@ -108,7 +112,7 @@ class Commandline < Thor
       args = options.dup
       if options[:fetch]
         say "Fetching csv file #{options[:filename]} from Google Drive"
-        files = download(options[:filename])
+        files = download(options[:filename], nil, options[:sheet])
         abort if files.empty? # no file downloaded
         args.delete(:fetch)
       else
@@ -117,6 +121,7 @@ class Commandline < Thor
       args.delete(:langs)
       args.delete(:filename)
 
+      xcode_macros = Babelish::XcodeMacros.new if options[:macros_filename]
       files.each_with_index do |filename, index|
         if options[:output_basenames]
           args[:output_basename] = options[:output_basenames][index]
@@ -126,6 +131,11 @@ class Commandline < Thor
         args = Thor::CoreExt::HashWithIndifferentAccess.new(args)
         converter = class_object.new(filename, options[:langs], args)
         say converter.convert
+        xcode_macros.process(converter.table, converter.keys) if options[:macros_filename]
+      end
+      if options[:macros_filename]
+        say "generating macros"
+        xcode_macros.write_content(options[:macros_filename])
       end
     end
 

data/lib/babelish/csv2base.rb

@@ -43,6 +43,18 @@ module Babelish
       return File.new(file_path, "w")
     end
 
+    def keys
+      @languages.each do |lang|
+        next unless lang
+        return lang.content.keys unless lang.content.keys.empty?
+      end
+      return []
+    end
+
+    def table
+      output_basename
+    end
+
     def language_filepaths(language)
       #implement in subclass
       []
@@ -54,7 +66,7 @@ module Babelish
     end
 
     def default_filepath
-      Pathname.new(@output_dir) + "#{@output_basename}.#{extension}"
+      Pathname.new(@output_dir) + "#{output_basename}.#{extension}"
     end
 
     def process_value(row_value, default_value)
@@ -94,10 +106,11 @@ module Babelish
 
           #header
           if rowIndex == 0
+            # defaultCol can be the keyValue
+            defaultCol = i if self.default_lang == row[i]
             # ignore all headers not listed in langs to create files
             (excludedCols << i and next) unless @langs.has_key?(row[i])
 
-            defaultCol = i if self.default_lang == row[i]
             language = Language.new(row[i])
             if @langs[row[i]].is_a?(Array)
               @langs[row[i]].each do |id|
@@ -110,7 +123,8 @@ module Babelish
           elsif !@state_column || (row[@state_column].nil? || row[@state_column] == '' || !@excluded_states.include?(row[@state_column]))
             # TODO: add option to strip the constant or referenced language
             key = row[@keys_column].strip
-            value = self.process_value(row[i], row[defaultCol])
+            default_value =  self.default_lang ? row[defaultCol] : nil
+            value = self.process_value(row[i], default_value)
 
             @languages[i].add_content_pair(key, value)
           end

data/lib/babelish/csv2strings.rb

@@ -1,16 +1,15 @@
 module Babelish
   class CSV2Strings < Csv2Base
+    attr_accessor :languages
 
     def language_filepaths(language)
       require 'pathname'
       filepaths = []
-      filename = @output_basename || 'Localizable'
-
       if language.regions.empty?
-        filepaths << Pathname.new(@output_dir) + "#{language.code}.lproj/#{filename}.strings"
+        filepaths << Pathname.new(@output_dir) + "#{language.code}.lproj/#{output_basename}.#{extension}"
       else
         language.regions.each do |region|
-          filepaths << Pathname.new(@output_dir) + "#{language.code}-#{region}.lproj/#{filename}.strings"
+          filepaths << Pathname.new(@output_dir) + "#{language.code}-#{region}.lproj/#{output_basename}.#{extension}"
         end
       end
       filepaths
@@ -23,5 +22,9 @@ module Babelish
     def extension
       "strings"
     end
+
+    def output_basename
+      @output_basename || 'Localizable'
+    end
   end
 end

data/lib/babelish/google_doc.rb

@@ -40,8 +40,8 @@ module Babelish
     end
 
     def authenticate
-      # will try to get token from ~/.ruby_google_drive.token
-      @session = GoogleDrive.saved_session
+      # will try to get token and store in file below
+      @session = GoogleDrive.saved_session ".babelish.token"
     end
 
     def file_with_name(name)

data/lib/babelish/strings2csv.rb

@@ -10,7 +10,7 @@ module Babelish
 
     def parse_dotstrings_line(line)
       line.strip!
-      if line[0] != ?# && line[0] != ?=
+      if line[0] != ?# && line[0] != ?= && line[0] != ?/
         m = line.match(/^[^\"]*\"(.+)\"[^=]+=[^\"]*\"(.*)\";/)
         return {m[1] => m[2]} unless m.nil?
       end

data/lib/babelish/version.rb

@@ -1,3 +1,3 @@
 module Babelish
-  VERSION = '0.3.1'
+  VERSION = "0.3.2"
 end

data/lib/babelish/xcode_macros.rb

@@ -0,0 +1,46 @@
+module Babelish
+  class XcodeMacros
+    attr_accessor :content, :table, :keys
+    def initialize(table = "Localizable", keys = {})
+      @content = ""
+      @table = table
+      @keys = keys
+    end
+
+    def self.write_macros(file_path, table, keys)
+      instance = XcodeMacros.new
+      instance.process(table, keys)
+      instance.write_content(file_path)
+    end
+
+    def process(table, keys)
+      keys.each do |key|
+        macro_name = "LS_#{key.upcase}" 
+        macro_name += "_#{table.upcase}" if table != "Localizable" 
+        macro_name.gsub!(' ', '')
+        macro_name.gsub!('.', '_')
+        macro_name.gsub!('-', '_')
+        @content << String.new(<<-EOS)
+#define #{macro_name} NSLocalizedStringFromTable(@"#{key}",@"#{table}",@"")
+        EOS
+      end
+      @content
+    end
+
+    def write_content(file_path)
+      header = String.new(<<-EOS)
+//
+//  file_path
+//  
+//  This file was generated by Babelish
+//  
+//  https://github.com/netbe/babelish
+//
+        EOS
+      header.gsub! "file_path", File.basename(file_path)
+      file = File.new(file_path, "w")
+      file.write header + @content
+      file.close
+    end
+  end
+end

data/lib/babelish.rb

@@ -25,3 +25,6 @@ require "babelish/json2csv"
 # General
 require "babelish/language"
 require "babelish/google_doc"
+
+# iOS specific
+require "babelish/xcode_macros"

data/test/babelish/commands/test_command_csv2strings.rb

@@ -11,7 +11,7 @@ class TestCSV2StringsCommand < Test::Unit::TestCase
     assert File.exist?("./en.lproj/Localizable.strings")
     assert File.exist?("./fr.lproj/Localizable.strings")
 
-    #clean up
+    # clean up
     system("rm -rf ./en.lproj/")
     system("rm -rf ./fr.lproj/")
   end
@@ -28,7 +28,7 @@ class TestCSV2StringsCommand < Test::Unit::TestCase
     assert File.exist?("./mynewlocation/en.lproj/Localizable.strings"), "can't find output file for English in mynewlocation folder"
     assert File.exist?("./mynewlocation/fr.lproj/Localizable.strings"), "can't find output file for French in mynewlocation folder"
 
-    #clean up
+    # clean up
     system("rm -rf ./mynewlocation")
   end
 
@@ -43,7 +43,7 @@ class TestCSV2StringsCommand < Test::Unit::TestCase
       Commandline.new([], options).csv2strings
     end
 
-    #clean up
+    # clean up
     system("rm -rf ./en.lproj/")
     system("rm -rf ./fr.lproj/")
   end
@@ -55,7 +55,7 @@ class TestCSV2StringsCommand < Test::Unit::TestCase
       Commandline.new.csv2strings
     end
 
-    #clean up
+    # clean up
     system("rm -rf ./en.lproj/")
     system("rm -rf ./fr.lproj/")
   end
@@ -76,7 +76,7 @@ class TestCSV2StringsCommand < Test::Unit::TestCase
     assert File.exist?("./en.lproj/sheet2.strings"), "can't find output file for sheet2 English"
     assert File.exist?("./fr.lproj/sheet2.strings"), "can't find output file for sheet2 French"
 
-    #clean up
+    # clean up
     system("rm -rf ./en.lproj/")
     system("rm -rf ./fr.lproj/")
   end
@@ -85,7 +85,7 @@ class TestCSV2StringsCommand < Test::Unit::TestCase
     omit if ENV['TRAVIS']
     options = {
       :filename => "my_strings",
-      :langs => {"English" => "en", "French" => "fr"},
+      :langs => {"English" => "en"},
       :fetch => true,
       :ignore_lang_path => true,
       :output_basenames => %w(sheet1 sheet2),
@@ -94,13 +94,42 @@ class TestCSV2StringsCommand < Test::Unit::TestCase
     Commandline.new([], options).csv2strings
     # testing
     assert File.exist?("./sheet1.strings"), "can't find output file for sheet1 English with_ignore_lang_path_option"
-    assert File.exist?("./sheet1.strings"), "can't find output file for sheet1 French with_ignore_lang_path_option"
     assert File.exist?("./sheet2.strings"), "can't find output file for sheet2 English with_ignore_lang_path_option"
-    assert File.exist?("./sheet2.strings"), "can't find output file for sheet2 French with_ignore_lang_path_option"
 
-    #clean up
-    system("rm -rf ./en.lproj/")
-    system("rm -rf ./fr.lproj/")
+    # clean up
+    system("rm -f sheet1.strings")
+    system("rm -f sheet2.strings")
+  end
+
+  def test_csv2strings_with_ignore_lang_path_option_local
+    options = {
+      :filename => "test/data/test_data.csv",
+      :langs => {"English" => "en"},
+      :ignore_lang_path => true,
+    }
+
+    Commandline.new([], options).csv2strings
+    # testing
+    assert File.exist?("./Localizable.strings"), "can't find output file for English with_ignore_lang_path_option"
+
+    # clean up
+    system("rm -f ./Localizable.strings")
+  end
+
+  def test_csv2string_with_macros_filename
+    options = {
+      :filename => "test/data/test_data.csv",
+      :macros_filename => "Babelish.h",
+      :langs => { "English" => "en" }
+    }
+
+    Commandline.new([], options).csv2strings
+    # testing
+    assert File.exist?("./Babelish.h"), "can't find macros file"
+
+    # clean up
+    system("rm -f ./Localizable.strings")
+    system("rm -f ./Babelish.h")
   end
 
   def teardown

data/test/babelish/test_csv2strings.rb

@@ -6,6 +6,7 @@ class TestCSV2Strings < Test::Unit::TestCase
     converter = Babelish::CSV2Strings.new(csv_file, 'English' => [:en])
     converter.convert
     assert File.exists?("en.lproj/Localizable.strings"), "the ouptut file does not exist"
+    system("rm -rf en.lproj/")
   end
 
   def test_converting_csv_to_dotstrings_one_output_option
@@ -17,5 +18,71 @@ class TestCSV2Strings < Test::Unit::TestCase
     :ignore_lang_path => true)
     converter.convert
     assert File.exists?(single_file), "the ouptut file does not exist"
+    system("rm -f #{single_file}")
   end
+
+  def test_converting_csv_to_dotstrings_default_lang
+    expected_output = String.new(<<-EOS)
+"GREETINGS" = "Buenos dias";
+"ANOTHER_STRING" = "testEN";
+    EOS
+    csv_file = "test/data/test_data_multiple_langs.csv"
+    spanish_file = "es.lproj/Localizable.strings"
+    converter = Babelish::CSV2Strings.new(csv_file,
+    {'English' => [:en], "French" => "fr", "German" => "de", "Spanish" => "es"},
+    :default_lang => "English")
+    converter.convert
+    assert File.exists?(spanish_file), "the ouptut file does not exist"
+    result = File.read(spanish_file)
+    assert_equal expected_output, result
+    system("rm -rf *.lproj")
+  end
+
+  def test_converting_csv_to_dotstrings_with_no_default_lang_is_empty
+    expected_output = String.new(<<-EOS)
+"GREETINGS" = "Buenos dias";
+"ANOTHER_STRING" = "";
+    EOS
+    csv_file = "test/data/test_data_multiple_langs.csv"
+    spanish_file = "es.lproj/Localizable.strings"
+    converter = Babelish::CSV2Strings.new(csv_file,
+    {'English' => [:en], "French" => "fr", "German" => "de", "Spanish" => "es"})
+    converter.convert
+    assert File.exists?(spanish_file), "the ouptut file does not exist"
+    result = File.read(spanish_file)
+    assert_equal expected_output, result
+    system("rm -rf *.lproj")
+  end
+
+  def test_converting_csv_to_dotstrings_default_lang_to_key
+    expected_output = String.new(<<-EOS)
+"GREETINGS" = "Buenos dias";
+"ANOTHER_STRING" = "ANOTHER_STRING";
+    EOS
+    csv_file = "test/data/test_data_multiple_langs.csv"
+    spanish_file = "es.lproj/Localizable.strings"
+    converter = Babelish::CSV2Strings.new(csv_file,
+    {'English' => [:en], "French" => "fr", "German" => "de", "Spanish" => "es"},
+    :default_lang => "variables")
+    converter.convert
+    assert File.exists?(spanish_file), "the ouptut file does not exist"
+    result = File.read(spanish_file)
+    assert_equal expected_output, result
+    system("rm -rf *.lproj")
+  end
+
+  def test_converting_csv_to_dotstrings_keys
+    expected_output = String.new(<<-EOS)
+"GREETINGS" = "Buenos dias";
+"ANOTHER_STRING" = "ANOTHER_STRING";
+    EOS
+    csv_file = "test/data/test_data_multiple_langs.csv"
+    converter = Babelish::CSV2Strings.new(csv_file,
+    {'English' => [:en], "French" => "fr", "German" => "de", "Spanish" => "es"},
+    :default_lang => "variables")
+    converter.convert
+    assert !converter.keys.empty?
+    system("rm -rf *.lproj")
+  end
+
 end

data/test/babelish/test_strings2csv.rb

@@ -40,6 +40,15 @@ class TestStrings2CSV < Test::Unit::TestCase
     assert_nil output, "output should be nil with wrong syntax"
   end
 
+  def test_parse_dotstrings_line_with_comment
+    input = String.new(<<-EOS)
+    /* Class = "IBUIButton"; normalTitle = "Wibble"; ObjectID = "xxx-xx-123"; */
+    EOS
+
+    output = Babelish::Strings2CSV.new.parse_dotstrings_line input
+    assert_nil output, "output should be nil with comment"
+  end
+
   def test_load_strings_with_wrong_file
     assert_raise(Errno::ENOENT) do
       output = Babelish::Strings2CSV.new.load_strings "file that does not exist.strings"
@@ -106,9 +115,9 @@ class TestStrings2CSV < Test::Unit::TestCase
       assert_equal filenames, converter.filenames
     end
 
-    def test_initialize_with_default_values
-      converter = Babelish::Strings2CSV.new
-      assert_not_nil converter.csv_filename
-    end
+  def test_initialize_with_default_values
+    converter = Babelish::Strings2CSV.new
+    assert_not_nil converter.csv_filename
+  end
 
   end

data/test/babelish/test_xcode_macros.rb

@@ -0,0 +1,60 @@
+require "test_helper"
+class TestXcodeMacros < Test::Unit::TestCase
+  def test_process
+    keys = ["login.title", "login.button"]
+    table = "Localizable"
+    xcode_macros = Babelish::XcodeMacros.new
+    content = xcode_macros.process(table, keys)
+    expected_output = String.new(<<-EOS)
+#define LS_LOGIN_TITLE NSLocalizedStringFromTable(@"login.title",@"Localizable",@"")
+#define LS_LOGIN_BUTTON NSLocalizedStringFromTable(@"login.button",@"Localizable",@"")
+    EOS
+    assert_equal expected_output, content
+  end
+
+  def test_write_macros_class_method
+    keys = ["login.title", "login.button"]
+    table = "Localizable"
+    Babelish::XcodeMacros.write_macros("Babelish.h", table, keys)
+    expected_output = String.new(<<-EOS)
+//
+//  Babelish.h
+//  
+//  This file was generated by Babelish
+//  
+//  https://github.com/netbe/babelish
+//
+#define LS_LOGIN_TITLE NSLocalizedStringFromTable(@"login.title",@"Localizable",@"")
+#define LS_LOGIN_BUTTON NSLocalizedStringFromTable(@"login.button",@"Localizable",@"")
+    EOS
+    assert File.exists?("Babelish.h")
+    result = File.read("Babelish.h")
+    assert_equal expected_output, result
+    #clean up
+    system("rm -f ./Babelish.h")
+  end
+
+  def test_write_macros_process
+    keys = ["login.title", "login.button"]
+    table = "Localizable"
+    macros = Babelish::XcodeMacros.new
+    macros.process(table, keys)
+    macros.write_content("Babelish.h")
+    expected_output = String.new(<<-EOS)
+//
+//  Babelish.h
+//  
+//  This file was generated by Babelish
+//  
+//  https://github.com/netbe/babelish
+//
+#define LS_LOGIN_TITLE NSLocalizedStringFromTable(@"login.title",@"Localizable",@"")
+#define LS_LOGIN_BUTTON NSLocalizedStringFromTable(@"login.button",@"Localizable",@"")
+    EOS
+    assert File.exists?("Babelish.h")
+    result = File.read("Babelish.h")
+    assert_equal expected_output, result
+    #clean up
+    system("rm -f ./Babelish.h")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelish
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - François Benaiteau
@@ -9,140 +9,137 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   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: google_drive
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.10
 - !ruby/object:Gem::Dependency
   name: highline
   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: xml-simple
   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: json
   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: test-unit
   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: simplecov
   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: 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'
-description: |-
-  This set of commands converts a CSV file to the following formats:
-                    - .strings (iOS)
-                    - .xml (Android)
-                    - .json
-                    - .php
+description: ! "This set of commands converts a CSV file to the following formats:\n
+  \                 - .strings (iOS)\n                  - .xml (Android)\n                  -
+  .json\n                  - .php"
 email:
 - francois.benaiteau@gmail.com
 - markus.paeschke@gmail.com
@@ -192,6 +189,7 @@ files:
 - lib/babelish/php2csv.rb
 - lib/babelish/strings2csv.rb
 - lib/babelish/version.rb
+- lib/babelish/xcode_macros.rb
 - test/babelish/commands/test_command_android2csv.rb
 - test/babelish/commands/test_command_csv2android.rb
 - test/babelish/commands/test_command_csv2strings.rb
@@ -208,6 +206,7 @@ files:
 - test/babelish/test_json2csv.rb
 - test/babelish/test_php2csv.rb
 - test/babelish/test_strings2csv.rb
+- test/babelish/test_xcode_macros.rb
 - test/data/android-en.xml
 - test/data/android-fr.xml
 - test/data/android.xml
@@ -224,7 +223,7 @@ files:
 - test/data/test_with_nil.strings
 - test/data/xcode_empty.strings
 - test/test_helper.rb
-homepage: https://github.com/netbe/CSV-to-iOS-Localizable.strings-converter
+homepage: http://netbe.github.io/Babelish/
 licenses:
 - MIT
 metadata: {}
@@ -234,51 +233,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: CSV converter for localization files
-test_files:
-- test/babelish/commands/test_command_android2csv.rb
-- test/babelish/commands/test_command_csv2android.rb
-- test/babelish/commands/test_command_csv2strings.rb
-- test/babelish/commands/test_command_strings2csv.rb
-- test/babelish/test_android2csv.rb
-- test/babelish/test_base2csv.rb
-- test/babelish/test_bins.rb
-- test/babelish/test_commandline.rb
-- test/babelish/test_csv2android.rb
-- test/babelish/test_csv2base.rb
-- test/babelish/test_csv2json.rb
-- test/babelish/test_csv2php.rb
-- test/babelish/test_csv2strings.rb
-- test/babelish/test_json2csv.rb
-- test/babelish/test_php2csv.rb
-- test/babelish/test_strings2csv.rb
-- test/data/android-en.xml
-- test/data/android-fr.xml
-- test/data/android.xml
-- test/data/genstrings.strings
-- test/data/json.json
-- test/data/php_lang.php
-- test/data/test_data.csv
-- test/data/test_data.strings
-- test/data/test_data_multiple_langs.csv
-- test/data/test_en.strings
-- test/data/test_fr.strings
-- test/data/test_utf16.strings
-- test/data/test_with_nil.csv
-- test/data/test_with_nil.strings
-- test/data/xcode_empty.strings
-- test/test_helper.rb
+test_files: []
 has_rdoc: