babelish 0.3.3 → 0.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDQ1NTdlNzA0OGNiMjcxMDZjZmE5NTEzNmExY2JlNzZiZTUwYWYwMw==
+    OGYzYzgwY2Y1NWU1MjVjMWY1YmI1YjhhMjc5M2VmZDlkODU5ODUxNg==
   data.tar.gz: !binary |-
-    MGMyZGE0NTk1MzE4Njc2ZTE2OWY1YjA4MWUwOTU1ZWQ4YTVmOWZmMQ==
+    OTg3NjllNjQ4ZTRkM2UzMTBmZDFhMjNjZjdhMWVmOTY3NTczMjA0Mw==
 SHA512:
   metadata.gz: !binary |-
-    MzgzMmY1ZDM1ZTQ3YmM2NDlhOWI0ZTFhNTYwM2Y1YjNhZWQ2YzNlNGM0ZDcy
-    NDI0NjAzNjA5OTkyMjA3MGM5OTU1OGUxZGU2YjdiOTk4YzI5MWVkZTM0Yjcw
-    OTI1MDQ1ODFiOGE0ZGEzZWQ4MTI0YTRiYmY4OTQ2Y2M1MzEzYTE=
+    YzE3MjhiZjc3YmJiMThjNGMyNmY1OGU0YWFiZTE5MWMxMDdkMGVkZGZkZGRk
+    NWQ5NWQ3MDc1NmJkZWEyY2JiODNlNjBjODhhOWQ4YTZjOTdmZTZkMzliOTFk
+    MzJjYTQ1ZWNhMDQ2YTJiZTZmMDEzMDk4ZGMxZWFiOGZiYjIxYWY=
   data.tar.gz: !binary |-
-    YTYwZjZmNWUzZTlhOTljNDdlN2E4ZjA5Y2Y1ZjgwMGMxY2E2OTIzMDNiYzc1
-    ZmE3NWU0OTc3YzRiM2U2NDk1YTM3YzdiYWRiMWE5ZjNiNmZkNTM1MDJlZmZl
-    ODI1NWRjMThjNWYxNDIxN2FkMTYyMjE5OWFjMmM3ZGM0MzkyNjI=
+    MTU1YmNiMDFjODRmMjQ0Y2UyYTE5Zjk1YjQxYjRlYWY5ODcyNzIwZjZkZTNh
+    MDFkNDVkYTIyMGExZTZmNTYzN2NhZTJjMDVhNGY0ZDJkN2ZkYTMwZDVhMjgy
+    ZjRiYmM5ZDQ4Zjk5Y2YxOGMwZmYwY2ZmNWYzMThjMmRhNTU3NDc=

data/.babelish.sample

@@ -30,4 +30,5 @@ langs:                               # Languages to convert. i.e. English:en
 # 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
-# stripping: false				     # Strips values inside the spreadsheet
+# stripping: false				     # Strips values inside the spreadsheet
+# csv_separator: ','				 # CSV column separator character, uses ',' by default

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 deploy:
   provider: rubygems
   api_key:

data/README.md

@@ -16,31 +16,31 @@ It can also fetch the csv file from GoogleDrive.
 
 `gem install babelish`
 
-Requires Ruby 1.9.2 or above.
+Requires Ruby 1.9.3 or above.
 
 # Usage
 
 ```
 › babelish help
 Commands:
-  babelish android2csv -i, --filenames=one two three              # Convert .xml files to CSV file
-  babelish csv2android --filename=FILENAME -L, --langs=key:value  # Convert CSV file to .xml
-  babelish csv2json --filename=FILENAME -L, --langs=key:value     # Convert CSV file to .json
-  babelish csv2php --filename=FILENAME -L, --langs=key:value      # Convert CSV file to .php
-  babelish csv2strings --filename=FILENAME -L, --langs=key:value  # Convert CSV file to .strings
-  babelish csv_download --gd-filename=GD_FILENAME                 # Download Google Spreadsheet containing translations
-  babelish help [COMMAND]                                         # Describe available commands or one specific command
-  babelish json2csv -i, --filenames=one two three                 # Convert .json files to CSV file
-  babelish php2csv -i, --filenames=one two three                  # Convert .php files to CSV file
-  babelish strings2csv -i, --filenames=one two three              # Convert .strings files to CSV file
-  babelish version                                                # Display current version
-
+  babelish android2csv     # Convert .xml files to CSV file
+  babelish csv2android     # Convert CSV file to .xml
+  babelish csv2json        # Convert CSV file to .json
+  babelish csv2php         # Convert CSV file to .php
+  babelish csv2strings     # Convert CSV file to .strings
+  babelish csv_download    # Download Google Spreadsheet containing translations
+  babelish help [COMMAND]  # Describe available commands or one specific command
+  babelish json2csv        # Convert .json files to CSV file
+  babelish open FILE       # Open local csv file in default editor or Google Spreadsheet containing translations in default browser
+  babelish php2csv         # Convert .php files to CSV file
+  babelish strings2csv     # Convert .strings files to CSV file
+  babelish version         # Display current version
 Options:
   [--verbose], [--no-verbose]
 ```
 
 You can use a **configuration file** to hold all your commandline arguments into a file.
-Place a `.babelish` file (YAML) in your repo where you will run the command.
+Place a `.babelish` file (YAML) in your repo where you will run the command. In case you need to reset the Google Drive token you have to delete the .babelish.token file.
 See [.babelish.sample](.babelish.sample) file in the doc folder. as the possible values.
 
 *For previous CSV-to-iOS-Localizable.strings-converter, rename your `.csvconverter` into `.babelish`.*

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-10-29'
+  s.date        = '2015-03-16'
   s.summary     = "CSV converter for localization files"
   s.description = "This set of commands converts a CSV file to the following formats:
                   - .strings (iOS)

data/lib/babelish/commandline.rb

@@ -21,6 +21,7 @@ class Commandline < Thor
     method_option :state_column, :type => :numeric, :aliases => "-s", :desc => "Position of column for state if any"
     method_option :keys_column,  :type => :numeric, :aliases => "-k", :desc => "Position of column for keys"
     method_option :default_lang, :type => :string, :aliases => "-l", :desc => "Default language to use for empty values if any"
+    method_option :csv_separator, :type => :string, :aliases => "-cs", :desc => "CSV column separator character, uses ',' by default"
     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 :stripping, :type => :boolean, :aliases => "-N", :default => false, :desc => "Strips values of spreadsheet"

data/lib/babelish/csv2base.rb

@@ -6,6 +6,7 @@ module Babelish
     attr_accessor :langs
     attr_accessor :csv_filename
     attr_accessor :default_lang
+    attr_accessor :csv_separator
     attr_accessor :excluded_states, :state_column, :keys_column
     attr_accessor :languages
 
@@ -13,7 +14,8 @@ module Babelish
       default_args = {
         :excluded_states => [],
         :state_column => nil,
-        :keys_column => 0
+        :keys_column => 0,
+        :csv_separator => ","
       }
 
       args = default_args.merge!(args)
@@ -33,6 +35,7 @@ module Babelish
       @state_column = args[:state_column]
       @keys_column = args[:keys_column]
       @default_lang = args[:default_lang]
+      @csv_separator = args[:csv_separator]
       @ignore_lang_path = args[:ignore_lang_path]
       @stripping = args[:stripping]
       @languages = []
@@ -89,7 +92,7 @@ module Babelish
       excludedCols = []
       defaultCol   = 0
 
-      CSV.foreach(name, :quote_char => '"', :col_sep => ',', :row_sep => :auto) do |row|
+      CSV.foreach(name, :quote_char => '"', :col_sep => @csv_separator, :row_sep => :auto) do |row|
 
         if rowIndex == 0
           #check there's at least two columns

data/lib/babelish/version.rb

@@ -1,3 +1,3 @@
 module Babelish
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/babelish/test_csv2base.rb

@@ -22,6 +22,13 @@ class TestCsv2Base < Test::Unit::TestCase
       converter = Babelish::Csv2Base.new("file.csv", {"English" => ["en"]})
       assert_not_nil converter.csv_filename
     end
+    
+    def test_initialize_with_custom_separator
+      converter = Babelish::Csv2Base.new("file.csv", {"English" => ["en"]}, {
+        :csv_separator => ";"
+        })
+      assert_not_nil converter.csv_filename
+    end
 
     def test_create_file_from_path
       test_file = "test_file.txt"

data/test/data/test_data_with_semicolon.csv

@@ -0,0 +1,3 @@
+variables;English
+ERROR_HANDLER_WARNING_DISMISS;OK
+ANOTHER_STRING;hello

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelish
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - François Benaiteau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -202,6 +202,7 @@ files:
 - test/data/test_data_multiple_langs.csv
 - test/data/test_data_with_percent.csv
 - test/data/test_data_with_percent_space.csv
+- test/data/test_data_with_semicolon.csv
 - test/data/test_data_with_spaces.csv
 - test/data/test_en.strings
 - test/data/test_fr.strings
@@ -230,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: CSV converter for localization files