xcres 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 582ff4713e27360dad8eac366f7fb972e631696f
-  data.tar.gz: 95e46087ebe01b670c0cc4b03493e87963146b17
+  metadata.gz: c693c63079477f934beba5d70aeeeb474ba89d3c
+  data.tar.gz: 37daa9576e22f68af31f1fcea2d8931287fadce2
 SHA512:
-  metadata.gz: 65b834e686b1f356abced830e74608fac622bc6c0d744ab7da13e8ce3592c18c42968c980b32d155f4bdd890a17ed10f301f4ad393e4a2c336e4d5cbab02d22e
-  data.tar.gz: dfa1cc9951f35286e886179f80f5560bcf8ce3c6cda38e287103209353418b30822ddeba41cfb7339237b92a8a866948e84f95c0182bf859e37e5514beca0162
+  metadata.gz: 59d34106718f0effdf97806992013b312b0e064f6577fc8ee8ae99e995d78aba7bd1567b899024e9731d7fcac60dcdf8ba25e5a54d38d341046e610fd5942915
+  data.tar.gz: 207373fdbeea3645e865910b744aeda5539b69ab4553773e3da4443e7440fa7d21158cb69afd10b27ecd623adbd8f494cbe772104bce718ef71677c754b619c0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xcres (0.4.2)
+    xcres (0.4.3)
       activesupport (>= 3.2.15, < 4)
       clamp (~> 0.6.3)
       colored (~> 1.2)

data/lib/xcres/analyzer/strings_analyzer.rb

@@ -170,7 +170,7 @@ module XCRes
     def read_plist_key(path, key)
       raise ArgumentError, 'Path is required, but nil' if path.nil?
       raise ArgumentError, 'Key is required, but nil' if key.nil?
-      out = `/usr/libexec/PlistBuddy -c "Print :#{key}" #{path}`.chomp
+      out = `/usr/libexec/PlistBuddy -c "Print :#{key}" "#{path}"`.chomp
       raise ArgumentError, out unless $?.success?
       out
     end
@@ -185,10 +185,10 @@ module XCRes
     def read_strings_file(path)
       raise ArgumentError, "File '#{path}' doesn't exist" unless path.exist?
       raise ArgumentError, "File '#{path}' is not a file" unless path.file?
-      error = `plutil -lint -s "#{path}"`
-      return warn "File %s is malformed:\n#{error}", path.to_s unless $?.success?
+      error = `plutil -lint -s "#{path}" 2>&1`
+      raise ArgumentError, "File %s is malformed:\n#{error}" % path.to_s unless $?.success?
       json_or_error = `plutil -convert json "#{path}" -o -`.chomp
-      return warn "File %s couldn't be converted to JSON.\n#{json_or_error}", path.to_s unless $?.success?
+      raise ArgumentError, "File %s couldn't be converted to JSON.\n#{json_or_error}" % path.to_s unless $?.success?
       JSON.parse(json_or_error.force_encoding('UTF-8'))
     rescue EncodingError => e
       raise StandardError, "Encoding error in #{path}: #{e}"
@@ -239,6 +239,9 @@ module XCRes
         # Load strings file contents
         strings = read_strings_file(path)
 
+        # Reject generated identifiers used by Interface Builder
+        strings.reject! { |key, _| /^[a-zA-Z0-9]{3}(-[a-zA-Z0-9]{3}){2}/.match(key) }
+
         keys = Hash[strings.map do |key, value|
           [key, { value: key, comment: value.gsub(/[\r\n]/, ' ') }]
         end]

data/lib/xcres/command/install_command.rb

@@ -167,8 +167,9 @@ class XCRes::InstallCommand < XCRes::ProjectCommand
   #
   def prefix_headers
     @prefix_headers ||= target.build_configurations.map do |config|
-      Pathname(config.build_settings['GCC_PREFIX_HEADER'])
-    end.flatten.to_set
+      setting = config.build_settings['GCC_PREFIX_HEADER']
+      setting ? Pathname(setting) : nil
+    end.flatten.compact.to_set
   end
 
 end

data/lib/xcres/version.rb

@@ -4,6 +4,6 @@ module XCRes
   #
   #   XCRes’s version, following [semver](http://semver.org).
   #
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 
 end

data/spec/fixtures/Example/Example/en.lproj/Localizable.strings

@@ -13,3 +13,6 @@
 // An Example Comment
 "example" = "Lorem Ipsum";
 "en_exclusive" = "Only in english";
+
+// Strings from Storyboards
+"123-abc-3e7.text" = "Hello Storyboards";

data/spec/fixtures/StringsFiles/syntax_error_missing_semicolon.strings

@@ -0,0 +1 @@
+"test" = "with missing semicolon"

data/spec/integration/version/after/execution_output.txt

@@ -1,3 +1,3 @@
  xcres version --verbose --no-ansi 2>&1
 Ⓥ Verbose mode is enabled.
-0.4.2
+0.4.3

data/spec/unit/analyzer/strings_analyzer_spec.rb

@@ -13,6 +13,8 @@ describe 'XCRes::StringsAnalyzer' do
 
     @analyzer = subject.new(@target)
     @analyzer.logger = stub('Logger', :log)
+    @analyzer.expects(:warn).never
+    @analyzer.expects(:error).never
   end
 
   describe "#initialize" do
@@ -96,4 +98,34 @@ describe 'XCRes::StringsAnalyzer' do
     end
   end
 
+  describe "#read_strings_file" do
+    it 'should read a valid file' do
+      @analyzer.read_strings_file(fixture_path + 'Example/Example/en.lproj/Localizable.strings').should == {
+        "foo"               => "Foo String",
+        "bar"               => "Bar String",
+        "en_exclusive"      => "Only in english",
+        "example"           => "Lorem Ipsum",
+        "123-abc-3e7.text"  => "Hello Storyboards",
+      }
+    end
+
+    it 'should raise an error for an invalid file' do
+      proc do
+        @analyzer.read_strings_file(fixture_path + 'StringsFiles/syntax_error_missing_semicolon.strings')
+      end.should.raise(StandardError).message.should.include "Old-style plist parser: missing semicolon in dictionary on line 2."
+    end
+  end
+
+  describe "#keys_by_file" do
+    it 'should return the string keys hash' do
+      path = fixture_path + 'Example/Example/en.lproj/Localizable.strings'
+      @analyzer.keys_by_file(path).should == {
+        "foo"          => { value: "foo",          comment: "Foo String"      },
+        "bar"          => { value: "bar",          comment: "Bar String"      },
+        "en_exclusive" => { value: "en_exclusive", comment: "Only in english" },
+        "example"      => { value: "example",      comment: "Lorem Ipsum"     },
+      }
+    end
+  end
+
 end

data/spec/unit/command/install_command_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe 'XCRes::InstallCommand' do
+
+  def subject
+    XCRes::InstallCommand
+  end
+
+  before do
+    @cmd = subject.new('xcres', [], {})
+    @cmd.stubs(:project).returns(xcodeproj)
+  end
+
+  describe '#prefix_headers' do
+    it 'should return the expected prefix headers' do
+      @cmd.prefix_headers.to_a.should == [Pathname('Example/Example-Prefix.pch')]
+    end
+
+    it 'should return empty array if a target has no value for GCC_PREFIX_HEADER' do
+      @cmd.target.build_configurations.each do |config|
+        config.build_settings.stubs(:[]).with('GCC_PREFIX_HEADER').returns(nil)
+      end
+      @cmd.prefix_headers.to_a.should == []
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcres
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Marius Rackwitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -289,6 +289,7 @@ files:
 - spec/fixtures/ExampleOSX/ExampleOSXTests/ExampleOSXTests-Info.plist
 - spec/fixtures/ExampleOSX/ExampleOSXTests/ExampleOSXTests.m
 - spec/fixtures/ExampleOSX/ExampleOSXTests/en.lproj/InfoPlist.strings
+- spec/fixtures/StringsFiles/syntax_error_missing_semicolon.strings
 - spec/integration.rb
 - spec/integration/build-keyword-clash/after/Example/Example.xcodeproj.yaml
 - spec/integration/build-keyword-clash/after/Example/Example/AppDelegate.h
@@ -519,6 +520,7 @@ files:
 - spec/unit/builder/file_builder_spec.rb
 - spec/unit/builder/resources_builder_spec.rb
 - spec/unit/builder/string_builder_spec.rb
+- spec/unit/command/install_command_spec.rb
 - spec/unit/command/main_command_spec.rb
 - spec/unit/command/project_command_spec.rb
 - spec/unit/helper/file_helper_spec.rb
@@ -592,6 +594,7 @@ test_files:
 - spec/fixtures/ExampleOSX/ExampleOSXTests/ExampleOSXTests-Info.plist
 - spec/fixtures/ExampleOSX/ExampleOSXTests/ExampleOSXTests.m
 - spec/fixtures/ExampleOSX/ExampleOSXTests/en.lproj/InfoPlist.strings
+- spec/fixtures/StringsFiles/syntax_error_missing_semicolon.strings
 - spec/integration.rb
 - spec/integration/build-keyword-clash/after/Example/Example.xcodeproj.yaml
 - spec/integration/build-keyword-clash/after/Example/Example/AppDelegate.h
@@ -822,6 +825,7 @@ test_files:
 - spec/unit/builder/file_builder_spec.rb
 - spec/unit/builder/resources_builder_spec.rb
 - spec/unit/builder/string_builder_spec.rb
+- spec/unit/command/install_command_spec.rb
 - spec/unit/command/main_command_spec.rb
 - spec/unit/command/project_command_spec.rb
 - spec/unit/helper/file_helper_spec.rb