babelish 0.5.6 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0c50bdc07265dcc37a15d445529ec631c08b9013433740d719dea55ea275c2b
-  data.tar.gz: c7a1b60e9b5753e49883c82046d7897368250ee5b588be1f25751b25d2c73414
+  metadata.gz: 4e29a6b5c4418173054bb6389c04015ec122cca9d52df3b34858ccf21c49b12f
+  data.tar.gz: 7ed86a00497a37ba7ece64831bb8512184699d758a808dea5e971afb4f539963
 SHA512:
-  metadata.gz: 8aae420d78d9f9cb11433ef203820cdaa39b1ab1b5a809bd8884b664b2136c333091a388ce4bde3e4af91de89b3d4ce985436ea6b39e81656596898c8b5563fb
-  data.tar.gz: 5a9ceeef88575b111ce1c7b272d18e35c6b1456f6685f161951dc2c391eb6a35cdd6d49700aa028af3b8a2c344d6bfd84d0a0741d5045db859e7f285c147ff3e
+  metadata.gz: b0b507e6eeac632aa1b607304b4bfd1f04aac6c3d66dd7fb5fb265cf613b3b091137ef596c6fdac16c63f8cd1dc56fbff05b2e3171d4743a4f69bd82634be349
+  data.tar.gz: 7a24ef23ea07c01893c9b155efd317918632422d8e6049612994413b8ab3e5f1841ead0a7a35fb5793dc683a9dfab39f61a59cdcf6d48893dd226cacb36e565d

data/README.md

@@ -18,11 +18,11 @@ It can also fetch the csv file from GoogleDrive.
 
 `gem install babelish`
 
