babelish 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmY3NGRmN2Q0MjljZmE1MDFiMjI2MjRkYmY1Y2UyMDZiYjI2NGIyNg==
-  data.tar.gz: !binary |-
-    ZmZkYjAxZDhmNjk0NWNjYjcyYmJlMTczMzVlYjJhMWQ4MGY5NGIxOA==
+SHA1:
+  metadata.gz: be34046268e439e572bf6a6a2396d5a7f4eb4144
+  data.tar.gz: b303dbab56fbc3a9fb05cdf8ee8b96ad492f7a48
 SHA512:
-  metadata.gz: !binary |-
-    ZTAzZjgyMDA2NmNhMjEyMGZlNTYyYTFhMThhMTUxNzA4MmU1Y2M1Y2E0NDg5
-    MDk5ODhiMjMwNTdkYjgyNDk5ODgxMWU4YmY4N2VhNzM4Zjc4MjY0MmM2NDdh
-    NTcwNzkwNDM4YWU1ZDdmZjI4OTlhY2Q0NDYyZTc3MzQ3MzRlZGI=
-  data.tar.gz: !binary |-
-    ZDJmMmM3ZThkMmJlZTU0ZWQzNjBjMGNkYjk1NTI0OTIxNWU3NDVlNGEwZGI1
-    ODMyMzVkZTdlMmRkNzgzOWZiNGZlNjU1Yjg0M2NiODdhYTkwY2Q1MGFmZjFi
-    ZjY2MmU3MDY1ZTQzODZmYzQyOTI2OWQ5Mjc2ZWVmMGFmY2QyMTQ=
+  metadata.gz: 05b8e867c1393e9c71b44000fcac86879313b863b698d349596920fabc17f2b231044c6a482f4f15ecc4476f1956c26aed7b7c20f9c1600e1850bc76d3fd4cbf
+  data.tar.gz: 534309b822c8587a37ab88aaea78e739db384c15aa39408a0b0393ed58e17f06489815ef18608c9980e8e4c56b9cd546ca2cb364924c45fff2cc6521a383c583

data/.babelish.sample

@@ -23,4 +23,9 @@ langs:                             # Languages to convert. i.e. English:en
 # 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
-# default-path: "resources/"          # Path of output files
+# 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/

data/README.md

@@ -1,40 +1,58 @@
-[![Build Status](https://secure.travis-ci.org/netbe/CSV-to-iOS-Localizable.strings-converter.png?branch=master)](http://travis-ci.org/netbe/CSV-to-iOS-Localizable.strings-converter)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/netbe/CSV-to-iOS-Localizable.strings-converter)
-[![Coverage Status](https://coveralls.io/repos/netbe/CSV-to-iOS-Localizable.strings-converter/badge.png)](https://coveralls.io/r/netbe/CSV-to-iOS-Localizable.strings-converter)
-[![Gem Version](https://badge.fury.io/rb/csv2strings.png)](http://badge.fury.io/rb/csv2strings)
-# Introduction
-This script converts a csv file of translations into the below file formats and vice-versa:
+[![Build Status](https://secure.travis-ci.org/netbe/Babelish.png?branch=master)](http://travis-ci.org/netbe/Babelish)
+[![Code Climate](https://codeclimate.com/github/netbe/Babelish.png)](https://codeclimate.com/github/netbe/Babelish)[![Coverage Status](https://coveralls.io/repos/netbe/Babelish/badge.png)](https://coveralls.io/r/netbe/Babelish)
+[![Gem Version](https://badge.fury.io/rb/babelish.svg)](http://badge.fury.io/rb/babelish)
+
+**Babelish : Chaotically confused, like Babel**
+
+Originally created to deal with localizedStrings files (aka *CSV-to-iOS-Localizable.strings-converter*), this command tool now converts a csv file of translations into the below file formats and vice-versa:
 * .strings (iOS)
 * .xml (Android)
 * .json
 * .php
 
-# Requirements
+It can also fetch the csv file from GoogleDrive.
 
-* Ruby 1.9.2 or above
-
-# Setup
+# Installation
 
 `gem install babelish`
 
-# Usage
-
-` babelish help`
+Requires Ruby 1.9.2 or above.
 
-* Use configuration file
+# Usage
 
-You can use a configuration file to hold all your commandline arguments into a file.
-Place a `.babelish` file in your repo where you will run the command.
-See `.babelish.sample` as the possible values.
+```
+› 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
+
+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.
+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`.*
 
 # Contributing
 
-If you feel like it, just create a pull request with a branch like `feature/<nameofbranch>` to `develop` branch
+Want to add another support for a new format or/and usage? Add a new feature? Fix a bug?
 
+Just create a pull request with a branch like `feature/<nameofbranch>` or `hotfix/<nameofbranch>`.
 
-## Development
 
-Edge version can be found on `develop` branch.
+## Development
 
 Run `bundle install` to install all the dependencies. Tests are done with `Test::Unit` so run `rake test` to run all the test suite.
 

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-04-10'
+  s.date        = '2014-05-07'
   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

@@ -13,15 +13,17 @@ class Commandline < Thor
 
   CSVCLASSES.each do |klass|
     desc "#{klass[:name].downcase}", "Convert CSV file to #{klass[:ext]}"
-    method_option :filename, :type => :string, :desc => "CSV file to convert from or name of file in Google Drive", :required => true
-    method_option :langs, :type => :hash, :aliases => "-L", :desc => "Languages to convert. i.e. English:en", :required => true
+    method_option :filename, :type => :string, :aliases => "-i", :desc => "CSV file to convert from or name of file in Google Drive"
+    method_option :langs, :type => :hash, :aliases => "-L", :desc => "Languages to convert. i.e. English:en"
 
     # optional options
     method_option :excluded_states, :type => :array, :aliases => "-x", :desc => "Exclude rows with given state"
     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 :default_path, :type => :string, :aliases => "-p", :desc => "Path of output files"
+    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 :fetch, :type => :boolean, :desc => "Download file from Google Drive"
     define_method("#{klass[:name].downcase}") do
       csv2base(klass[:name])
@@ -37,7 +39,7 @@ class Commandline < Thor
 
   BASECLASSES.each do |klass|
     desc "#{klass[:name].downcase}", "Convert #{klass[:ext]} files to CSV file"
-    method_option :filenames, :type => :array, :aliases => "-i", :desc => "location of strings files (FILENAMES)", :required => true
+    method_option :filenames, :type => :array, :aliases => "-i", :desc => "location of strings files (FILENAMES)"
 
     # optional options
     method_option :csv_filename, :type => :string, :aliases => "-o", :desc => "location of output file"
@@ -49,10 +51,32 @@ class Commandline < Thor
   end
 
   desc "csv_download", "Download Google Spreadsheet containing translations"
-  method_option :gd_filename, :type => :string, :required => :true, :desc => "File to download from Google Drive"
-  method_option :output_filename, :type => :string, :desc => "Filepath of downloaded file"
+  method_option :gd_filename, :type => :string, :desc => "File to download from Google Drive."
+  method_option :sheet, :type => :numeric, :desc => "Index of worksheet to download. First index is 0."
+  method_option :all, :type => :boolean, :lazy_default => true, :desc => "Download all worksheets to individual csv files."
+  method_option :output_filename, :type => :string, :desc => "Filepath of downloaded file."
   def csv_download
-    download(options['gd_filename'], options['output_filename'])
+    all = options[:sheet] ? false : options[:all]
+    filename = options['gd_filename']
+    raise ArgumentError.new("csv_download command : missing file to download") unless filename
+    if all
+      download(filename)
+    else
+      download(filename, options['output_filename'], options['sheet'])
+    end
+  end
+
+  desc "open FILE", "Open local csv file in default editor or Google Spreadsheet containing translations in default browser"
+  def open(file = "translations.csv")
+    filename = file || options["filename"]
+    if File.exists?(filename)
+      say "Opening local file '#{filename}'"
+      system "open \"#{filename}\""
+    else
+      say "Opening Google Drive file '#{filename}'"
+      gd = Babelish::GoogleDoc.new
+      gd.open filename.to_s
+    end
   end
 
   desc "version", "Display current version"
@@ -62,37 +86,47 @@ class Commandline < Thor
   end
 
   no_tasks do
-    def download(filename, output_filename = nil)
+    def download(filename, output_filename = nil, worksheet_index = nil)
       gd = Babelish::GoogleDoc.new
-      if output_filename
-        file_path = gd.download filename.to_s, output_filename
+      if output_filename || worksheet_index
+        file_path = gd.download_spreadsheet filename.to_s, output_filename, worksheet_index
+        files = [file_path].compact
       else
-        file_path = gd.download filename.to_s
+        files = gd.download filename.to_s
+        file_path = files.join("\n")
       end
+
       if file_path
-        say "File '#{filename}' downloaded to '#{file_path}'"
+        say "File '#{filename}' downloaded to :\n#{file_path.to_s}"
       else
         say "Could not download the requested file: #{filename}"
       end
-      file_path
+      files
     end
 
     def csv2base(classname)
       args = options.dup
       if options[:fetch]
         say "Fetching csv file #{options[:filename]} from Google Drive"
-        filename = download(options[:filename])
-        abort unless filename # no file downloaded
+        files = download(options[:filename])
+        abort if files.empty? # no file downloaded
         args.delete(:fetch)
       else
-        filename = options[:filename]
+        files = [options[:filename]]
       end
       args.delete(:langs)
       args.delete(:filename)
 
-      class_object = eval "Babelish::#{classname}"
-      converter = class_object.new(filename, options[:langs], args)
-      say converter.convert
+      files.each_with_index do |filename, index|
+        if options[:output_basenames]
+          args[:output_basename] = options[:output_basenames][index]
+        end
+
+        class_object = eval "Babelish::#{classname}"
+        args = Thor::CoreExt::HashWithIndifferentAccess.new(args)
+        converter = class_object.new(filename, options[:langs], args)
+        say converter.convert
+      end
     end
 
     def base2csv(classname)
@@ -104,7 +138,12 @@ class Commandline < Thor
     end
   end
 
+  def self.exit_on_failure?
+    true
+  end
+
   private
+
   def options
     original_options = super
     return original_options unless File.exists?(".babelish")

data/lib/babelish/csv2android.rb

@@ -7,7 +7,7 @@ module Babelish
     def initialize(filename, langs, args = {})
       super(filename, langs, args)
 
-      @file_path = args[:default_path].to_s
+      @file_path = args[:output_dir].to_s
     end
 
     def language_filepaths(language)
@@ -32,5 +32,9 @@ module Babelish
       end
       return output
     end
+
+    def extension
+      "xml"
+    end
   end
 end

data/lib/babelish/csv2base.rb

@@ -1,6 +1,8 @@
+require 'pathname'
 module Babelish
   class Csv2Base
-    attr_accessor :default_path, :output_file
+    attr_accessor :output_dir, :output_basename
+    attr_accessor :ignore_lang_path
     attr_accessor :langs
     attr_accessor :csv_filename
     attr_accessor :default_lang
@@ -15,20 +17,23 @@ module Babelish
       }
 
       args = default_args.merge!(args)
-
+      args = Thor::CoreExt::HashWithIndifferentAccess.new(args)
       @langs = langs
+
+      # check input types
+      raise ArgumentError.new("wrong value of filename: #{filename.inspect}") unless filename.is_a?(String)
       if !@langs.is_a?(Hash) || @langs.size == 0
-        raise "wrong format or/and langs parameter" + @langs.inspect
+        raise ArgumentError.new("wrong format or/and langs parameter: #{@langs.inspect}")
       end
 
-      @output_file = args[:output_file]
-      @default_path = args[:default_path].to_s
+      @output_basename = args[:output_basename]
+      @output_dir = args[:output_dir].to_s
       @csv_filename = filename
       @excluded_states = args[:excluded_states]
       @state_column = args[:state_column]
       @keys_column = args[:keys_column]
       @default_lang = args[:default_lang]
-
+      @ignore_lang_path = args[:ignore_lang_path]
       @languages = []
     end
 
@@ -43,6 +48,15 @@ module Babelish
       []
     end
 
+    def extension
+      #implement in subclass
+      ""
+    end
+
+    def default_filepath
+      Pathname.new(@output_dir) + "#{@output_basename}.#{extension}"
+    end
+
     def process_value(row_value, default_value)
       value = row_value.nil? ? default_value : row_value
       value = "" if value.nil?
@@ -50,99 +64,99 @@ module Babelish
       value.gsub!(/\s*(\n|\\\s*n)\s*/, "\\n") #replace new lines with \n + strip
       value.gsub!(/%\s+([a-zA-Z@])([^a-zA-Z@]|$)/, "%\\1\\2") #repair string formats ("% d points" etc)
       value.gsub!(/([^0-9\s\(\{\[^])%/, "\\1 %")
-        value.strip!
-        return value.to_utf8
-      end
+      value.strip!
+      return value.to_utf8
+    end
 
-      def get_row_format(row_key, row_value)
-        return "\"" + row_key + "\" = \"" + row_value + "\""
-      end
+    def get_row_format(row_key, row_value)
+      return "\"" + row_key + "\" = \"" + row_value + "\""
+    end
 
-      # Convert csv file to multiple Localizable.strings files for each column
-      def convert(name = @csv_filename)
-        rowIndex     = 0
-        excludedCols = []
-        defaultCol   = 0
+    # Convert csv file to multiple Localizable.strings files for each column
+    def convert(name = @csv_filename)
+      rowIndex     = 0
+      excludedCols = []
+      defaultCol   = 0
 
-        CSV.foreach(name, :quote_char => '"', :col_sep => ',', :row_sep => :auto) do |row|
+      CSV.foreach(name, :quote_char => '"', :col_sep => ',', :row_sep => :auto) do |row|
 
-          if rowIndex == 0
-            #check there's at least two columns
-            return unless row.count > 1
-          else
-            #skip empty lines (or sections)
-            next if row == nil or row[@keys_column].nil?
-          end
+        if rowIndex == 0
+          #check there's at least two columns
+          return unless row.count > 1
+        else
+          #skip empty lines (or sections)
+          next if row == nil or row[@keys_column].nil?
+        end
 
-          # go through columns
-          row.size.times do |i|
-            next if excludedCols.include? i
-
-            #header
-            if rowIndex == 0
-              # 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|
-                  language.add_language_id(id.to_s)
-                end
-              else
-                language.add_language_id(@langs[row[i]].to_s)
-              end
-              @languages[i] = language
-            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])
+        # go through columns
+        row.size.times do |i|
+          next if excludedCols.include? i
 
-              @languages[i].add_content_pair(key, value)
+          #header
+          if rowIndex == 0
+            # 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|
+                language.add_language_id(id.to_s)
+              end
+            else
+              language.add_language_id(@langs[row[i]].to_s)
             end
-          end
+            @languages[i] = language
+          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])
 
-          rowIndex += 1
+            @languages[i].add_content_pair(key, value)
+          end
         end
 
-        write_content
+        rowIndex += 1
       end
 
-      def write_content
-        info = "List of created files:\n"
-        count = 0
-        @languages.each do |language|
-          next if language.nil?
-
-          files = []
-          if @output_file
-            files << create_file_from_path(@output_file)
-          else
-            language_filepaths(language).each do |filename|
-              files << create_file_from_path(filename)
-            end
-          end
-          files.each do |file|
-            file.write hash_to_output(language.content)
-            info += "#{file.path.to_s}\n"
-            count += 1
+      write_content
+    end
 
-            file.close
+    def write_content
+      info = "List of created files:\n"
+      count = 0
+      @languages.each do |language|
+        next if language.nil?
+
+        files = []
+        if @ignore_lang_path
+          files << create_file_from_path(default_filepath)
+        else
+          language_filepaths(language).each do |filename|
+            files << create_file_from_path(filename)
           end
         end
+        files.each do |file|
+          file.write hash_to_output(language.content)
+          info += "- #{File.absolute_path(file)}\n"
+          count += 1
 
-        info = "Created #{count} files.\n" + info
-        return info
+          file.close
+        end
       end
 
-      def hash_to_output(content = {})
-        output = ''
-        if content && content.size > 0
-          content.each do |key, value|
-            output += get_row_format(key, value)
-          end
+      info = "Created #{count} files.\n" + info
+      return info
+    end
+
+    def hash_to_output(content = {})
+      output = ''
+      if content && content.size > 0
+        content.each do |key, value|
+          output += get_row_format(key, value)
         end
-        return output
       end
+      return output
     end
   end
+end

data/lib/babelish/csv2json.rb

@@ -1,22 +1,21 @@
 module Babelish
   require 'json'
   class CSV2JSON < Csv2Base
-    attr_accessor :file_path
-
-    def initialize(filename, langs, args = {})
-      super(filename, langs, args)
-
-      @file_path = args[:default_path].to_s
-    end
 
     def language_filepaths(language)
       require 'pathname'
-      filepath = Pathname.new("#{@file_path}#{language.code}.js")
+      filename = @output_basename || language.code
+      filepath = Pathname.new("#{@output_dir}#{filename}.js")
+
       return filepath ? [filepath] : []
     end
 
     def hash_to_output(content = {})
       return content.to_json
     end
+
+    def extension
+      "js"
+    end
   end
 end

data/lib/babelish/csv2php.rb

@@ -1,18 +1,16 @@
 module Babelish
   class CSV2Php < Csv2Base
     attr_accessor :php_tag
-    attr_accessor :file_path
 
     def initialize(filename, langs, args = {})
       super(filename, langs, args)
-
+      # TODO: list this arg in commandline
       @php_tag = args[:php_tag].nil? ? 'lang' : args[:php_tag]
-      @file_path = args[:default_path].to_s
     end
 
     def language_filepaths(language)
       require 'pathname'
-      filepath = Pathname.new(@file_path) + "#{language.code}" + "lang.php"
+      filepath = Pathname.new(@output_dir) + "#{language.code}" + "lang.php"
       return filepath ? [filepath] : []
     end
 
@@ -20,5 +18,8 @@ module Babelish
       return "$" + @php_tag + "['#{row_key}'] = \"#{row_value}\";\n"
     end
 
+    def extension
+      "php"
+    end
   end
 end

data/lib/babelish/csv2strings.rb

@@ -1,22 +1,16 @@
 module Babelish
   class CSV2Strings < Csv2Base
-    attr_accessor :file_path
-
-    def initialize(filename, langs, args = {})
-      super(filename, langs, args)
-
-      @file_path = args[:default_path].to_s
-    end
 
     def language_filepaths(language)
       require 'pathname'
       filepaths = []
+      filename = @output_basename || 'Localizable'
 
       if language.regions.empty?
-        filepaths << Pathname.new(@file_path) + "#{language.code}.lproj/Localizable.strings"
+        filepaths << Pathname.new(@output_dir) + "#{language.code}.lproj/#{filename}.strings"
       else
         language.regions.each do |region|
-          filepaths << Pathname.new(@file_path) + "#{language.code}-#{region}.lproj/Localizable.strings"
+          filepaths << Pathname.new(@output_dir) + "#{language.code}-#{region}.lproj/#{filename}.strings"
         end
       end
       filepaths
@@ -26,5 +20,8 @@ module Babelish
       return "\"#{row_key}\" = \"#{row_value}\";\n"
     end
 
+    def extension
+      "strings"
+    end
   end
 end

data/lib/babelish/google_doc.rb

@@ -12,25 +12,48 @@ module Babelish
   class GoogleDoc
     attr_accessor :session
 
+    def download(requested_filename)
+      file = file_with_name(requested_filename)
+      return [] unless file
+      files = []
+      file.worksheets.each_with_index do |worksheet, index|
+        files << download_spreadsheet(requested_filename, "translations_#{worksheet.title}.csv", index)
+      end
+      files
+    end
+
+    def download_spreadsheet(requested_filename, output_filename, worksheet_index = 0)
+      output_filename ||= "translations.csv"
+      file = file_with_name(requested_filename)
+      return nil unless file
+      file.export_as_file(output_filename, "csv", worksheet_index)
+      return output_filename
+    end
+
+    def open(requested_filename)
+      file = file_with_name(requested_filename)
+      if file
+        system "open \"#{file.human_url}\""
+      else
+        puts "can't open requested file"
+      end
+    end
+
     def authenticate
       # will try to get token from ~/.ruby_google_drive.token
       @session = GoogleDrive.saved_session
     end
 
-    def download(requested_filename, worksheet_index = nil, output_filename = "translations.csv")
+    def file_with_name(name)
       unless @session
         authenticate
       end
-      result = @session.file_by_title(requested_filename)
+      result = @session.file_by_title(name)
       if result.is_a? Array
         file = result.first
       else
         file = result
       end
-      return nil unless file
-      file.export_as_file(output_filename, "csv", worksheet_index)
-      return output_filename
     end
-
   end
 end

data/lib/babelish/version.rb

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

data/test/babelish/commands/test_command_csv2android.rb

@@ -16,11 +16,11 @@ class TestCSV2AndroidCommand < Test::Unit::TestCase
     system("rm -rf ./values-fr/")
   end
 
-  def test_csv2android_with_default_path
+  def test_csv2android_with_output_dir
     options = {
     	:filename => "test/data/test_data_multiple_langs.csv",
     	:langs => {"English" => "en", "French" => "fr"},
-    	:default_path => "mynewlocation"
+    	:output_dir => "mynewlocation"
     }
 
     Commandline.new([], options).csv2android

data/test/babelish/commands/test_command_csv2strings.rb

@@ -16,17 +16,17 @@ class TestCSV2StringsCommand < Test::Unit::TestCase
     system("rm -rf ./fr.lproj/")
   end
 
-  def test_csv2strings_with_default_path
+  def test_csv2strings_with_output_dir
     options = {
     	:filename => "test/data/test_data_multiple_langs.csv",
     	:langs => {"English" => "en", "French" => "fr"},
-    	:default_path => "mynewlocation"
+    	:output_dir => "mynewlocation"
     }
     Commandline.new([], options).csv2strings
 
     # testing
-    assert File.exist?("./mynewlocation/en.lproj/Localizable.strings"), "can't find output file for English"
-    assert File.exist?("./mynewlocation/fr.lproj/Localizable.strings"), "can't find output file for French"
+    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
     system("rm -rf ./mynewlocation")
@@ -35,13 +35,17 @@ class TestCSV2StringsCommand < Test::Unit::TestCase
   def test_csv2strings_with_fetch_google_doc
     omit if ENV['TRAVIS']
     options = {
-      :filename => "my_trads",
+      :filename => "my_strings",
       :langs => {"English" => "en", "French" => "fr"},
       :fetch => true
     }
     assert_nothing_raised do
       Commandline.new([], options).csv2strings
     end
+
+    #clean up
+    system("rm -rf ./en.lproj/")
+    system("rm -rf ./fr.lproj/")
   end
 
   def test_csv2strings_with_config_file
@@ -51,6 +55,52 @@ class TestCSV2StringsCommand < Test::Unit::TestCase
       Commandline.new.csv2strings
     end
 
+    #clean up
+    system("rm -rf ./en.lproj/")
+    system("rm -rf ./fr.lproj/")
+  end
+
+  def test_csv2strings_with_output_basenames_option
+    omit if ENV['TRAVIS']
+    options = {
+      :filename => "my_strings",
+      :langs => {"English" => "en", "French" => "fr"},
+      :fetch => true,
+      :output_basenames => %w(sheet1 sheet2),
+    }
+
+    Commandline.new([], options).csv2strings
+    # testing
+    assert File.exist?("./en.lproj/sheet1.strings"), "can't find output file for sheet1 English"
+    assert File.exist?("./fr.lproj/sheet1.strings"), "can't find output file for sheet1 French"
+    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
+    system("rm -rf ./en.lproj/")
+    system("rm -rf ./fr.lproj/")
+  end
+
+  def test_csv2strings_with_ignore_lang_path_option
+    omit if ENV['TRAVIS']
+    options = {
+      :filename => "my_strings",
+      :langs => {"English" => "en", "French" => "fr"},
+      :fetch => true,
+      :ignore_lang_path => true,
+      :output_basenames => %w(sheet1 sheet2),
+    }
+
+    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/")
   end
 
   def teardown

data/test/babelish/test_bins.rb

@@ -4,11 +4,19 @@ class TestBins < Test::Unit::TestCase
   def test_csv2strings_with_google_doc
     omit if ENV['TRAVIS']
     assert_nothing_raised do
-      system("./bin/csv2strings --fetch --filename test.csv")
+      system("./bin/csv2strings --fetch --filename my_strings --langs English:en")
     end
     assert_equal $?.exitstatus, 0
   end
 
+  def test_csv2strings_with_google_doc_missing_langs
+    omit if ENV['TRAVIS']
+    assert_nothing_raised do
+      system("./bin/csv2strings --fetch --filename my_strings")
+    end
+    assert_equal $?.exitstatus, 1
+  end
+
   def test_csv2strings_with_config_file
     system("cp .babelish.sample .babelish")
 

data/test/babelish/test_commandline.rb

@@ -0,0 +1,103 @@
+require 'test_helper'
+class TestCommandLine < Test::Unit::TestCase
+
+  def test_csv2base_with_config_file_all_required_options
+    options = {
+      :filename => "test/data/test_data_multiple_langs.csv",
+      :langs => {"English" => "en", "French" => "fr"}
+    }
+    config_file = File.new(".babelish", "w")
+    config_file.write options.to_yaml
+    config_file.close
+
+    assert_nothing_raised do
+      Commandline.new.csv2strings
+    end
+
+    #clean up
+    system("rm -rf ./en.lproj/")
+    system("rm -rf ./fr.lproj/")
+    system("rm -f .babelish")
+  end
+
+
+  def test_csv2base_without_filename_fails
+    options = {
+      :langs => {"English" => "en", "French" => "fr"}
+    }
+    config_file = File.new(".babelish", "w")
+    config_file.write options.to_yaml
+    config_file.close
+
+    assert_raises do
+      Commandline.new.csv2strings
+    end
+
+    #clean up
+    system("rm -rf ./en.lproj/")
+    system("rm -rf ./fr.lproj/")
+    system("rm -f .babelish")
+  end
+
+  def test_base2csv_with_config_file_all_required_options
+    options = {
+      :filenames => ["test/data/test_en.strings", "test/data/test_fr.strings"],
+    }
+    config_file = File.new(".babelish", "w")
+    config_file.write options.to_yaml
+    config_file.close
+
+    assert_nothing_raised do
+      Commandline.new.strings2csv
+    end
+
+    #clean up
+    system("rm -f translations.csv")
+    system("rm -f .babelish")
+  end
+
+  def test_base2csv_with_config_without_filenames_fails
+    options = {}
+    config_file = File.new(".babelish", "w")
+    config_file.write options.to_yaml
+    config_file.close
+
+    assert_raises do
+      Commandline.new.strings2csv
+    end
+
+    #clean up
+    system("rm -f .babelish")
+  end
+
+  def test_csv_download_without_gd_filename_fails
+    options = {}
+    config_file = File.new(".babelish", "w")
+    config_file.write options.to_yaml
+    config_file.close
+
+    assert_raises do
+      Commandline.new.csv_download
+    end
+
+    #clean up
+    system("rm -f .babelish")
+  end
+
+
+  def test_csv_download_with_required_params
+    omit if ENV['TRAVIS']
+    options = {:gd_filename => "my_strings"}
+    config_file = File.new(".babelish", "w")
+    config_file.write options.to_yaml
+    config_file.close
+
+    assert_nothing_raised do
+      Commandline.new.csv_download
+    end
+
+    #clean up
+    system("rm -f .babelish")
+  end
+
+end

data/test/babelish/test_csv2android.rb

@@ -16,7 +16,8 @@ class TestCSV2Android < Test::Unit::TestCase
     single_file = 'myApp.xml'
     converter = Babelish::CSV2Android.new(csv_file,
     {'English' => "en"},
-    :output_file => single_file)
+    :output_basename => 'myApp',
+    :ignore_lang_path => true)
     converter.convert
     assert File.exists?(single_file), "the ouptut file does not exist"
 

data/test/babelish/test_csv2json.rb

@@ -16,7 +16,8 @@ class TestCSV2JSON < Test::Unit::TestCase
     single_file = 'myfile.js'
     converter = Babelish::CSV2JSON.new(csv_file,
     {'English' => "en"},
-    :output_file => single_file)
+    :output_basename => 'myfile',
+    :ignore_lang_path => true)
     converter.convert
     assert File.exists?(single_file), "the ouptut file does not exist"
 

data/test/babelish/test_csv2php.rb

@@ -16,7 +16,8 @@ class TestCSV2Php < Test::Unit::TestCase
     single_file = 'myApp.php'
     converter = Babelish::CSV2Php.new(csv_file,
     {'English' => "en"},
-    :output_file => single_file)
+    :output_basename => 'myApp',
+    :ignore_lang_path => true)
     converter.convert
     assert File.exists?(single_file), "the ouptut file does not exist"
 

data/test/babelish/test_csv2strings.rb

@@ -13,7 +13,8 @@ class TestCSV2Strings < Test::Unit::TestCase
     single_file = 'myApp.strings'
     converter = Babelish::CSV2Strings.new(csv_file,
     {'English' => [:en]},
-    :output_file => single_file)
+    :output_basename => 'myApp',
+    :ignore_lang_path => true)
     converter.convert
     assert File.exists?(single_file), "the ouptut file does not exist"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelish
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - François Benaiteau
@@ -9,137 +9,140 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-07 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !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:\n
-  \                 - .strings (iOS)\n                  - .xml (Android)\n                  -
-  .json\n                  - .php"
+description: |-
+  This set of commands converts a CSV file to the following formats:
+                    - .strings (iOS)
+                    - .xml (Android)
+                    - .json
+                    - .php
 email:
 - francois.benaiteau@gmail.com
 - markus.paeschke@gmail.com
@@ -196,6 +199,7 @@ files:
 - 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
@@ -230,12 +234,12 @@ 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: []
@@ -244,5 +248,37 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: CSV converter for localization files
-test_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
 has_rdoc: