xcres 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c693c63079477f934beba5d70aeeeb474ba89d3c
-  data.tar.gz: 37daa9576e22f68af31f1fcea2d8931287fadce2
+  metadata.gz: 66662fa71e28ebba0f9e8709d34eaa747884acd5
+  data.tar.gz: 848102aa3b625215e7523bfec8e216e6c9d2b80f
 SHA512:
-  metadata.gz: 59d34106718f0effdf97806992013b312b0e064f6577fc8ee8ae99e995d78aba7bd1567b899024e9731d7fcac60dcdf8ba25e5a54d38d341046e610fd5942915
-  data.tar.gz: 207373fdbeea3645e865910b744aeda5539b69ab4553773e3da4443e7440fa7d21158cb69afd10b27ecd623adbd8f494cbe772104bce718ef71677c754b619c0
+  metadata.gz: 22ab34d31c641dfae88fe78ef6e5c19e9a60e6b1244f269f511343b7a6f72461640c7cf8d6b845b414dba357a27a981c85de16a42879dfa69bcd7804fc790467
+  data.tar.gz: 477d6500c3aa810f1d97f04203e00965cbe0ab11b2c9f2977a5ccaecc090d9c2250a721da0e009298bf32fb3a3bc5adce0ea82eefde001abfd5f2df8cbe5c475

data/Gemfile.lock

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

data/lib/xcres/analyzer/strings_analyzer.rb

@@ -153,8 +153,12 @@ module XCRes
     #
     def native_dev_languages
       @native_dev_languages ||= absolute_info_plist_paths.map do |path|
-        read_plist_key(path, :CFBundleDevelopmentRegion)
-      end.to_set
+        begin
+          read_plist_key(path, :CFBundleDevelopmentRegion)
+        rescue ArgumentError => e
+          warn e
+        end
+      end.compact.to_set
     end
 
     # Extracts a given key from a plist file given as a path
@@ -168,10 +172,11 @@ module XCRes
     # @return [String]
     #
     def read_plist_key(path, key)
+      raise ArgumentError, "File '#{path}' doesn't exist" unless path.exist?
       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
-      raise ArgumentError, out unless $?.success?
+      out = `/usr/libexec/PlistBuddy -c "Print :#{key}" "#{path}" 2>&1`.chomp
+      raise ArgumentError, "Error reading plist: #{out}" unless $?.success?
       out
     end
 
@@ -215,18 +220,6 @@ module XCRes
       end
     end
 
-    # Get relative file paths
-    #
-    # @return [Array<Pathname>]
-    #
-    def strings_file_paths
-      project_dir = project.path + '..'
-      project_dir_realpath = project_dir.realpath
-      strings_file_refs.map(&:real_path).map do |path|
-        project_dir + path.relative_path_from(project_dir_realpath) rescue path
-      end
-    end
-
     # Read a file and collect all its keys
     #
     # @param  [Pathname] path

data/lib/xcres/logger.rb

@@ -108,20 +108,21 @@ class XCRes::Logger
 
   # Print a warning log message in yellow color
   #
-  # @param [String] message
+  # @param [String|Exception] message_or_exception
   #        the message, which can have format placeholders
   #
   # @param [#to_s...] format_args
   #        will be passed as right hand side to the percent operator,
   #        which will fill the format placeholders used in the message
   #
-  def warn message, *format_args
+  def warn message_or_exception, *format_args
+    message, _ = coerce_to_message(message_or_exception)
     inform_colored '⚠' + ' ' + message, :yellow, *format_args
   end
 
   # Print a log message to indicate failure of an operation in red color
   #
-  # @param [String|Exception] message
+  # @param [String|Exception] message_or_exception
   #        The message, which can have format placeholders,
   #        can also be a kind of Exception, then its message would been
   #        used instead. The backtrace will be only printed, if the verbose
@@ -131,13 +132,8 @@ class XCRes::Logger
   #        will be passed as right hand side to the percent operator,
   #        which will fill the format placeholders used in the message
   #
