xcoder 0.0.7 → 0.0.8

data/README.md

@@ -18,18 +18,21 @@ and then require the gem in your project/rakefile/etc
 	
 ### Find a configuration for a target on a project
 
-	project = Xcode.find_projects.first
-	config = project.target(:Target).config(:Debug)
-
+	project = Xcode.project(:MyProject).target(:Target).config(:Debug)
 
 ### Building a configuration
 
-	config.build
+	builder = config.builder
+	builder.profile = 'Profiles/MyAdHoc.mobileprovision'	# This will remove old profiles and install the profile
+	builder.identity = 'iPhone Developer: Ray Hilton'		# The name of the identity to use to sign the IPA (optional)
+	builder.build
 	
 ### Packaging a built .app
 
-	config.package :sign => 'Developer Identity Name', :profile => 'Profile.mobileprovision'
+	builder.package
 	
+This will produce a .ipa and a .dSYM.zip
+
 ### Incrementing the build number
 
 	config.info_plist do |info|

data/lib/xcode/builder.rb

@@ -0,0 +1,129 @@
+require 'xcode/shell'
+require 'xcode/provisioning_profile'
+
+module Xcode
+  class Builder
+    attr_accessor :profile, :identity
+    
+    def initialize(config)
+      @target = config.target
+      @config = config
+    end
+    
+    def install_profile
+      return if @profile.nil?
+      # TODO: remove other profiles for the same app?
+      p = ProvisioningProfile.new(@profile)
+      
+      ProvisioningProfile.installed_profiles.each do |installed|
+        if installed.identifiers==p.identifiers and installed.uuid==p.uuid
+          installed.uninstall
+        end
+      end
+      
+      p.install
+    end
+    
+    def build
+      install_profile
+      
+      cmd = []
+      cmd << "xcodebuild"
+      cmd << "-sdk #{@target.project.sdk}" unless @target.project.sdk.nil?
+      cmd << "-project \"#{@target.project.path}\""
+      cmd << "-target \"#{@target.name}\""
+      cmd << "-configuration \"#{@config.name}\""
+      Xcode::Shell.execute(cmd)
+    end
+    
+    def clean
+      cmd = []
+      cmd << "xcodebuild"
+      cmd << "-project \"#{@target.project.path}\""
+      cmd << "-target \"#{@target.name}\""
+      cmd << "-configuration \"#{@config.name}\""
+      cmd << "clean"
+      Xcode::Shell.execute(cmd)
+
+      # FIXME: Totally not safe
+      # cmd = []
+      # cmd << "rm -Rf #{build_path}"
+      # Xcode::Shell.execute(cmd)
+    end    
+    
+    def sign
+      cmd = []
+      cmd << "codesign"
+      cmd << "--force"
+      cmd << "--sign \"#{@identity}\""
+      cmd << "--resource-rules=\"#{app_path}/ResourceRules.plist\""
+      cmd << "--entitlements \"#{entitlements_path}\""
+      cmd << "\"#{ipa_path}\""
+      Xcode::Shell.execute(cmd)
+    end
+    
+    def package
+      #package IPA
+      cmd = []      
+      cmd << "xcrun"
+      cmd << "-sdk #{@target.project.sdk.nil? ? "iphoneos" : @target.project.sdk}"
+      cmd << "PackageApplication"
+      cmd << "-v \"#{app_path}\""
+      cmd << "-o \"#{ipa_path}\""
+      
+      unless @identity.nil?
+        cmd << "--sign \"#{@identity}\""
+      end
+      
+      unless @profile.nil?
+        cmd << "--embed \"#{@profile}\""
+      end
+      
+      Xcode::Shell.execute(cmd)
+      
+      # package dSYM
+      cmd = []
+      cmd << "zip"
+      cmd << "-r"
+      cmd << "-T"
+      cmd << "-y #{dsym_zip_path}"
+      cmd << "#{dsym_path}"
+      Xcode::Shell.execute(cmd)
+    end
+    
+    def build_path
+      "#{File.dirname(@target.project.path)}/build/"
+    end
+    
+    def configuration_build_path
+      "#{build_path}/#{@config.name}-#{@target.project.sdk}"
+    end
+    
+    def entitlements_path
+      "#{build_path}/#{@target.name}.build/#{name}-#{@target.project.sdk}/#{@target.name}.build/#{@config.product_name}.xcent"
+    end
+    
+    def app_path
+      "#{configuration_build_path}/#{@config.product_name}.app"
+    end
+    
+    def product_version_basename
+      version = @config.info_plist.version
+      version = "SNAPSHOT" if version.nil? or version==""
+      "#{configuration_build_path}/#{@config.product_name}-#{@config.name}-#{version}"
+    end
+
+    def ipa_path
+      "#{product_version_basename}.ipa"
+    end
+    
+    def dsym_path
+      "#{app_path}.dSYM"
+    end
+    
+    def dsym_zip_path
+      "#{product_version_basename}.dSYM.zip"
+    end
+    
+  end
+end

