applyrics 0.0.3.pre → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f8c09970f5298b306a1f05ff6c89f36fb8db206
-  data.tar.gz: d7226737efbd8949a1e5eaa135809d7a20457251
+  metadata.gz: e5a8c442b98fb9151e37f70ec88480b448871054
+  data.tar.gz: cbed507f90c7651baf3225c941dc68f968766978
 SHA512:
-  metadata.gz: 9c05ad2a2ee39d8854a7487f96ac1efaa4e70c4f7c828df7a8785a547a43bd430f0d7ca1f6a6eb629009e1cc218e6d03fa3359ac2f8489d2a5e35d1872a92180
-  data.tar.gz: a65d253e07a1cf8a45e2a9362073b9bc7114344321869cf47684583591bf58e3e0488854f62a8f0b4b5f917c091a3f569d4839e4903bf86f898aaece54f0abdb
+  metadata.gz: 6e94add58e7b6b4615a94cfb242905499073290b7fb813a4cd4a1443e329a24f4ee0d4e61c9785c1118c4c808b551972b6e2c7d4b167f2cb79a50575c344e77a
+  data.tar.gz: 60ba3c94c66bbcd5fca2394a5be362c79a5148b071819430d51c411d321574bf7a3e768a87da966faea03b2d7c6fcade283004396818f73b5dec312871dba027

data/lib/applyrics.rb

@@ -2,6 +2,8 @@ require 'applyrics/info'
 require 'applyrics/tools/genstrings'
 require 'applyrics/setup'
 require 'applyrics/lyricsfile'
+require 'applyrics/stringsfile'
+require 'applyrics/languagefile'
 module Applyrics
   class << self
   end

data/lib/applyrics/cli.rb

@@ -16,9 +16,7 @@ module Applyrics
       program :version, Applyrics::VERSION
       program :description, Applyrics::DESCRIPTION
       program :help_formatter, :compact
-      global_option '--project PATH', String, 'Path to iOS or Android project'
       global_option '--[no-]rebuild', TrueClass, 'Rebuild language files from source'
-      global_option '--lang CODE', String, 'Only perform the action for the specified language'
 
       command :init do |c|
         c.syntax = "applyrics init"
@@ -55,7 +53,6 @@ module Applyrics
       command :extract do |c|
         c.syntax = "applyrics extract"
         c.description = "Pull strings from the project into a strings.json file"
-        c.option '--force-split', TrueClass, 'Saves one language file per language instead of a single one for all languages'
         c.action do |args, options|
           
           project = Applyrics::Project.new()
@@ -85,8 +82,22 @@ module Applyrics
         c.description = "Applies language from a .json file"
         c.option '--data STRING', String, 'Path to .json file (Default: strings.json)'
         c.action do |args, options|
-          options.default :project => './', :data => './lyrics.json'
-          puts "Not implemented yet... Sorry!"
+          options.default :project => './', :data => './strings.json'
+
+          language_file = LanguageFile.new(options.data)
+
+          puts "Loaded language file with #{language_file.languages.length} languages".green
+
+          project = Applyrics::Project.new()
+          detect_lang = project.detected_languages
+
+          langs = project.string_files()
+
+          langs = langs.merge(language_file.to_hash)
+
+          project.apply_languages(langs)
+
+
         end
       end
 

data/lib/applyrics/info.rb

@@ -1,4 +1,4 @@
 module Applyrics
-  VERSION = "0.0.3.pre"
+  VERSION = "0.0.4"
   DESCRIPTION = "Handle localization for all your mobile projects"
 end

data/lib/applyrics/languagefile.rb

@@ -34,6 +34,10 @@ module Applyrics
       @hash = MultiJson.load(data)
     end
 
+    def to_hash
+      @hash
+    end
+
     def write()
       File.open(@path, 'w') { |file| file.write(MultiJson.dump(@hash, :pretty => true)) }
     end

data/lib/applyrics/project.rb

@@ -72,6 +72,10 @@ module Applyrics
       @project.rebuild_files()
     end
 
+    def apply_languages(data)
+      @project.apply_languages(data)
+    end
+
     def platform
       @platform
     end

data/lib/applyrics/project_ios.rb

