xcodeproj 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80889f1543d932a364554166034555b0838ab081
-  data.tar.gz: 67b60068200d0226b81fb02441ad0a61919588b9
+  metadata.gz: 483500148fe17ee6fba34b974409c1315347f096
+  data.tar.gz: dbda0068b785df5bda02f297d677737de8a6e604
 SHA512:
-  metadata.gz: f4a9cbd8cdece69a9118f93eaebccf888448db9bd67c3af3e7fa0cc0375339ae70683d48a3db6af5c4f1df44726e13da47f9f41119bc6ef5d7483d0e64a7e852
-  data.tar.gz: 7f96eb1680c4ad7e70cb9318266204fb03e88f81bfda553420bef222b93ab01043a7204f47efed0e89ee3b6c6f1ff100b92b90408a85c117a5dbf01744c22358
+  metadata.gz: f263348b6d8ebfd90c70a74ac61e8bf9c7d6b69c469cfdb6a094d114d30dd8236863b448924bc33bb956f7bdfc8a3575813f93d6103017c0980308eaa6199cf8
+  data.tar.gz: 89b9daa36a81cc4486b12324f2b48ebde2713902c2f0cb7318b85900e893f6107d565c0c60b6ee2f529fca98324b423e97a026cfd414d8a4aeafd9b24a0032eb

data/lib/xcodeproj/command/sort.rb

@@ -7,7 +7,7 @@ module Xcodeproj
         If no `PROJECT' is specified then the current work directory is searched for one.
       eos
 
-      self.summary = 'Sorts the give project.'
+      self.summary = 'Sorts the given project.'
 
       self.arguments = [
         CLAide::Argument.new('PROJECT', false),

data/lib/xcodeproj/gem_version.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
   # The version of the xcodeproj gem.
   #
-  VERSION = '1.3.1'.freeze unless defined? Xcodeproj::VERSION
+  VERSION = '1.3.2'.freeze unless defined? Xcodeproj::VERSION
 end

data/lib/xcodeproj/plist/ffi.rb

@@ -1,35 +1,6 @@
+
 module Xcodeproj
   module Plist
-    module Extensions
-      # Since Xcode 8 beta 4, calling `PBXProject.projectWithFile` breaks subsequent calls to
-      # `chdir`. While sounding ridiculous, this is unfortunately true and debugging it from the
-      # userland side showed no difference at all to successful calls to `chdir`, but the working
-      # directory is simply not changed in the end. This workaround is even more absurd, monkey
-      # patching all calls to `chdir` to use `__pthread_chdir` which appears to work.
-      module Dir
-        def self.chdir(path)
-          old_dir = Dir.getwd
-          res = actually_chdir(path)
-
-          if block_given?
-            begin
-              return yield
-            ensure
-              actually_chdir(old_dir)
-            end
-          end
-
-          res
-        end
-
-        def self.actually_chdir(path)
-          libc = Fiddle.dlopen '/usr/lib/libc.dylib'
-          f = Fiddle::Function.new(libc['__pthread_chdir'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
-          f.call(path.to_s)
-        end
-      end
-    end
-
     # Provides support for loading and serializing property list files via
     # Fiddle and CoreFoundation / Xcode.
     #
@@ -171,7 +142,10 @@ module Xcodeproj
         end
 
         def monkey_patch_chdir
-          Dir.send(:include, Extensions::Dir)
+          require 'xcodeproj/plist/ffi/chdir_override'
+          class << Dir
+            alias_method :chdir, :cp_chdir
+          end
         end
       end
     end

data/lib/xcodeproj/plist/ffi/chdir_override.rb

@@ -0,0 +1,27 @@
+# Since Xcode 8 beta 4, calling `PBXProject.projectWithFile` breaks subsequent calls to
+# `chdir`. While sounding ridiculous, this is unfortunately true and debugging it from the
+# userland side showed no difference at all to successful calls to `chdir`, but the working
+# directory is simply not changed in the end. This workaround is even more absurd, monkey
+# patching all calls to `chdir` to use `__pthread_chdir` which appears to work.
+class Dir
+  def self.cp_chdir(path)
+    old_dir = Dir.getwd
+    res = cp_actually_chdir(path)
+
+    if block_given?
+      begin
+        return yield
+      ensure
+        cp_actually_chdir(old_dir)
+      end
+    end
+
+    res
+  end
+
+  def self.cp_actually_chdir(path)
+    libc = Fiddle.dlopen '/usr/lib/libc.dylib'
+    f = Fiddle::Function.new(libc['__pthread_chdir'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
+    f.call(path.to_s)
+  end
+end

data/lib/xcodeproj/scheme/abstract_scheme_action.rb

@@ -1,4 +1,6 @@
 require 'xcodeproj/scheme/xml_element_wrapper'
+require 'xcodeproj/scheme/environment_variables'
+require 'xcodeproj/scheme/command_line_arguments'
 
 module Xcodeproj
   class XCScheme

data/lib/xcodeproj/scheme/command_line_arguments.rb

@@ -0,0 +1,162 @@
+require 'xcodeproj/scheme/xml_element_wrapper'
+
+module Xcodeproj
+  class XCScheme
+    COMMAND_LINE_ARGS_NODE = 'CommandLineArguments'.freeze
+    COMMAND_LINE_ARG_NODE = 'CommandLineArgument'.freeze
+
+    # This class wraps the CommandLineArguments node of a .xcscheme XML file. This
+    # is just a container of CommandLineArgument objects. It can either appear on a
+    # LaunchAction or TestAction scheme group.
+    #
+    class CommandLineArguments < XMLElementWrapper
+      # @param [nil,REXML::Element,Array<CommandLineArgument>,Array<Hash{Symbol => String,Bool}>] node_or_arguments
+      #        The 'CommandLineArguments' XML node, or list of command line arguments, that this object represents.
+      #          - If nil, an empty 'CommandLineArguments' XML node will be created
+      #          - If an REXML::Element, it must be named 'CommandLineArguments'
+      #          - If an Array of objects or Hashes, they'll each be passed to {#assign_argument}
+      #
+      def initialize(node_or_arguments = nil)
+        create_xml_element_with_fallback(node_or_arguments, COMMAND_LINE_ARGS_NODE) do
+          @all_arguments = []
+          node_or_arguments.each { |var| assign_argument(var) } unless node_or_arguments.nil?
+        end
+      end
+
+      # @return [Array<CommandLineArgument>]
+      #         The key value pairs currently set in @xml_element
+      #
+      def all_arguments
+        @all_arguments ||= @xml_element.get_elements(COMMAND_LINE_ARG_NODE).map { |argument| CommandLineArgument.new(argument) }
+      end
+
+      # Adds a given argument to the set of command line arguments, or replaces it if that key already exists
+      #
+      # @param [CommandLineArgument,Hash{Symbol => String,Bool}] argument
+      #        The argument to add or update, backed by an CommandLineArgument node.
+      #          - If an CommandLineArgument, the previous reference will still be valid
+      #          - If a Hash, must conform to {CommandLineArgument#initialize} requirements
+      # @return [Array<CommandLineArgument>]
+      #         The new set of command line arguments after addition
+      #
+      def assign_argument(argument)
+        command_line_arg = if argument.is_a?(CommandLineArgument)
+                             argument
+                           else
+                             CommandLineArgument.new(argument)
+                           end
+        all_arguments.each { |existing_var| remove_argument(existing_var) if existing_var.argument == command_line_arg.argument }
+        @xml_element.add_element(command_line_arg.xml_element)
+        @all_arguments << command_line_arg
+      end
+
+      # Removes a specified argument (by string or object) from the set of command line arguments
+      #
+      # @param [CommandLineArgument,String] argument
+      #        The argument to remove
+      # @return [Array<CommandLineArgument>]
+      #         The new set of command line arguments after removal
+      #
+      def remove_argument(argument)
+        command_line_arg = if argument.is_a?(CommandLineArgument)
+                             argument
+                           else
+                             CommandLineArgument.new(argument)
+                           end
+        raise "Unexpected parameter type: #{command_line_arg.class}" unless command_line_arg.is_a?(CommandLineArgument)
+        @xml_element.delete_element(command_line_arg.xml_element)
+        @all_arguments -= [command_line_arg]
+      end
+
+      # @param [String] key
+      #        The key to lookup
+      # @return [CommandLineArgument] argument
+      #         Returns the matching command line argument for a specified key
+      #
+      def [](argument)
+        all_arguments.find { |var| var.argument == argument }
+      end
+
+      # Assigns a value for a specified key
+      #
+      # @param [String] key
+      #        The key to update in the command line arguments
+      # @param [String] value
+      #        The value to lookup
+      # @return [CommandLineArgument] argument
+      #         The newly updated command line argument
+      #
+      def []=(argument, enabled)
+        assign_argument(:argument => argument, :enabled => enabled)
+        self[argument]
+      end
+
+      # @return [Array<Hash{Symbol => String,Bool}>]
+      #         The current command line arguments represented as an array
+      #
+      def to_a
+        all_arguments.map(&:to_h)
+      end
+    end
+
+    # This class wraps the CommandLineArgument node of a .xcscheme XML file.
+    # Environment arguments are accessible via the NSDictionary returned from
+    # [[NSProcessInfo processInfo] arguments] in your app code.
+    #
+    class CommandLineArgument < XMLElementWrapper
+      # @param [nil,REXML::Element,Hash{Symbol => String,Bool}] node_or_argument
+      #        - If nil, it will create a default XML node to use
+      #        - If a REXML::Element, should be a <CommandLineArgument> XML node to wrap
+      #        - If a Hash, must contain keys :key and :value (Strings) and optionally :enabled (Boolean)
+      #
+      def initialize(node_or_argument)
+        create_xml_element_with_fallback(node_or_argument, COMMAND_LINE_ARG_NODE) do
+          raise "Must pass a Hash with 'argument' and 'enabled'!" unless node_or_argument.is_a?(Hash) &&
+              node_or_argument.key?(:argument) && node_or_argument.key?(:enabled)
+
+          @xml_element.attributes['argument'] = node_or_argument[:argument]
+          @xml_element.attributes['isEnabled'] = if node_or_argument.key?(:enabled)
+                                                   bool_to_string(node_or_argument[:enabled])
+                                                 else
+                                                   bool_to_string(false)
+                                                 end
+        end
+      end
+
+      # Returns the CommandLineArgument's key
+      # @return [String]
+      #
+      def argument
+        @xml_element.attributes['argument']
+      end
+
+      # Sets the CommandLineArgument's key
+      # @param [String] key
+      #
+      def argument=(argument)
+        @xml_element.attributes['argument'] = argument
+      end
+
+      # Returns the CommandLineArgument's enabled state
+      # @return [Bool]
+      #
+      def enabled
+        string_to_bool(@xml_element.attributes['isEnabled'])
+      end
+
+      # Sets the CommandLineArgument's enabled state
+      # @param [Bool] enabled
+      #
+      def enabled=(enabled)
+        @xml_element.attributes['isEnabled'] = bool_to_string(enabled)
+      end
+
+      # @return [Hash{:key => String, :value => String, :enabled => Bool}]
+      #         The command line argument XML node with attributes converted to a representative Hash
+      #
+      def to_h
+        { :argument => argument, :enabled => enabled }
+      end
+    end
+  end
+end

data/lib/xcodeproj/scheme/launch_action.rb

@@ -79,6 +79,22 @@ module Xcodeproj
       end
 
       # @todo handle 'AdditionalOptions' tag
+
+      # @return [CommandLineArguments]
+      #         Returns the CommandLineArguments that will be passed at app launch
+      #
+      def command_line_arguments
+        CommandLineArguments.new(@xml_element.elements[XCScheme::COMMAND_LINE_ARGS_NODE])
+      end
+
+      # @return [CommandLineArguments] arguments
+      #         Sets the CommandLineArguments that will be passed at app launch
+      #
+      def command_line_arguments=(arguments)
+        @xml_element.delete_element(XCScheme::COMMAND_LINE_ARGS_NODE)
+        @xml_element.add_element(arguments.xml_element) if arguments
+        arguments
+      end
     end
   end
 end

data/lib/xcodeproj/scheme/test_action.rb

@@ -1,5 +1,4 @@
 require 'xcodeproj/scheme/abstract_scheme_action'
-require 'xcodeproj/scheme/environment_variables'
 
 module Xcodeproj
   class XCScheme

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -85,6 +85,7 @@ files:
 - lib/xcodeproj/helper.rb
 - lib/xcodeproj/plist.rb
 - lib/xcodeproj/plist/ffi.rb
+- lib/xcodeproj/plist/ffi/chdir_override.rb
 - lib/xcodeproj/plist/ffi/core_foundation.rb
 - lib/xcodeproj/plist/ffi/dev_tools_core.rb
 - lib/xcodeproj/plist/plist_gem.rb
@@ -117,6 +118,7 @@ files:
 - lib/xcodeproj/scheme/build_action.rb
 - lib/xcodeproj/scheme/buildable_product_runnable.rb
 - lib/xcodeproj/scheme/buildable_reference.rb
+- lib/xcodeproj/scheme/command_line_arguments.rb
 - lib/xcodeproj/scheme/environment_variables.rb
 - lib/xcodeproj/scheme/launch_action.rb
 - lib/xcodeproj/scheme/macro_expansion.rb