gravitext-devtools 1.1.0 → 1.2.0

data/History.rdoc

@@ -1,3 +1,12 @@
+=== 1.2.0 (2012-1-13)
+* Use rjack-tarpit ~> 2.0.0 (build)
+* Convert to use of hooker ~> 1.0.0 for config support.
+* Added config support to ManifestWriter, for file
+  inclusion/exclusion like for headers.
+* Add Rakefile, Gemfile, and gemspec and Ruby lines to count.
+* Add assembly, gemspec, and Gemfile* as default header exclusions.
+* Add gemspec and Gemfile* as default manifest exclusions.
+
 === 1.1.0 (2011-2-13)
 * Add support for header inclusion files.
 * Add new gt-count utility.

data/README.rdoc

@@ -13,7 +13,7 @@ gt-count::    Count lines of code by type.
 
 == License
 
-Copyright (c) 2008-2011 David Kellum
+Copyright (c) 2008-2012 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/Rakefile

@@ -1,30 +1,7 @@
 # -*- ruby -*-
 
-$LOAD_PATH << './lib'
-require 'gravitext-devtools/base'
-
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.3.0'
+require 'bundler/setup'
 require 'rjack-tarpit'
 
-t = RJack::TarPit.new( 'gravitext-devtools', Gravitext::DevTools::VERSION )
-
-t.specify do |h|
-  h.developer( 'David Kellum', 'dek-oss@gravitext.com' )
-  h.extra_deps << [ 'rainbow', '~> 1.1' ]
-end
-
-task :check_history_version do
-  t.test_line_match( 'History.rdoc', /^==/, / #{ t.version } / )
-end
-task :check_history_date do
-  t.test_line_match( 'History.rdoc', /^==/, /\([0-9\-]+\)$/ )
-end
-
-task :gem  => [ :check_history_version, ]
-task :tag  => [ :check_history_version, :check_history_date ]
-task :push => [ :check_history_version, :check_history_date ]
-
-task :test #noop
-
-t.define_tasks
+RJack::TarPit.new( 'gravitext-devtools' ).define_tasks

data/bin/gt-cleanws

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/bin/gt-count

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/bin/gt-header

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -19,4 +19,10 @@ $LOAD_PATH.unshift File.join( File.dirname( __FILE__ ), "..", "lib" )
 
 require 'gravitext-devtools/header_writer'
 
-Gravitext::DevTools::HeaderWriter.new.run
+module Gravitext::DevTools
+
+  load_config_from_pwd
+
+  HeaderWriter.new.run
+
+end

data/bin/gt-manifest

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -19,4 +19,10 @@ $LOAD_PATH.unshift File.join( File.dirname( __FILE__ ), "..", "lib" )
 
 require 'gravitext-devtools/manifest_writer'
 
-Gravitext::DevTools::ManifestWriter.new.run
+module Gravitext::DevTools
+
+  load_config_from_pwd
+
+  ManifestWriter.new.run
+
+end

data/lib/gravitext-devtools.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -17,11 +17,25 @@
 require 'gravitext-devtools/base.rb'
 require 'optparse'
 
+require 'rubygems'
+require 'hooker'
+
+module Hooker
+  class << self
+    # Deprecated, use setup_header instead.
+    def header( &block )
+      add( [ :gt, :header ], caller.first, &block )
+    end
+  end
+
+  log_with { |m| puts m }
+end
+
 module Gravitext
   module DevTools
 
-    def self.configure
-      yield Gravitext::DevTools::Config
+    def self.configure( &block )
+      Hooker.with( :gt, &block )
     end
 
     def self.load_config_from_pwd
@@ -30,7 +44,7 @@ module Gravitext
       while( File.directory?( pwd ) )
         cfile = File.join( pwd, '.gt-config' )
         if File.exist?( cfile )
-          Config::load_config( cfile )
+          Hooker.load_file( cfile )
           break
         end
         break if File.exist?( File.join( pwd, '.git' ) )
@@ -40,19 +54,6 @@ module Gravitext
       end
     end
 
-    module Config
-
-      def self.load_config( file )
-        puts "Loading config #{file}."
-        load file
-      end
-
-      def self.method_missing( method, *arguments, &block )
-        ccall = caller[0]
-        puts "Method %s from %s not defined, ignored" % [ method, ccall ]
-      end
-    end
-
     class GitFileLister
 
       # Inclusions to the list expressed in various ways

data/lib/gravitext-devtools/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -16,6 +16,6 @@
 
 module Gravitext
   module DevTools
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/lib/gravitext-devtools/header_writer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -17,20 +17,11 @@
 require 'gravitext-devtools'
 require 'fileutils'
 require 'erb'
-require 'rubygems'
 require 'rainbow'
 
 module Gravitext
   module DevTools
 
-    module Config
-      def self.header
-        hw = HeaderWriter.instance
-        raise "HeaderWriter not initialized" unless hw
-        yield hw
-      end
-    end
-
     class HeaderWriter
       include FileUtils
 
@@ -41,10 +32,6 @@ module Gravitext
       attr_accessor :exclusions
       attr_accessor :inclusions
 
-      class << self
-        attr_accessor :instance
-      end
-
       def initialize
         @verbose = false
         @do_write = false
@@ -63,11 +50,13 @@ module Gravitext
                         '**/*.jar',
                         '**/Rakefile',
                         '**/pom.xml',
-                        '**/assembly.xml']
+                        '**/assembly.xml',
+                        '*.gemspec',
+                        'Gemfile*' ]
 
         @cached_header = {}
 
-        HeaderWriter.instance = self # The last created
+        Hooker.apply( [ :gt, :header ], self )
       end
 
       def parse_options( args = ARGV )
@@ -90,15 +79,13 @@ module Gravitext
 
         parse_options( args )
 
-        Gravitext::DevTools.load_config_from_pwd
-
         @git_lister.inclusions = @inclusions
         @git_lister.exclusions = @exclusions
 
         files = @git_lister.files
 
         files.each do |fname|
-          HeaderProcessor.new( fname, @do_write ).process
+          HeaderProcessor.new( fname, @do_write, self ).process
         end
       end
 
@@ -153,9 +140,10 @@ module Gravitext
       EMPTY = mk_tag( "EMPTY", :yellow )
       WROTE = mk_tag( "WROTE", :yellow )
 
-      def initialize( fname, do_write = false )
+      def initialize( fname, do_write, writer )
         @cpos = 0
         @do_write = do_write
+        @writer = writer
         @fname = fname
         @format = case fname
                   when /\.(java|c|h)$/
@@ -168,7 +156,6 @@ module Gravitext
                     :txt
                   end
         @state = :first
-        @writer = HeaderWriter.instance
       end
 
       def process

data/lib/gravitext-devtools/line_counter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -51,7 +51,8 @@ module Gravitext
         total_lines = total_code = 0
 
         map = [ [ 'JAVA', [ '**/*.java' ] ],
-                [ 'RUBY', [ '**/*.rb', '**/bin/*', '**/init/*'] ] ]
+                [ 'RUBY', [ '**/*.rb', '**/bin/*', '**/init/*',
+                            '**/Rakefile', '**/Gemfile', '**.gemspec' ] ] ]
 
         map.each do | lang, fpats |
           files = git_files.select { |f| @git_lister.match?( fpats, f ) }

data/lib/gravitext-devtools/manifest_writer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2011 David Kellum
+# Copyright (c) 2008-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -29,17 +29,25 @@ module Gravitext
       # Boolean
       attr_accessor :static
 
+      attr_accessor :exclusions
+      attr_accessor :inclusions
+
       def initialize
         @verbose = false
         @static = File.exist?( 'Manifest.static' )
 
         @git_lister = GitFileLister.new
 
-        @git_lister.exclusions = [ %r{(^|/).gitignore$},
-                                   %r{(^|/).gt-config$},
-                                   %r{(^|/)src(/|$)},
-                                   'lib/**/*.jar',
-                                   'Manifest.static' ]
+        @inclusions = []
+        @exclusions = [ %r{(^|/).gitignore$},
+                        %r{(^|/).gt-config$},
+                        %r{(^|/)src(/|$)},
+                        'lib/**/*.jar',
+                        'Manifest.static',
+                        '*.gemspec',
+                        'Gemfile*' ]
+
+        Hooker.apply( [ :gt, :manifest ], self )
       end
 
       def parse_options( args = ARGV )
@@ -61,6 +69,9 @@ module Gravitext
 
         parse_options( args )
 
+        @git_lister.inclusions = @inclusions
+        @git_lister.exclusions = @exclusions
+
         @git_lister.extra_files << 'Manifest.txt' unless @static
         @git_lister.git_flags   << '-c' # Include cached by default
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gravitext-devtools
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - David Kellum
@@ -15,12 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 -08:00
-default_executable: 
+date: 2012-01-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rainbow
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,31 +28,42 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rjack-tarpit
+  name: rainbow
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
         - 1
-        - 3
         - 0
-        version: 1.3.0
-  type: :development
+        - 0
+        version: 1.0.0
   version_requirements: *id002
-description: |-
-  A collection of development support tools.
-  
-  gt-manifest:: Maintain manifest from git ls-files minus exclusions.
-  gt-cleanws::  Cleanup whitespace in files.
-  gt-header::   Add and maintain file license headers.
-  gt-count::    Count lines of code by type.
+  name: hooker
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  version_requirements: *id003
+  name: rjack-tarpit
+  prerelease: false
+  type: :development
+description: 
 email: 
 - dek-oss@gravitext.com
 executables: 
@@ -66,8 +74,6 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- Manifest.txt
-- templates/format/format.txt
 - History.rdoc
 - README.rdoc
 files: 
@@ -91,7 +97,6 @@ files:
 - templates/license/apache
 - templates/license/bsd
 - templates/license/mit
-has_rdoc: true
 homepage: http://github.com/dekellum/gravitext-devtools
 licenses: []
 
@@ -121,10 +126,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: gravitext-devtools
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: A collection of development support tools
+summary: A collection of development support tools.
 test_files: []