xcodeproj 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06c48b7bd46aeb7eb795a2ec7ec6e5ae9df37873
-  data.tar.gz: 61e02524ef77d19d327a31a198823db5f2c8a8ee
+  metadata.gz: 3e60fb9981ce8111af008a6fede49f4bdb85da8d
+  data.tar.gz: b15a3c5bc25c0f775d4c55785a15ff7bd73a1dcb
 SHA512:
-  metadata.gz: 6d3bcde97af5710149529b4225a666a45ad092f1525e610f07930ff8e48bfd032034f58dce7462fe4c2b3e34618a5400c9fad9d96443121b9e85e2dfdc8c6a29
-  data.tar.gz: a703e835b631554b38738a1ec248f6fb9e25c29dc07b58f54f576569a7f1ce939bed45b4709919b336b72a357893df7ef27c6913541b778af072175f603e0f96
+  metadata.gz: 7f2fcf6d8a4676c47ea208ce946a8782718d1484bdd81fd7edc70e7ffcfa0d02f732f2727e5beac6a22fadcd18bb42ca9848949b2ba387afd894fbfabf8136da
+  data.tar.gz: d0b1e17ccdaba4f89ea2985a6278f742d003297e2c9d2c884e84ad73e8befb5246bf5329a95b74f1f498c0fafc4ad7f728fd9e63f5508a75cf3073c31b728f6e

data/bin/xcodeproj

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-if $0 == __FILE__
+if $PROGRAM_NAME == __FILE__
   ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
-  require "rubygems"
-  require "bundler/setup"
-  $:.unshift File.expand_path('../../ext', __FILE__)
-  $:.unshift File.expand_path('../../lib', __FILE__)
+  require 'rubygems'
+  require 'bundler/setup'
+  $LOAD_PATH.unshift File.expand_path('../../ext', __FILE__)
+  $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 end
 
 require 'xcodeproj'

data/lib/xcodeproj.rb

@@ -1,5 +1,4 @@
 module Xcodeproj
-
   class PlainInformative < StandardError
   end
 
@@ -22,7 +21,6 @@ module Xcodeproj
   autoload :XCScheme,         'xcodeproj/scheme'
   autoload :XcodebuildHelper, 'xcodeproj/xcodebuild_helper'
 
-
   # TODO: Delete me (compatibility with CocoaPods 0.33.1)
   def self.read_plist(path)
     PlistHelper.read(path)

data/lib/xcodeproj/command.rb

@@ -1,5 +1,4 @@
 module Xcodeproj
-
   require 'colored'
 
   class Command
@@ -33,16 +32,27 @@ module Xcodeproj
       def options
         options  = @command_class.options
         keys     = options.map(&:first)
-        key_size = keys.inject(0) { |size, key| key.size > size ? key.size : size }
+        key_size = keys.reduce(0) { |size, key| key.size > size ? key.size : size }
         options.map { |key, desc| "    #{key.ljust(key_size)}   #{desc}" }.join("\n")
       end
     end
 
     class ARGV < Array
-      def options;        select { |x| x.to_s[0,1] == '-' };   end
-      def arguments;      self - options;                      end
-      def option(name);   !!delete(name);                      end
-      def shift_argument; (arg = arguments[0]) && delete(arg); end
+      def options
+        select { |x| x.to_s[0, 1] == '-' }
+      end
+
+      def arguments
+        self - options
+      end
+
+      def option(name)
+        !!delete(name)
+      end
+
+      def shift_argument
+        (arg = arguments[0]) && delete(arg)
+      end
     end
 
     def self.banner
@@ -66,14 +76,14 @@ module Xcodeproj
       sub_command.run
 
     rescue Interrupt
-      puts "[!] Cancelled".red
-      #Config.instance.verbose? ? raise : exit(1)
+      puts '[!] Cancelled'.red
+      # Config.instance.verbose? ? raise : exit(1)
       exit(1)
 
-    rescue Exception => e
+    rescue => e
       puts e.message
       unless e.is_a?(Informative) || e.is_a?(Help)
-        puts *e.backtrace
+        puts e.backtrace
       end
       exit 1
     end
@@ -88,14 +98,14 @@ module Xcodeproj
 
       show_help = argv.option('--help')
 
-      String.send(:define_method, :colorize) { |string , _| string } if argv.option( '--no-color' )
+      String.send(:define_method, :colorize) { |string, _| string } if argv.option('--no-color')
 
       command_class = case command_argument = argv.shift_argument