-Requires Ruby 2.0.0 or above.
+Requires Ruby 2.1.0 or above.
 
 Or download [Latest Release](https://github.com/netbe/Babelish/releases/latest).
 
-Or via docker: `docker run netbe/Babelish babelish help`
+Or via docker: `docker run netbe/babelish babelish help`
 
 # Usage
 
@@ -57,7 +57,7 @@ See [.babelish.sample](.babelish.sample) file in the doc folder. as the possible
 
 **Note for docker:** In order to export the output of a conversion, you will need to pipe the result out of the container. An example would be
 ```
-› docker run netbe/Babelish babelish csv2json >> some_file.json
+› docker run netbe/babelish babelish csv2json >> some_file.json
 ```
 
 **For more details, check the documentation:**
@@ -71,3 +71,7 @@ Run `bundle install` to install all the dependencies. Tests are done with `Test:
 # Todo & Known issues
 
 See GitHub issues
+
+# Privacy Policy
+
+See [related infos](privacy-policy.md)

data/lib/babelish.rb

@@ -24,6 +24,7 @@ require "babelish/json2csv"
 
 # General
 require "babelish/language"
+require "babelish/keys"
 require "babelish/google_doc"
 
 # iOS specific

data/lib/babelish/csv2android.rb

@@ -13,7 +13,8 @@ module Babelish
       require 'pathname'
       output_name = "strings.xml"
       output_name = "#{@output_basename}.xml" unless @output_basename.empty?
-      filepath = Pathname.new(@file_path) + "values-#{language.code}" + output_name
+      region = language.region.to_s.empty? ? "" : "-r#{language.region}"
+      filepath = Pathname.new(@file_path) + "values-#{language.code}#{region}" + output_name
       return filepath ? [filepath] : []
     end
 

data/lib/babelish/google_doc.rb

@@ -40,17 +40,21 @@ module Babelish
         puts "can't open requested file"
       end
     end
-
+    
     def authenticate
       # will try to get token and store in file below
-      @session = GoogleDrive.saved_session ".babelish.token"
+      config = GoogleDrive::Config.new(".babelish.token")
+      config.client_id = Babelish::Keys::GOOGLE_DRIVE_CLIENT_ID
+      config.client_secret = Babelish::Keys::GOOGLE_DRIVE_CLIENT_SECRET
+      config.scope = ["https://www.googleapis.com/auth/drive.readonly"]
+      @session = GoogleDrive::Session.from_config(config)
     end
-
+    
     def file_with_name(name)
       unless @session
         authenticate
       end
-      @session.spreadsheet_by_title(name)
+      @session.file_by_title(name)
     end
   end
 end

data/lib/babelish/keys.rb

@@ -0,0 +1,6 @@
+  module Babelish
+    module Keys
+      GOOGLE_DRIVE_CLIENT_SECRET = "e48n2RU6tjimMBRo6Ru4RIHs"
+      GOOGLE_DRIVE_CLIENT_ID = "1055694645196-j74lpcu8riev3m4fdrjnh4s7salcskc7.apps.googleusercontent.com"
+    end
+  end

data/lib/babelish/version.rb

@@ -1,3 +1,3 @@
 module Babelish
-  VERSION = "0.5.6"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelish
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.6
 platform: ruby
 authors:
 - François Benaiteau
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: google_drive
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -165,17 +165,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".babelish.sample"
-- ".gitignore"
-- ".hound.yml"
-- ".travis.yml"
-- CONTRIBUTING.md
-- Dockerfile
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- babelish.gemspec
 - bin/babelish
 - lib/babelish.rb
 - lib/babelish/android2csv.rb
@@ -188,57 +179,12 @@ files:
 - lib/babelish/csv2strings.rb
 - lib/babelish/google_doc.rb
 - lib/babelish/json2csv.rb
+- lib/babelish/keys.rb
 - lib/babelish/language.rb
 - 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
-- 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_fastlane.rb
-- 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
-- test/data/android_special_chars.csv
-- test/data/android_special_chars.xml
-- test/data/android_special_chars_test_result.xml
-- test/data/genstrings.strings
-- test/data/json.json
-- test/data/php_lang.php
-- test/data/test_comments.strings
-- test/data/test_data.csv
-- test/data/test_data.strings
-- test/data/test_data_fr_with_comments.strings
-- test/data/test_data_fr_with_comments.xml
-- test/data/test_data_multiple_langs.csv
-- test/data/test_data_with_comments.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
-- test/data/test_space.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
 homepage: http://netbe.github.io/Babelish/
 licenses:
 - MIT
@@ -258,8 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: CSV converter for localization files

data/.babelish.sample

@@ -1,35 +0,0 @@
-# This is a sample configuration file
-
-###################################### Base2CSV ######################################
-
-## required, location of strings files (FILENAMES)
-filenames: ["test/data/test_en.strings", "test/data/test_fr.strings"]
-
-## optional
-# headers: ["Constants", "English", "French"] # override headers of columns, default is name of input files and 'Variables' for reference
-# csv_filename: "testconfig.csv"              # location of output file
-# dryrun: true                                # prints out content of hash without writing file
-
-###################################### 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
-  English: "en"
-
-## optional
-# fetch: true                        # set to true to get file(filename) from google drive
-# excluded_states: ["Images", "Xib"] # Exclude rows with given state
-# comments_column: 4                 # Position of column for comments if any
-# 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
-# stripping: false				     # Strips values inside the spreadsheet
-# csv_separator: ','				 # CSV column separator character, uses ',' by default

data/.gitignore

@@ -1,31 +0,0 @@
-# Generated files
-/*.csv
-/*.strings
-*.lproj
-*.gem
-*~
-*#
-#*#
-
-# Config file
-.babelish
-.babelish.token
-
-# SimpleCov
-coverage
-
-# ignore Gemfile.lock as http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
-# this should solve the fastercsv issue
-Gemfile.lock
-
-# Ruby package manager files
-.ruby-version
-.rbenv-version
-.rvmrc
-
-# Sublime Text
-*.sublime-workspace
-*.sublime-project
-
-doc
-.yardoc

data/.hound.yml

@@ -1,4 +0,0 @@
-HashSyntax:
-  Enabled: false
-LineLength:
-  Enabled: false

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.1.0
-  - 2.2
-  - 2.3.1
-deploy:
-  provider: rubygems
-  api_key:
-    secure: Xjq+v+jEU6wK4BtyfnV1elegNcxK6Ah/O99Sn9c2IlkCmJ1wxLBouqzEiSorSJ4IOMa5H2y3gwo5GXOr6Y7d8huyGrPuBeCSGqAmH77wNCIv7G+jnLiYb1sRZbtKcPW2QaN6JF81qDIelwyspMfo6/ug1qN1x323UaxZl7f7nUE=
-  gem: babelish
-  on:
-    tags: true
-    repo: netbe/Babelish
-    all_branches: true

data/CONTRIBUTING.md

@@ -1,12 +0,0 @@
-# Contributing
-
-Want to add another support for a new format or/and usage? Add a new feature? Fix a bug?
-
-1. Create a pull request with a branch like `feature/<nameofbranch>` or `hotfix/<nameofbranch>`.
-2. Don't forget to explain the issue or the benefits of the feature you want to be merged.
-3. Write unit tests covering the feature and/or fix the ones the feature/issue breaks.
-
-And in any case feel free to ask for help in any of those steps.
-
-
-

data/Dockerfile

@@ -1,6 +0,0 @@
-FROM ruby:2.2-alpine
-RUN apk add --no-cache git build-base
-COPY . /code
-
-WORKDIR /code
-RUN bundle install

data/Gemfile

@@ -1,8 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in teachmehowtomakearubygem.gemspec
-gemspec
-
-group :test do
-  gem 'coveralls', :require => false, :platforms => [:ruby_19, :ruby_20]
-end

data/Rakefile

@@ -1,17 +0,0 @@
-require "bundler/gem_tasks"
-require 'rake/testtask'
-require 'yard'
-
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/babelish/**/test_*.rb']
-  # t.warning = true
-  t.verbose = true
-end
-
-YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']
-  # t.options = ['--any', '--extra', '--opts']
-end
-
-task :default => :test

data/babelish.gemspec

@@ -1,42 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'babelish/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'babelish'
-  s.version     = Babelish::VERSION
-  s.date        = Time.now.strftime("%Y-%m-%d")
-  s.summary     = "CSV converter for localization files"
-  s.description = "This set of commands converts a CSV file to the following formats:
-                  - .strings (iOS)
-                  - .xml (Android)
-                  - .json
-                  - .php"
-  s.authors     = ["François Benaiteau", "Markus Paeschke"]
-  s.email       = ['francois.benaiteau@gmail.com', 'markus.paeschke@gmail.com']
-  s.homepage    = 'http://netbe.github.io/Babelish/'
-  s.license = 'MIT'
-
-  s.add_dependency "thor"
-
-  s.add_dependency "google_drive", "~> 3.0"
-  s.add_dependency "nokogiri"
-  # google_drive dependency to ask for mail and password
-  s.add_dependency "highline"
-
-  # specify version of rack so works on ruby <2.2.2
-  s.add_dependency "rack", ">= 1.6.11"
-  # json support
-  s.add_dependency "json"
-
-  s.add_development_dependency "rake"
-  s.add_development_dependency "test-unit"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "yard"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_path  = 'lib'
-end

data/test/babelish/commands/test_command_android2csv.rb

@@ -1,60 +0,0 @@
-require 'test_helper'
-class TestAndroid2CSVCommand < Test::Unit::TestCase
-  def test_android2csv
-    options = {:filenames => ["test/data/android.xml"]}
-    Commandline.new([], options).android2csv
-
-    assert File.exist?("translations.csv")
-
-    # clean up
-    system("rm -f translations.csv")
-  end
-
-  def test_android2csv_with_dryrun_option
-    options = {:filenames => ["test/data/android.xml"], :dryrun => true}
-    Commandline.new([], options).android2csv
-
-    assert !File.exist?("translations.csv")
-
-    # clean up
-    system("rm -f translations.csv")
-  end
-
-  def test_android2csv_with_output_file
-    options = {:filenames => ["test/data/android.xml"], :csv_filename => "myfile.csv"}
-    # -i, -o
-    Commandline.new([], options).android2csv
-
-    assert File.exist?("myfile.csv")
-
-    # clean up
-    system("rm -f myfile.csv")
-  end
-
-  def test_android2csv_with_headers
-    options = {:filenames => ["test/data/android.xml"], :headers => ["constants", "english"]}
-    # -i, -h
-    Commandline.new([], options).android2csv
-
-    #TODO assertion or move test on at lib level
-
-    # clean up
-    system("rm -f translations.csv")
-  end
-
-  def test_android2csv_with_two_files
-    options = {
-      :filenames => ["test/data/android-en.xml", "test/data/android-fr.xml"],
-      :headers => %w{Constants English French},
-      :csv_filename => "enfr.csv"
-    }
-    # --filenames, --headers, -o
-    Commandline.new([], options).android2csv
-
-    #TODO assertion
-
-    # clean up
-    system("rm -f enfr.csv")
-  end
-
-end