@@ -36,7 +36,7 @@ module Applyrics
     def language_files
       folder = self.platform_project_settings("SOURCE_ROOT") unless !folder.nil?
       out = {}
-      Dir[File.join(folder, "**","*.strings")].each do |file|
+      Dir[File.join(folder, "**", "*.lproj", "*.strings")].each do |file|
         lang = /(\w*).lproj/.match(file)[1]
         lang = (lang == "Base" ? default_language : lang)
 
@@ -76,12 +76,13 @@ module Applyrics
       Dir[File.join(folder, "**", "*.lproj", "*.strings")].each do |file|
         strings = StringsFile.new(file)
         lang = /(\w*).lproj/.match(file)[1]
+        lang = (lang == "Base" ? default_language : lang)
 
         if !out.key?(lang)
           out[lang] = {}
         end
 
-        out[lang][File.basename(file)] = strings.hash
+        out[lang][File.basename(file)] = strings.to_hash
       end
 
       out
@@ -105,12 +106,31 @@ module Applyrics
 
       Dir[File.join(tmp_folder, "*.strings")].each do |file|
         strings = StringsFile.new(file)
-        langHash[File.basename(file)] = strings.hash
+        langHash[File.basename(file)] = strings.to_hash
       end
 
       FileUtils.remove_dir(tmp_folder)
 
       out
     end
+
+    def apply_languages(data)
+      folder = self.platform_project_settings("SOURCE_ROOT")
+
+      data.each do |lang, files|
+        files.each do |file, data|
+
+          lang_folder = Dir[File.join(folder, "**", (lang == default_language ? "Base" : lang) + ".lproj")].first
+
+          if !Dir.exist?(lang_folder)
+            Dir.mkdir(lang_folder, 0700)
+            puts "Created #{lang_folder}".yellow
+          end
+
+          strings = StringsFile.new(File.join(lang_folder, file), data)
+          strings.write
+        end
+      end
+    end
   end
 end

data/lib/applyrics/setup.rb

@@ -7,16 +7,12 @@ module Applyrics
     def run(config = {})
       platform = nil
       if is_ios?
-        puts "Found iOS project..."
         platform = :ios
       elsif is_android?
-        puts "Found Android project..."
         platform = :android
       elsif is_unity?
-        puts "Found Unity project..."
         platform = :unity
       else
-        puts "Didn't find any project!"
         return
       end
 

data/lib/applyrics/stringsfile.rb

@@ -10,13 +10,6 @@ module Applyrics
       end
     end
 
-    def read
-      @hash = {}
-      parser = Parser.new(@hash)
-      File.open(@path, 'rb:bom|utf-16LE:utf-8') { |fd| parser.parse fd }
-      self
-    end
-
     def keys
       # Not implemented...
     end
@@ -29,11 +22,42 @@ module Applyrics
       # Not implemented...
     end
 
-    def hash
+    def to_hash
       @hash
     end
 
+    def read
+      @hash = {}
+      parser = Parser.new(@hash)
+      File.open(@path, 'rb:bom|utf-16LE:utf-8') { |fd| parser.parse fd }
+      self
+    end
+
+    def write
+      temp = Tempfile.new(File.basename(@path))
+      begin
+        gen = Generator.new(@hash)
+        gen.run { |line| temp.puts line }
+        FileUtils.mv(temp.path, @path)
+      ensure
+        temp.close
+      end
+    end
+
+    class Generator
+      def initialize(data)
+        @hash = data
+      end
+
+      def run
+        @hash.each do |key,value|
+          yield "\"#{key}\" = \"#{value}\"\n" if block_given?
+        end
+      end
+    end
+
     class Parser
+
       def initialize(hash)
         @hash = hash
         @property_regex = %r/\A(.*?)=(.*)\z/u

data/lib/assets/LyricsfileTemplate

@@ -4,6 +4,3 @@ project:[[PROJECT_KEY]]
 
 # Name of local language file
 filename:[[FILENAME]]
-
-# Don't build string from these files
-ignore:[[IGNORE]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: applyrics
 version: !ruby/object:Gem::Version
-  version: 0.0.3.pre
+  version: 0.0.4
 platform: ruby
 authors:
 - Frederik Wallner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -153,12 +153,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14