stringy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d244e57d49544f32e39dbf8bb44c021de56ec2b3
-  data.tar.gz: 63bef50a62337f5bd07d0d747153eab76c245ffa
+  metadata.gz: 55871567022ba990377fed2910968c91ea3010b1
+  data.tar.gz: 730893de0de29a9b3461a10f2b7cb70156c23565
 SHA512:
-  metadata.gz: 4178b8760042fe03c1cb6534abeb6465eccc3d2f887de16555ecd827e767b2050864a04ddecbee0b72b512ac5d3a2fe9b78c67b54e06946ae0764d908966f7c7
-  data.tar.gz: a0401dafe6ad309ae0c0c209a3edb4bc048791efe81d0ad40b3b122ae7ed29e35b979cc45ba71f587918199806193437ccbebf79becea485adeb8e452d5210fb
+  metadata.gz: 8f43bb9cc998a3f8bf4bb38d1a25ba240653c8e4782c686c376d3b27b0f24c9bce4783be884319ef6b17b846d652e1996a91fb64d6d7f79615a5e8711c900695
+  data.tar.gz: cf8ceadc46b6654ee98767375022fcd2d8b8f425c3fd94560672562c9d8e37e52b26d9dc788a7656201ed040588dc6d6c54db537445444d4c654bc35a66ae43b

data/lib/stringy/cli.rb

@@ -9,6 +9,7 @@ Thread.abort_on_exception = true
 module Stringy
   class CLI < Thor
     class_option :verbose, :type => :boolean, :aliases => "-v"
+    class_option :force, :type => :boolean, :aliases => "-f"
 
     method_option :overwrite, :type => :boolean, :aliases => "-o"
     desc "update -v -o", "Updates then base stings and optionaly overwrites the tranlations"
@@ -40,15 +41,14 @@ module Stringy
 
         # Set up some extentions
         storyboardExt = ".storyboard"
+        xibExt = ".xib"
         stringsExt = ".strings"
         localeDirExt = ".lproj"
 
-        newStringsExt=".strings.new"
-
-        isNewStringsFile = false
+        newStringsExt=".new"
 
         # Loop the storyboards in base
-        Dir.glob("Base.lproj/*#{storyboardExt}") do |storyboardPath|
+        Dir.glob("Base.lproj/*{#{storyboardExt},#{xibExt}}") do |storyboardPath|
 
           # Create the base path (eg. settings)
           baseStringsPath = storyboardPath.chomp(File.extname(storyboardPath)) + stringsExt
@@ -57,39 +57,34 @@ module Stringy
           puts "Starting " + baseStringsPath if options[:verbose]
 
           # Check if it exists
-          if File.file?(baseStringsPath)
-            isNewStringsFile = false
+          stringFileIsMissing = !File.file?(baseStringsPath)
+          if !stringFileIsMissing
+            storyboardIsNewer = File.mtime(storyboardPath) > File.mtime(baseStringsPath)
           else
-            # If it we need to create the file.
-            puts baseStringsPath + " file doesn't exist; create" if options[:verbose]
-            puts "Running: ibtool --export-strings-file #{baseStringsPath.chomp} #{storyboardPath.chomp}" if options[:verbose]
-            system("ibtool --export-strings-file #{baseStringsPath.chomp} #{storyboardPath.chomp}"+warningSuppressor)
-
-            puts baseStringsPath + " file created" if options[:verbose]
-
-            isNewStringsFile = true
+            storyboardIsNewer = false
           end
 
+          puts "String file is missing" if options[:verbose] && stringFileIsMissing
+          puts "Storyboard is newer" if options[:verbose] && storyboardIsNewer
+
           # Create strings file only when storyboard file newer and not just been created
-          if isNewStringsFile || `find #{storyboardPath.chomp} -prune -newer #{baseStringsPath.chomp} -print | grep -q .` then
+          if options[:force] || stringFileIsMissing || storyboardIsNewer then
 
-            puts storyboardPath + " is modified; update " + baseStringsPath if options[:verbose]
+            puts "Updating " + baseStringsPath if options[:verbose]
 
             # Get storyboard file name and folder
             storyboardDir = File.dirname(storyboardPath)
 
             # Get New Base strings file full path and strings file name
-            newBaseStringsPath = `echo "#{storyboardPath}" | sed "s/#{storyboardExt}/#{newStringsExt}/"`.chomp
             stringsFile = File.basename(baseStringsPath)
+            newBaseStringsPath = "#{storyboardDir}/#{stringsFile}#{newStringsExt}"
 
-            if isNewStringsFile == false
-              puts "Running: ibtool --export-strings-file #{newBaseStringsPath.chomp} #{storyboardPath.chomp}" if options[:verbose]
-              system("ibtool --export-strings-file #{newBaseStringsPath.chomp} #{storyboardPath.chomp}"+warningSuppressor)
-
-              puts "Running: iconv -f UTF-16 -t UTF-8 #{newBaseStringsPath.chomp} > #{baseStringsPath.chomp}" if options[:verbose]
-              system("iconv -f UTF-16 -t UTF-8 #{newBaseStringsPath.chomp} > #{baseStringsPath.chomp}"+warningSuppressor)
-            end
+            puts "Running: ibtool --export-strings-file #{newBaseStringsPath.chomp} #{storyboardPath.chomp}" if options[:verbose]
+            system("ibtool --export-strings-file #{newBaseStringsPath.chomp} #{storyboardPath.chomp}"+warningSuppressor)
 
+            puts "Running: iconv -f UTF-16 -t UTF-8 #{newBaseStringsPath.chomp} > #{baseStringsPath.chomp}" if options[:verbose]
+            system("iconv -f UTF-16 -t UTF-8 #{newBaseStringsPath.chomp} > #{baseStringsPath.chomp}")
+            
             FileUtils.rm(newBaseStringsPath) if File.exists?(newBaseStringsPath)
 
             if options[:overwrite] then
@@ -101,16 +96,18 @@ module Stringy
 
                   localeStringsPath = localeStringsDir+"/"+stringsFile
 
-                  puts "Move strings file in " + localeStringsDir if options[:verbose]
+                  puts "Move strings file in " + localeStringsPath if options[:verbose]
                   FileUtils.mkdir_p(File.dirname(localeStringsPath))
                   FileUtils.cp(baseStringsPath, localeStringsPath)
                 end
               end
             end
+          else
+            puts "No action needed" if options[:verbose]
           end
       end
       
-      puts "" if !options[:verbose]
+      puts "" #just to add a line for formating
     end
   end
 end

data/lib/stringy/version.rb

@@ -1,3 +1,3 @@
 module Stringy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stringy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Benjamin Briggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler