xcoder 0.1.8 → 0.1.9

data/README.md

@@ -6,6 +6,10 @@ Xcoder is a ruby wrapper around various Xcode tools as well as providing project
 
 Full documentation can be found here: http://rayh.github.com/xcoder/
 
+## Requirements
+
+Xcoder assumes you are using XCode 4.3 on Lion and ruby 1.9.  You may have some degree of success with lesser versions, but they are not intentionally supported.
+
 ## Example Usage
 
 You will need to install the gem:
@@ -47,6 +51,11 @@ You can either use the user's login keychain, another named keychain, or simply
 		# import certs into the keychain
 		# perform builds within this keychain's context
 	end	# Keychain is deleted
+	
+Or, you can create a temporary keychain that will be deleted when the process exits:
+
+	keychain = Xcode::Keychain.temp
+
 		
 #### Importing a certificate
 

data/lib/xcode/configuration.rb

@@ -285,7 +285,9 @@ module Xcode
     # @return [String,Array,Hash] the value stored for the specified configuration
     #  
     def get(name)
-      if Configuration.setting_name_to_property(name)
+      if respond_to?(name)
+        send(name)
+      elsif Configuration.setting_name_to_property(name)
         send Configuration.setting_name_to_property(name)
       else
         build_settings[name]
@@ -299,7 +301,9 @@ module Xcode
     # @param [String,Array,Hash] value the value to store for the specific setting
     #
     def set(name, value)
-      if Configuration.setting_name_to_property(name)
+      if respond_to?(name)
+        send("#{name}=",value)
+      elsif Configuration.setting_name_to_property(name)
         send("#{Configuration.setting_name_to_property(name)}=",value)
       else
         build_settings[name] = value
@@ -313,12 +317,37 @@ module Xcode
     # @param [String,Array,Hash] value the value to store for the specific setting
     #
     def append(name, value)
-      if Configuration.setting_name_to_property(name)
+      
+      if respond_to?(name)
+        send("append_to_#{name}",value)
+      elsif Configuration.setting_name_to_property(name)
         send("append_to_#{Configuration.setting_name_to_property(name)}",value)
       else
-        # @todo this will likely raise some errors if trying to append a string
-        #   to an array, but that likely means a new property should be defined.
-        build_settings[name] = build_settings[name] + value
+
+        # @note this will likely raise some errors if trying to append a booleans
+        #   to fixnums, strings to booleans, symbols + arrays, etc. but that likely 
+        #   means a new property should be defined so that the appending logic
+        #   wil behave correctly.
+  
+        if build_settings[name].is_a?(Array)
+          
+          # Ensure that we are appending an array to the array; Array() does not
+          # work in this case in the event we were to pass in a Hash.
+          value = value.is_a?(Array) ? value : [ value ]
+          build_settings[name] = build_settings[name] + value.compact
+          
+        else
+          
+          # Ensure we handle the cases where a nil value is present that we append
+          # correctly to the value. We also need to try and leave intact boolean
+          # values which may be stored
+          
+          value = "" unless value
+          build_settings[name] = "" unless build_settings[name]
+          
+          build_settings[name] = build_settings[name] + value
+        end
+       
       end
     end
     

data/lib/xcode/configurations/array_property.rb

@@ -28,10 +28,10 @@ module Xcode
       end
       
       def append(original,value)
-        (Array(original) + Array(value)).uniq
+        (open(original) + Array(value)).uniq
       end
   
     end
     
   end
-end
+end

data/lib/xcode/configurations/boolean_property.rb

@@ -36,11 +36,19 @@ module Xcode
         value.to_s =~ /^(?:NO|false)$/ ? "NO" : "YES"
       end
       
+      #
+      # @note Appending boolean properties has no real good default operation. What
+      #   happens in this case is that whatever you decide to append will automatically
+      #   override the previously existing settings.
+      # 
+      # @param [Types] original the original value to be appended
+      # @param [Types] value Description
+      #
       def append(original,value)
-        save(original) | save(value)
+        save(value)
       end
   
     end
     
   end
-end
+end

