xcoder 0.0.15 → 0.0.16

data/lib/xcode/builder.rb

@@ -3,7 +3,8 @@ require 'xcode/provisioning_profile'
 
 module Xcode
   class Builder
-    attr_accessor :profile, :identity, :build_path
+    attr_accessor :profile, :identity, :build_path, :keychain
+    
     def initialize(config)
       if config.is_a? Xcode::Scheme
         @scheme = config
@@ -41,6 +42,7 @@ module Xcode
       cmd << "-target \"#{@target.name}\"" if @scheme.nil?
       cmd << "-configuration \"#{@config.name}\"" if @scheme.nil?
       
+      cmd << "OTHER_CODE_SIGN_FLAGS=\"--keychain #{@keychain.path}\"" unless @keychain.nil?
       cmd << "CODE_SIGN_IDENTITY=\"#{@identity}\"" unless @identity.nil?
       cmd << "OBJROOT=\"#{@build_path}\""
       cmd << "SYMROOT=\"#{@build_path}\""
@@ -104,6 +106,8 @@ module Xcode
       cmd << "-v \"#{app_path}\""
       cmd << "-o \"#{ipa_path}\""
       
+      cmd << "OTHER_CODE_SIGN_FLAGS=\"--keychain #{@keychain.path}\"" unless @keychain.nil?
+      
       unless @identity.nil?
         cmd << "--sign \"#{@identity}\""
       end

data/lib/xcode/buildfile.rb

@@ -44,41 +44,48 @@ module Xcode
      end
      builder = config.builder
      
-     unless @values[:identity].nil?
-       builder.identity = @values[:identity] 
-       puts "[#{label}] Set build identity to #{@values[:identity]}"
-     end
+     # unless @values[:identity].nil?
+     #   builder.identity = @values[:identity] 
+     #   puts "[#{label}] Set build identity to #{@values[:identity]}"
+     # end
      
      unless @values[:profile].nil?
        builder.profile = @values[:profile]
        puts "[#{label}] Set build profile to #{@values[:profile]}"
      end
      
-     puts "[#{label}] CLEAN"
-     @before[:clean].each do |b|
-       b.call(builder)
-     end
-     builder.clean
-     @after[:clean].each do |b|
-       b.call(builder)
-     end
+     Keychain.temp_keychain(@values[:project]) do |kc|
+       kc.import @values[:certificate], @values[:password]
+       
+       builder.identity = @values[:identity] || kc.certificates.first
+       builder.keychain = kc
+       
+       puts "[#{label}] CLEAN"
+       @before[:clean].each do |b|
+         b.call(builder)
+       end
+       builder.clean
+       @after[:clean].each do |b|
+         b.call(builder)
+       end
      
-     puts "[#{label}] BUILD"
-     @before[:build].each do |b|
-       b.call(builder)
-     end
-     builder.build
-     @after[:build].each do |b|
-       b.call(builder)
-     end
+       puts "[#{label}] BUILD"
+       @before[:build].each do |b|
+         b.call(builder)
+       end
+       builder.build
+       @after[:build].each do |b|
+         b.call(builder)
+       end
      
-     puts "[#{label}] PACKAGE"
-     @before[:package].each do |b|
-       b.call(builder)
-     end
-     builder.package
-     @after[:package].each do |b|
-       b.call(builder)
+       puts "[#{label}] PACKAGE"
+       @before[:package].each do |b|
+         b.call(builder)
+       end
+       builder.package
+       @after[:package].each do |b|
+         b.call(builder)
+       end
      end
           
       

data/lib/xcode/keychain.rb

@@ -1,29 +1,77 @@
 module Xcode
   class Keychain
-    def initialize(path)
-      @path = File.expand_path path
+    attr_accessor :name, :path
+    
+    TEMP_PASSWORD = "build_keychain_password"
+    def initialize(name)
+      @name = name
+      @path = File.expand_path "~/Library/Keychains/#{name}"
     end
     
     def import(cert, password)
       cmd = []
       cmd << "security"
       cmd << "import '#{cert}'"
-      cmd << "-k #{@path}"
+      cmd << "-k '#{@path}'"
       cmd << "-P #{password}"
       cmd << "-T /usr/bin/codesign"
       Xcode::Shell.execute(cmd)
     end
     
+    def certificates
+      names = []
+      cmd = []
+      cmd << "security"
+      cmd << "find-certificate"
+      cmd << "-a"
+      cmd << "#{@name}"
+      data = Xcode::Shell.execute(cmd, false).join("")
+      data.scan /\s+"labl"<blob>="([^"]+)"/ do |m|
+        names << m[0]
+      end
+      names
+    end
+    
     def unlock(password)
       cmd = []
       cmd << "security"
-      cmd << "unlock-keychain #{@path}"
+      cmd << "unlock-keychain"
+      cmd << "-p #{password}"
+      cmd << "#{@name}"
+      Xcode::Shell.execute(cmd)
+    end
+    
+    def self.create(name, password)
+      cmd = []
+      cmd << "security"
+      cmd << "create-keychain"
       cmd << "-p #{password}"
+      cmd << "#{name}"
       Xcode::Shell.execute(cmd)
+      
+      Xcode::Keychain.new(name)
+    end
+    
+    # FIXME: dangerous
+    def delete
+      cmd = []
+      cmd << "security"
+      cmd << "delete-keychain #{name}"
+      Xcode::Shell.execute(cmd)
+    end
+    
+    def self.temp_keychain(name, &block)
+      kc = Xcode::Keychain.create(name, TEMP_PASSWORD)
+      begin
+        kc.unlock(TEMP_PASSWORD)
+        block.call(kc)
+      ensure
+        kc.delete
+      end
     end
     
     def self.login_keychain
-      Xcode::Keychain.new("~/Library/Keychains/login.keychain")
+      Xcode::Keychain.new("login.keychain")
     end
   end
 end

data/lib/xcode/version.rb

@@ -1,3 +1,3 @@
 module Xcode
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/keychain_spec.rb

@@ -0,0 +1,25 @@
+require 'rspec'
+require 'xcoder'
+
+describe Xcode::Keychain do 
+  it "should create a keychain" do 
+    kc = Xcode::Keychain.temp_keychain('Test.keychain') do |kc|
+      puts kc.path
+      File.exists?(kc.path).should==true
+    end
+    File.exists?(Xcode::Keychain.new('Test.keychain').path).should==false
+  end
+  
+  it "should import a certificate" do 
+    Xcode::Keychain.temp_keychain('Test2.keychain') do |kc|
+      kc.import "#{File.dirname(__FILE__)}/Provisioning/TestUser.p12", 'testpassword'
+      kc.certificates.size.should==1
+      kc.certificates[0].should=="Test User"
+    end
+  end
+  
+  it "should fetch the login keychain" do
+    kc = Xcode::Keychain.login_keychain
+    File.exists?(kc.path).should==true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcoder
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70233550609660 !ruby/object:Gem::Requirement
+  requirement: &70335891561420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233550609660
+  version_requirements: *70335891561420
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70233550609240 !ruby/object:Gem::Requirement
+  requirement: &70335891561000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233550609240
+  version_requirements: *70335891561000
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70233550608820 !ruby/object:Gem::Requirement
+  requirement: &70335891560580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233550608820
+  version_requirements: *70335891560580
 description: Provides a ruby based object-model for parsing project structures and
   invoking builds
 email:
@@ -72,6 +72,7 @@ files:
 - lib/xcode/version.rb
 - lib/xcode/workspace.rb
 - lib/xcoder.rb
+- spec/Provisioning/TestUser.p12
 - spec/TestProject/Buildfile
 - spec/TestProject/TestProject.xcodeproj/project.pbxproj
 - spec/TestProject/TestProject.xcodeproj/xcuserdata/ray.xcuserdatad/xcschemes/TestProject.xcscheme
@@ -91,6 +92,7 @@ files:
 - spec/TestWorkspace.xcworkspace/contents.xcworkspacedata
 - spec/TestWorkspace.xcworkspace/xcuserdata/ray.xcuserdatad/UserInterfaceState.xcuserstate
 - spec/configuration_spec.rb
+- spec/keychain_spec.rb
 - spec/project_spec.rb
 - spec/scheme_spec.rb
 - spec/target_spec.rb
@@ -121,6 +123,7 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper around xcodebuild, xcrun, agvtool and pbxproj files
 test_files:
+- spec/Provisioning/TestUser.p12
 - spec/TestProject/Buildfile
 - spec/TestProject/TestProject.xcodeproj/project.pbxproj
 - spec/TestProject/TestProject.xcodeproj/xcuserdata/ray.xcuserdatad/xcschemes/TestProject.xcscheme
@@ -140,6 +143,7 @@ test_files:
 - spec/TestWorkspace.xcworkspace/contents.xcworkspacedata
 - spec/TestWorkspace.xcworkspace/xcuserdata/ray.xcuserdatad/UserInterfaceState.xcuserstate
 - spec/configuration_spec.rb
+- spec/keychain_spec.rb
 - spec/project_spec.rb
 - spec/scheme_spec.rb
 - spec/target_spec.rb