gog 0.0.2pre → 0.0.3pre

data/README.md

@@ -6,6 +6,10 @@ Gog aims to help developers to insert changelog data inside git commits.
 Gog allows to create changelogs based on commit data and tagged commits.
 
 ## This is still alpha software !
+- You can help !
+- Better tag managemnt
+- Adding a config file to the engine
+- just ask by sending a email via github
 
 # Syntax
 

data/lib/gog/change.rb

@@ -9,8 +9,8 @@ class Gog
       @commit = commit
     end
 
-    def closest_tag
-      @closest_tag ||= find_closest_tag
+    def closest_parent_tag_name
+      @closest_parent_tag_name ||= find_closest_parent_tag_name
     end
 
     def to_s
@@ -19,7 +19,7 @@ class Gog
 
     private
 
-    def find_closest_tag
+    def find_closest_parent_tag_name
       available_tags = Gog::Log.repo_tags
       return if available_tags.empty?
 
@@ -28,13 +28,16 @@ class Gog
         available_tags_by_sha[tag.commit.sha] = tag
       end
 
-      Change.find_tag_in_self_or_parents(self, available_tags_by_sha)
+      Change.find_tag_name_in_self_or_parents(self.commit.parents, available_tags_by_sha)
     end
 
-    def self.find_tag_in_self_or_parents(change, tags)
-      tag = tags[change.commit.sha]
-      tag || find_tag_in_self_or_parents(change.parents.first, tags)
+    def self.find_tag_name_in_self_or_parents(commits, tags)
+      return '0.0.0' if commits.empty?
+      commit = commits.first
+      tag = tags[commit.sha]
+      tag ? tag.name : find_tag_name_in_self_or_parents(commit.parents, tags)
     end
-
+    
+    
   end
 end

data/lib/gog/log.rb

@@ -9,9 +9,9 @@ class Gog
     class << self
 
 
-      def init(repo = Grit::Repo.new("."))
+      def init(repo = Grit::Repo.new('.'))
         @@repo = repo
-        @@changes = @@repo.commits.map do |commit|
+        @@changes = @@repo.commits('master', 30).map do |commit|
           Gog::Commit.extract_changes commit
         end
         @@changes.select! { |change| !change.empty? }
@@ -24,11 +24,21 @@ class Gog
       end
 
       def changes_by_tag
-        tags = Hash.new()
+        reversed_tags = Hash.new {|h,k| h[k] = [] }
+        tags = Hash.new
+        # Grouping changes by parent tags (impossible in the other way with Grit)
         @@changes.each do |change|
-          tag_name = change.closest_tag.name
-          tags[tag_name] = [] unless tags[tag_name]
-          tags[tag_name] << change
+          tag_name = change.closest_parent_tag_name
+          reversed_tags[tag_name] << change
+        end
+
+        # Reversing tag array
+        tags_array = reversed_tags.to_a
+        tags_array.each_with_index do |tag_and_changes, index|
+          tag = tag_and_changes[0]
+          tag_changes = tag_and_changes[1]
+          new_tag = index > 0 ? tags_array[index - 1][0] : 'Unreleased'
+          tags[new_tag] = changes_sorted_by_header(tag_changes)
         end
         tags
       end
@@ -37,8 +47,16 @@ class Gog
         if @@changes.empty?
           'No changes found. Read https://github.com/goglog/gog for instructions.'
         else
-          @@changes.join("\n")
+          @@changes.join "\n"
+        end
+      end
+
+      def changes_sorted_by_header(changes)
+        sorted_changes  = Hash.new {|h,k| h[k] = [] }
+        changes.each do |change|
+          sorted_changes[change.header] << change
         end
+        sorted_changes
       end
 
       def repo_tags

data/lib/gog/version.rb

@@ -1,3 +1,3 @@
 class Gog
-  VERSION = "0.0.2pre"
+  VERSION = "0.0.3pre"
 end

data/spec/lib/gog/log_spec.rb

@@ -37,11 +37,11 @@ describe Gog::Log do
         it 'finds closest tag for first change' do
           Gog::Log.init repo
           change = Gog::Log.changes.first
-          change.closest_tag.name.should eq('0.0.2')
+          change.closest_parent_tag_name.should eq('0.0.3')
         end
 
         it "show changes by tag" do
-          changes = %Q%{\"0.0.2\"=>[Enhancement: Readme in md format], \"0.0.1\"=>[Explaining: this repo]}%
+          changes = %Q%{\"Unreleased\"=>{\"Feature\"=>[Feature: Unreleased change]}, \"0.0.3\"=>{\"Feature\"=>[Feature: Le changement c'est maintenant !., Feature: Needed change.]}, \"0.0.2\"=>{\"Enhancement\"=>[Enhancement: Readme in md format]}, \"0.0.1\"=>{\"Explaining\"=>[Explaining: this repo]}}%
           Gog::Log.init repo
           Gog::Log.changes_by_tag.inspect.should eq(changes)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gog
 version: !ruby/object:Gem::Version
-  version: 0.0.2pre
+  version: 0.0.3pre
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit