ios_localizer 0.0.1.1 → 0.0.1.2

data/bin/ios_localizer

@@ -5,30 +5,63 @@ require 'optparse'
 
 # Initialise default constants
 
-key = nil
-proj_dir = Dir.pwd
-source = "en"
-skip = []
+options = {}
 
+options[:source] = "en"
+options[:skip] = []
 # Get command line variables 
 
-OptionParser.new do |opts|
-  opts.banner = "Usage: your_app [options]"
+optparse = OptionParser.new do |opts|
+  opts.banner = "Usage: ios_localizer"
+
+  opts.separator ""
+  opts.separator "Specific options:"
+  
   opts.on('-k [ARG]', '--key [ARG]', "Mandatory Google Translate key") do |v|
-  	key = v
+  	options[:key] = v
   end
   opts.on('-s [ARG]', '--source [ARG]', "Specify the source language") do |v|
-  	source = v
+  	options[:source] = v
+  end
+  opts.on('-n [ARG]', '--nolang [ARG]', "Specify languages added to project but should be avoided during translation") do |v|
+  	options[:skip] << v
+  end
+  opts.on("-v", "--verbose", "Run verbosely") do |v|
+    opts.verbose = v
+  end
+
+  opts.separator ""
+  opts.separator "Common options:"
+
+
+  opts.on_tail("-h", "--help", "Show help message") do
+    puts opts
+      exit
   end
-  opts.on('-n [ARG]', '--nolang [ARG]', "Specify the languages gem should avoid converting") do |v|
-  	skip << v
+  opts.on_tail("--version", "Show gem version") do
+    puts IosLocalizer::VERSION
+    exit
   end
 end.parse!
 
 # Raise appropriate exceptions
 
-raise OptionParser::MissingArgument if key.nil?
+begin
+  optparse.parse!
+  mandatory = [:key]
+  missing = mandatory.select{ |param| options[param].nil? }
+  if not missing.empty?
+    puts "Missing options: #{missing.join(', ')}"
+    puts optparse
+    exit
+  end
+rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+  puts $!.to_s
+  puts optparse
+  exit
+end                                                         
 
+puts "Performing task with options: #{options.inspect}"
 # Pass parameter to script
 
-IosLocalizer.localize(key, proj_dir, source, skip)
+IosLocalizer.localize(options [:key], Dir.pwd, options [:source], options [:skip])

data/lib/ios_localizer.rb

@@ -41,7 +41,7 @@ module IosLocalizer
 	def IosLocalizer.localize(key, proj_dir, source, skip)
 
 		h = HelperMethods.new
-
+		
 		source_strings_file = proj_dir + "/" + source + ".lproj/Localizable.strings"
 
 		#Get languages
@@ -50,8 +50,19 @@ module IosLocalizer
 
 		ldata = h.getDataFromURL (lurl)
 
-		if ldata.has_key? 'Error'
-			raise "web service error"
+		if ldata.has_key? "error"
+			if ldata["error"]["errors"][0]["reason"] == "keyInvalid"
+				puts "ERROR: Invalid API Key"
+				exit
+			else
+				puts "ERROR: web service error"
+				exit
+			end
+		end
+
+		if ldata.count == 0
+			puts "Invalid API key"
+			exit (1)
 		end
 
 		languages = Array.new

data/lib/ios_localizer/version.rb

@@ -1,3 +1,3 @@
 module IosLocalizer
-  VERSION = "0.0.1.1"
+  VERSION = "0.0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ios_localizer
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 -04:00
+date: 2012-09-16 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70328367060260 !ruby/object:Gem::Requirement
+  requirement: &70272343747100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328367060260
+  version_requirements: *70272343747100
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70328367059800 !ruby/object:Gem::Requirement
+  requirement: &70272343746680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328367059800
+  version_requirements: *70272343746680
 description: Uses Google Translate's REST API to properly translate the source Localizable.strings
   file to each of the specified languages
 email: