locraft 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 103081da34b1c6113eb9334b6c88f3ac1dd8206d
-  data.tar.gz: cf5c7a2ba35dfbc2dda4dfc0572ac858a5eaa955
+  metadata.gz: 646cc80f22f86b648222b63b0d3972073c6228ad
+  data.tar.gz: a89aeb11a41d07fcfd86ba01007e12462520a14c
 SHA512:
-  metadata.gz: f0d8989e05e265b900a068d3ecaa77348a7546d95ae3624ac44d7da213fd89506a26056b72a85231ebfc92a8a51d976e0714456bf9837cf51a09e6be5167fee4
-  data.tar.gz: 0deefdad49f0f9f51bce119265b9ac24d2bedb710b338a637970c9b7c9bba76b08d526827d3b2382f27d862cf1324b601b3c071d5e4fb114e5b3b6998a2ff866
+  metadata.gz: 1954e7acaf2abfb3f8f5fd8404da1a608cd7065be8744aa8a1998d288b7cd00e4c9b2b3410727c5c1d3f275beef930f7daeb0772c97396a3cc3cf3f712e7c35d
+  data.tar.gz: 3a20b2b9c02e941d917e858b82f26ecd47c6c533861d4b37cbc73be799b7001adc9083723590c4ee59de1c4989aa681940bab51de7204f7d228649dc38867a42

data/lib/locraft/config.rb

@@ -1,11 +1,9 @@
 module Locraft
-
   STRINGS_EXTENSION = '.strings'
   SWIFT = 'swift'
   OBJC = 'objc'
 
   class Config
-
     attr_accessor :langs
     attr_accessor :default_lang
     attr_accessor :destination_dir
@@ -38,8 +36,8 @@ module Locraft
       self.macro_destination_dir = './'
       self.keys_separator = '.'
       self.langs = {
-          'English' => 'en',
-          'Russian' => 'ru'
+        'English' => 'en',
+        'Russian' => 'ru'
       }
       yield self if block_given?
     end
@@ -51,19 +49,26 @@ module Locraft
         config.from_file = file
         return config if Config === config
 
-        warn %Q([#{file}] isn't a Locraft::Config, but #{config.class}.)
-      rescue SyntaxError, Exception => e
-        warn %Q(Invalid config in [#{file}]: #{e})
+        warn "[#{file}] isn't a Locraft::Config, but #{config.class}."
+      rescue SyntaxError, StandardError => e
+        warn "Invalid config in [#{file}]: #{e}"
       end
     end
 
     def relative_destination_dir
-      File.expand_path('../' + self.destination_dir, self.from_file)
+      File.expand_path('../' + destination_dir, from_file)
     end
 
     def relative_macro_destination_dir
-      File.expand_path('../' + self.macro_destination_dir, self.from_file)
+      File.expand_path('../' + macro_destination_dir, from_file)
     end
 
+    def strings_file
+      "#{strings_basename}#{STRINGS_EXTENSION}"
+    end
+
+    def info_plist_file
+      "#{info_plist_basename}#{STRINGS_EXTENSION}"
+    end
   end
-end
+end

data/lib/locraft/constants_generator.rb

@@ -2,7 +2,6 @@ require_relative 'config'
 
 module Locraft
   class ConstantsGenerator
-
     OBJC_CONST_TEMPLATE_H = 'extern NSString *const __nonnull %{const};'
     OBJC_CONST_TEMPLATE_M = 'NSString *const %{const} = @"%{key}";'
     SWIFT_CONST_TEMPLATE = 'let %{const}: String = @"%{key}"'
@@ -13,27 +12,27 @@ module Locraft
 
     def generate
       if @config.dev_lang.equal?(OBJC)
-        self.write_to(%Q{#{@config.relative_macro_destination_dir}/#{self.files_name}.h}, self.h_file)
-        self.write_to(%Q{#{@config.relative_macro_destination_dir}/#{self.files_name}.m}, self.m_file)
+        write_to("#{@config.relative_macro_destination_dir}/#{files_name}.h", h_file)
+        write_to("#{@config.relative_macro_destination_dir}/#{files_name}.m", m_file)
       else
-        self.write_to(%Q{#{@config.relative_macro_destination_dir}/#{self.files_name}.swift}, self.swift_file)
+        write_to("#{@config.relative_macro_destination_dir}/#{files_name}.swift", swift_file)
       end
 
-      puts %(constants files was created for [#{@config.dev_lang}] language)
+      puts "constants files was created for [#{@config.dev_lang}] language"
     end
 
     def strings_lines
-      File.readlines(self.strings_file).select { |l| l =~ %r(".*"\s*=\s*".*";) }
+      File.readlines(strings_file).select { |l| l =~ /".*"\s*=\s*".*";/ }
     end
 
     def strings_file
-      to_add = %Q(#{@config.langs.values.first}.lproj/#{@config.strings_basename}#{STRINGS_EXTENSION})
+      to_add = "#{@config.langs.values.first}.lproj/#{@config.strings_file}"
       File.join(@config.relative_destination_dir, to_add)
     end
 
     def write_to(file, content)
       File.open(file, 'w+') do |f|
-        f.puts self.files_header + "\n"
+        f.puts files_header + "\n"
         f.puts content
       end
     end
@@ -47,31 +46,30 @@ module Locraft
     end
 
     def m_file
-      file = %Q{#import "#{self.files_name}.h"\n}
-      file + self.constants_keys.map { |d| OBJC_CONST_TEMPLATE_M % d }.join("\n")
+      file = %(#import "#{files_name}.h"\n)
+      file + constants_keys.map { |d| OBJC_CONST_TEMPLATE_M % d }.join("\n")
     end
 
     def h_file
-      file = %Q{@import Foundation;\n}
-      file + self.constants_keys.map { |d| OBJC_CONST_TEMPLATE_H % d }.join("\n")
+      file = "@import Foundation;\n"
+      file + constants_keys.map { |d| OBJC_CONST_TEMPLATE_H % d }.join("\n")
     end
 
     def swift_file
-      file = %Q{import Foundation\n}
-      file + self.constants_keys.map { |d| SWIFT_CONST_TEMPLATE % d }.join("\n")
+      file = "import Foundation\n"
+      file + constants_keys.map { |d| SWIFT_CONST_TEMPLATE % d }.join("\n")
     end
 
     def constants_keys
-      self.strings_lines.map do |l|
-        key = l.match(%r("(.*)"\s*=))[1]
-        { :key => key, :const => self.constant_from(key) }
+      strings_lines.map do |l|
+        key = l.match(/"(.*)"\s*=/)[1]
+        { key: key, const: constant_from(key) }
       end
     end
 
     def constant_from(key)
-      inside = key.split(/[#{@config.keys_separator}\s]/).map { |s| s.capitalize }.join
-      %Q{k#{@config.dev_prefix}#{inside}Localized}
+      inside = key.split(/[#{@config.keys_separator}\s]/).map(&:capitalize).join
+      "k#{@config.dev_prefix}#{inside}Localized"
     end
-
   end
 end

data/lib/locraft/csv_parser.rb

@@ -4,44 +4,59 @@ require 'fileutils'
 
 module Locraft
   class CSVParser
+    include FileUtils
 
-    def initialize(csv_file, config)
+    def initialize(config)
       @config = config
-      @csv_body = File.read(csv_file)
     end
 
-    def parse_to_strings
-      csv = CSV.new(@csv_body, :headers => true)
-      rows = csv.to_a.map { |row| row.to_hash }
+    def parse_csv_file_to_strings(csv_file)
+      if File.file?(csv_file)
+        parse_csv_to_strings(File.read(csv_file))
+      else
+        warn "CSVParser ERROR: there is no such a csv_file [#{csv_file}]"
+      end
+    end
+
+    def parse_csv_to_strings(csv_body)
+      rows = csv_rows(csv_body)
       @config.langs.keys.each do |lang|
-        self.parse_rows_for_lang(rows, lang)
+        lproj_dir = mkdir_for_lang(lang)
+        localizable_file = "#{lproj_dir}/#{@config.strings_file}"
+        File.write(localizable_file, parse_rows_for_lang(rows, lang))
       end
     end
 
-    # return file path
+    def csv_rows(body)
+      csv = CSV.new(body, headers: true)
+      csv.to_a.map(&:to_hash)
+    end
+
+    # return strings file content
     def parse_rows_for_lang(rows, lang)
-      lproj_dir = %Q{#{@config.relative_destination_dir}/#{@config.langs[lang]}.lproj}
-      FileUtils::mkdir_p lproj_dir unless Dir.exists?(lproj_dir)
-      localizable_file = %Q(#{lproj_dir}/#{@config.strings_basename}#{STRINGS_EXTENSION})
-      File.open(localizable_file, 'w+') do |file|
-        rows.each do |row|
-          hash = self.row_hash(row, lang)
-          unless hash[:key].nil?
-            file.puts '/* %{comment} */' % hash unless hash[:comment].nil?
-            file.puts %Q{"%{key}" = "%{value}";\n\n} % hash
-          end
+      content = ''
+      rows.each do |row|
+        hash = row_hash(row, lang)
+        unless hash[:key].nil?
+          content += '/* %{comment} */' % hash unless hash[:comment].nil?
+          content += %(\n"%{key}" = "%{value}";\n\n) % hash
         end
       end
-      localizable_file
+      content
     end
 
     def row_hash(row, lang)
       {
-          :comment => row[@config.gdoc_comments_column],
-          :value => row[lang] || row[@config.default_lang],
-          :key => row[@config.gdoc_keys_column] || row[@config.default_lang]
+        comment: row[@config.gdoc_comments_column],
+        value: row[lang] || row[@config.default_lang],
+        key: row[@config.gdoc_keys_column] || row[@config.default_lang]
       }
     end
 
+    def mkdir_for_lang(lang)
+      lproj_dir = "#{@config.relative_destination_dir}/#{@config.langs[lang]}.lproj"
+      mkdir_p lproj_dir unless Dir.exist?(lproj_dir)
+      lproj_dir
+    end
   end
-end
+end

data/lib/locraft/extractor.rb

@@ -6,7 +6,6 @@ require_relative 'google_drive_wrapper'
 
 module Locraft
   class Extractor
-
     def initialize(config_file)
       @config = Config.load_from(config_file)
     end
@@ -14,8 +13,8 @@ module Locraft
     def extract
       # generate localized strings files
       csv_file = GoogleDriveWrapper.new(@config).export_worksheet
-      csv_parser = CSVParser.new(csv_file, @config)
-      csv_parser.parse_to_strings
+      csv_parser = CSVParser.new(@config)
+      csv_parser.parse_csv_file_to_strings(csv_file)
 
       # generate .plist files
       InfoPlistGenerator.new(@config).generate
@@ -23,6 +22,5 @@ module Locraft
       # generate constants
       ConstantsGenerator.new(@config).generate
     end
-
   end
 end

data/lib/locraft/google_drive_wrapper.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 
 module Locraft
   class GoogleDriveWrapper
+    include FileUtils
 
     EXPORTED_CSV_FILE = 'google_doc_sheet.csv'
     SESSION_TOKEN_FILE = '.locraft_gdrive_token'
@@ -13,21 +14,19 @@ module Locraft
     end
 
     def authenticate
-      FileUtils::mkdir_p @config.relative_destination_dir unless Dir.exists?(@config.relative_destination_dir)
+      mkdir_p @config.relative_destination_dir unless Dir.exist?(@config.relative_destination_dir)
       token_file = File.join(@config.relative_destination_dir, SESSION_TOKEN_FILE)
       @session = GoogleDrive.saved_session(token_file)
     end
 
     def doc_named(name)
-      unless @session
-        authenticate
-      end
+      authenticate unless @session
       @session.spreadsheet_by_title(name)
     end
 
     # return exported file path
     def export_worksheet
-      worksheets = self.doc_named(@config.gdoc_file).worksheets
+      worksheets = doc_named(@config.gdoc_file).worksheets
       if worksheets.count > @config.gdoc_sheet
         sheet = worksheets[@config.gdoc_sheet]
         file = File.join(@config.relative_destination_dir, EXPORTED_CSV_FILE)
@@ -37,6 +36,5 @@ module Locraft
         warn 'gdrive_wrapper worksheet export error: sheet number in config out of bounds!'
       end
     end
-
   end
-end
+end

data/lib/locraft/info_plist_generator.rb

@@ -2,29 +2,27 @@ require_relative 'config'
 
 module Locraft
   class InfoPlistGenerator
-
     def initialize(config)
       @config = config
     end
 
     def generate
       dir = @config.relative_destination_dir
-      folders = Dir.entries(dir).select { |d| d =~ %r(.+(.lproj)) }.map { |d| File.join(dir, d) }
+      folders = Dir.entries(dir).select { |d| d =~ /.+(.lproj)/ }.map { |d| File.join(dir, d) }
       folders.each { |f| generate_info_plist_in_lproj(f) }
     end
 
     def generate_info_plist_in_lproj(folder)
-      localizable_file = File.join(folder, %Q(#{@config.strings_basename}#{STRINGS_EXTENSION}))
-      info_file = File.join(folder, %Q(#{@config.info_plist_basename}#{STRINGS_EXTENSION}))
+      localizable_file = File.join(folder, @config.strings_file.to_s)
+      info_file = File.join(folder, @config.info_plist_file.to_s)
       File.write(info_file, info_plist_from(localizable_file))
 
-      puts %Q(- #{info_file} created)
+      puts "- #{info_file} created"
     end
 
     def info_plist_from(localizable_file)
-      filter = %r("(NS|CF).*"\s*=\s*".*";)
+      filter = /"(NS|CF).*"\s*=\s*".*";/
       File.readlines(localizable_file).select { |l| l =~ filter }.join("\n")
     end
-
   end
-end
+end

data/lib/locraft/initializer.rb

@@ -3,7 +3,6 @@ module Locraft
   SAMPLE_CONFIG_FILE = './locraft.config'
 
   class Initializer
-
     def self.init
       config = File.read(File.expand_path('../resources/sample_locraft.config', __FILE__))
       if File.file? SAMPLE_CONFIG_FILE
@@ -12,6 +11,5 @@ module Locraft
         File.write(SAMPLE_CONFIG_FILE, config)
       end
     end
-
   end
-end
+end

data/lib/locraft/runner.rb

@@ -4,23 +4,21 @@ require 'thor'
 
 module Locraft
   class Runner < Thor
-
     desc 'init', 'create sample locraft.config'
     def init
       Initializer.init
     end
 
     desc 'extract', 'extract strings from google drive and parse them into {.strings, .plist} files. Then create constants'
-    option :config, :default => SAMPLE_CONFIG_FILE , :aliases => '-c', :type => :string, :desc => 'configuration file'
+    option :config, default: SAMPLE_CONFIG_FILE, aliases: '-c', type: :string, desc: 'configuration file'
     def extract
       config_file = options[:config]
       if File.file? config_file
         extractor = Extractor.new(options[:config])
         extractor.extract
       else
-        warn %Q(Error: there is no such a file '#{config_file}'.)
+        warn %(Error: there is no such a file "#{config_file}".)
       end
     end
-
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locraft
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - sroik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive