fmpvc 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df624961cae0090a3a05545c2d6f0a3d1c2632d8
-  data.tar.gz: 274c6fee11358e8b3b217acaed6165b91c6701d4
+  metadata.gz: 6375927885c92d53b9e49ab8e2de3955e62b1994
+  data.tar.gz: a7af50f77aae4c3d9981b55385b7d088ade3b391
 SHA512:
-  metadata.gz: f9d53f2f965e6091c9ff13f9560b582f140d1cd6dd578edbb687f8977d4146c177f2d46eee6ecde0e59e26e483bde45c8beae61768138cd67a10b25caae8f286
-  data.tar.gz: 208b2d92908fb27617a11a05777538b9941f22ef83f3050445ed29a8e28cfc907fd7d108f8855b300e484652f9f385dfd8f1082d53fd194284e55a5d82fb70e1
+  metadata.gz: 2f28fb3116aec19ad61c68833a966b9986fe604a03911ace19d30eaec817986bc04c58aa6398740094233489e67f095f1bff031857d89d58ad1ab2b86c102f49
+  data.tar.gz: 98ade21fcdf20bb15970a32895966741d27362d07d6090349ec74b79fb6f570d18b0ef0b67de1c03e5cedaa5bb6b3bb48b93916dcb7fc1f68ea280987af5e381

data/.gitignore

@@ -15,6 +15,7 @@ spec/data/test_4/fmp_text/
 spec/data/test_5/fmp_text/
 spec/data/test_6/fmp_text/
 spec/data/test_7/fmp_text/
+spec/data/test_8/fmp_text/
 
 .ruby-version
 .ruby-gemset

data/README.md

@@ -58,6 +58,7 @@ Command-line options:
     -d, --ddr-dir <directory>        Look for DDR files in directory named <directory>.
     -D, --text-dir <directory>       Write text files in directory named <directory>.
     -q, --quiet                      Suppress progress messages.
+    -R, --no-record-info             Suppress record specific information in Table YAML
     -s, --summary-file <filename>    Look for Summary file named <filename>.
     -t, --tree-file <filename>       Set tree file name.
     -T, --no-tree                    Don't create a tree file.
@@ -69,6 +70,13 @@ By default, `fmpvc` appends a [YAML](http://www.yaml.org/spec/1.2/spec.html) rep
 
 YAML generation can be suppressed with the `-Y` command-line option.
 
+The DDR includes record specific info in the Tables section:
+
+- count of records in the table
+- next value for serial number (auto-increment) fields.
+
+This information appears in the YAML and causes the Tables files to change even with no changes to the database schema, and therefore, it's undesireable when using these files with a version control system.  This record info (in the YAML) can be suppressed with the `-R` command-line option (the default behavior is to include all information).
+
 ### tree command
 
 The tree command creates a textual representation of a directory and its filesystem objects.  By default, `fmpvc` searches for `tree` in the shell's path and if it finds, one, uses it to create the file, `./fmp_text/tree.txt`.

data/RELEASE_NOTES.md

@@ -0,0 +1,46 @@
+# FMPVC Release Notes
+
+## v0.3.4 (2015-07-02)
+
+### New Features
+
+- Command-line option to suppress record specific info
+  - in Tables files
+  - `-R` or `--no-record-info`
+- Added release notes file (`RELEASE_NOTES.md`)
+
+### Bugs Fixed
+
+- Missing BaseMenu bug (issue #3)
+
+## v0.3.3 (2015-06-20)
+
+### Bugs Fixed
+
+- Options file bug (issue #1)
+- Fixes to allow DDRs from FMPA versions 11-14
+
+## v0.3.2 (2015-06-14)
+
+Initial public release on rubygems and github
+
+## v0.3.0 
+
+Added configuration mechanism with defaults and command-line options
+
+## v0.2.4 
+
+Executable fixes (progress indicators and Summary file)
+
+## v0.2.2 
+
+Verbose progress indication added
+
+## v0.2.0 
+
+Separated file creation from DDR and FMPReport objects
+
+## v0.1.0 
+
+Initial working gem with parsing code
+

data/exe/fmpvc

@@ -25,6 +25,9 @@ OptionParser.new do |opts|
   opts.on('-q', '--quiet', 'Suppress progress messages.') do
     FMPVC.configuration.quiet = true
   end
+  opts.on('-R', '--no-record-info', 'Suppress record specific information in Table YAML.') do
+    FMPVC.configuration.show_record_info = false
+  end
   opts.on('-s', '--summary-file <filename>', 'Look for Summary file named <filename>.') do |s|
     FMPVC.configuration.ddr_filename = s
   end

data/lib/fmpvc/FMPReport.rb

@@ -11,7 +11,7 @@ module FMPVC
   
   class FMPReport
     
-    attr_reader :content, :type, :text_dir, :text_filename, :report_dirpath, :named_objects
+    attr_reader :content, :type, :text_dir, :text_filename, :report_dirpath, :named_objects, :tables
     
     def initialize(report_filename, ddr)
       report_dirpath    = "#{ddr.base_dir_ddr}/#{report_filename}"  # location of the fmpfilename.xml file
@@ -34,6 +34,7 @@ module FMPVC
       ### single folder with files                                                                                                                                          
       @value_lists              = parse_fmp_obj( "/FMPReport/File/ValueListCatalog",           "/*[name()='ValueList']",                      @value_list_content           )
       @tables                   = parse_fmp_obj( "/FMPReport/File/BaseTableCatalog",           "/*[name()='BaseTable']",                      @table_content                )
+      suppress_record_info if FMPVC.configuration.show_record_info == false
       @custom_functions         = parse_fmp_obj( "/FMPReport/File/CustomFunctionCatalog",      "/*[name()='CustomFunction']",                 @custom_function_content      )
       @menu_sets                = parse_fmp_obj( "/FMPReport/File/CustomMenuSetCatalog",       "/*[name()='CustomMenuSet']",                  @menu_sets_content            )
       @custom_menus             = parse_fmp_obj( "/FMPReport/File/CustomMenuCatalog",          "/*[name()='CustomMenu']",                     @custom_menus_content         )
@@ -116,6 +117,15 @@ module FMPVC
       $stdout.puts [verb, object].join(" ") unless FMPVC.configuration.quiet
     end
     
+    def suppress_record_info()
+      @tables.each do |a_table|
+        current_yaml = a_table[:yaml]
+        yaml_serial_number_fixed = current_yaml.gsub(%r{(nextValue:.*\D)(\d+)(\D*?)(?=\n)}, '\1\3') # e.g. nextValue: 123serial456 or nextValue: 123serial
+        yaml_record_count_fixed = yaml_serial_number_fixed.gsub(%r{(BaseTable: \s+ id:\ '\d+' \s+ records:\ '.*?)(\d+)'}mx, '\1\'') # e.g. records: '234'
+        a_table[:yaml] = yaml_record_count_fixed
+    end
+    end
+    
 
     def parse_fmp_obj(object_base, object_nodes, obj_content, one_file = false)
       post_notification(object_base.gsub(%r{\/FMPReport\/File\/},''), '  Parsing')
@@ -265,7 +275,7 @@ module FMPVC
         content = ''
         menu_name         = a_menu['name']
         menu_id           = a_menu['id']
-        menu_base         = a_menu.xpath('./BaseMenu').first['name']
+        menu_base         = a_menu.xpath('./BaseMenu').empty? ? "" : a_menu.xpath('./BaseMenu').first['name']
         menu_comment      = a_menu.xpath('./Comment').text
         menu_format       = "%17s  %-35s\n"
 

data/lib/fmpvc/configuration.rb

@@ -1,7 +1,7 @@
 module FMPVC
   class Configuration
    
-   attr_accessor :quiet, :yaml, :ddr_dirname, :ddr_filename, :ddr_basedir, :text_dirname, :tree_filename
+   attr_accessor :quiet, :yaml, :ddr_dirname, :ddr_filename, :ddr_basedir, :text_dirname, :tree_filename, :show_record_info
    
    def initialize
      # set default config settings
@@ -12,6 +12,7 @@ module FMPVC
      @ddr_basedir         = './'                # base directory (containing fmp_ddr, fmp_text)
      @text_dirname        = 'fmp_text'          # text file base directory
      @tree_filename       = 'tree.txt'          # set to nil to disable tree file generation
+     @show_record_info    = true                # show record info in DDR by default
    end
     
   end

data/lib/fmpvc/version.rb

@@ -1,3 +1,3 @@
 module FMPVC
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmpvc
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Martin S. Boswell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASE_NOTES.md
 - Rakefile
 - bin/console
 - bin/run_current