-  def fail message, *format_args
-    exception = nil
-    if message.kind_of? Exception
-      exception = message
-      message = exception.message
-    end
-
+  def fail message_or_exception, *format_args
+    message, exception = coerce_to_message(message_or_exception)
     inform_colored '✗' + ' ' + message, :red, *format_args
 
     if verbose? && exception != nil
@@ -145,4 +141,29 @@ class XCRes::Logger
     end
   end
 
+  private
+
+  # Coerces the given message or an exception to a string, and yields them as
+  # separated parameters to a block, which allows further handling.
+  #
+  # @param [#to_s] message_or_exception
+  #        Can be a String message or an exception
+  #
+  # @return [String,Exception?] message,exception
+  #         An array on first place is either the first argument or the
+  #         exception's message. If the given argument +message_or_exception+
+  #         is an exception, then it is the second element in the result.
+  #
+  def coerce_to_message(message_or_exception)
+    exception = nil
+    if message_or_exception.kind_of? Exception
+      exception = message_or_exception
+      message = exception.message
+    else
+      message = message_or_exception.to_s
+    end
+
+    return message, exception
+  end
+
 end

data/lib/xcres/version.rb

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

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.3
+0.4.4

data/spec/unit/analyzer/strings_analyzer_spec.rb

@@ -83,18 +83,150 @@ describe 'XCRes::StringsAnalyzer' do
     end
   end
 
-  describe "#find_strings_file_refs" do
+  describe "with fixture project" do
     before do
       @target = app_target
       @analyzer = subject.new(@target)
+      @analyzer.logger = stub('Logger', :log)
+      @analyzer.expects(:warn).never
+      @analyzer.expects(:error).never
     end
 
