gliss 0.1.0

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/LICENSE

@@ -0,0 +1,202 @@
+
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.rdoc

@@ -0,0 +1,22 @@
+= 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.  
+
+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.
+
+You may then inspect the gliss glosses in your repo by running `gliss FROM TO`, where `FROM` and `TO` are branches, tags, or SHAs; gliss will show all the glosses in commits reachable from `TO` that are not reachable from `FROM`.  
+
+Gliss supports options for filtering glosses by tag and running in a different repo; try `gliss -h` for help.
+
+== How to contribute
+ 
+* Fork the project.
+* Make your feature addition or bug fix, ideally on a sensibly-named topic branch.
+* Add tests for it, ideally in separate spec files.
+* Don't change VERSION.
+
+== Copyright
+
+Copyright (c) 2011 Red Hat, Inc., and William C. Benton. See LICENSE for details.
+
+Gliss uses Grit, which is copyright (c) 2010 Tom Preston-Werner.

data/Rakefile

@@ -0,0 +1,46 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "gliss"
+    gem.summary = %Q{gliss is a tool for inspecting lightweight annotations in a git repository}
+    gem.description = %Q{gliss is a tool for inspecting lightweight annotations, called "glosses," in a git repository.  The annotation format used by gliss is simple and human-readable.  You can use gliss glosses to streamline, e.g., producing upgrade notes as part of a release process.}
+    gem.email = "willb@redhat.com"
+    gem.homepage = "http://github.com/willb/gliss"
+    gem.authors = ["Will Benton"]
+    gem.add_dependency "grit", "~> 2.4.0"
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "gliss #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/bin/gliss

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2011 Red Hat, Inc. and William C. Benton
+# Author:  William Benton (willb@redhat.com)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'gliss'
+
+Gliss::App.new.main

data/lib/gliss.rb

@@ -0,0 +1,147 @@
+# gliss.rb
+#
+# lightweight glossing for git commit messages
+#
+# Copyright (c) 2011 Red Hat, Inc. and William C. Benton
+# Author:  William Benton (willb@redhat.com)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'grit'
+require 'optparse'
+
+module Gliss
+  Gloss = Struct.new(:sha, :tag, :text)
+  CommitMsg = Struct.new(:sha, :log)
+  GLOSS_RE=/^((?:[^\s]){3})(-?)(.*?)\1(.*)/
+  GLOSS_TAG=3
+  GLOSS_TEXT=4
+  GLOSS_STRIP=2
+  INDENT_RE=/^(\s+)(.*)$/
+  INDENT_AMOUNT=1
+  INDENTED_TEXT=2
+
+  def self.glosses_between(repo, older, newer)
+    commits_between(repo, older, newer).inject([]) do |acc, commit|
+      acc + glosses_in(commit.log, commit.sha)
+    end
+  end
+
+  def self.commits_between(repo, older, newer)
+    if repo.is_a?(String)
+      repo = Grit::Repo.new(repo)
+    end
+
+    commits = repo.commit_deltas_from(repo, older, newer).sort_by {|c| c.committed_date}
+    commits.map do |commit_obj|
+      CommitMsg.new(commit_obj.sha, commit_obj.message)
+    end
+  end
+
+  def self.glosses_in(message, sha=nil)
+    result = []
+    continuing = false
+    indent_matcher = nil
+
+    message.each_line do |line|
+      line.chomp!
+      match = nil
+      if continuing
+        match = line.match((indent_matcher || INDENT_RE))
+        
+        if match
+          indent_matcher ||= /^(#{match[INDENT_AMOUNT]})(.*)$/
+          text = match[INDENTED_TEXT].strip
+          result[-1].text << text
+        else
+          indent_matcher = nil
+          continuing = false
+        end
+      end
+          
+      match = line.match(GLOSS_RE)
+      if match
+        continuing = true
+        indent_matcher = nil
+        tag = match[GLOSS_TAG].strip
+        text = match[GLOSS_TEXT].strip
+        result << Gloss.new(sha, tag, [text])
+      end
+    end
+
+    result.each {|g| g.text.reject! {|t| t == ''}; g.text = g.text.join(" ")}
+  end
+  
+  class App
+    def initialize(args=nil)
+      @args = (args || ARGV.dup)
+    end
+    
+    def main
+      begin
+        process_args
+        r = Grit::Repo.new(@repo)
+        output_glosses(r)
+      rescue Exception=>ex
+        puts "fatal:  #{ex.inspect}"
+      end
+    end
+    
+    private
+    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}"}
+        end
+      end 
+    end
+    
+    def process_args
+      @repo = "."
+      @filter = /.*/
+      
+      oparser.parse!(@args)
+      unless @args.size <= 2 && @args.size >= 1
+        puts "fatal:  you must specify at least one branch or tag name"
+        puts oparser
+        exit(1)
+      end
+      
+      @from, @to = @args
+      @to ||= "master"
+    end
+    
+    def oparser
+      @oparser ||= OptionParser.new do |opts|
+        opts.banner = "gliss [options] FROM [TO]\nDisplays all gliss-formatted glosses reachable from TO but not from FROM.\nIf TO is not specified, use \"master\"."
+        
+        opts.on("-h", "--help", "Displays this message") do
+          puts opts
+          exit
+        end
+        
+        opts.on("-r REPO", "--repo REPO", "Runs in the given repo (default is \".\")") do |repo|
+          @repo = repo
+        end
+        
+        opts.on("-f REGEX", "--filter REGEX", "Output only messages with tags matching REGEX", "(default is all tags)") do |filter|
+          @filter = Regexp.new(filter)
+        end
+      end
+    end
+  end
+end

