CocoaPods · Jul 2, 2012 · Jul 2, 2012 · Jul 2, 2012
Showing with 124 additions and 14 deletions.

+14 −5 Gemfile.lock

+75 −2 Rakefile

+1 −1 lib/xcodeproj.rb

+11 −6 lib/xcodeproj/project.rb

+23 −0 spec/project_spec.rb
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,12 +2,21 @@ GEM
   remote: http://rubygems.org/
   specs:
     bacon (1.1.0)
-    kicker (2.5.0)
-      rb-fsevent
+    ffi (1.0.11)
+    kicker (2.6.0)
+      listen
+    listen (0.4.7)
+      rb-fchange (~> 0.0.5)
+      rb-fsevent (~> 0.9.1)
+      rb-inotify (~> 0.8.8)
     rake (0.9.2.2)
-    rb-fsevent (0.9.0)
-    redcarpet (2.1.0)
-    yard (0.7.5)
+    rb-fchange (0.0.5)
+      ffi
+    rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
+    redcarpet (2.1.1)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby

diff --git a/Rakefile b/Rakefile
@@ -86,15 +86,88 @@ rescue LoadError
 end
 
 namespace :gem do
+  def gem_version
+    require File.expand_path('../lib/xcodeproj', __FILE__)
+    Xcodeproj::VERSION
+  end
+
+  def gem_filename
+    "xcodeproj-#{gem_version}.gem"
+  end
+
   desc "Build the gem"
   task :build do
     sh "gem build xcodeproj.gemspec"
   end
 
   desc "Install a gem version of the current code"
   task :install => :build do
-    require File.expand_path('../lib/xcodeproj', __FILE__)
-    sh "gem install xcodeproj-#{Xcodeproj::VERSION}.gem"
+    sh "gem install #{gem_filename}"
+  end
+
+  def silent_sh(command)
+    output = `#{command} 2>&1`
+    unless $?.success?
+      puts output
+      exit 1
+    end
+    output
+  end
+
+  desc "Run all specs, build and install gem, commit version change, tag version change, and push everything"
+  task :release do
+
+    unless ENV['SKIP_CHECKS']
+      if `git symbolic-ref HEAD 2>/dev/null`.strip.split('/').last != 'master'
+        $stderr.puts "[!] You need to be on the `master' branch in order to be able to do a release."
+        exit 1
+      end
+
+      if `git tag`.strip.split("\n").include?(gem_version)
+        $stderr.puts "[!] A tag for version `#{gem_version}' already exists. Change the version in lib/xcodeproj.rb"
+        exit 1
+      end
+
+      puts "You are about to release `#{gem_version}', is that correct? [y/n]"
+      exit if $stdin.gets.strip.downcase != 'y'
+
+      diff_lines = `git diff --name-only`.strip.split("\n")
+
+      if diff_lines.size == 0
+        $stderr.puts "[!] Change the version number yourself in lib/xcodeproj.rb"
+        exit 1
+      end
+
+      if diff_lines != ['Gemfile.lock', 'lib/xcodeproj.rb']
+        $stderr.puts "[!] Only change the version number in a release commit!"
+        exit 1
+      end
+    end
+
+    puts "* Running specs"
+    silent_sh('rake spec:all')
+
+    tmp = File.expand_path('../tmp', __FILE__)
+    tmp_gems = File.join(tmp, 'gems')
+
+    Rake::Task['gem:build'].invoke
+
+    puts "* Testing gem installation (tmp/gems)"
+    silent_sh "rm -rf '#{tmp}'"
+    silent_sh "gem install --install-dir='#{tmp_gems}' #{gem_filename}"
+
+    # puts "* Building examples from gem (tmp/gems)"
+    # ENV['GEM_HOME'] = ENV['GEM_PATH'] = tmp_gems
+    # ENV['PATH']     = "#{tmp_gems}/bin:#{ENV['PATH']}"
+    # ENV['FROM_GEM'] = '1'
+    # silent_sh "rake examples:build"
+
+    # Then release
+    sh "git commit Gemfile.lock lib/xcodeproj.rb -m 'Release #{gem_version}'"
+    sh "git tag -a #{gem_version} -m 'Release #{gem_version}'"
+    sh "git push origin master"
+    sh "git push origin --tags"
+    sh "gem push #{gem_filename}"
   end
 end
 

diff --git a/lib/xcodeproj.rb b/lib/xcodeproj.rb
@@ -1,5 +1,5 @@
 module Xcodeproj
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 
   autoload :Config,    'xcodeproj/config'
   autoload :Project,   'xcodeproj/project'

diff --git a/lib/xcodeproj/project.rb b/lib/xcodeproj/project.rb
@@ -167,12 +167,17 @@ def files
     #                             directory.
     # @return [PBXFileReference]  The file reference object.
     def add_system_framework(name)
-      group = groups.where('name' => 'Frameworks') || groups.new('name' => 'Frameworks')
-      group.files.new({
-        'name' => "#{name}.framework",
-        'path' => "System/Library/Frameworks/#{name}.framework",
-        'sourceTree' => 'SDKROOT'
-      })
+      path = "System/Library/Frameworks/#{name}.framework"
+      if file = files.where(:path => path)
+        file
+      else
+        group = groups.where('name' => 'Frameworks') || groups.new('name' => 'Frameworks')
+        group.files.new({
+          'name' => "#{name}.framework",
+          'path' => path,
+          'sourceTree' => 'SDKROOT'
+        })
+      end
     end
 
     # @return [PBXObjectList<XCBuildConfiguration]  A list of project wide

diff --git a/spec/project_spec.rb b/spec/project_spec.rb
@@ -81,6 +81,29 @@ module ProjectSpecs
       @project.build_settings('Release').should == {}
     end
 
+    it "adds a file reference, for a system framework, to the Frameworks group" do
+      group = @project.groups.where(:name => 'Frameworks')
+      file = @project.add_system_framework('QuartzCore')
+      file.group.should == group
+      file.name.should == 'QuartzCore.framework'
+      file.path.should == 'System/Library/Frameworks/QuartzCore.framework'
+      file.source_tree.should == 'SDKROOT'
+    end
+
+    it "does not add a system framework if it already exists in the project" do
+      before = @project.files.size
+
+      file = @project.add_system_framework('Foundation')
+      file.name.should == 'Foundation.framework'
+      @project.files.size.should == before
+
+      @project.groups.where(:name => 'Frameworks').name = 'Renamed Frameworks Group'
+      file = @project.add_system_framework('Foundation')
+      file.name.should == 'Foundation.framework'
+      @project.files.size.should == before
+    end
+
+    # TODO this should go to the native target spec
     it "adds an `m' or `c' file to the `sources build' phase list" do
       %w{ m mm c cpp }.each do |ext|
         path = Pathname.new("path/to/file.#{ext}")