data/lib/xcode/configuration.rb

@@ -1,4 +1,4 @@
-require 'xcode/shell'
+require 'xcode/builder'
 
 module Xcode
   class Configuration
@@ -43,86 +43,8 @@ module Xcode
       info
     end
     
-    def build
-      cmd = []
-      cmd << "xcodebuild"
-      cmd << "-sdk #{@target.project.sdk}" unless @target.project.sdk.nil?
-      cmd << "-project \"#{@target.project.path}\""
-      cmd << "-target \"#{@target.name}\""
-      cmd << "-configuration \"#{name}\""
-      Xcode::Shell.execute(cmd)
+    def builder
+      Xcode::Builder.new(self)
     end
-    
-    def clean
-      cmd = []
-      cmd << "xcodebuild"
-#      cmd << "-sdk #{@target.project.sdk}" unless @target.project.sdk.nil?
-      cmd << "-project \"#{@target.project.path}\""
-      cmd << "-target \"#{@target.name}\""
-      cmd << "-configuration \"#{name}\""
-      cmd << "clean"
-      Xcode::Shell.execute(cmd)
-    end    
-    
-    def sign(identity)
-      cmd = []
-      cmd << "codesign"
-      cmd << "--force"
-      cmd << "--sign \"#{identity}\""
-      cmd << "--resource-rules=\"#{app_path}/ResourceRules.plist\""
-      cmd << "--entitlements \"#{entitlements_path}\""
-      cmd << "\"#{ipa_path}\""
-      Xcode::Shell.execute(cmd)
-    end
-    
-    def entitlements_path
-      "#{File.dirname(@target.project.path)}/build/#{@target.name}.build/#{name}-#{@target.project.sdk}/#{@target.name}.build/#{product_name}.xcent"
-    end
-    
-    def app_path
-      "#{File.dirname(@target.project.path)}/build/#{name}-#{@target.project.sdk}/#{product_name}.app"
-    end
-
-    def ipa_path
-      "#{File.dirname(@target.project.path)}/build/#{name}-#{@target.project.sdk}/#{product_name}-#{name}-#{info_plist.version}.ipa"
-    end
-
-    def package(options={})
-      cmd = []      
-      cmd << "xcrun"
-      cmd << "-sdk #{@target.project.sdk.nil? ? "iphoneos" : @target.project.sdk}"
-      cmd << "PackageApplication"
-      cmd << "-v \"#{app_path}\""
-      cmd << "-o \"#{ipa_path}\""
-      
-      if options.has_key? :sign
-        cmd << "--sign \"#{options[:sign]}\""
-      end
-      
-      if options.has_key? :profile
-        cmd << "--embed \"#{options[:profile]}\""
-      end
-      
-      Xcode::Shell.execute(cmd)
-    end
-    
-    private 
-    
-    def execute(bits, show_output=true)
-      out = []
-      cmd = bits.join(' ')
-      puts "EXECUTE: #{cmd}"
-      IO.popen (cmd) do |f| 
-        f.each do |line|
-          puts line if show_output
-          out << line
-        end 
-      end
-      #Process.wait
-      raise "Error (#{$?.exitstatus}) executing '#{cmd}'\n\n  #{out.join("  ")}" if $?.exitstatus>0
-      #puts "RETURN: #{out.inspect}"
-      out
-    end
-    
   end
 end

data/lib/xcode/project.rb

@@ -4,11 +4,12 @@ require 'xcode/configuration'
 
 module Xcode
   class Project 
-    attr_reader :targets, :sdk, :path
+    attr_reader :name, :targets, :sdk, :path
     def initialize(path, sdk=nil)
       @sdk = sdk || "iphoneos"  # FIXME: should support OSX/simulator too
       @path = File.expand_path path
       @targets = {}
+      @name = File.basename(@path).gsub(/\.xcodeproj/,'')
 
       parse_pbxproj
 #      parse_configurations
