blammo 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/blammo.rb

@@ -1,2 +1,5 @@
+require 'fancypath'
+
+require 'blammo/changelog'
 require 'blammo/cli'
 require 'blammo/git'

data/lib/blammo/changelog.rb

@@ -0,0 +1,31 @@
+require 'yaml'
+
+module Blammo
+  class Changelog
+    attr_accessor :releases
+
+    def initialize(path)
+      @path      = path.to_fancypath
+      @releases  = @path.exists? ? YAML.load_file(@path) : []
+    end
+
+    def update
+      commits = Git.commits(@path.dir, last_sha)
+
+      unless commits.empty?
+        release = Time.now.strftime("%Y%m%d%H%M%S")
+        releases.unshift(release => commits)
+      end
+
+      @releases.to_yaml(open(@path, "w"))
+    end
+
+    def last_sha
+      return if @releases.empty?
+      release = @releases.first
+      commits = release.first.last
+      commit  = commits.detect {|commit| commit.is_a?(Hash)}
+      commit ? commit.first.first : nil
+    end
+  end
+end

data/lib/blammo/cli.rb

@@ -1,60 +1,21 @@
-require 'erb'
-require 'fancypath'
 require 'thor'
 require 'tilt'
-require 'yaml'
 
 module Blammo
   class CLI < Thor
-    CHANGELOG_FILE_NAME = "changelog.yml"
-
     desc "generate [PATH]", "Generates a changelog.yml file"
-    def generate(repo_path = ".")
-      changelog_path = repo_path.to_fancypath.dir / CHANGELOG_FILE_NAME
-      releases = changelog_path.exists? ? YAML.load_file(changelog_path) : []
-
-      last_sha = self.class.find_last_sha(releases)
-      commits  = Git.commits(repo_path, last_sha)
-
-      unless commits.empty?
-        release  = Time.now.strftime("%Y%m%d%H%M%S")
-
-        releases.unshift(release => commits)
-        releases.to_yaml(open(changelog_path, "w"))
-      end
-
-      puts releases.to_yaml
-    end
-
-    desc "render PATH", "Renders the given changelog.yml file"
-    def render(path)
-      releases = YAML.load_file(path)
-
-      releases.each do |release_hash|
-        release, groups = release_hash.first
-        puts release
-
-        groups.each do |group_hash|
-          group, commits = group_hash
-          puts "  " + group
-
-          commits.each do |commit_hash|
-            sha, message = commit_hash.first
-            puts "    " + message
-          end
-        end
-      end
-
-      template = Tilt.new(File.expand_path("../../templates/changelog.markdown.erb", __FILE__))
-      puts template.render(nil, :date => Date.today)
+    def generate(path = "changelog.yml")
+      changelog = Changelog.new(path)
+      changelog.update
+      puts changelog.releases.to_yaml
     end
 
-    def self.find_last_sha(releases)
-      return if releases.empty?
-      release = releases.first
-      commits = release.first.last
-      commit  = commits.detect {|commit| commit.is_a?(Hash)}
-      commit ? commit.first.first : nil
+    desc "render [PATH]", "Renders the given changelog.yml file"
+    def render(path = "changelog.yml")
+      changelog     = Changelog.new(path)
+      template_path = __FILE__.to_fancypath.dir / "../../templates/changelog.markdown.erb".to_fancypath
+      template      = Tilt.new(template_path)
+      puts template.render(nil, :changelog => changelog)
     end
   end
 end

data/spec/blammo/changelog_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+CHANGELOG_PATH = __FILE__.to_fancypath.dir / "../fixtures/changelog.yml"
+
+describe Blammo::Changelog do
+  describe ".last_sha" do
+    context "with no releases" do
+      before do
+        @changelog = Blammo::Changelog.new("foobar.yml")
+      end
+
+      it "should return nil" do
+        @changelog.last_sha.should be_nil
+      end
+    end
+
+    context "with a release" do
+      before do
+        @changelog = Blammo::Changelog.new(CHANGELOG_PATH)
+      end
+
+      it "should return the SHA of the last commit" do
+        @changelog.last_sha.should == "867b20e695e2b3770e150b0e844cdb6addd48ba4"
+      end
+    end
+  end
+end

data/spec/blammo/cli_spec.rb

@@ -12,28 +12,4 @@ describe Blammo::CLI do
       pending
     end
   end
-
-  describe ".find_last_sha" do
-    context "with no releases" do
-      it "should return nil" do
-        Blammo::CLI.find_last_sha([]).should be_nil
-      end
-    end
-
-    context "with a release" do
-      before do
-        @sha      = "3b183d9d1ec270fc63ef54695db1cd2df5d597cf"
-        @releases = [
-          {"20100424175354" => [
-            "foo bar",
-            {@sha => "lorem ipsum"}
-          ]}
-        ]
-      end
-
-      it "should return the SHA of the last commit" do
-        Blammo::CLI.find_last_sha(@releases).should == @sha
-      end
-    end
-  end
 end

data/templates/changelog.markdown.erb

@@ -1,3 +1,10 @@
 # CHANGELOG
 
-<%= date %>
+<% changelog.releases.each do |release_hash| %>
+  <% release, commits = release_hash.first %>
+## <%= release %>
+  <% commits.each do |commit_hash| %>
+    <% sha, message = commit_hash.first %>
+* <%= message %>
+  <% end %>
+<% end %>

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Josh Bassett
@@ -14,8 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 +10:00
-default_executable: blammo
+date: 2010-04-30 00:00:00 +10:00
+default_executable: blam
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -128,7 +128,7 @@ dependencies:
 description: "      Changelog generator.\n"
 email: josh.bassett@gmail.com
 executables: 
-- blammo
+- blam
 extensions: []
 
 extra_rdoc_files: 
@@ -140,11 +140,13 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- bin/blammo
+- bin/blam
 - lib/blammo.rb
 - lib/blammo/alone.rb
+- lib/blammo/changelog.rb
 - lib/blammo/cli.rb
 - lib/blammo/git.rb
+- spec/blammo/changelog_spec.rb
 - spec/blammo/cli_spec.rb
 - spec/blammo/git_spec.rb
 - spec/spec.opts
@@ -181,6 +183,7 @@ signing_key:
 specification_version: 3
 summary: CHANGELOG from Blammo.
 test_files: 
+- spec/blammo/changelog_spec.rb
 - spec/blammo/cli_spec.rb
 - spec/blammo/git_spec.rb
 - spec/spec_helper.rb