Permalink
Browse files

Merge branch 'master' into develop

* master:
  [Gemfile.lock] Update.
  Release 0.6.0.rc4
  [Rakefile] Improvements to release.
  • Loading branch information...
2 parents 224c72e + 6182b4a commit 78b9f6dc492137efa593eb09b2eb9cfe05aa5624 @fabiopelosin fabiopelosin committed Jun 29, 2012
Showing with 8 additions and 6 deletions.
  1. +1 −1 Gemfile.lock
  2. +6 −4 Rakefile
  3. +1 −1 lib/cocoapods.rb
View
@@ -8,7 +8,7 @@ GIT
PATH
remote: .
specs:
- cocoapods (0.6.0.rc3)
+ cocoapods (0.6.0.rc4)
colored (~> 1.2)
escape (~> 0.0.4)
faraday (~> 0.8.1)
View
@@ -77,7 +77,7 @@ namespace :gem do
end
desc "Run all specs, build and install gem, commit version change, tag version change, and push everything"
- task :release => :build do
+ task :release do
unless ENV['SKIP_CHECKS']
if `git symbolic-ref HEAD 2>/dev/null`.strip.split('/').last != 'master'
@@ -93,14 +93,14 @@ namespace :gem do
puts "You are about to release `#{gem_version}', is that correct? [y/n]"
exit if $stdin.gets.strip.downcase != 'y'
- diff_lines = `git diff --numstat`.strip.split("\n")
+ diff_lines = `git diff --name-only`.strip.split("\n")
- if diff_lines.size == 0 || !diff_lines.first.include?('lib/cocoapods.rb')
+ if diff_lines.size == 0
$stderr.puts "[!] Change the version number yourself in lib/cocoapods.rb"
exit 1
end
- if diff_lines.size > 1 || !diff_lines.first.include?('lib/cocoapods.rb')
+ if diff_lines != ['Gemfile.lock', 'lib/cocoapods.rb']
$stderr.puts "[!] Only change the version number in a release commit!"
exit 1
end
@@ -125,6 +125,8 @@ namespace :gem do
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}"
View
@@ -1,5 +1,5 @@
module Pod
- VERSION = '0.6.0.rc3'
+ VERSION = '0.6.0.rc4'
class PlainInformative < StandardError
end

0 comments on commit 78b9f6d

Please sign in to comment.