simple_changelog 0.0.15 → 0.0.16

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2IwNDgyZWJlYzViYjNmMzM0NmYxZTNlYjg3N2ZiNTQxOTRmY2U3Yg==
+  data.tar.gz: !binary |-
+    NjA5M2QxYWExZjMwZjNiZWE4NmI1MWJjMThlNzA4NTc1YjYyOWRiMQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDEzNDkyYzQzNTFhMGIwZmQ2MjYzMDllMjZkN2U0MzQ1ODUwNWM5NzhlNWM1
+    ZWNlNmEyOWM0NTA3OWM2NDUyY2Q1MjY1YTEwYWQ5NWYwZTEwYjdiZDBjMWFj
+    ZjRhNDU3MzVlNjhhNDhhYmJiYThiODkwODdkOWNhY2IzZTI2ZjM=
+  data.tar.gz: !binary |-
+    Y2RlYjUyOTY1NDNiZjY5ZWQ3ZTlhNGE2MTZhNDk2MjZiOGVjNzgyZjljM2Zh
+    NzU1MjI4Y2I3YWU2N2YyNWI3YjdkYzIzMGU5MzY5NzJmMTUxZWZkZGFmOTJl
+    NjU4Y2M5ZTg0MjA4Y2M4YTI5NTEwYTM3ZDMyYzg0ZGMyZDY5MWY=

data/app/assets/stylesheets/simple_changelog/repositories.css

@@ -16,33 +16,44 @@
 #app-changelog .commits {
   margin-left: 50px;
 }
+.commit {
+  padding: 4px;
+}
+.commit.odd {
+  background-color: #eee;
+}
 
-.commit .dev, .commit .d {
+.commit .type.dev, .commit .type.d {
   color: #2E64FE;
   font-weight: bold;
 }
 
-.commit .fix, .commit .f {
+.commit type.fix, .commit .f {
   color: #04B431;
   font-weight: bold;
 }
 
-.commit .ref, .commit .r {
+.commit .type.ref, .commit .type.r {
   color: #FF8000;
   font-weight: bold;
 }
 
-.commit .cros {
-  color: #000000;
+.commit .type.bug, .commit .type.b {
+  color: #B40404;
   font-weight: bold;
 }
 
-.commit .bug, .commit .b {
-  color: #B40404;
+.commit .type.new, .commit .type.n {
+  color: #6A0888;
   font-weight: bold;
 }
 
-.commit .new, .commit .n {
-  color: #6A0888;
+.commit .name {
+  color: #000000;
   font-weight: bold;
 }
+
+.commit .author {
+  color: #888;
+  font-size: .8em;
+}

data/app/helpers/simple_changelog/repositories_helper.rb

@@ -1,24 +1,9 @@
+require('minigit')
+
 module SimpleChangelog
   module RepositoriesHelper
     def long_date_format(datetime)
       datetime.to_date.to_formatted_s :long
     end
-
-    def highlight_commit_tags(commit_message)
-      highlighted_message = commit_message.gsub(/\[[^\[\]]+\]/) do |tag|
-        tag_class = tag.gsub(/[^A-Za-z]/, '').downcase
-        content_tag(:span, class: tag_class) { tag }
-      end
-
-      highlighted_message.html_safe
-    end
-
-    def current_version_tag
-      ENV['app_version'] ||= Repository.new.current_version_tag
-    end
-
-    def changelog_link(html_options = {})
-      link_to current_version_tag, simple_changelog_path, html_options
-    end
   end
-end
+end

data/app/models/simple_changelog/commit.rb

@@ -1,3 +1,3 @@
 module SimpleChangelog
-  Commit = Struct.new(:message, :date, :id, :author)
+  Commit = Struct.new(:name, :type, :message, :author)
 end

data/app/models/simple_changelog/repository.rb

@@ -1,64 +1,64 @@
 module SimpleChangelog
   class Repository
+
+    NEW_LINE_SPLITTER = /\r?\n/
+
     def initialize(path = Rails.root)
-      @repo = Grit::Repo.new path
-      @tags = @repo.tags
-      @commits = @repo.commits
+      @repo = MiniGit.new path
+
+      create_tags
     end
 
     def load_history
       history = {}
 
-      if @tags.any? || @commits.any?
-        middle_tags = convert_tags(@tags).sort_by { |t| t.date }
-        tags = [tail_tag] + middle_tags
-        tags << head_tag if has_head_commits?(middle_tags)
-        tags.reverse!
-        tags.each_cons(2) do |prev, succ|
-          history[prev] = commits_between(succ, prev).sort_by { |c| c.message }
+      if @tags.any?
+        @tags.each_cons(2) do |prev, succ|
+          history[prev] = commits_between(succ, prev)
         end
       end
 
       history
     end
 
-    def current_version_tag
-      if @tags.empty?
-        @commits.empty? ? '' : 'HEAD'
-      else
-        last_tag = @tags.sort_by { |t| t.tag_date }.last
-        last_tag.name
-      end
-    end
-
     private
 
-    def has_head_commits?(middle_tags)
-      commit = @repo.commits('master', 1).first
-      middle_tags.none? { |t| t.commit_id == commit.id }
-    end
+    def create_tags
+      tags_string = @repo.capturing.log tags: true, 'simplify-by-decoration' => true, pretty: 'format:%d|q%ai'
 
-    def head_tag
-      commit = @repo.commits('master', 1).first
-      Tag.new('HEAD', commit.date, commit.id)
-    end
+      @tags = []
 
-    def tail_tag
-      commit = @repo.commits('master', 1, @repo.commit_count - 1).first
-      Tag.new('TAIL', commit.date, commit.id)
-    end
+      tags_string.split(NEW_LINE_SPLITTER).each do |tag_info|
+        match = /\A\((.+)\)\|(.+)\z/.match(tag_info.strip)
+        if match
+          names = match[1]
+          datetime = DateTime.parse(match[2])
 
-    def commits_between(from, to)
-      commits = @repo.commits_between(from.commit_id, to.commit_id)
-      convert_commits(commits)
-    end
+          names.split(',').each do |name|
+            @tags << SimpleChangelog::Tag.new(name.strip, datetime)
+          end
+        end
+      end
 
-    def convert_commits(commits)
-      commits.map { |c| Commit.new(c.short_message, c.date, c.id, c.author.name) }
+      @tags.sort! { |a, b| -(a.datetime <=> b.datetime) }
     end
 
-    def convert_tags(tags)
-      tags.map { |t| Tag.new(t.name, t.tag_date, t.commit.id) }
+    def commits_between(prev, succ)
+      commits = []
+      commits_string = @repo.capturing.log "#{prev.name}..#{succ.name}", pretty: 'format:%an|%s'
+
+      commits_string.split(NEW_LINE_SPLITTER).each do |commmit_info|
+        match = /\A(.+?)\|(\[(.+)\])(.+)\z/.match(commmit_info.strip)
+
+        if match
+          names = match[3].split('][')
+          type = names.pop if names.count > 1
+
+          commits << SimpleChangelog::Commit.new(names.join(', '), type, (match[4].strip if match[4]), match[1])
+        end
+      end
+
+      commits
     end
   end
 end

data/app/models/simple_changelog/tag.rb

@@ -1,3 +1,3 @@
 module SimpleChangelog
-  Tag = Struct.new(:name, :date, :commit_id)
+  Tag = Struct.new(:name, :datetime)
 end

data/app/views/simple_changelog/repositories/_commit.html.erb

@@ -1,4 +1,8 @@
-<div class="commit">
-  <%= highlight_commit_tags(commit.message) %>
-  <b>&nbsp;by&nbsp;<%= commit.author %></b>
+<div class="commit <%= cycle("odd", "even") %>">
+  <span class="name"><%= commit.name %></span> |
+  <% if commit.type %>
+    <span class="type <%= commit.type.downcase %>"><%= commit.type %></span> –
+  <% end %>
+  <span class="message"><%= commit.message %></span>
+  <span class="author"> by <%= commit.author %></span>
 </div>

data/app/views/simple_changelog/repositories/_version_tag.html.erb

@@ -1,7 +1,6 @@
 <div class="version-tag">
-  <h2 class="underlined"><%= version_tag.name %>&nbsp;(<%= long_date_format(version_tag.date) %>)</h2>
+  <h2 class="underlined"><%= version_tag.name %>&nbsp;(<%= long_date_format(version_tag.datetime) %>)</h2>
   <section class="commits">
-    <%= render partial: 'commit',
-               collection: changelog[version_tag] %>
+    <%= render partial: 'commit', collection: changelog[version_tag] %>
   </section>
 </div>

data/lib/simple_changelog/engine.rb

@@ -1,5 +1,3 @@
-require 'grit'
-
 module SimpleChangelog
   class Engine < ::Rails::Engine
     isolate_namespace SimpleChangelog

data/lib/simple_changelog/version.rb

@@ -1,3 +1,3 @@
 module SimpleChangelog
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: simple_changelog
 version: !ruby/object:Gem::Version
-  version: 0.0.15
-  prerelease: 
+  version: 0.0.16
 platform: ruby
 authors:
 - Alex Sologub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,31 +20,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.8
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: minigit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,54 +74,53 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/helpers/simple_changelog/repositories_helper.rb
-- app/helpers/simple_changelog/application_helper.rb
+- app/assets/javascripts/simple_changelog/application.js
+- app/assets/javascripts/simple_changelog/repositories.js
+- app/assets/stylesheets/simple_changelog/application.css
+- app/assets/stylesheets/simple_changelog/repositories.css
 - app/controllers/simple_changelog/application_controller.rb
 - app/controllers/simple_changelog/repositories_controller.rb
-- app/models/simple_changelog/tag.rb
+- app/helpers/simple_changelog/application_helper.rb
+- app/helpers/simple_changelog/repositories_helper.rb
 - app/models/simple_changelog/commit.rb
 - app/models/simple_changelog/repository.rb
+- app/models/simple_changelog/tag.rb
+- app/views/layouts/simple_changelog/application.html.erb
 - app/views/simple_changelog/repositories/_commit.html.erb
 - app/views/simple_changelog/repositories/_version_tag.html.erb
 - app/views/simple_changelog/repositories/show.html.erb
-- app/views/layouts/simple_changelog/application.html.erb
-- app/assets/javascripts/simple_changelog/application.js
-- app/assets/javascripts/simple_changelog/repositories.js
-- app/assets/stylesheets/simple_changelog/repositories.css
-- app/assets/stylesheets/simple_changelog/application.css
 - config/routes.rb
-- lib/simple_changelog.rb
-- lib/tasks/simple_changelog_tasks.rake
-- lib/simple_changelog/engine.rb
-- lib/simple_changelog/version.rb
 - lib/generators/simple_changelog/install_generator.rb
 - lib/generators/templates/README
+- lib/simple_changelog/engine.rb
+- lib/simple_changelog/version.rb
+- lib/simple_changelog.rb
+- lib/tasks/simple_changelog_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
 homepage: https://github.com/marvelousNinja/simple_changelog.git
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple gem for rails applications and their git repositories. Mounts page
   with history of commits.
 test_files: []