primedia-qa_release_tasks 0.3.0 → 0.4.0

data/Rakefile

@@ -7,7 +7,7 @@ require 'spec/rake/spectask'
 require 'lib/qa_release_tasks'
 
 GEM = "qa_release_tasks"
-GEM_VERSION = "0.1.1"
+GEM_VERSION = QaReleaseTasks.version
 AUTHORS = "Jason Noble", "Rein Henrichs"
 SUMMARY = "A gem that provides workflow driven rake tasks for git QA branch management"
 
@@ -20,10 +20,11 @@ spec = Gem::Specification.new do |s|
   s.summary = SUMMARY
   s.description = s.summary
   s.authors = AUTHORS
+  s.executables = ['git-changelog']
   
   s.require_path = 'lib'
   s.autorequire = GEM
-  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{bin,lib,spec}/**/*")
 end
 
 task :default => :spec

data/bin/git-changelog

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby -wKU
+require File.join(File.dirname(__FILE__), '../lib/qa_release_tasks')
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Git Changelog - Show a list of changes by version."
+  
+  opts.separator ''
+  
+  opts.on_tail('-h', '--help', 'Displays this help message') do
+    puts opts
+    exit
+  end
+  
+  opts.on_tail("--version", "Show version") do
+    puts 'git changelog version ' + QaReleaseTasks.version
+    exit
+  end
+
+  opts.on('-l', '--limit [LIMIT]', Integer, 'Maximum commits for each version, default is 20') do |limit|
+    options[:limit] = limit || 20
+  end
+  
+  opts.on('--no-limit', 'Show all commits for each version') do
+    options[:limit] = false
+  end
+  
+  opts.on('-a', '--all', 'Show all versions') do
+    options[:all] = true
+  end
+  
+  opts.on('--from [VERSION]',
+          'Start changelog at this version. Defaults to most recent version.') do |from|
+    options[:from] = from
+  end
+  
+  opts.on('--to [VERSION]',
+          'End changelog at this version. Defaults to second most recent version.') do |to|
+    options[:to] = to
+  end
+end.parse!
+
+Git::ReleaseNotes.new(options).annotate!

data/lib/git/release_notes.rb

@@ -3,17 +3,28 @@ module Git
     require 'enumerator'
     include CLI
     include Commands
+    
+    attr_reader :options
+    def initialize(options = {})
+      @options = options
+      @limit = options[:limit].nil? ? 20 : options[:limit]
+    end
 
     def annotate!
       assert_is_git_repo
       tags = get_tags.reverse
       error "No version tags available." if tags.empty?
       
-      start_tag = ask "Start at which tag?", tags[0], tags
-      start_index = tags.index(start_tag)      
-      end_tag = ask "End at which tag?", tags[start_index + 1] || tags[start_index], tags
+      if options[:all]
+        start_index = 0
+        end_index = tags.length - 1
+      else
+        start_tag = options[:from] || ask("Start at which tag?", tags[0], tags)
+        start_index = tags.index(start_tag)   
+        end_tag = options[:to] || ask("End at which tag?", tags[start_index + 1] || tags[start_index], tags)
+        end_index = tags.index(end_tag) + 1 # include end tag
+      end
       puts
-      end_index = tags.index(end_tag) + 1 # include end tag
       
       start_index.upto(end_index-1) do |i|
         start = tags[i]
@@ -21,11 +32,12 @@ module Git
         range = ''
         range << "refs/tags/#{finish}.." if finish # log until end tag if there is an end tag
         range << "refs/tags/#{start}"
-        log = `git log --no-merges --pretty=format:"%h  %s" #{range}`.strip
+        log = `git log --no-merges --pretty=format:"%h  %s" #{range}`.strip.split("\n")
         next if log.empty?
         puts "#{start}"
         puts "=" * start.length
-        puts log
+        puts @limit ? log[0,@limit] : log
+        puts "         ... and #{log.size - @limit} more." if @limit && log.size > @limit
         puts
       end
     end

data/lib/git/tagger.rb

@@ -42,6 +42,14 @@ module Git
       system("git pull")               &&
       response = %x(git merge master)
 
+      unless $?.success?
+        `git reset --hard`
+        error <<-EOS
+        Conflicts when updating the QA branch from master prevented a release from being created.
+        Please resolve these conflicts and then re-run rake qa:release:new.
+        EOS
+      end
+
       unless response.include?("Fast forward") || response.include?('Already up-to-date.')
         warn "There are outstanding changes in qa_branch that may need to be merged into master"
       end

data/lib/qa_release_tasks.rb

@@ -4,3 +4,11 @@ require 'git/commands'
 require 'git/release_notes'
 require 'git/tagger'
 require 'tasks/qa_release'
+
+module QaReleaseTasks
+  VERSION = '0.4.1'
+
+  def self.version
+    VERSION
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: primedia-qa_release_tasks
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jason Noble
@@ -10,14 +10,14 @@ autorequire: qa_release_tasks
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 -07:00
-default_executable: 
+date: 2009-04-02 00:00:00 -07:00
+default_executable: git-changelog
 dependencies: []
 
 description: A gem that provides workflow driven rake tasks for git QA branch management
 email: 
-executables: []
-
+executables: 
+- git-changelog
 extensions: []
 
 extra_rdoc_files: 
@@ -27,6 +27,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- bin/git-changelog
 - lib/cli.rb
 - lib/git
 - lib/git/commands.rb