data/lib/xcode/configurations/key_value_array_property.rb

@@ -32,11 +32,11 @@ module Xcode
       # back out to a key=value pair array.
       # 
       def append(original,value)
-        all_values = (Array(original) + Array(value)).map {|key_value| key_value.split("=") }.flatten
+        all_values = (open(original) + Array(value)).map {|key_value| key_value.split("=") }.flatten
         Hash[*all_values].map {|k,v| "#{k}=#{v}" }
       end
   
     end
     
   end
-end
+end

data/lib/xcode/configurations/space_delimited_string_property.rb

@@ -26,11 +26,16 @@ module Xcode
       extend self
   
       #
+      # While the space delimited string can and is often stored in that way,
+      # it appears as though Xcode is now possibly storing these values in a format
+      # that the parser is returning as an Array. So if the raw value is an
+      # array, simply return that raw value instead of attempting to convert it.
+      # 
       # @param [Nil,String] value stored within the build settings
       # @return [Array<String>] a list of the strings that are within this string
       # 
       def open(value)
-        value.to_s.split(" ")
+        value.is_a?(Array) ? value : value.to_s.split(" ")
       end
   
       #
@@ -41,11 +46,20 @@ module Xcode
         Array(value).join(" ")
       end
       
+      #
+      # Space Delimited Strings are not unlike arrays and those we assume that the
+      # inputs are going to be two arrays that will be joined and then ensured 
+      # that only the unique values are saved.
+      # 
+      # @param [Nil,String] original the original value stored within the field
+      # @param [Nil,String,Array] value the new values that will coerced into an array
+      #   and joined with the original values.
+      #
       def append(original,value)
-        save( ( open(original) + open(value) ).uniq )
+        save( ( open(original) + Array(value)).uniq )
       end
   
     end
     
   end
-end
+end

data/lib/xcode/configurations/string_property.rb

@@ -20,10 +20,10 @@ module Xcode
       end
       
       def append(original,value)
-        original.to_s + value.to_s
+        open(original) + value.to_s
       end
   
     end
     
   end
-end
+end

data/lib/xcode/file_reference.rb

@@ -67,8 +67,7 @@ module Xcode
     # @return [Hash] system framework properties
     # 
     def self.system_framework(name,properties = {})
-
-      name = name[/(.+)(?:\.framework)?$/,1]
+      name = name.gsub(File.extname(name),"")
       
       default_properties = { 'isa' => 'PBXFileReference',
         'lastKnownFileType' => 'wrapper.framework', 
@@ -135,4 +134,4 @@ module Xcode
     
   end
   
-end
+end

data/lib/xcode/group.rb

@@ -98,7 +98,9 @@ module Xcode
     #   if no matches were found.
     # 
     def exists?(name)
-      children.find_all {|child| child.name == name }
+      children.find_all do |child| 
+        child.name ? (child.name == name) : (File.basename(child.path) == name)
+      end
     end
     
     #
@@ -144,11 +146,13 @@ module Xcode
       # found.
       
       find_file_by = file_properties['name'] || file_properties['path']
+      
       found_or_created_file = exists?(find_file_by).first
       
       unless found_or_created_file
         found_or_created_file = create_child_object FileReference.file(file_properties)
       end
+      
       found_or_created_file.supergroup = self
       
       found_or_created_file
@@ -292,4 +296,4 @@ module Xcode
     
   end
   
-end
+end

data/lib/xcode/keychain.rb

@@ -52,6 +52,17 @@ module Xcode
       names
     end
     
+    #
+    # Secure the keychain 
+    #
+    def lock
+      cmd = []
+      cmd << "security"
+      cmd << "lock-keychain"
+      cmd << "\"#{@path}\""
+      Xcode::Shell.execute(cmd)
+    end
+    
     #
     # Unlock the keychain using the provided password
     # 

data/lib/xcode/parsers/plutil_project_parser.rb

@@ -14,7 +14,25 @@ module Xcode
       xml = `plutil -convert xml1 -o - "#{path}"`
       Plist::parse_xml(xml)
     end
+
+    #
+    # Save the outputed string data to the specified project file path and then
+    # formats that data to be prettier than the default output.
+    # 
+    def save path,data
+     
+      File.open(path,'w') do |file|
+        file.puts data
+      end
+
+      #
+      
+      if File.exists?(path)
+        `pl -input #{path} -output #{path}`
+      end
+
+   end
   
   end
   
-end
+end

data/lib/xcode/project.rb

@@ -195,16 +195,15 @@ module Xcode
     # @param [String] path the path to save the project
     #
     def save(path)
-      Dir.mkdir(path) unless File.exists?(path)
       
+      Dir.mkdir(path) unless File.exists?(path)
       project_filepath = "#{path}/project.pbxproj"
       
       # @toodo Save the workspace when the project is saved
       # FileUtils.cp_r "#{path}/project.xcworkspace", "#{path}/project.xcworkspace"
+  
+      Xcode::PLUTILProjectParser.save "#{@path}/project.pbxproj", to_xcplist
       
-      File.open(project_filepath,'w') do |file|
-        file.puts to_xcplist
-      end
     end
     
     #

data/lib/xcode/registry.rb

@@ -46,7 +46,7 @@ module Xcode
     #   identifier; false if it is not.
     # 
     def self.is_identifier? value
-      value =~ /^[0-9A-F]{24}$/
+      value =~ /^[0-9A-F]{24,}$/
     end
 
     #

data/lib/xcode/version.rb

@@ -1,3 +1,3 @@
 module Xcode
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/configuration_spec.rb

@@ -68,10 +68,17 @@ describe Xcode::Configuration do
 
     it "should append to  existing settings" do
       subject.set 'OTHER_LDFLAGS', '-NONE'
-      subject.append 'OTHER_LDFLAGS', '-FOR -ME'
+      subject.append 'OTHER_LDFLAGS', '-FOR'
+      subject.append 'OTHER_LDFLAGS', [ '-FOR' , '-ME' ]
       settings['OTHER_LDFLAGS'].should == "-NONE -FOR -ME"
     end
     
+     it "should append to  existing settings" do
+      subject.set 'OTHER_LDFLAGS', '-NONE -FOR'
+      subject.append 'OTHER_LDFLAGS', '-FOR'
+      subject.append 'OTHER_LDFLAGS', [ '-FOR' , '-ME' ]
+      settings['OTHER_LDFLAGS'].should == "-FOR -ME"
+    end
   end
   
   describe "#get" do
@@ -331,4 +338,4 @@ describe Xcode::Configuration do
     end
   end
   
-end
+end

data/spec/keychain_spec.rb

@@ -26,6 +26,14 @@ describe Xcode::Keychain do
     kc.identities[0].should=="Test User"
   end
   
+  # FIXME: Need to surpress GUI dialog prompting to unlock keychain
+  # it "should lock the keychain" do 
+  #     kc = Xcode::Keychain.temp
+  #     kc.lock
+  #     kc.import "#{File.dirname(__FILE__)}/Provisioning/TestUser.p12", 'testpassword'
+  #     kc.identities.size.should==0
+  #   end
+  
   it "should fetch the login keychain" do
     kc = Xcode::Keychain.login
     File.exists?(kc.path).should==true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcoder
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000Z
+date: 2012-03-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70302521954920 !ruby/object:Gem::Requirement
+  requirement: &70245902880760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302521954920
+  version_requirements: *70245902880760
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70302524739260 !ruby/object:Gem::Requirement
+  requirement: &70245902896700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302524739260
+  version_requirements: *70245902896700
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70302524738840 !ruby/object:Gem::Requirement
+  requirement: &70245902896280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302524738840
+  version_requirements: *70245902896280
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70302524738420 !ruby/object:Gem::Requirement
+  requirement: &70245902895860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302524738420
+  version_requirements: *70245902895860
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70302524738000 !ruby/object:Gem::Requirement
+  requirement: &70245902895440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302524738000
+  version_requirements: *70245902895440
 description: Provides a ruby based object-model for parsing project structures and
   invoking builds
 email: