be9-rubbr 1.1.4.1 → 1.1.4.2

data/Manifest.txt

@@ -20,6 +20,7 @@ lib/rubbr/runner/pdflatex.rb
 lib/rubbr/runner/latex.rb
 lib/rubbr/runner/dvips.rb
 lib/rubbr/runner/bibtex.rb
+lib/rubbr/scm/git.rb
 lib/rubbr/scm/subversion.rb
 lib/rubbr/scm/mercurial.rb
 lib/rubbr/viewer/ps.rb

data/lib/rubbr/builder.rb

@@ -29,10 +29,14 @@ module Rubbr
 
       notice "Entering build loop. Press Ctrl-C to break out."
 
+      forced_first_time = Rubbr.options[:force]
+
       while true
-        if Rubbr::Change.d?
+        if Rubbr::Change.d? || forced_first_time
           notice "Change detected, building"
 
+          forced_first_time = false
+
           do_build
         end
 
@@ -56,6 +60,8 @@ module Rubbr
           Rubbr::Builder::Ps.build
         end
       end
+    rescue Rubbr::Runner::GotErrors
+      notice "There were errors, processing stopped."
     end
 
     class Base

data/lib/rubbr/runner.rb

@@ -4,6 +4,8 @@ module Rubbr
   # information if input files are missing and also cleans up the output of
   # these utilities.
   module Runner
+    class GotErrors < ::StandardError; end
+
     class Base
       include Rubbr::Cli
 
@@ -81,7 +83,8 @@ module Rubbr
           @errors.each do |message|
             error message
           end
-          exit
+          
+          raise GotErrors
         end
       end
     end

data/lib/rubbr/scm/git.rb

@@ -0,0 +1,32 @@
+module Rubbr
+
+  # Extracts changeset stats from various SCM systems. This info can be
+  # included in the title page of the latex document and is especially helpful
+  # when working with draft versions.
+  module Scm
+    class Git < Base
+
+      def initialize
+        super
+
+        @name = 'Git'
+        @executable = valid_executable :git
+
+        @revision, @date = parse_scm_stats
+
+        yield self if block_given?
+      end
+
+      def parse_scm_stats
+        return [nil, nil] unless @executable
+
+        raw_stats = `#@executable show --abbrev-commit --pretty=medium HEAD`
+        revision = raw_stats.scan(/^commit ([0-9a-f]+)/).first.first
+        date = raw_stats.scan(/^Date: +(.+)/).first.first
+
+        [revision, date]
+      end
+    end
+  end
+end
+

data/lib/rubbr/scm.rb

@@ -24,14 +24,20 @@ module Rubbr
     end
 
     def self.stats(dir)
-      if File.exists? File.join(dir, '.svn')
-        Rubbr::Scm::Subversion.new.collect_scm_stats
-      elsif File.exists? File.join(dir, '.hg')
-        Rubbr::Scm::Mercurial.new.collect_scm_stats
+      {
+        '.svn' => Rubbr::Scm::Subversion,
+        '.hg'  => Rubbr::Scm::Mercurial,
+        '.git' => Rubbr::Scm::Git
+      }.each do |ext, klass|
+        if File.exists? File.join(dir, ext)
+          return klass.new.collect_scm_stats
+        end
       end
+
+      nil
     end
 
-    %w(mercurial subversion).each do
+    %w(mercurial subversion git).each do
       |f| require File.dirname(__FILE__) + "/scm/#{f}"
     end
   end

data/lib/rubbr.rb

@@ -2,7 +2,7 @@ require 'optparse'
 $:.unshift File.dirname(__FILE__)
 
 module Rubbr
-  VERSION = '1.1.4.1'
+  VERSION = '1.1.4.2'
 
   autoload :Options,       'rubbr/options'
   autoload :Cli,           'rubbr/cli'
@@ -40,6 +40,10 @@ module Rubbr
           @@cmd_opts[:engine] = engine
         end
 
+        opts.on('-n', '--distribution-name NAME', String, 'Set distribution name') do |name|
+          @@cmd_opts[:distribution_name] = name
+        end
+
         opts.on('-d', '--display', 'Display the document') do
           @@cmd_opts[:view] = true
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: be9-rubbr
 version: !ruby/object:Gem::Version 
-  version: 1.1.4.1
+  version: 1.1.4.2
 platform: ruby
 authors: 
 - Eivind Uggedal
@@ -9,17 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-04-30 00:00:00 -07:00
 default_executable: rubbr
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.12.2
     version: 
 description: Build LaTeX documents.
 email: eu@redflavor.com
@@ -54,6 +55,7 @@ files:
 - lib/rubbr/runner/latex.rb
 - lib/rubbr/runner/dvips.rb
 - lib/rubbr/runner/bibtex.rb
+- lib/rubbr/scm/git.rb
 - lib/rubbr/scm/subversion.rb
 - lib/rubbr/scm/mercurial.rb
 - lib/rubbr/viewer/ps.rb
@@ -84,7 +86,7 @@ requirements: []
 rubyforge_project: rubbr
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: LaTeX builder
 test_files: []