data/spec/gliss_spec.rb

@@ -0,0 +1,55 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Gliss" do
+  TEST_MESSAGE = <<-END
+===FOO=== is an example gloss of type FOO
+===BAR=== is a gloss that 
+  spans several lines
+  because each line has the same
+  indent 
+    or at least that much
+This line does not contain a gloss.
+ Neither does this one.
+===BLAH===
+  This is a gloss with nothing on the first line.
+:::ARGH::: argh is a gloss with a different delimiter character.
+---cruft---
+  
+  This is a gloss in paragraph format.
+  This is a good format for longer comments.
+END
+  
+  before(:each) do
+    @glosses = Gliss.glosses_in(TEST_MESSAGE)
+  end
+  
+  it "correctly identifies single-line glosses" do
+    @glosses.select {|g| g.tag == "FOO" && g.text == "is an example gloss of type FOO"}.size.should == 1
+  end
+  
+  it "correctly identifies multiple-line glosses" do
+    @glosses.select {|g| g.tag == "BAR" && g.text == "is a gloss that spans several lines because each line has the same indent or at least that much"}.size.should == 1
+  end
+  
+  it "correctly identifies glosses with nothing on the first line" do
+    found = @glosses.select {|g| g.tag == "BLAH" && g.text == "This is a gloss with nothing on the first line."}
+    found.size.should == 1
+  end
+  
+  it "correctly identifies glosses with nothing on the first or second lines" do
+    found = @glosses.select {|g| g.tag == "cruft" && g.text == "This is a gloss in paragraph format. This is a good format for longer comments."}
+    found.size.should == 1
+  end
+  
+  it "correctly identifies glosses with alternate delimiter characters" do
+    @glosses.select {|g| g.tag == "ARGH" && g.text == "argh is a gloss with a different delimiter character."}.size.should == 1
+  end
+  
+  it "finds multiple glosses in a message" do
+    @glosses.size.should == 5
+  end
+  
+  it "does not create spurious glosses" do
+     @glosses.select {|g| g.text =~ /does not contain a gloss|does this one/}.size.should == 0
+  end
+end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'gliss'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+end

metadata

@@ -0,0 +1,109 @@
+--- !ruby/object:Gem::Specification 
+name: gliss
+version: !ruby/object:Gem::Version 
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
+platform: ruby
+authors: 
+- Will Benton
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2011-01-12 00:00:00 -06:00
+default_executable: gliss
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: grit
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  type: :development
+  version_requirements: *id002
+description: gliss is a tool for inspecting lightweight annotations, called "glosses," in a git repository.  The annotation format used by gliss is simple and human-readable.  You can use gliss glosses to streamline, e.g., producing upgrade notes as part of a release process.
+email: willb@redhat.com
+executables: 
+- gliss
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
+files: 
+- .document
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- bin/gliss
+- lib/gliss.rb
+- spec/gliss_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+has_rdoc: true
+homepage: http://github.com/willb/gliss
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: gliss is a tool for inspecting lightweight annotations in a git repository
+test_files: 
+- spec/gliss_spec.rb
+- spec/spec_helper.rb