changelogger 0.0.2 → 0.0.3

data/bin/changelogger

@@ -1,6 +1,20 @@
 #!/usr/bin/env ruby
 
+require 'thor'
 require 'changelogger'
 
-path = ARGV[0] || Dir.pwd
-puts ChangeLogger.new(path).changelog
+class ChangeLoggerCLI < Thor
+  desc "changelog [DIR]", "outputs the changelog for the repository in [DIR] based on git tags"
+  long_desc <<-LONGDESC
+    Outputs the changelog for the git repository in the provided DIR or in the current working directory if nothing is specified for that parameter. The changelog is built by listing commits in the branch associated with the current repository head and splitting them according to the available tags.
+
+    Since the commit associated with the current repository head might not still be tagged, the --top_version option allows the provided string to be used as the top version in the changelog.
+  LONGDESC
+  option :top_version
+  def changelog(dir = nil)
+    path = dir || Dir.pwd
+    puts ChangeLogger.new(path).changelog(:top_version => options[:top_version])
+  end
+end
+
+ChangeLoggerCLI.start(ARGV)

data/lib/changelogger.rb

@@ -1,20 +1,27 @@
 require 'grit'
 require 'changelogger/commit_formatter'
 require 'changelogger/commit_filter'
+require 'changelogger/header_formatter'
 
 class ChangeLogger
-  def initialize(repo_dir)
-    @repo = Grit::Repo.new(repo_dir)
+  def initialize(repo_dir, is_bare = false)
+    @repo = Grit::Repo.new(repo_dir, :is_bare => is_bare)
   end
 
-  def changelog
+  def changelog(options = {})
+    commit_formatter = options[:commit_formatter] || CommitFormatter.new
+    commit_filter = options[:commit_filter] || CommitFilter.new
+    header_formatter = options[:header_formatter] || HeaderFormatter.new
+
     tags = @repo.tags
 
     changelog = ""
-    @repo.commits('master', false).each do |commit|
+    changelog += header_formatter.format(options[:top_version]) unless options[:top_version].nil?
+
+    @repo.commits(@repo.head.name, false).each do |commit|
       tag = tags.find { |t| t.commit.id == commit.id }
-      changelog += ("\n" + tag.name + "\n") unless tag.nil?
-      changelog += CommitFormatter.new(commit).format + "\n" unless CommitFilter.new(commit).filter
+      changelog += header_formatter.format(tag.name) unless tag.nil?
+      changelog += commit_formatter.format(commit) + "\n" unless !commit_filter.filter(commit)
     end
 
     changelog

data/lib/changelogger/commit_filter.rb

@@ -1,11 +1,7 @@
 require 'grit'
 
 class CommitFilter
-  def initialize(commit)
-    @commit = commit
-  end
-
-  def filter
-    @commit.message.start_with? "Merge"
+  def filter(commit)
+    !commit.message.start_with? "Merge"
   end
 end

data/lib/changelogger/commit_formatter.rb

@@ -1,14 +1,10 @@
 require 'grit'
 
 class CommitFormatter
-  def initialize(commit)
-    @commit = commit
-  end
-
-  def format
+  def format(commit)
     "  - " +
-      @commit.committed_date.strftime("%Y/%m/%d: ") +
-      @commit.message.split(/\n/).first +
-      " (" + @commit.author.name + ")"
+      commit.committed_date.strftime("%Y/%m/%d: ") +
+      commit.message.split(/\n/).first +
+      " (" + commit.author.name + ")"
   end
 end

data/lib/changelogger/header_formatter.rb

@@ -0,0 +1,5 @@
+class HeaderFormatter
+  def format(header)
+    "\n" + header + "\n"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: changelogger
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,10 +68,12 @@ extra_rdoc_files: []
 files:
 - lib/changelogger/commit_filter.rb
 - lib/changelogger/commit_formatter.rb
+- lib/changelogger/header_formatter.rb
 - lib/changelogger.rb
 - bin/changelogger
 homepage: http://github.com/jcazevedo/changelogger
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: