tmsync 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2feb4ddab0578aa817fde936f9bfc69bf6684a72
-  data.tar.gz: 0fc15599460f6b338dff4ef6b5d3bc63ecdf69d3
+  metadata.gz: cebd6cabe522817b08e27a68674f876ac6230bf0
+  data.tar.gz: 05a305e4fa9e9f3fcc3ab1a778374a24cf66adb3
 SHA512:
-  metadata.gz: 2b5ece11d498aa43af6f62e396e65fe932c4c642b4bc5ccf6536a668972503ddd0beae88f571f58af251a01734b6d3847932716dd357bed5e81612691f54a356
-  data.tar.gz: 23c92a976e5b645e718257478a98813dda9f9bb293ffe7ba7025d58501548698cb785a82012a02e8f63489bf52b9223460446f2b579f443e76cb67b460a75d61
+  metadata.gz: e2253480e605e1f27dfb92b1a284da70c3a43b0c5ccca9c8d3646ebed75a45ed7baa66b05959816545afecbbb49c0a65bc94980946150b358c390b292e0a880e
+  data.tar.gz: 0151f6219e93d24f8007f71ede107bfc8d321cb12e0c39ab29a7c50c5450389e68fcc9940d1786fd63a2f7fac897c256104a9f6d7f6f1d2f00060b36c5146144

data/lib/tmsync/cli.rb

@@ -49,6 +49,8 @@ module Tmsync
             file_directory[0] = '' if file_directory[0] == '/'
             file_extension = File.extname(file_path)
             file_name = File.basename(file_path, file_extension)
+            android_module = ''
+            android_module = file_path.to_a.first if options[:platform] == 'android'
 
             command = options[:command]
               .gsub('<LANGUAGE>', language)
@@ -56,6 +58,7 @@ module Tmsync
               .gsub('<FILE_DIR>', file_directory)
               .gsub('<FILE_EXT>', file_extension)
               .gsub('<FILE_NAME>', file_name)
+              .gsub('<ANDROID_MODULE>', android_module)
 
             puts "Executing: '#{command}'"
             output = %x(#{command})

data/lib/tmsync/version.rb

@@ -1,3 +1,3 @@
 module Tmsync
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/tmsync.rb

@@ -5,7 +5,7 @@ module Tmsync
     IOS_MATCHING_REGEX = '.*\/(\S+)\.lproj\/.*\.strings'
     IOS_EXCLUDE_REGEX = '\/Carthage\/|\/Pods\/'
 
-    ANDROID_MATCHING_REGEX = 'app\/src\/main\/res\/values-?(\S+)?\/strings.xml'
+    ANDROID_MATCHING_REGEX = '[^\/]+\/src\/main\/res\/values-?(\S+)?\/strings.xml'
     ANDROID_EXCLUDE_REGEX = '\A\z'
 
     FALLBACK_LANGUAGE = 'en'
@@ -38,7 +38,7 @@ module Tmsync
       found_files = found_files.select { |file_path|
         file_path =~ @matching_regex
       }.map { |file_path|
-        [file_path.match(@matching_regex).captures.first, file_path]
+        [file_path.match(@matching_regex).captures.last, file_path]
       }
 
       result = found_files.group_by(&:first).map { |k,v| [k, v.each(&:shift).flatten] }.to_h

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmsync
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Cihat Gündüz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor