xcodeproj 0.18.0 → 0.19.0

data/lib/xcodeproj/project/object_list.rb

@@ -1,6 +1,5 @@
 module Xcodeproj
   class Project
-
     # This class represents an ordered relationship to many objects.
     #
     # It works in conjunction with the {AbstractObject} class to ensure that
@@ -16,7 +15,6 @@ module Xcodeproj
     # @todo Cover all the mutations methods of the {Array} class.
     #
     class ObjectList < Array
-
       # {Xcodeproj} clients are not expected to create instances of
       # {ObjectList}, it is always initialized empty and automatically by the
       # synthesized methods generated by {AbstractObject.has_many}.
@@ -38,7 +36,7 @@ module Xcodeproj
       #   the UUIDs of all the objects referenced by this list.
       #
       def uuids
-        map { |obj| obj.uuid }
+        map(&:uuid)
       end
 
       # @return [Array<AbstractObject>]
@@ -48,7 +46,6 @@ module Xcodeproj
         to_a
       end
 
-
       public
 
       # @!group Notification enabled methods
@@ -63,8 +60,8 @@ module Xcodeproj
       #
       # @return [void]
       #
-      def +(objects)
-        perform_additions_operations(objects)
+      def +(other)
+        perform_additions_operations(other)
         super
       end
 
@@ -157,7 +154,7 @@ module Xcodeproj
         if obj = delete(object)
           insert(new_index, obj)
         else
-          raise "Attempt to move object `#{object}` not present in the list `#{self.inspect}`"
+          raise "Attempt to move object `#{object}` not present in the list `#{inspect}`"
         end
       end
 
@@ -175,11 +172,10 @@ module Xcodeproj
         if obj = delete_at(current_index)
           insert(new_index, obj)
         else
-          raise "Attempt to move object from index `#{current_index}` which is beyond bounds of the list `#{self.inspect}`"
+          raise "Attempt to move object from index `#{current_index}` which is beyond bounds of the list `#{inspect}`"
         end
       end
 
-
       private
 
       # @!group Notification Methods

data/lib/xcodeproj/project/project_helper.rb

@@ -1,7 +1,6 @@
 module Xcodeproj
   class Project
     module ProjectHelper
-
       include Object
 
       # @!group Targets
@@ -36,7 +35,6 @@ module Xcodeproj
       # @return [PBXNativeTarget] the target.
       #
       def self.new_target(project, type, name, platform, deployment_target, product_group)
-
         # Target
         target = project.new(PBXNativeTarget)
         project.targets << target
@@ -55,7 +53,7 @@ module Xcodeproj
 
         # Frameworks
         framework_name = (platform == :ios) ? 'Foundation' : 'Cocoa'
-        framework_ref = target.add_system_framework(framework_name)
+        target.add_system_framework(framework_name)
 
         target
       end
@@ -100,7 +98,6 @@ module Xcodeproj
         debug_conf.build_settings = build_settings
         cl.build_configurations << release_conf
         cl.build_configurations << debug_conf
-        cl
         target.build_configuration_list = cl
 
         # Product
@@ -115,7 +112,6 @@ module Xcodeproj
         target
       end
 
-
       # @!group Private Helpers
 
       #-----------------------------------------------------------------------#
@@ -172,7 +168,7 @@ module Xcodeproj
           build_settings = {
             'PRODUCT_NAME' => '$(TARGET_NAME)',
             'WRAPPER_EXTENSION' => 'bundle',
-            'SKIP_INSTALL' => 'YES'
+            'SKIP_INSTALL' => 'YES',
           }
 
           if platform == :osx
@@ -222,7 +218,6 @@ module Xcodeproj
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

data/lib/xcodeproj/project/xcproj_helper.rb

@@ -2,7 +2,6 @@ module Xcodeproj
   class Project
     module XCProjHelper
       class << self
-
         # @return [Bool] Whether the xcproj tool is available.
         #
         def available?
@@ -47,7 +46,6 @@ module Xcodeproj
         end
 
         #---------------------------------------------------------------------#
-
       end
     end
   end

data/lib/xcodeproj/scheme.rb

@@ -1,13 +1,11 @@
 require 'rexml/document'
 
 module Xcodeproj
-
   # This class represents a Scheme document represented by a ".xcscheme" file
   # usually stored in a xcuserdata or xcshareddata (for a shared scheme)
   # folder.
   #
   class XCScheme
-
     # @return [REXML::Document] the XML object that will be manipulated to save
     #         the scheme file after.
     #
@@ -46,7 +44,7 @@ module Xcodeproj
       @launch_action.attributes['ignoresPersistentStateOnLaunch'] = 'NO'
       @launch_action.attributes['debugDocumentVersioning'] = 'YES'
       @launch_action.attributes['allowLocationSimulation'] = 'YES'
-      additional_options = @launch_action.add_element 'AdditionalOptions'
+      @launch_action.add_element('AdditionalOptions')
 
       @profile_action = @scheme.add_element 'ProfileAction'
       @profile_action.attributes['shouldUseLaunchSchemeArgsEnv'] = 'YES'
@@ -76,7 +74,7 @@ module Xcodeproj
     #        Whether to build this target in the launch action. Often false for test targets.
     #
     def add_build_target(build_target, build_for_running = true)
-      if !@build_action_entries then
+      unless @build_action_entries
         @build_action_entries = @build_action.add_element 'BuildActionEntries'
       end
 
@@ -166,7 +164,7 @@ module Xcodeproj
       to_folder = shared_data_dir(project_path)
       to_folder.mkpath
       to = to_folder + "#{scheme_name}.xcscheme"
-      from = self.user_data_dir(project_path, user) + "#{scheme_name}.xcscheme"
+      from = user_data_dir(project_path, user) + "#{scheme_name}.xcscheme"
       FileUtils.mv(from, to)
     end
 
@@ -199,7 +197,7 @@ module Xcodeproj
     # @return [String] the XML string value of the current state of the object.
     #
     def to_s
-      formatter = XML_Formatter.new(2)
+      formatter = XMLFormatter.new(2)
       formatter.compact = false
       out = ''
       formatter.write(@doc, out)
@@ -242,29 +240,29 @@ module Xcodeproj
 
     # XML formatter which closely mimics the output generated by Xcode.
     #
-    class XML_Formatter < REXML::Formatters::Pretty
+    class XMLFormatter < REXML::Formatters::Pretty
       def write_element(node, output)
         @indentation = 3
-        output << ' '*@level
+        output << ' ' * @level
         output << "<#{node.expanded_name}"
 
         @level += @indentation
         node.attributes.each_attribute do |attr|
           output << "\n"
-          output << ' '*@level
+          output << ' ' * @level
           output << attr.to_string.gsub(/=/, ' = ')
         end unless node.attributes.empty?
 
-        output << ">"
+        output << '>'
 
         output << "\n"
-        node.children.each { |child|
-          next if child.kind_of?(REXML::Text) and child.to_s.strip.length == 0
+        node.children.each do |child|
+          next if child.is_a?(REXML::Text) && child.to_s.strip.length == 0
           write(child, output)
           output << "\n"
-        }
+        end
         @level -= @indentation
-        output << ' '*@level
+        output << ' ' * @level
         output << "</#{node.expanded_name}>"
       end
     end
@@ -304,6 +302,5 @@ module Xcodeproj
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end

data/lib/xcodeproj/user_interface.rb

@@ -1,9 +1,7 @@
 module Xcodeproj
-
   # Manages the UI output so clients can customize it.
   #
   module UserInterface
-
     # Prints a message to standard output.
     #
     # @return [void]
@@ -19,8 +17,6 @@ module Xcodeproj
     def self.warn(message)
       STDERR.puts message
     end
-
   end
   UI = UserInterface
 end
-

data/lib/xcodeproj/workspace.rb

@@ -3,12 +3,10 @@ require 'rexml/document'
 require 'xcodeproj/workspace/file_reference'
 
 module Xcodeproj
-
   # Provides support for generating, reading and serializing Xcode Workspace
   # documents.
   #
   class Workspace
-
     # @return [Array<String>] the paths of the projects contained in the
     # @return [Array<FileReference>] the paths of the projects contained in the
     #         workspace.
@@ -33,11 +31,9 @@ module Xcodeproj
     # @return [Workspace] the generated workspace.
     #
     def self.new_from_xcworkspace(path)
-      begin
-        from_s(File.read(File.join(path, 'contents.xcworkspacedata')), File.expand_path(File.dirname(path)))
-      rescue Errno::ENOENT
-        new
-      end
+      from_s(File.read(File.join(path, 'contents.xcworkspacedata')), File.expand_path(File.dirname(path)))
+    rescue Errno::ENOENT
+      new
     end
 
     #-------------------------------------------------------------------------#
@@ -50,9 +46,9 @@ module Xcodeproj
     #
     # @return [Workspace] the generated workspace.
     #
-    def self.from_s(xml, workspace_path='')
+    def self.from_s(xml, workspace_path = '')
       document = REXML::Document.new(xml)
-      file_references = document.get_elements("/Workspace/FileRef").map do |node|
+      file_references = document.get_elements('/Workspace/FileRef').map do |node|
         FileReference.from_node(node)
       end
       instance = new(file_references)
@@ -88,18 +84,11 @@ module Xcodeproj
       @file_references.include?(file_reference)
     end
 
-    # The template to generate a workspace XML representation.
-    #
-    TEMPLATE = %q[<?xml version="1.0" encoding="UTF-8"?><Workspace version="1.0"></Workspace>]
-
     # @return [String] the XML representation of the workspace.
     #
     def to_s
-      REXML::Document.new(TEMPLATE).tap do |document|
-        @file_references.each do |file_reference|
-          document.root << file_reference.to_node
-        end
-      end.to_s
+      contents = file_references.map { |reference| file_reference_xml(reference) }
+      root_xml(contents.join(''))
     end
 
     # Saves the workspace at the given `xcworkspace` path.
@@ -125,16 +114,15 @@ module Xcodeproj
     #
     # @return [void]
     #
-    def load_schemes workspace_dir_path
+    def load_schemes(workspace_dir_path)
       @file_references.each do |file_reference|
         project_full_path = file_reference.absolute_path(workspace_dir_path)
         load_schemes_from_project(project_full_path)
       end
     end
 
-    #-------------------------------------------------------------------------#
-
     private
+
     # Load all schemes from project
     #
     # @param [String] project_full_path
@@ -142,14 +130,39 @@ module Xcodeproj
     #
     # @return [void]
     #
-    def load_schemes_from_project project_full_path
+    def load_schemes_from_project(project_full_path)
       schemes = Xcodeproj::Project.schemes project_full_path
       schemes.each do |scheme_name|
         @schemes[scheme_name] = project_full_path
       end
     end
 
-    #-------------------------------------------------------------------------#
+    # @return [String] The template of the workspace XML as formated by Xcode.
+    #
+    # @param  [String] contents The XML contents of the workspace.
+    #
+    def root_xml(contents)
+      <<-DOC
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   #{contents.strip}
+</Workspace>
+      DOC
+    end
+
+    # @return [String] The XML representation of a file reference.
+    #
+    # @param  [FileReference] file_reference The file reference.
+    #
+    def file_reference_xml(file_reference)
+      <<-DOC
+   <FileRef
+      location = "#{file_reference.type}:#{file_reference.path}">
+   </FileRef>
+      DOC
+    end
 
+    #-------------------------------------------------------------------------#
   end
 end

data/lib/xcodeproj/workspace/file_reference.rb

@@ -20,7 +20,7 @@ module Xcodeproj
       # @param [#to_s] path @see path
       # @param [#to_s] type @see type
       #
-      def initialize(path, type="group")
+      def initialize(path, type = 'group')
         @path = path.to_s
         @type = type.to_s
       end
@@ -53,7 +53,7 @@ module Xcodeproj
       # @return [REXML::Element] the XML representation of the file reference.
       #
       def to_node
-        REXML::Element.new("FileRef").tap do |element|
+        REXML::Element.new('FileRef').tap do |element|
           element.attributes['location'] = "#{type}:#{path}"
         end
       end
@@ -76,7 +76,7 @@ module Xcodeproj
         when 'absolute'
           File.expand_path(path)
         when 'developer'
-          raise "Developer workspace file reference type is not yet " \
+          raise 'Developer workspace file reference type is not yet ' \
             "#{self}"
         else
           raise "Unsupported workspace file reference type #{type}"

data/lib/xcodeproj/xcodebuild_helper.rb

@@ -1,9 +1,7 @@
 module Xcodeproj
-
   # Helper class which returns information from xcodebuild.
   #
   class XcodebuildHelper
-
     def initialize
       @needs_to_parse_sdks = true
     end
@@ -75,8 +73,6 @@ module Xcodeproj
       `xcodebuild -showsdks 2>/dev/null`
     end
 
-    public
-
     #-------------------------------------------------------------------------#
 
     # @!group Singleton
@@ -90,7 +86,5 @@ module Xcodeproj
     end
 
     #-------------------------------------------------------------------------#
-
   end
-
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
 description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script
@@ -61,15 +61,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
-- bin/xcodeproj
-- lib/xcodeproj.rb
-- lib/xcodeproj/command.rb
+- LICENSE
 - lib/xcodeproj/command/project_diff.rb
 - lib/xcodeproj/command/show.rb
 - lib/xcodeproj/command/sort.rb
 - lib/xcodeproj/command/target_diff.rb
+- lib/xcodeproj/command.rb
+- lib/xcodeproj/config/other_linker_flags_parser.rb
 - lib/xcodeproj/config.rb
 - lib/xcodeproj/constants.rb
 - lib/xcodeproj/differ.rb
@@ -77,8 +76,7 @@ files:
 - lib/xcodeproj/gem_version.rb
 - lib/xcodeproj/helper.rb
 - lib/xcodeproj/plist_helper.rb
-- lib/xcodeproj/project.rb
-- lib/xcodeproj/project/object.rb
+- lib/xcodeproj/project/case_converter.rb
 - lib/xcodeproj/project/object/build_configuration.rb
 - lib/xcodeproj/project/object/build_file.rb
 - lib/xcodeproj/project/object/build_phase.rb
@@ -93,16 +91,20 @@ files:
 - lib/xcodeproj/project/object/reference_proxy.rb
 - lib/xcodeproj/project/object/root_object.rb
 - lib/xcodeproj/project/object/target_dependency.rb
+- lib/xcodeproj/project/object.rb
 - lib/xcodeproj/project/object_attributes.rb
 - lib/xcodeproj/project/object_dictionary.rb
 - lib/xcodeproj/project/object_list.rb
 - lib/xcodeproj/project/project_helper.rb
 - lib/xcodeproj/project/xcproj_helper.rb
+- lib/xcodeproj/project.rb
 - lib/xcodeproj/scheme.rb
 - lib/xcodeproj/user_interface.rb
-- lib/xcodeproj/workspace.rb
 - lib/xcodeproj/workspace/file_reference.rb
+- lib/xcodeproj/workspace.rb
 - lib/xcodeproj/xcodebuild_helper.rb
+- lib/xcodeproj.rb
+- bin/xcodeproj
 homepage: https://github.com/cocoapods/xcodeproj
 licenses:
 - MIT
@@ -113,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.