woz 0.1.0 → 0.2.0

data/README.md

@@ -47,6 +47,20 @@ To make it even more clear, here is a simple representation of the xls file:
 
 This will genereate different '.lproj' directories with the localized files inside of them.
 
+There is also a possibility to generate strings files from a xls file located on a different location on your disk. Just pass the relative or absolute filepath to the 'woz strings' command:
+
+    woz strings a_relative_directory/the_file.xls
+    woz strings /an_absolute_directory/the_file.xls
+    woz strings ~/an_absolute_directory_inside_your_home_folder/the_file.xls
+
+## Changelog
+
+### 0.2.0
+
+- Add filename/filepath behind the 'woz strings' command in order to use that xls file for strings generation.
+- Better .strings content formatting.
+- Better overwrite confirmation messages.
+
 ## License
 
 Check out the LICENSE.txt file. Really awesome reading material...

data/bin/woz

@@ -10,8 +10,8 @@ class WozCommand < Thor
   end
 
   desc "strings", "creates the strings files from the available xls file."
-  def strings
-    Woz::Builder.generate_strings
+  def strings(filepath=nil)
+    Woz::Builder.generate_strings(filepath)
   end
 
   desc "setup", "creates the woz configuration file."

data/lib/woz/builder.rb

@@ -26,8 +26,8 @@ module Woz
         generate_translation_xls
       end
 
-      def generate_strings
-        generate_translation_strings
+      def generate_strings(xls_filepath=nil)
+        generate_translation_strings(xls_filepath)
       end
 
       protected
@@ -111,7 +111,7 @@ TEXT
 
         xls = generate_spreadsheet list
 
-        if !Woz.config.ask_confirmation || ask("! this xls file will be overwrite type 'y' to confirm: ") == "y"
+        if !Woz.config.ask_confirmation || ask("! the project's xls file will be overwritten, type 'y' and enter to continue: ") == "y"
           xls.write(File.join(output_dir, Woz.config.xls_filename))
           puts "# xls generated at #{File.join(output_dir, Woz.config.xls_filename)}"
         else
@@ -140,9 +140,11 @@ TEXT
         list
       end
 
-      def generate_translation_strings
-        file = File.join(Dir.pwd, Woz.config.xls_filename)
-        output_dir = get_output_dir(file)
+      def generate_translation_strings(xls_filepath=nil)
+        filepath = File.expand_path(xls_filepath || Woz.config.xls_filename)
+        puts filepath.inspect
+        file = File.join(filepath)
+        output_dir = get_output_dir(File.join(File.expand_path(Woz.config.xls_filename)))
 
         fail "! xls file not found, specify the filename in the .wozniak file" unless File.exists?(file)
 
@@ -158,17 +160,21 @@ TEXT
           cocoa_languages_array << "@\"#{language}\""
 
           new_file = !File.exists?(file_path)
-          if new_file || !Woz.config.ask_confirmation || ask("! this #{language} strings file will be overwrite type 'y' to confirm: ") == "y"
+          if new_file || !Woz.config.ask_confirmation || ask("! the project's #{language} strings file will be overwritten, type 'y' and enter to continue: ") == "y"
             if new_file
               file = File.new(file_path, "w")
             else
               file = File.open(file_path, "w")
             end
             list[language].each do |key, value|
-              if value.nil?
-                file.puts "\"#{key}\" = \"MISSING VALUE\";" unless key.nil?
-              else
-                file.puts "\"#{key}\" = \"#{value}\";"
+              unless key.nil?
+                file.puts "\/\* #{key} \*\/"
+                if value.nil?
+                  file.puts "\"#{key}\" = \"MISSING VALUE\";"
+                else
+                  file.puts "\"#{key}\" = \"#{value}\";"
+                end
+                file.puts ""
               end
             end
             puts "# #{language} strings generated at #{file_path}"

data/lib/woz/version.rb

@@ -1,3 +1,3 @@
 module Woz
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/example_xcode_project/.wozniak

@@ -5,7 +5,7 @@
 Woz.configure do |config|
   config.xls_filename = "Localizable.xls"
   config.strings_filename = "Localizable.strings"
-  config.ask_confirmation = false
+  config.ask_confirmation = true
 end
 #
 # You can now run `woz xls` to create a translation

data/spec/example_xcode_project/de.lproj/Localizable.strings

@@ -1,3 +1,12 @@
+/* name */
+"name" = "MISSING VALUE";
+
+/* beer */
 "beer" = "biere";
+
+/* title */
 "title" = "MISSING VALUE";
-"name" = "MISSING VALUE";
+
+/* fun */
+"fun" = "Spaß";
+

data/spec/example_xcode_project/en.lproj/Localizable.strings

@@ -1,3 +1,12 @@
+/* name */
+"name" = "name";
+
+/* beer */
 "beer" = "MISSING VALUE";
+
+/* title */
 "title" = "title";
-"name" = "name";
+
+/* fun */
+"fun" = "pleasure";
+

data/spec/example_xcode_project/fr.lproj/Localizable.strings

@@ -1,3 +1,12 @@
+/* name */
+"name" = "nom";
+
+/* beer */
 "beer" = "bière";
+
+/* title */
 "title" = "titre";
-"name" = "nom";
+
+/* fun */
+"fun" = "plaisire";
+

data/spec/example_xcode_project/nl.lproj/Localizable.strings

@@ -1,3 +1,12 @@
+/* name */
+"name" = "naam";
+
+/* beer */
 "beer" = "bier";
+
+/* title */
 "title" = "titel";
-"name" = "naam";
+
+/* fun */
+"fun" = "plezier";
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woz
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-31 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70249543876360 !ruby/object:Gem::Requirement
+  requirement: &70346431276860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.15
   type: :runtime
   prerelease: false
-  version_requirements: *70249543876360
+  version_requirements: *70346431276860
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70249543875740 !ruby/object:Gem::Requirement
+  requirement: &70346431276180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70249543875740
+  version_requirements: *70346431276180
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &70249543875160 !ruby/object:Gem::Requirement
+  requirement: &70346431275620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: 0.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *70249543875160
+  version_requirements: *70346431275620
 description: Generate strings files from an xls and vice versa.
 email:
 - jelle@fousa.be