@@ -27,6 +28,7 @@ module Xcode
       json = JSON.parse(`plutil -convert json -o - "#{@path}/project.pbxproj"`)
       
       root = json['objects'][json['rootObject']]
+
       root['targets'].each do |target_id|
         target = Xcode::Target.new(self, json['objects'][target_id])
         

data/lib/xcode/provisioning_profile.rb

@@ -0,0 +1,50 @@
+module Xcode
+  class ProvisioningProfile
+    attr_reader :path, :name, :uuid, :identifiers
+    def initialize(path)
+      @path = path
+      @identifiers = []
+      
+      # TODO: im sure this could be done in a nicer way.  maybe read out the XML-like stuff and use the plist -> json converter
+      uuid = nil
+      File.open(path, "rb") do |f|
+        input = f.read
+        input=~/<key>UUID<\/key>.*?<string>(.*?)<\/string>/im
+        @uuid = $1.strip
+                
+        input=~/<key>Name<\/key>.*?<string>(.*?)<\/string>/im
+        @name = $1.strip
+        
+        input=~/<key>ApplicationIdentifierPrefix<\/key>.*?<array>(.*?)<\/array>/im
+        $1.split(/<string>/).each do |id|
+          next if id.nil? or id.strip==""
+          @identifiers << id.gsub(/<\/string>/,'').strip
+        end
+      end
+    
+    end
+
+    def self.profiles_path
+      File.expand_path "~/Library/MobileDevice/Provisioning\\ Profiles/"  
+    end
+    
+    def install_path
+      "#{ProvisioningProfile.profiles_path}/#{self.uuid}.mobileprovision"
+    end
+    
+    def install
+      Xcode::Shell.execute("cp #{self.path} #{self.install_path}")   
+    end
+    
+    def uninstall
+      Xcode::Shell.execute("rm -f #{self.install_path}")
+    end
+
+    def self.installed_profiles
+      Dir["#{self.profiles_path}/*.mobileprovision"].map do |file|
+        ProvisioningProfile.new(file)
+      end
+    end
+    
+  end
+end

data/lib/xcode/version.rb

@@ -1,3 +1,3 @@
 module Xcode
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/xcoder.rb

@@ -10,13 +10,16 @@ module Xcode
   @@projects = nil
   @@sdks = nil
   
-  # def self.project(name)
-  #   parse_projects if @@projects.nil?
-  #   @@projects.each do |p|
-  #     return p if p.name == name
-  #   end
-  #   raise "Unable to find project named #{name}"
-  # end
+  def self.project(name)
+    name = name.to_s
+    if @@projects.nil?
+      @@projects = parse_projects
+    end
+    @@projects.each do |p|
+      return p if p.name == name
+    end
+    raise "Unable to find project named #{name}.  However, I did find these projects: #{@@projects.map {|p| p.name}.join(', ') }"
+  end
   
   def self.import_certificate(cert, password, keychain="~/Library/Keychains/login.keychain")
     cmd = []
@@ -28,19 +31,6 @@ module Xcode
     Xcode::Shell.execute(cmd)
   end
   
-  def self.import_provisioning_profile(profile)
-    uuid = nil
-    File.open(profile, "rb") do |f|
-      input = f.read
-      input=~/<key>UUID<\/key>.*<string>(.*)<\/string>/im
-      uuid = $1.strip
-    end
-    
-    puts "Importing profile #{profile} with UUID #{uuid}"
-    
-    Xcode::Shell.execute("cp #{profile} ~/Library/MobileDevice/Provisioning\\ Profiles/#{uuid}.mobileprovision")   
-  end
-  
   def self.find_projects(dir='.')
     parse_projects(dir)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcoder
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2011-11-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70290395384320 !ruby/object:Gem::Requirement
+  requirement: &70359983645620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290395384320
+  version_requirements: *70359983645620
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70290395383900 !ruby/object:Gem::Requirement
+  requirement: &70359983645200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290395383900
+  version_requirements: *70359983645200
 description: Provides a ruby based object-model for parsing project structures and
   invoking builds
 email:
@@ -46,9 +46,11 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- lib/xcode/builder.rb
 - lib/xcode/configuration.rb
 - lib/xcode/info_plist.rb
 - lib/xcode/project.rb
+- lib/xcode/provisioning_profile.rb
 - lib/xcode/shell.rb
 - lib/xcode/target.rb
 - lib/xcode/version.rb