ptlog 0.2.2 → 0.3.0

data/lib/ptlog.rb

@@ -1,4 +1,6 @@
 require "ptlog/version"
+require "git"
+
 
 module PTLog
   class GeneralError < StandardError; end
@@ -10,6 +12,27 @@ module PTLog
     autoload :API, "ptlog/pivotal/api"
   end
 
-  autoload :Release, "ptlog/release"
-  autoload :ChangeLog, "ptlog/change_log"
+  module Git
+    autoload :Lib, "ptlog/git/lib"
+  end
+
+  module Wrappers
+    autoload :ChangeLog,  "ptlog/wrappers/changelog"
+    autoload :Release,    "ptlog/wrappers/release"
+  end
+
+  autoload :Release,    "ptlog/release"
+  autoload :ChangeLog,  "ptlog/change_log"
+  autoload :TagList,    "ptlog/git/tags_list"
+
+  def self.root
+    File.expand_path '../..', __FILE__
+  end
+
+  def self.templates
+    File.join root, 'templates'
+  end
 end
+
+Git::Lib.send :include, PTLog::Git::Lib
+

data/lib/ptlog/change_log.rb

@@ -1,125 +1,22 @@
-require 'git'
-require 'nokogiri'
-
-module Git
-  class Lib
-    def ordered_tags
-      command_lines("for-each-ref --sort='*authordate' --format='%(tag)' refs/tags")
-    end
-    def first_commit
-      command("rev-list --max-parents=0 HEAD")
-    end
-  end
-end
-
-
+require 'erb'
 
 module PTLog
-  class TagList
-    include Enumerable
-
-    def initialize(git, since)
-      @list = git.lib.ordered_tags
-      @since = since
-      @first_commit = git.lib.first_commit
-    end
-
-    def each(options = {})
-      list_after_item = @list[@list.index(@since), @list.size]
-
-      if block_given?
-        list_after_item.reverse.each { |e| yield(e) }
-      else
-        Enumerator.new(list_after_item.reverse, :each)
-      end
+  class Controller
+    def initialize
+      @changelog = PTLog::Wrappers::ChangeLog.new
     end
-
-    def next_to(name)
-      @list[@list.index(name) + 1] || 'HEAD'
-    end
-
-    def prev_to(name)
-      0 < @list.index(name) && @list[@list.index(name) - 1] or @first_commit
+    def get_binding
+      binding
     end
   end
 
   class ChangeLog
-    attr_reader :git, :tags
-
-    def initialize
-      @git ||= Git.open(Dir.getwd)
-      @start = ENV['PTLOG_SINCE'] || git.lib.ordered_tags[-1]
-      @tags = PTLog::TagList.new(@git, @start)
-    end
-
-    def log(from, to)
-      git.log.between(from, to)
-    end
-
-    def stories(from, to)
-      output = {}
-      log(from, to).each do |commit|
-        commit.message.scan(/\#(\d+)/).flatten.each do |num|
-          output[num] ||= []
-          output[num] << commit.message
-        end
-      end
-      output
-    end
-
     def self.generate
       raise GeneralError, "You have to specify Pivotal token with export PIVOTAL_TOKEN=xyz" unless ENV.has_key?('PIVOTAL_TOKEN')
 
-      changelog = new
-
-      @builder = Nokogiri::HTML::Builder.new(:encoding => 'UTF-8') do |doc|
-        doc.body do
-          doc.h1 "Change Log @ #{Time.new.utc.strftime('%I:%M%P %D UTC')}"
-          changelog.tags.each do |tag|
-
-            doc.h2 do
-              doc.text "Release #{tag} "
-              doc.span(class: 'date') do
-                doc.text changelog.git.gcommit(tag).date.utc.strftime('(%I:%M%P %D UTC)')
-              end
-            end
-
-            changelog.stories(changelog.tags.prev_to(tag), tag).each do |num, messages|
-              doc.div(class: 'story') do
-                story = Pivotal::Story.get(num)
-                doc.h3 do
-                  if story.valid?
-                    doc.a(href: story.url) do
-                      doc.span(class: 'num') do
-                        doc.text num
-                      end
-                    end
-                    doc.span(class: 'name') do
-                      doc.text " "
-                      doc.text story.name
-                    end
-                  else
-                    doc.span(class: 'num') do
-                      doc.text num
-                    end
-                    doc.span(class: 'name error') do
-                      doc.text " "
-                      doc.text story.error
-                    end
-                  end
-                end
-                doc.ul(class: 'commits') do
-                  messages.each do |message|
-                    doc.li message
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-
-      @builder.to_html
+      controller = PTLog::Controller.new
+      template = ERB.new IO.read(File.join(PTLog.templates, 'changelog.erb'))
+      template.result(controller.get_binding)
     end
   end
 end

data/lib/ptlog/git/lib.rb

@@ -0,0 +1,10 @@
+module PTLog::Git
+  module Lib
+    def ordered_tags
+      command_lines("for-each-ref --sort='*authordate' --format='%(tag)' refs/tags")
+    end
+    def first_commit
+      command("rev-list --max-parents=0 HEAD")
+    end
+  end
+end

data/lib/ptlog/git/tags_list.rb

@@ -0,0 +1,29 @@
+module PTLog
+  class TagList
+    include Enumerable
+
+    def initialize(git, since)
+      @list = git.lib.ordered_tags + ['HEAD']
+      @since = since
+      @first_commit = git.lib.first_commit
+    end
+
+    def each(options = {})
+      list_after_item = @list[@list.index(@since), @list.size]
+
+      if block_given?
+        list_after_item.reverse.each { |e| yield(e) }
+      else
+        Enumerator.new(list_after_item.reverse, :each)
+      end
+    end
+
+    def next_to(name)
+      @list[@list.index(name) + 1] || 'HEAD'
+    end
+
+    def prev_to(name)
+      0 < @list.index(name) && @list[@list.index(name) - 1] or @first_commit
+    end
+  end
+end

data/lib/ptlog/pivotal/story.rb

@@ -3,7 +3,10 @@ require 'faraday'
 module PTLog
   module Pivotal
     class Story
+      attr_reader :num
+
       def initialize(story_id)
+        @num = story_id
         @story = Pivotal::API.story(story_id)
         @labels = @story['labels'].map { |label| label['name'] } if @story['labels'].is_a?(Array)
       end

data/lib/ptlog/version.rb

@@ -1,3 +1,3 @@
 module PTLog
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/ptlog/wrappers/changelog.rb

@@ -0,0 +1,21 @@
+module PTLog::Wrappers
+  class ChangeLog
+    attr_reader :git, :tags
+
+    def initialize
+      @git ||= ::Git.open(Dir.getwd)
+      @start = ENV['PTLOG_SINCE'] || git.lib.ordered_tags.first
+      @tags = PTLog::TagList.new(@git, @start)
+    end
+
+    def date
+      Time.new.utc.strftime('%I:%M%P %D UTC')
+    end
+
+    def releases
+      @tags.map do |tag|
+        PTLog::Wrappers::Release.new(tag, self)
+      end
+    end
+  end
+end

data/lib/ptlog/wrappers/release.rb

@@ -0,0 +1,35 @@
+module PTLog::Wrappers
+  class Release
+    def initialize(tag, changelog)
+      @tag = tag
+      @initial_commit = changelog.tags.prev_to(tag)
+      @git = changelog.git
+      @commit = @git.gcommit(tag)
+    end
+
+    def title
+      @tag
+    end
+
+    def date
+      @commit.date.utc.strftime('%I:%M%P %D UTC')
+    end
+
+    def stories
+      ids = @git.log.between(@initial_commit, @tag).map do |commit|
+        commit.message.scan(/\#(\d+)/)
+      end
+      ids.flatten.uniq.map{ |num| PTLog::Pivotal::Story.get(num) }
+    end
+
+    def commits(num)
+      @git.log.between(@initial_commit, @tag).select do |commit|
+        commit.message =~ (/\##{num}/)
+      end
+    end
+
+    def get_binding
+      binding
+    end
+  end
+end

data/templates/changelog.erb

@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>ChangeLog</title>
+    <link href='http://fonts.googleapis.com/css?family=Abel' rel='stylesheet' type='text/css'>
+
+    <style type="text/css">
+
+      @font-face {
+        font-family: sans-serif;
+        font-weight: normal;
+        font-style: normal;
+      }
+
+      @font-face {
+        font-family: sans-serif;
+        font-weight: normal;
+        font-style: normal;
+      }
+
+      body {
+        background-color: #f4f3f0;
+        min-width: 450px;
+        padding: 0;
+        margin: 0;
+        color: #292C2F;
+        font-family: DINPro-Regular, Arial;
+        font-size: 13px;
+      }
+
+      .content {
+        width: 800px;
+        margin: 22px auto;
+      }
+
+      .content-inner {
+        -webkit-border-radius: 5px;
+        -moz-border-radius: 5px;
+        border-radius: 5px;
+        background: white;
+        padding: 1px 30px;
+        -webkit-box-shadow: 0 3px 5px #d4d5d5;
+        -moz-box-shadow: 0 3px 5px #d4d5d5;
+        -o-box-shadow: 0 3px 5px #d4d5d5;
+        box-shadow: 0 3px 5px #d4d5d5;
+      }
+
+      h1, h2 , h3 {
+        font-family: sans-serif;
+        color: #000;
+        line-height: 1.321em;
+        font-weight: normal;
+        margin: 0;
+      }
+
+      h1 {
+        margin-bottom: 10px;
+        font-size: 30px;
+      }
+
+      h2 {
+        margin: 25px 0 10px;
+        font-size: 18px;
+      }
+
+      h3 {
+        font-size: 13px;
+        font-weight: bold;
+        margin-bottom: 5px;
+        padding-left: 15px;
+      }
+
+      a, a:visited, a:link, .num {
+        color: #4781c6;
+        text-decoration: none;
+      }
+
+      a:hover {
+        color: #f2b500;
+        text-decoration: none;
+      }
+
+      ul, li {
+        list-style: none;
+      }
+
+      ul {
+        margin: 0;
+        margin-bottom: 10px;
+        padding-left: 30px;
+      }
+
+      .date {
+        font-size: 13px;
+        font-style: italic;
+      }
+
+      .story {
+        margin-bottom: 25px;
+      }
+
+    </style>
+
+    <link rel="shortcut icon" href="assets/favicon.ico" />
+  </head>
+
+  <body>
+    <div class="content">
+      <h1>Change Log @ <%= @changelog.date %></h1>
+      <div class="content-inner">
+
+        <% for @release in @changelog.releases %>
+        <h2><%= @release.title %> <span class="date">(<%= @release.date %>)</span></h2>
+
+          <% for @story in @release.stories %>
+          <div class="story">
+
+            <% if @story.valid? %>
+            <h3>
+              <a href="<%= @story.url %>"><span class="num"><%= @story.num %></span></a>
+              <span class="name"><%= @story.name %></span>
+            </h3>
+            <% else %>
+            <h3>
+              <span class="num"><%= @story.num %></span>
+              <span class="name"><%= @story.error %></span>
+            </h3>
+            <% end %>
+
+            <ul class="commits">
+              <% for @commit in @release.commits(@story.num) %>
+              <li><%= @commit.message %></li>
+              <% end %>
+            </ul>
+          </div>
+          <% end %>
+
+        <% end %>
+      </div>
+    </div>
+  </body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ptlog
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,12 +123,17 @@ files:
 - lib/ptlog.rb
 - lib/ptlog/capistrno.rb
 - lib/ptlog/change_log.rb
+- lib/ptlog/git/lib.rb
+- lib/ptlog/git/tags_list.rb
 - lib/ptlog/pivotal/api.rb
 - lib/ptlog/pivotal/story.rb
 - lib/ptlog/release.rb
 - lib/ptlog/version.rb
+- lib/ptlog/wrappers/changelog.rb
+- lib/ptlog/wrappers/release.rb
 - ptlog.gemspec
 - spec/spec_helper.rb
+- templates/changelog.erb
 homepage: https://github.com/dml/ptlog
 licenses:
 - MIT
@@ -156,4 +161,3 @@ specification_version: 3
 summary: Generages changelog based on PivotalTracker stories and Git commits
 test_files:
 - spec/spec_helper.rb
-has_rdoc: