gliss 0.1.0 → 0.1.1

data/README.rdoc

@@ -1,6 +1,6 @@
 = gliss
 
-Gliss is a portmanteau (one might say "portamento," were one inclined to terrible puns) of "git," "lightweight," and "gloss."  It enables you to put tagged notes in git commit messages and then to extract these later.  
+Gliss enables you to put tagged notes in git commit messages and then to extract these later.  
 
 A gliss gloss begins on a line by itself with three identical characters, followed by a tag name, followed by the three characters that started the line.  For example, `===EXAMPLE===' would begin a gliss gloss tagged `EXAMPLE`.  After the tag name, you may place text to be associated with the tag for this commit.  If the first line after the line containing the tag begins with an indent, its text will be considered to be part of the gloss text, and so on for any line immediately succeeding gloss text that is indented at least as much as the first line after the tagged line.
 
@@ -8,6 +8,16 @@ You may then inspect the gliss glosses in your repo by running `gliss FROM TO`,
 
 Gliss supports options for filtering glosses by tag and running in a different repo; try `gliss -h` for help.
 
+== Frequently Anticipated Questions
+
+Q:  What does "gliss" mean?
+
+A:  Gliss is a portmanteau (one might say "portamento," were one inclined to terrible puns) of "git," "lightweight," and "gloss."
+
+Q:  Hey dummy, haven't you heard of `git note`?
+
+A:  Sadly, not everyone is using a sufficiently modern version of git to benefit from git notes.  Even if we can use git notes for annotations, we still need some way to distinguish typed annotations from general notes and comments.  We expect that a future release of gliss will support glosses contained in git notes.
+
 == How to contribute
  
 * Fork the project.

data/Rakefile

@@ -22,7 +22,7 @@ end
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_files = FileList['spec/*_spec.rb']
 end
 
 Spec::Rake::SpecTask.new(:rcov) do |spec|

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/gliss.rb

@@ -19,6 +19,7 @@
 
 require 'grit'
 require 'optparse'
+require 'set'
 
 module Gliss
   Gloss = Struct.new(:sha, :tag, :text)
@@ -31,6 +32,8 @@ module Gliss
   INDENT_AMOUNT=1
   INDENTED_TEXT=2
 
+  attr_reader :filter
+
   def self.glosses_between(repo, older, newer)
     commits_between(repo, older, newer).inject([]) do |acc, commit|
       acc + glosses_in(commit.log, commit.sha)
@@ -90,8 +93,10 @@ module Gliss
     def main
       begin
         process_args
-        r = Grit::Repo.new(@repo)
-        output_glosses(r)
+        @the_repo = Grit::Repo.new(@repo)
+        output_glosses(@the_repo)
+      rescue SystemExit=>ex
+          exit!(ex.status)
       rescue Exception=>ex
         puts "fatal:  #{ex.inspect}"
       end
@@ -101,11 +106,7 @@ module Gliss
     def output_glosses(repo)
       Gliss::glosses_between(repo, @from, @to).each do |gloss|
         if gloss.tag =~ @filter
-          sha = gloss.sha.slice(0,8)
-          tag = gloss.tag
-          msg = gloss.text
-          puts "#{sha} (#{tag})"
-          msg.each_line {|line| puts "  #{line.chomp}"}
+          @output_proc.call(gloss)
         end
       end 
     end
@@ -113,6 +114,13 @@ module Gliss
     def process_args
       @repo = "."
       @filter = /.*/
+      @output_proc = Proc.new do |gloss|
+        sha = gloss.sha.slice(0,8)
+        tag = gloss.tag
+        msg = gloss.text
+        puts "#{sha} (#{tag})"
+        msg.each_line {|line| puts "  #{line.chomp}"}
+      end
       
       oparser.parse!(@args)
       unless @args.size <= 2 && @args.size >= 1
@@ -141,6 +149,20 @@ module Gliss
         opts.on("-f REGEX", "--filter REGEX", "Output only messages with tags matching REGEX", "(default is all tags)") do |filter|
           @filter = Regexp.new(filter)
         end
+        
+        opts.on("-w", "--whole-commit", "Output entire commit messages that contain glosses") do
+          @seen_messages = Set.new
+          @output_proc = Proc.new do |gloss|
+            unless @seen_messages.include?(gloss.sha)
+              @seen_messages << gloss.sha
+              commit, = @the_repo.commits(gloss.sha)
+              sha = commit.to_s.slice(0,8)
+              # puts commit.inspect
+              puts sha
+              commit.message.each_line {|line| puts "  #{line}"}
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gliss
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Will Benton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -06:00
+date: 2011-06-27 00:00:00 -05:00
 default_executable: gliss
 dependencies: 
 - !ruby/object:Gem::Dependency