babelish 0.5.1 → 0.5.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDBmYjkzYmRiMDA5MmQwMDZjOWQyMzk0MjE4YjllYWRlODQzNzE3Zg==
-  data.tar.gz: !binary |-
-    Nzk4MTgwOTExZWQwNjc5NDUwMDU3YjVhYzZmN2FkNmNmY2RiNzBkZQ==
+SHA1:
+  metadata.gz: fc2f01e77a4bf12791af0fe06d52e21e7f0fcffb
+  data.tar.gz: 2238a556f99720f380edcab4cbd45719fdd05285
 SHA512:
-  metadata.gz: !binary |-
-    ODA5ZTBmYTdkNmUzYWMyZWI0MWMyZTU2MzBlNTVhNjA0YTlmN2ZhMDZlZGEw
-    YzBkYmI3MDFjMGI2MGE5MmJiMTQzZTgyNzY3NzkwOTJmYjFmMjRkMGM2MmMy
-    MGViODA3M2I3NGZiNTU5NzM4MTk3NDNiMTY0ZTU3ZDZjYzJhZjA=
-  data.tar.gz: !binary |-
-    ZDZjNjA2YTg1OThmZTE5Y2RjOTJiOWEzMDgwNTIxMDQ2M2VmNmJmNDYwM2Zj
-    MjVhMmFlYjE5OTFlMTg3ZjA3ZDA4MzRhOTRkMTQyZDBhYTcwZjk4NmYxNDBk
-    NmY0ZGUyMjdjMTEzMjk2YWQ5OWYxZjk2YmNiODQ0ZTQxMDE5ZTE=
+  metadata.gz: c6fdead31265c94b0f00374fd922b1e3e8a88ccabaf62a22574627bd20a7f20c8c193b0c56f232416c39364e1ef48521623198cfd346fe4a17073c075a3065f6
+  data.tar.gz: a3704fff4a8d7a3d3b3cf6f9b9f3ff7a6f62b629a0e420fec70f1fac3219225638fbdc991764125bc4123390a6ca9c9321cb14e5cdfd8f759f523bad6b402e76

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.0.0
   - 2.1.0
   - 2.2
+  - 2.3.1
 deploy:
   provider: rubygems
   api_key:

data/CONTRIBUTING.md

@@ -0,0 +1,12 @@
+# 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

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

data/README.md

@@ -2,6 +2,7 @@
 [![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)
 
+![Docker](http://dockeri.co/image/netbe/babelish)
 
 **Babelish : Chaotically confused, like Babel**
 
@@ -21,10 +22,12 @@ Requires Ruby 2.0.0 or above.
 
 Or download [Latest Release](https://github.com/netbe/Babelish/releases/latest).
 
+Or via docker: `docker run netbe/Babelish babelish help`
+
 # Usage
 
 ```
-› babelish help
+› babelish help                                                                                                                                                          18:21:30
 Commands:
   babelish android2csv     # Convert .xml files to CSV file
   babelish csv2android     # Convert CSV file to .xml
@@ -33,13 +36,17 @@ Commands:
   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 init            # Create a configuration file from template
   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]
+      [--verbose], [--no-verbose]
+  -c, [--config=CONFIG]            # Read configuration from given file
+                                   # Default: .babelish
 ```
 
 You can use a **configuration file** to hold all your commandline arguments into a file.
@@ -48,15 +55,14 @@ See [.babelish.sample](.babelish.sample) file in the doc folder. as the possible
 
 *For previous CSV-to-iOS-Localizable.strings-converter, rename your `.csvconverter` into `.babelish`.*
 
+**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
+```
+
 **For more details, check the documentation:**
 https://github.com/netbe/Babelish/wiki/How-to-Use
 
-# Contributing
-
-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
 

data/babelish.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |s|
   # 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.4"
   # json support
   s.add_dependency "json"
 

data/lib/babelish/commandline.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'yaml'
 class Commandline < Thor
   include Thor::Actions
   class_option :verbose, :type => :boolean
@@ -54,7 +55,11 @@ class Commandline < Thor
     method_option :headers, :type => :array, :aliases => "-h", :desc => "override headers of columns, default is name of input files and 'Variables' for reference"
     method_option :dryrun, :type => :boolean, :aliases => "-n", :desc => "prints out content of hash without writing file"
     define_method("#{klass[:name].downcase}") do
-      base2csv(klass[:name])
+      begin
+        base2csv(klass[:name])
+      rescue Errno::ENOENT => e
+        warn e.message
+      end
     end
   end
 

data/lib/babelish/csv2android.rb

@@ -6,11 +6,14 @@ module Babelish
       super(filename, langs, args)
 
       @file_path = args[:output_dir].to_s
+      @output_basename = args[:output_basename].to_s
     end
 
     def language_filepaths(language)
       require 'pathname'
-      filepath = Pathname.new(@file_path) + "values-#{language.code}" + "strings.xml"
+      output_name = "strings.xml"
+      output_name = "#{@output_basename}.xml" unless @output_basename.empty?
+      filepath = Pathname.new(@file_path) + "values-#{language.code}" + output_name
       return filepath ? [filepath] : []
     end
 

data/lib/babelish/version.rb

@@ -1,3 +1,3 @@
 module Babelish
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/test/babelish/test_commandline.rb

@@ -78,6 +78,22 @@ class TestCommandLine < Test::Unit::TestCase
     system("rm -f .babelish")
   end
 
+  def test_base2csv_with_config_with_non_existent_filenames_fails
+    options = {:filenames => ['foo']}
+    config_file = File.new(".babelish", "w")
+    config_file.write options.to_yaml
+    config_file.close
+
+    _, stderr = capture_output do
+      Commandline.new.strings2csv
+    end
+    assert_match(/No such file or directory/, stderr)
+    assert_match(/foo/, stderr)
+
+    # clean up
+    system("rm -f .babelish")
+  end
+
   def test_csv_download_without_gd_filename_fails
     options = {}
     config_file = File.new(".babelish", "w")

data/test/babelish/test_csv2android.rb

@@ -56,4 +56,17 @@ class TestCSV2Android < Test::Unit::TestCase
     # clean up
     system("rm -rf values-fr")
   end
+
+  def test_converting_with_basename
+    csv_file = "test/data/test_data.csv"
+    converter = Babelish::CSV2Android.new(csv_file,
+                                          { "English" => "en" },
+                                          { output_basename: "super_strings" })
+    converter.convert
+    exist = File.exist?("values-en/super_strings.xml")
+    assert exist, "the ouptut file does not exist"
+
+    # clean up
+    system("rm -rf ./values-en")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelish
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - François Benaiteau
@@ -9,137 +9,154 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2017-06-06 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: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   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: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !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
@@ -148,10 +165,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .babelish.sample
-- .gitignore
-- .hound.yml
-- .travis.yml
+- ".babelish.sample"
+- ".gitignore"
+- ".hound.yml"
+- ".travis.yml"
+- CONTRIBUTING.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -229,12 +248,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: []