code_tools 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e0734734f903314d2b0ac7652eca0c3a345d498
-  data.tar.gz: 4466ac82270d0b13b24bbbacdca8744204e33743
+  metadata.gz: cbaf6f2122fa3302144ef27d0c5484c82a8bec52
+  data.tar.gz: 2b3eb698101465ed00e6b367cf55e357a1aede36
 SHA512:
-  metadata.gz: b7d0326b92e82e509fec5dd40c4e251434165682c78191e20d2ab5535ee7912428088c184c0762393b8bc83acd4beee36906fff81f5b34d3536dd2ed0132816c
-  data.tar.gz: 8bc0c83868759a9d0cb1e533955fcf80b0cfa7b458b05a7d3fbc968d56e6269b5ea2a301b0f2c5e74074b7db14677b55479014a28702a75c817a5b37e26fa095
+  metadata.gz: a24bfc3ab574bfbc0fbc38b0568919cf1cf3fabf340c270810ff4cdd8b90b9d825b55cd2f719891c6b78e3bd8a83c59723a72d7225a49cfa9148d6b93ea71dd4
+  data.tar.gz: ceadd6e3b9b004033420b90e6e4f0bf4d63764765b3e9a2f74efd39060ed42be21309ce6773ad49346a962baba94bd71fb94ba4eb05256296beb1564e6ec65bc

data/lib/vamper/default.version.config

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <VersionConfig>
+  <FileType>
+    <Name>Ruby Files</Name>
+    <FileSpec>*.rb</FileSpec>
+    <Update>
+      <Search>(?'Before'\$VERSION=\')([0-9]+\.[0-9]+\.[0-9]+)-[0-9]+\.[0-9]+(?'After'\')</Search>
+      <Replace>${Before}${Major}.${Minor}.${Patch}-${Build}.${Revision}${After}</Replace>
+    </Update>
+  </FileType>
   <FileType>
     <Name>Version-in-a-text-file</Name>
     <FileSpec>*.version.txt</FileSpec>

data/lib/vamper/version_config_file.rb

@@ -1,5 +1,5 @@
 require 'nokogiri'
-require 'core_ext.rb'
+require_relative '../core_ext.rb'
 
 class VersionConfigFile
   def initialize(io, tags)
@@ -16,6 +16,7 @@ class VersionConfigFile
       }
       update_node_set = node.xpath('Update')
       if update_node_set
