babelyoda 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/bin/babelyoda

@@ -2,18 +2,19 @@
 
 require 'rubygems'
 require 'fileutils'
-require 'plist'
 require 'term/ansicolor'
 require 'tmpdir'
 require 'yaml'
 
 include Term::ANSIColor
 
+require 'babelyoda/options'
+require 'babelyoda/strings'
+
 # Main block
 
 def main
-  banner
-  check_args
+  $config = BabelYoda::Options.parse
   setup
   print_config
   prepare_folders
@@ -32,34 +33,13 @@ end
 
 # Aux methods
 
-def banner
-  puts "Babel Yoda v1.2.0"
-  puts "© 2010 Andrey Subbotin <andrey@subbotin.me>"
-end
-
-def usage 
-  puts ""
-  puts "Usage: babelyoda [<rules.babelyoda>]"
-  puts ""
-  puts "<rules.babelyoda> = babel yoda config file, default is rules.babelyoda"   
-end
-
-def check_args 
-  if ARGV.length > 1
-    usage
-    exit 1
-  end
-end
-
 def setup
-  $config = Hash.new
   global_config_filename = File.expand_path('~/.babelyoda')
   $config.merge!(YAML.load_file(global_config_filename)) if File.exist?(global_config_filename)
-  config = YAML.load_file(ARGV[0].nil? ? 'rules.babelyoda' : ARGV[0])
+  config = YAML.load_file($config['rules'])
   config['tmp_dir'] = File.join Dir.tmpdir, "epl.babelyoda.#{$$}"
   config['src_dir'] = File.join config['tmp_dir'], 'src'
   config['startwd'] = Dir.getwd
-  config['src_lang'] = Plist::parse_xml(config['plist'])['CFBundleDevelopmentRegion']
   config['src_lang_lproj'] = config['src_lang'] + '.lproj'
   config['src_lang_lproj_dir'] = File.join(config['strings_folder'], config['src_lang_lproj'])
   config['src_lang_code_strings_file'] = File.join(config['src_lang_lproj_dir'], 'Localizable.strings')
@@ -237,6 +217,8 @@ def genstrings(files, output_path)
   files_safe = escape_cmd_args(files)
   rc = exe "genstrings -o '#{output_path}' #{files_safe}"
   error "Failed to generate strings" unless rc
+  strings_file = File.join(output_path, 'Localizable.strings')
+  BabelYoda::StringsHelper.safe_init_strings_file strings_file
 end
 
 def gen_src_xib_strings
@@ -257,6 +239,7 @@ def gen_xib_strings(xib)
   strings = tmp_filename_for_xib_strings(xib)
   rc = exe "ibtool --generate-strings-file '#{strings}' '#{xib}'"
   error "Failed to generate strings for file '#{xib}'" unless rc
+  BabelYoda::StringsHelper.safe_init_strings_file strings
   strings
 end
 
@@ -265,9 +248,13 @@ def merge_strings(src_strings, dst_strings)
   puts "DST_STRINGS: #{dst_strings}"
   targets.each do |target|
     status "MERGING STRINGS AT '#{src_strings}' INTO '#{target}'"
-    FileUtils.touch target
-    rc = exe "wincent-strings-util --base '#{src_strings}' --merge '#{target}' --output '#{target}'"
-    error "Failed to merge '#{src_strings}' into '#{target}'" unless rc
+    FileUtils.mkdir_p File.split(target)[0], :verbose => true
+    if File.exists? target
+      rc = exe "wincent-strings-util --base '#{src_strings}' --merge '#{target}' --output '#{target}'"
+      error "Failed to merge '#{src_strings}' into '#{target}'" unless rc
+    else
+      FileUtils.cp src_strings, target, :verbose => true
+    end
   end
 end
 
@@ -363,6 +350,8 @@ def localize_xibs_incrementally
       FileUtils.cp src_xib, dst_xib, :preserve => true, :verbose => true
       old_dst_xib = old_xib_for_xib_lang(dst_xib, lang)
       FileUtils.cp dst_xib, old_dst_xib, :preserve => true, :verbose => true
+
+      BabelYoda::StringsHelper.safe_init_strings_file dst_strings
       
       ncmd = ['ibtool', '--previous-file', "'#{old_dst_xib}'",
              '--incremental-file', "'#{old_src_xib}'",
@@ -370,7 +359,6 @@ def localize_xibs_incrementally
              '--localize-incremental',
              '--write', "#{dst_xib}",
              "#{src_xib}"].join(' ')
-       puts "XIB-CMD: #{ncmd}"
       rc = exe ncmd 
       error "Failed to localize a XIB incrementally" unless rc
     end

data/data/empty.strings

@@ -0,0 +1 @@
+��

data/lib/babelyoda/options.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'ostruct'
+  
+module BabelYoda
+  class Options
+    
+    #
+    # Return a structure describing the options.
+    #
+    def self.parse
+      # The options specified on the command line will be collected in *options*.
+      # We set default values here.
+      options = { 'rules' => 'rules.babelyoda' }
+
+      optparser = OptionParser.new do |opts|
+        opts.banner = "Usage: babelyoda [options]"
+
+        opts.separator ""
+        opts.separator "Common options:"
+        
+        # Optional argument; multi-line description.
+        opts.on("-r", "--rules <RULES-FILE>",
+                "Use the specified rules file.",
+                "Default is 'babelyoda.rules'.") do |rules|
+          options['rules'] = rules
+        end        
+        
+        # No argument, shows at tail.  This will print an options summary.
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+      end
+      
+      optparser.parse!
+      options
+    end
+        
+  end
+end

data/lib/babelyoda/strings.rb

@@ -0,0 +1,11 @@
+module BabelYoda
+  class StringsHelper
+    def self.safe_init_strings_file(path)
+      unless File.exists? path
+        empty_strings_file = File.join File.dirname(__FILE__), '..', '..', 'data', 'empty.strings'
+        FileUtils.mkdir_p File.split(path)[0], :verbose => true
+        FileUtils.cp empty_strings_file, path, :verbose => true
+      end
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Andrey Subbotin
@@ -56,8 +56,9 @@ files:
 - LICENSE
 - README.rdoc
 - VERSION
-- bin/babelyoda
-- lib/babelyoda.rb
+- data/empty.strings
+- lib/babelyoda/options.rb
+- lib/babelyoda/strings.rb
 has_rdoc: true
 homepage: http://github.com/eploko/babelyoda
 licenses: []