-    it 'should return the strings files of the fixture project' do
-      strings_files = @analyzer.find_file_refs_by_extname('.strings')
-      strings_files.count.should.be.eql?(3)
-      strings_files[0].path.should.be.eql?('en.lproj/InfoPlist.strings')
-      strings_files[1].path.should.be.eql?('en.lproj/Localizable.strings')
-      strings_files[2].path.should.be.eql?('de.lproj/Localizable.strings')
+    describe "#strings_file_refs" do
+      it 'should return the strings files of the fixture project' do
+        strings_files = @analyzer.strings_file_refs
+        strings_files.count.should.be.eql?(3)
+        strings_files[0].path.should.be.eql?('en.lproj/InfoPlist.strings')
+        strings_files[1].path.should.be.eql?('en.lproj/Localizable.strings')
+        strings_files[2].path.should.be.eql?('de.lproj/Localizable.strings')
+      end
+    end
+
+    describe '#derive_used_languages' do
+      it 'should find used languages' do
+        languages = @analyzer.derive_used_languages(@analyzer.strings_file_refs)
+        languages.should == ['en', 'de'].to_set
+      end
+    end
+
+    describe '#used_languages' do
+      it 'should return english and german as used languages' do
+        @analyzer.used_languages.should == ['en', 'de'].to_set
+      end
+    end
+
+    describe '#info_plist_paths' do
+      it 'should return a set with the configured paths of the project' do
+        @analyzer.info_plist_paths.should == [Pathname('Example/Example-Info.plist')].to_set
+      end
+    end
+
+    describe '#absolute_info_plist_paths' do
+      it 'should resolve the path if it is relative' do
+        @analyzer.absolute_project_file_path('Info.plist')
+          .relative_path_from(fixture_path)
+          .should == Pathname('Example/Info.plist')
+      end
+
+      it 'should resolve the path if $SRCROOT is used' do
+        @analyzer.absolute_project_file_path('$SRCROOT/Info.plist')
+          .relative_path_from(fixture_path)
+          .should == Pathname('Example/Info.plist')
+      end
+    end
+
+    describe '#native_dev_languages' do
+      it 'should return english' do
+        @analyzer.native_dev_languages.should == ['en'].to_set
+      end
+
+      describe 'with non-configured Info.plist' do
+        it 'should warn on missing plists' do
+          @target.build_configurations[0].build_settings['INFOPLIST_FILE'] = 'NonExisting.plist'
+          @analyzer.expects(:warn).once
+          @analyzer.native_dev_languages.should == ['en'].to_set
+        end
+      end
+    end
+
+    describe '#read_plist_key' do
+      before do
+        @plist_path = fixture_path + 'Example/Example/Example-Info.plist'
+      end
+
+      it 'should read and return existing keys' do
+        @analyzer.read_plist_key(@plist_path, :CFBundleDevelopmentRegion)
+          .should == 'en'
+      end
+
+      it 'should raise an ArgumentError on non-existing files' do
+        plist_path = Pathname('NonExisting.plist')
+        proc do
+          @analyzer.read_plist_key(plist_path, :XCResNonExistingKey)
+        end.should.raise(ArgumentError).message
+          .should == "File 'NonExisting.plist' doesn't exist"
+      end
+
+      it 'should raise an ArgumentError on non-existing keys' do
+        proc do
+          @analyzer.read_plist_key(@plist_path, :XCResNonExistingKey)
+        end.should.raise(ArgumentError).message
+          .should == 'Error reading plist: Print: Entry, ":XCResNonExistingKey", Does Not Exist'
+      end
+    end
+
+    describe '#absolute_project_file_path' do
+      it 'should treat relative paths correctly' do
+        @analyzer.absolute_project_file_path('Info.plist')
+          .relative_path_from(fixture_path)
+          .should == Pathname('Example/Info.plist')
+      end
+
+      it 'should replace $SRCROOT with project path' do
+        @analyzer.absolute_project_file_path('$SRCROOT/Info.plist')
+          .relative_path_from(fixture_path)
+          .should == Pathname('Example/Info.plist')
+      end
+
+      it 'should replace ${SRCROOT} with project path' do
+        @analyzer.absolute_project_file_path('${SRCROOT}/Info.plist')
+          .relative_path_from(fixture_path)
+          .should == Pathname('Example/Info.plist')
+      end
+
+      it 'should replace $(SRCROOT) with project path' do
+        @analyzer.absolute_project_file_path('$(SRCROOT)/Info.plist')
+          .relative_path_from(fixture_path)
+          .should == Pathname('Example/Info.plist')
+      end
+    end
+
+    describe '#selected_strings_file_refs' do
+      describe 'for english development language' do
+        before do
+          @analyzer.stubs(:languages).returns ['en']
+        end
+
+        it 'should return the selected strings file refs' do
+          strings_files = @analyzer.selected_strings_file_refs
+          strings_files.count.should.be.eql?(2)
+          strings_files[0].path.should.be.eql?('en.lproj/InfoPlist.strings')
+          strings_files[1].path.should.be.eql?('en.lproj/Localizable.strings')
+        end
+      end
+
+      describe 'for german development language' do
+        before do
+          @analyzer.stubs(:languages).returns ['de']
+        end
+
+        it 'should return the selected strings file refs' do
+          @analyzer.stubs(:languages).returns ['de']
+          strings_files = @analyzer.selected_strings_file_refs
+          strings_files.count.should.be.eql?(1)
+          strings_files[0].path.should.be.eql?('de.lproj/Localizable.strings')
+        end
+      end
     end
   end
 

data/spec/unit/logger_spec.rb

@@ -122,6 +122,11 @@ describe 'XCRes::LoggerSpec' do
       @logger.warn 'test'
       out.should.be.eql? "\e[33m⚠ test\e[0m"
     end
+
+    it 'accepts an Exception as message' do
+      @logger.warn StandardError.new('test')
+      out.should.be.eql? "\e[33m⚠ test\e[0m"
+    end
   end
 
   describe '#fail' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcres
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Marius Rackwitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler