Merge branch 'master' into local_repos
Conflicts: spec/unit/project_spec.rb
Showing
| ... | @@ -18,7 +18,7 @@ group :development do | ... | @@ -18,7 +18,7 @@ group :development do |
| gem "mocha-on-bacon" | gem "mocha-on-bacon" | ||
| gem 'prettybacon', :git => 'https://github.com/irrationalfab/PrettyBacon.git', :branch => 'master' | gem 'prettybacon', :git => 'https://github.com/irrationalfab/PrettyBacon.git', :branch => 'master' | ||
| gem "rake" | gem "rake" | ||
| gem 'coveralls', :require => false, :git => 'https://github.com/lemurheavy/coveralls-ruby.git' | gem 'coveralls', :require => false | ||
| # Explicitly add this, otherwise it might sometimes be missing: | # Explicitly add this, otherwise it might sometimes be missing: | ||
| # https://github.com/lemurheavy/coveralls-ruby/blob/master/coveralls-ruby.gemspec#L23. | # https://github.com/lemurheavy/coveralls-ruby/blob/master/coveralls-ruby.gemspec#L23. | ||
| gem 'simplecov' | gem 'simplecov' | ||
| ... | ... |
| ... | @@ -30,7 +30,7 @@ s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHA | ... | @@ -30,7 +30,7 @@ s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHA |
| s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}" | s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}" | ||
| s.add_runtime_dependency 'claide', '~> 0.3.2' | s.add_runtime_dependency 'claide', '~> 0.3.2' | ||
| s.add_runtime_dependency 'cocoapods-downloader', '~> 0.2.0' | s.add_runtime_dependency 'cocoapods-downloader', '~> 0.2.0' | ||
| s.add_runtime_dependency 'xcodeproj', '~> 0.11.0' | s.add_runtime_dependency 'xcodeproj', '~> 0.13.1' | ||
| s.add_runtime_dependency 'colored', '~> 1.2' | s.add_runtime_dependency 'colored', '~> 1.2' | ||
| s.add_runtime_dependency 'escape', '~> 0.0.4' | s.add_runtime_dependency 'escape', '~> 0.0.4' | ||
| ... | @@ -54,6 +54,9 @@ s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHA | ... | @@ -54,6 +54,9 @@ s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHA |
| lines = text.split("\n") | lines = text.split("\n") | ||
| current_version_index = lines.find_index { |line| line =~ (/^#{current_verison_title}/) } | current_version_index = lines.find_index { |line| line =~ (/^#{current_verison_title}/) } | ||
| unless current_version_index | |||
| raise "Update the changelog for the last version" | |||
| end | |||
| previous_version_lines = lines[(current_version_index+1)...-1] | previous_version_lines = lines[(current_version_index+1)...-1] | ||
| previous_version_index = current_version_index + previous_version_lines.find_index { |line| line =~ (/^#{title_token}/) && !line.include?('rc') } | previous_version_index = current_version_index + previous_version_lines.find_index { |line| line =~ (/^#{title_token}/) && !line.include?('rc') } | ||
| ... | ... |
This diff is collapsed.
This diff is collapsed.
18.2 KB
942 Bytes
4.98 KB
6.39 KB
9.82 KB
1.07 KB
2.7 KB
This diff is collapsed.
File added
This diff is collapsed.
3.88 KB
3.88 KB
5.58 KB
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.