+        # Replace ${...} entries in the replace string with equivalent tags if available
         file_type.updates = update_node_set.map { |sub_node|
           s_and_r = search_replace_struct.new(
             %r(#{sub_node.at_xpath('Search').text.gsub(/\(\?'(\w+)'/, '(?<\\1>')}),

data/lib/vamper/version_file.rb

@@ -1,5 +1,5 @@
 require 'nokogiri'
-require 'core_ext.rb'
+require_relative '../core_ext.rb'
 
 class BadVersionFile < StandardError; end
 

data/lib/vamper.rb

@@ -1,66 +1,65 @@
 require 'tzinfo'
 require 'nokogiri'
-require 'vamper/version_file.rb'
-require 'vamper/version_config_file.rb'
-require 'core_ext.rb'
+require 'ostruct'
+require 'optparse'
+require_relative './vamper/version_file.rb'
+require_relative './vamper/version_config_file.rb'
+require_relative './core_ext.rb'
 
-$VERSION='4.0.0-20150811.0'
+$VERSION='4.1.0-20151225.0'
 
 class Vamper
 
-  def initialize
-    @do_update = false;
-    @version_file_name = ''
-  end
-
   def parse(args)
-    args.each { |arg|
-      case arg
-        when '-?', '-help'
-          print %Q(Version Stamper. Version #{$VERSION}
-Copyright (c) John Lyon-Smith 2015.
-
-Syntax:               #{File.basename(__FILE__)} [switches] VERSION_FILE
-
-Description:          Stamps versions into project files
-
-Switches:
+    options = OpenStruct.new
+    options.do_update = false
+    options.version_file_name = ''
+
+    opt_parser = OptionParser.new do |opts|
+      opts.banner = %Q(Version Stamper. Version #{$VERSION}
+Copyright (c) John Lyon-Smith, 2016.
+Usage:            #{File.basename(__FILE__)} [options]
+)
+      opts.separator %Q(Options:
+)
 
-    -help|-?          Shows this help
-    -u|-update        Increment the build number and update all files
+      opts.on("-u", "--update", "Increment the build number and update all files") do |dir|
+        options.do_update = true
+      end
 
-)
-          exit(0)
-        when '-u', '-update'
-          @do_update = true
-        else
-          @version_file_name = arg
+      opts.on_tail("-?", "--help", "Show this message") do
+        puts opts
+        exit
       end
-    }
+    end
+
+    opt_parser.parse!(args)
+    options
   end
 
   def execute
-    self.parse(ARGV)
+    options = self.parse(ARGV)
 
-    if @version_file_name.length == 0
-      find_version_file
+    if options.version_file_name.length == 0
+      find_version_file options
     end
 
-    @version_file_name = File.expand_path(@version_file_name)
+    options.version_file_name = File.expand_path(options.version_file_name)
 
-    project_name = File.basename(@version_file_name, '.version')
-    version_config_file_name = "#{File.dirname(@version_file_name)}/#{project_name}.version.config"
+    project_name = File.basename(options.version_file_name, '.version')
+    version_config_file_name = "#{File.dirname(options.version_file_name)}/#{project_name}.version.config"
 
-    puts "Version file is '#{@version_file_name}'"
+    puts "Version file is '#{options.version_file_name}'"
     puts "Version config is '#{version_config_file_name}'"
     puts "Project name is '#{project_name}'"
 
-    if File.exists?(@version_file_name)
-      version_file = VersionFile.new(File.open(@version_file_name))
+    if File.exists?(options.version_file_name)
+      version_file = VersionFile.new(File.open(options.version_file_name))
     else
       verson_file = VersionFile.new
     end
 
+    tags = version_file.tags
     now = TZInfo::Timezone.get(version_file.time_zone).now
 
     case version_file.build_value_type
@@ -82,18 +81,18 @@ Switches:
         else
           version_file.revision += 1
         end
+        tags[:DashBuild] = build[0..3] + '-' + build[4..5] + '-' + build[6..7]
       when :Incremental
         version_file.build += 1
         version_file.revision = 0
     end
 
     puts 'Version data is:'
-    tags = version_file.tags
     tags.each { |key, value|
       puts "  #{key}=#{value}"
     }
 
-    if @do_update
+    if options.do_update
       puts 'Updating version information:'
     end
 
@@ -105,7 +104,7 @@ Switches:
     file_list = version_file.files.map { |file_name| file_name.replace_tags!(tags) }
 
     file_list.each do |file_name|
-      path = File.expand_path(File.join(File.dirname(@version_file_name), file_name))
+      path = File.expand_path(File.join(File.dirname(options.version_file_name), file_name))
       path_file_name = File.basename(path)
       match = false
 
@@ -122,14 +121,16 @@ Switches:
             exit(1)
           end
 
-          if @do_update
+          if options.do_update
             IO.write(path, file_type.write)
           end
         else # !file_type.write
           if File.exists?(path)
-            if @do_update
+            if options.do_update
               file_type.updates.each do |update|
                 content = IO.read(path)
+                # At this the only ${...} variables left in the replace strings are Before and After
+                # This line converts the ${...} into \k<...>
                 content.gsub!(%r(#{update.search})m, update.replace.gsub(/\${(\w+)}/,'\\\\k<\\1>'))
                 IO.write(path, content)
               end
@@ -150,19 +151,19 @@ Switches:
 
       puts path
 
-      if @do_update
-        version_file.write_to(File.open(@version_file_name, 'w'))
+      if options.do_update
+        version_file.write_to(File.open(options.version_file_name, 'w'))
       end
     end
   end
 
-  def find_version_file
+  def find_version_file(options)
     dir = Dir.pwd
 
     while dir.length != 0
       files = Dir.glob('*.version')
       if files.length > 0
-        @version_file_name = files[0]
+        options.version_file_name = files[0]
         break
       else
         if dir == '/'
@@ -173,18 +174,18 @@ Switches:
       end
     end
 
-    if @version_file_name.length == 0
+    if options.version_file_name.length == 0
       error 'Unable to find a .version file in this or parent directories.'
       exit(1)
     end
   end
 
   def get_full_date(now)
-    now.year * 10000 + now.month * 100 + now.mday
+    (now.year * 10000 + now.month * 100 + now.mday).to_s
   end
 
   def get_jdate(now, start_year)
-    ((now.year - start_year + 1) * 10000) + (now.month * 100) + now.mday
+    (((now.year - start_year + 1) * 10000) + (now.month * 100) + now.mday).to_s
   end
 
   def error(msg)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: code_tools
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - John Lyon-smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 description: Tools for source code maintenance, including version stamping, line endings
@@ -47,13 +47,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/vamper.rb
+- bin/code_tools
+- bin/vamper
 - lib/core_ext.rb
+- lib/vamper.rb
 - lib/vamper/default.version.config
 - lib/vamper/version_config_file.rb
 - lib/vamper/version_file.rb
-- bin/vamper
-- bin/code_tools
 homepage: http://rubygems.org/gems/code_tools
 licenses:
 - MIT
@@ -64,17 +64,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Source code tools