gravitext-devtools 1.2.0 → 1.3.0

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 1.3.0 (2012-9-13)
+* Add gt-version script for aiding common version bump,date tasks.
+* Fix gt-header usage text
+* Ruby 1.9/charset relates fixes
+
 === 1.2.0 (2012-1-13)
 * Use rjack-tarpit ~> 2.0.0 (build)
 * Convert to use of hooker ~> 1.0.0 for config support.

data/Manifest.txt

@@ -6,11 +6,13 @@ bin/gt-cleanws
 bin/gt-count
 bin/gt-header
 bin/gt-manifest
+bin/gt-version
 lib/gravitext-devtools/base.rb
 lib/gravitext-devtools.rb
 lib/gravitext-devtools/header_writer.rb
 lib/gravitext-devtools/line_counter.rb
 lib/gravitext-devtools/manifest_writer.rb
+lib/gravitext-devtools/version_writer.rb
 templates/format/format.java
 templates/format/format.rb
 templates/format/format.txt

data/README.rdoc

@@ -10,6 +10,7 @@ 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.
+gt-version::  Bump versions and set release dates.
 
 == License
 

data/bin/gt-cleanws

@@ -147,7 +147,7 @@ class CleanWS
 
         fout = @do_write ? open( ofile, 'w' ) : @fout
 
-        result = open( ifile, 'r' ) do |fin|
+        result = open( ifile, 'rb' ) do |fin|
           filter( fin, fout )
         end
 

data/bin/gt-version

@@ -0,0 +1,28 @@
+#!/usr/bin/ruby
+#--
+# 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
+# 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.
+#++
+
+$LOAD_PATH.unshift File.join( File.dirname( __FILE__ ), "..", "lib" )
+
+require 'gravitext-devtools/version_writer'
+
+module Gravitext::DevTools
+
+  load_config_from_pwd
+
+  VersionWriter.new.run
+
+end

data/lib/gravitext-devtools/base.rb

@@ -16,6 +16,6 @@
 
 module Gravitext
   module DevTools
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/gravitext-devtools/header_writer.rb

@@ -62,9 +62,9 @@ module Gravitext
       def parse_options( args = ARGV )
 
         @git_lister.parse_options( args ) do |opts|
-          opts.banner = "Usage:  gt-manifest [dir|file] ..."
+          opts.banner = "Usage:  gt-header [dir|file] ..."
           opts.on( "-v", "--verbose",
-                   "Output full manifest details" ) do
+                   "Output full details" ) do
             @verbose = true
           end
           opts.on( "-w", "--write",
@@ -116,7 +116,8 @@ module Gravitext
       end
 
       def expand( template, bnd )
-        ERB.new( template, nil, '%' ).result( bnd ).map { |l| l.rstrip }
+        ERB.new( template, nil, '%' ).result( bnd ).
+          split( $/ ).map { |l| l.rstrip }
       end
 
       def years

data/lib/gravitext-devtools/line_counter.rb

@@ -69,7 +69,7 @@ module Gravitext
         lines = codelines = 0
         is_java = ( filename =~ /\.java$/ )
 
-        open( filename, 'r' ) { |f|
+        open( filename, 'rb' ) { |f|
           f.each do |line|
             lines += 1
             next if line =~ /^\s*$/

data/lib/gravitext-devtools/version_writer.rb

@@ -0,0 +1,189 @@
+#--
+# 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
+# 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 'gravitext-devtools'
+require 'fileutils'
+require 'rainbow'
+
+module Gravitext
+  module DevTools
+
+    class VersionWriter
+      include FileUtils
+
+      attr_accessor :local_dep_prefix
+      attr_accessor :exclusions
+      attr_accessor :inclusions
+      attr_accessor :patterns
+
+      def initialize
+
+        @local_dep_prefix = nil
+
+        @git_lister = GitFileLister.new
+        @inclusions = []
+        @exclusions = @git_lister.exclusions.dup
+        @version = nil
+
+        @patterns = {
+          :history => [ /History\./,
+                        /^=== ([0-9a-z.]+) \((TBD|[0-9\-]+)\)/ ],
+          :pom     => [ /pom\.xml$/,
+                        /<version>([0-9a-z.]+)<\/version>/ ],
+          :rb      => [ /(version|base)\.rb$/,
+                        /VERSION\s*=\s*['"]([0-9a-z.]+)['"]/ ],
+          :init    => [ /init\//,
+                        /^gem.+,\s*['"]=\s*([0-9a-z.]+)['"]/ ],
+          :gemspec => [ /\.gemspec$/,
+                        /RJack::TarPit\.specify/ ]
+        }
+
+        Hooker.apply( [ :gt, :version ], self )
+      end
+
+      def parse_options( args = ARGV )
+
+        @git_lister.parse_options( args ) do |opts|
+          opts.banner = "Usage: gt-version [options] dir|files ..."
+          opts.on( "-v", "--version V", "Specify new version", String ) do |v|
+            @version = v
+          end
+          opts.on( "-d", "--depend-prefix P",
+                   "Also adjust local dependencies with prefix" ) do |p|
+            @local_dep_prefix = p
+          end
+        end
+      end
+
+      def run( args = ARGV )
+        parse_options( args )
+
+        @git_lister.inclusions = @inclusions
+        @git_lister.exclusions = @exclusions
+
+        @git_lister.files.each do |fname|
+          process( fname )
+        end
+      end
+
+      def process( fname )
+        type, (_,vline) = @patterns.find { |_,(fp,_)| fname =~ fp }
+        return false unless type
+
+        # With no version specified, only process history for release date
+        return false unless @version || type == :history
+
+        lines = IO.readlines( fname )
+        first_match = true
+        lines.each_index do |i|
+          line = lines[i]
+          if line =~ vline
+            case type
+            when :history
+              if $2 == 'TBD'
+                lines[i] = if @version.nil? || $1 == @version
+                             "=== #{$1} (#{release_date})"
+                           else
+                             "=== #{@version} (TBD)"
+                           end
+              else
+                lines.insert( i, [ "=== #{@version} (TBD)", '' ] )
+              end
+            when :pom
+              lines[i] = line.sub( /^(\s*<version>)([0-9a-z.]+)(<\/version>)/,
+                                   "\\1#{@version}\\3" )
+              adjust_pom_local( lines, i+1 ) if @local_dep_prefix
+            when :rb
+              lines[i] = line.sub( /^(\s*VERSION\s*=\s*['"])([0-9a-z.]+)/,
+                                   "\\1#{@version}" )
+            when :init
+              lines[i] = line.sub( /^(gem.+,\s*['"]=\s*)([0-9a-z.]+)/,
+                                   "\\1#{@version}" )
+            when :gemspec
+              adjust_gemspec_local( lines, i+1 ) if @local_dep_prefix
+            end
+            break
+          end
+        end
+        rewrite_file( fname, lines )
+        true
+      end
+
+      def adjust_pom_local( lines, start )
+        parent = false
+        local = false
+        lines.each_index do |i|
+          next unless i >= start
+          line = lines[i]
+          case line
+          when /<parent>/
+            local = true
+            parent = true
+          when /<\/parent>/
+            local = false
+            parent = false
+          when /<artifactId>/
+            local = ( line =~ /<artifactId>\s*#{@local_dep_prefix}/ )
+          when /<version>([\[\]\(\)0-9a-z.,]+)(<\/version>)/
+            if local
+              if parent
+                lines[i] = line.sub( /^(\s*<version>)([0-9a-z.]+)/,
+                                     "\\1#{@version}" )
+              else
+                lines[i] = line.sub( /^(\s*<version>)([\[\]\(\)0-9a-z.,]+)/,
+                                     "\\1#{maven_version_range}" )
+              end
+            end
+          when /<\/dependencies>/
+            break
+          end
+        end
+      end
+
+      def adjust_gemspec_local( lines, start )
+        parent = false
+        local = false
+        lines.each_index do |i|
+          next unless i >= start
+          line = lines[i]
+          if line =~ /\.depend.+['"]#{@local_dep_prefix}/
+            lines[i] = line.sub( /(\.depend.*,\s*['"])([^'"]+)(['"])/,
+                                 "\\1#{gem_version_range}\\3" )
+          end
+        end
+      end
+
+      def release_date
+        Time.now.strftime( "%Y-%-m-%-d" )
+      end
+
+      def rewrite_file( file, lines )
+        open( file, "w" ) { |fout| fout.puts( lines ) }
+      end
+
+      def maven_version_range
+        minor_v = @version =~ /^(\d+\.\d+)/ && $1
+        "[#{@version},#{minor_v}.999)"
+      end
+
+      def gem_version_range
+        "~> #{@version}"
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,82 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gravitext-devtools
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-09-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-  version_requirements: *id001
-  name: rainbow
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  version_requirements: *id002
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: hooker
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: rjack-tarpit
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: 
-email: 
+email:
 - dek-oss@gravitext.com
-executables: 
+executables:
 - gt-cleanws
 - gt-count
 - gt-header
 - gt-manifest
+- gt-version
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.rdoc
 - README.rdoc
-files: 
+files:
 - History.rdoc
 - Manifest.txt
 - README.rdoc
@@ -85,11 +81,13 @@ files:
 - bin/gt-count
 - bin/gt-header
 - bin/gt-manifest
+- bin/gt-version
 - lib/gravitext-devtools/base.rb
 - lib/gravitext-devtools.rb
 - lib/gravitext-devtools/header_writer.rb
 - lib/gravitext-devtools/line_counter.rb
 - lib/gravitext-devtools/manifest_writer.rb
+- lib/gravitext-devtools/version_writer.rb
 - templates/format/format.java
 - templates/format/format.rb
 - templates/format/format.txt
@@ -99,37 +97,34 @@ files:
 - templates/license/mit
 homepage: http://github.com/dekellum/gravitext-devtools
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 317307963780800362
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 317307963780800362
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A collection of development support tools.
 test_files: []
-