-      when 'target-diff'  then TargetDiff
-      when 'project-diff' then ProjectDiff
-      when 'show'         then Show
-      when 'sort'         then Sort
-      end
+                      when 'target-diff'  then TargetDiff
+                      when 'project-diff' then ProjectDiff
+                      when 'show'         then Show
+                      when 'sort'         then Sort
+                      end
 
       if command_class.nil?
         raise Help.new(self, argv, command_argument)
@@ -134,4 +144,3 @@ module Xcodeproj
     end
   end
 end
-

data/lib/xcodeproj/command/project_diff.rb

@@ -2,25 +2,25 @@ module Xcodeproj
   class Command
     class ProjectDiff < Command
       def self.banner
-%{Shows the difference between two projects:
+        %{Shows the difference between two projects:
 
-    $ project-diff PROJECT_1 PROJECT_2
+            $ project-diff PROJECT_1 PROJECT_2
 
-      It shows the difference in a UUID agnostic fashion.
+              It shows the difference in a UUID agnostic fashion.
 
-      To reduce the noise (and to simplify implementation) differences in the
-      order of arrays are ignored.}
+              To reduce the noise (and to simplify implementation) differences in the
+              order of arrays are ignored.}
       end
 
       def self.options
-        [ ["--ignore KEY", "A key to ignore in the comparison. Can be specified multiple times."] ].concat(super)
+        [['--ignore KEY', 'A key to ignore in the comparison. Can be specified multiple times.']].concat(super)
       end
 
       def initialize(argv)
         @path_project1  = argv.shift_argument
         @path_project2  = argv.shift_argument
         unless @path_project1 && @path_project2
-          raise Informative, "Two project paths are required."
+          raise Informative, 'Two project paths are required.'
         end
         @keys_to_ignore = []
         while (idx = argv.index('--ignore'))
@@ -30,7 +30,6 @@ module Xcodeproj
         super unless argv.empty?
       end
 
-
       def run
         hash_1 = Project.new(@path_project1).to_tree_hash.dup
         hash_2 = Project.new(@path_project2).to_tree_hash.dup
@@ -45,11 +44,9 @@ module Xcodeproj
         yaml = diff.to_yaml
         yaml = yaml.gsub(@path_project1, @path_project1.cyan)
         yaml = yaml.gsub(@path_project2, @path_project2.magenta)
-        yaml = yaml.gsub(":diff:", "diff:".yellow)
+        yaml = yaml.gsub(':diff:', 'diff:'.yellow)
         puts yaml
       end
     end
   end
 end
-
-

data/lib/xcodeproj/command/show.rb

@@ -2,17 +2,17 @@ module Xcodeproj
   class Command
     class Show < Command
       def self.banner
-%{Shows an overview of a project in a YAML representation.'
+        %(Shows an overview of a project in a YAML representation.'
 
-    $ show [PROJECT]
+            $ show [PROJECT]
 
-      If no `PROJECT' is specified then the current work directory is searched
-      for one.}
+              If no `PROJECT' is specified then the current work directory is searched
+              for one.)
       end
 
       def self.options
         [
-          ["--format [hash|tree_hash|raw]", "YAML output format, optional"],
+          ['--format [hash|tree_hash|raw]', 'YAML output format, optional'],
         ].concat(super)
       end
 
@@ -47,10 +47,10 @@ module Xcodeproj
         pretty_print = xcodeproj.pretty_print
         sections = []
         pretty_print.each do |key, value|
-        section = key.green
+          section = key.green
           yaml = value.to_yaml
-          yaml.gsub!(/^---$/,'')
-          yaml.gsub!(/^-/,"\n-")
+          yaml.gsub!(/^---$/, '')
+          yaml.gsub!(/^-/, "\n-")
           section << yaml
           sections << section
         end
@@ -59,5 +59,3 @@ module Xcodeproj
     end
   end
 end
-
-

data/lib/xcodeproj/command/sort.rb

@@ -2,12 +2,12 @@ module Xcodeproj
   class Command
     class Sort < Command
       def self.banner
-%{Sorts the give project
+        %(Sorts the give project
 
-    $ sort [PROJECT]
+            $ sort [PROJECT]
 
-      If no `PROJECT' is specified then the current work directory is searched
-      for one.}
+              If no `PROJECT' is specified then the current work directory is searched
+              for one.)
       end
 
       def initialize(argv)
@@ -24,6 +24,3 @@ module Xcodeproj
     end
   end
 end
-
-
-

data/lib/xcodeproj/command/target_diff.rb

@@ -2,16 +2,16 @@ module Xcodeproj
   class Command
     class TargetDiff < Command
       def self.banner
-%{Shows the difference between two targets:
+        %(Shows the difference between two targets:
 
-    $ targets-diff [target 1] [target 2]
+            $ targets-diff [target 1] [target 2]
 
-      Only supports build source files atm.}
+              Only supports build source files atm.)
       end
 
       def self.options
         [
-          ["--project PATH", "The Xcode project document to use."],
+          ['--project PATH', 'The Xcode project document to use.'],
         ].concat(super)
       end
 
@@ -39,4 +39,3 @@ module Xcodeproj
     end
   end
 end
-

data/lib/xcodeproj/config.rb

@@ -1,12 +1,11 @@
 require 'shellwords'
+require 'xcodeproj/config/other_linker_flags_parser'
 
 module Xcodeproj
-
   # This class holds the data for a Xcode build settings file (xcconfig) and
   # provides support for serialization.
   #
   class Config
-
     require 'set'
 
     # @return [Hash{String => String}] The attributes of the settings file
@@ -14,20 +13,11 @@ module Xcodeproj
     #
     attr_accessor :attributes
 
-    # @return [Set<String>] The list of the frameworks required by this
-    #         settings file.
-    #
-    attr_accessor :frameworks
-
-    # @return [Set<String>] The list of the *weak* frameworks required by
-    #         this settings file.
-    #
-    attr_accessor :weak_frameworks
-
-    # @return [Set<String>] The list of the libraries required by this
-    #         settings file.
+    # @return [Hash{Symbol => Set<String>}] The other linker flags by key.
+    #         Xcodeproj handles them in a dedicated way to prevent duplication
+    #         of the libraries and of the frameworks.
     #
-    attr_accessor :libraries
+    attr_accessor :other_linker_flags
 
     # @return [Array] The list of the configuration files included by this
     #         configuration file (`#include "SomeConfig"`).
@@ -40,7 +30,10 @@ module Xcodeproj
     def initialize(xcconfig_hash_or_file = {})
       @attributes = {}
       @includes = []
-      @frameworks, @weak_frameworks, @libraries = Set.new, Set.new, Set.new
+      @other_linker_flags = {}
+      [:simple, :frameworks, :weak_frameworks, :libraries].each do |key|
+        @other_linker_flags[key] = Set.new
+      end
       merge!(extract_hash(xcconfig_hash_or_file))
     end
 
@@ -49,14 +42,13 @@ module Xcodeproj
     end
 
     def ==(other)
-      other.respond_to?(:to_hash) && other.to_hash == self.to_hash
+      other.respond_to?(:to_hash) && other.to_hash == to_hash
     end
 
-    #-------------------------------------------------------------------------#
-
     public
 
     # @!group Serialization
+    #-------------------------------------------------------------------------#
 
     # Sorts the internal data by setting name and serializes it in the xcconfig
     # format.
@@ -69,7 +61,7 @@ module Xcodeproj
     # @return [String] The serialized internal data.
     #
     def to_s(prefix = nil)
-      include_lines = includes.map { |path| "#include \"#{normalized_xcconfig_path(path)}\""}
+      include_lines = includes.map { |path| "#include \"#{normalized_xcconfig_path(path)}\"" }
       settings = to_hash(prefix).sort_by(&:first).map { |k, v| "#{k} = #{v}" }
       [include_lines + settings].join("\n")
     end
@@ -87,8 +79,8 @@ module Xcodeproj
     end
 
     # The hash representation of the xcconfig. The hash includes the
-    # frameworks, the weak frameworks and the libraries in the `Other Linker
-    # Flags` (`OTHER_LDFLAGS`).
+    # frameworks, the weak frameworks, the libraries and the simple other
+    # linker flags in the `Other Linker Flags` (`OTHER_LDFLAGS`).
     #
     # @note   All the values are sorted to have a consistent output in Ruby
     #         1.8.7.
@@ -96,26 +88,54 @@ module Xcodeproj
     # @return [Hash] The hash representation
     #
     def to_hash(prefix = nil)
-      hash = @attributes.dup
-      flags = hash['OTHER_LDFLAGS'] || ''
-      flags = flags.dup.strip
-      flags << libraries.to_a.sort.reduce('')  {| memo, l | memo << " -l#{l}" }
-      flags << frameworks.to_a.sort.reduce('') {| memo, f | memo << " -framework #{f}" }
-      flags << weak_frameworks.to_a.sort.reduce('') {| memo, f | memo << " -weak_framework #{f}" }
-      hash['OTHER_LDFLAGS'] = flags.strip
-      hash.delete('OTHER_LDFLAGS') if flags.strip.empty?
+      list = []
+      list += other_linker_flags[:simple].to_a.sort
+      modifiers = {
+        :frameworks => '-framework',
+        :weak_frameworks => '-weak_framework',
+        :libraries => '-l',
+      }
+      [:libraries, :frameworks, :weak_frameworks].each do |key|
+        modifier = modifiers[key]
+        sorted = other_linker_flags[key].to_a.sort
+        list += sorted.map { |l| %(#{modifier} "#{l}") }
+      end
+
+      result = attributes.dup
+      result['OTHER_LDFLAGS'] = list.join(' ') unless list.empty?
+
       if prefix
-        Hash[hash.map {|k, v| [prefix + k, v]}]
+        Hash[result.map { |k, v| [prefix + k, v] }]
       else
-        hash
+        result
       end
     end
 
-    #-------------------------------------------------------------------------#
+    # @return [Set<String>] The list of the frameworks required by this
+    #         settings file.
+    #
+    def frameworks
+      other_linker_flags[:frameworks]
+    end
+
+    # @return [Set<String>] The list of the *weak* frameworks required by
+    #         this settings file.
+    #
+    def weak_frameworks
+      other_linker_flags[:weak_frameworks]
+    end
+
+    # @return [Set<String>] The list of the libraries required by this
+    #         settings file.
+    #
+    def libraries
+      other_linker_flags[:libraries]
+    end
 
     public
 
     # @!group Merging
+    #-------------------------------------------------------------------------#
 
     # Merges the given xcconfig representation in the receiver.
     #
@@ -139,29 +159,17 @@ module Xcodeproj
     def merge!(xcconfig)
       if xcconfig.is_a? Config
         merge_attributes!(xcconfig.attributes)
-        @libraries.merge(xcconfig.libraries)
-        @frameworks.merge(xcconfig.frameworks)
-        @weak_frameworks.merge(xcconfig.weak_frameworks)
+        other_linker_flags.keys.each do |key|
+          other_linker_flags[key].merge(xcconfig.other_linker_flags[key])
+        end
       else
         merge_attributes!(xcconfig.to_hash)
-
-        # Parse frameworks and libraries. Then remove them from the linker
-        # flags
-        flags = @attributes['OTHER_LDFLAGS']
-        return unless flags
-
-        frameworks = flags.scan(/(?:\A|\s)-framework\s+([^\s]+)/).map { |m| m[0] }
-        weak_frameworks = flags.scan(/(?:\A|\s)-weak_framework\s+([^\s]+)/).map { |m| m[0] }
-        libraries  = flags.scan(/(?:\A|\s)-l ?([^\s]+)/).map { |m| m[0] }
-        @frameworks.merge frameworks
-        @weak_frameworks.merge weak_frameworks
-        @libraries.merge libraries
-
-        new_flags = flags.dup
-        frameworks.each {|f| new_flags.gsub!("-framework #{f}", "") }
-        weak_frameworks.each {|f| new_flags.gsub!("-weak_framework #{f}", "") }
-        libraries.each  {|l| new_flags.gsub!("-l#{l}", ""); new_flags.gsub!("-l #{l}", "") }
-        @attributes['OTHER_LDFLAGS'] = new_flags.gsub("\w*", ' ').strip
+        if flags = attributes.delete('OTHER_LDFLAGS')
+          flags_by_key = OtherLinkerFlagsParser.parse(flags)
+          other_linker_flags.keys.each do |key|
+            other_linker_flags[key].merge(flags_by_key[key])
+          end
+        end
       end
     end
     alias_method :<<, :merge!
@@ -175,13 +183,13 @@ module Xcodeproj
     # @return [Config] the new xcconfig.
     #
     def merge(config)
-      self.dup.tap { |x| x.merge!(config) }
+      dup.tap { |x| x.merge!(config) }
     end
 
     # @return [Config] A copy of the receiver.
     #
     def dup
-      Xcodeproj::Config.new(self.to_hash.dup)
+      Xcodeproj::Config.new(to_hash.dup)
     end
 
     #-------------------------------------------------------------------------#
@@ -302,6 +310,5 @@ module Xcodeproj
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end