dcm 0.0.17 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 178c96d7543921916d9ce230357dcde49fae0c99d6cd6f7893ea340e24cbb169
-  data.tar.gz: 193d267c359f51cb7ac48a15478916c4760118918941eb0721fa7bda4797c7a0
+  metadata.gz: ff41f6d733e28eebf919406315f8a48dad52e1ca0e0125596198f03cbc18ce49
+  data.tar.gz: 4975ccbbe1e3b4dbaff474e8001cefe68ebe064c6b6ed38e3c232cc8f2c96d2a
 SHA512:
-  metadata.gz: be1e020c36af16f739a0a964ec4e294f496af0430380654d15127a691032e50a3065c72529eb4d0e3c2ab4062012c14956be0c77030a6e3aa768050897c9d261
-  data.tar.gz: 3dd9027dfc17a483c9df7c7b99607142e86cc85c7767e58f2a2c759183ec1ac46cc1a6439962450f2f7b60ec0ff0cb92cd082c0a8ff92595010282a0af86a767
+  metadata.gz: f69c854cdb29bb6961c4c66b33a05e94a449a094618b9299e5dcc8116de1526185c248c2490797e83c5410bd9f3842593de5f91e0c7f9068ef93dedfc6346072
+  data.tar.gz: 6fd9a37661dbfbeaaf56dcca87f4eb4ea7abeb56c3ffd0e2864e07aa3f34f5ea732740e1cb5f7fa22638f85a08bb4519cc2b8c9981fe24cbe3fede11590c7a88

data/lib/cli.rb

@@ -19,6 +19,17 @@ module Dcm
 
   class CLI < Thor
 
+    check_unknown_options!
+
+    def help
+      super
+      puts <<~EOS
+        Options:
+          FILTER may be any of the following keys: #{VariantFilter::ALLOWED_FILTERKEYS.join(", ")}
+          and should have the format key:value
+      EOS
+    end
+
     desc "show FILE", "Show all labels in FILE"
     option :oneline, type: :boolean, aliases: ["-l"]
     def show(file=nil)
@@ -26,7 +37,7 @@ module Dcm
     end
 
     desc "new [SPEC]", "Create a new dcm from scratch"
-    option :indented,   aliases: ["-i"], type: :boolean, default: false
+    option :indented, aliases: ["-i"], type: :boolean, default: false
     def new(*spec)
       list = parse_spec(spec)
       puts list.to_dcm(option[:indented])
@@ -43,18 +54,30 @@ module Dcm
 
     desc "creta2begu FILTER CODING FILE", "Convert a hierarchical DCM to a flat DCM"
     def creta2begu(expr, codingpath, file)
+      filter = VariantFilter.new(expr)
       list = parse_file(file)
 
-      puts Codinginfo.new(codingpath, VariantFilter.new(expr))
+      puts Codinginfo.new(codingpath, filter)
         .flatten_list(list)
         .to_dcm
     end
 
+    desc "creta2filt FILTER CODING FILE", "Filter a hierarchical DCM"
+    def creta2filt(expr, codingpath, file)
+      filter = VariantFilter.new(expr)
+      list = parse_file(file)
+
+      puts Codinginfo.new(codingpath, filter)
+        .filter_list(list)
+        .to_dcm
+    end
+
     desc "begu2creta FILTER CODING FILE", "Convert a flat DCM to a hierarchical DCM"
     def begu2creta(expr, codingpath, file)
+      filter = VariantFilter.new(expr)
       list = parse_file(file)
 
-      puts Codinginfo.new(codingpath, VariantFilter.new(expr))
+      puts Codinginfo.new(codingpath, filter)
         .unflatten_list(list)
         .to_dcm
     end

data/lib/codinginfo.rb

@@ -10,16 +10,29 @@ class Codinginfo
     # the package and value can be merged
 
     attr_reader :name, :value, :package
+    attr_accessor :assignments
     def initialize(name:, package: nil, value: nil)
-      @name = name
-      @package = package
-      @value = value
+      @name        = name
+      @package     = package
+      @value       = value
+      @assignments = []
     end
 
-    def label_prefix
-      return /^#{name}_(\w+_)?#{value}\./ if package.nil?
+    def match?(label)
+      # assignments
+      #   .values
+      #   .select { _1.name == name }
+      #   .map { combine(_1) }
+      #   .any? { label.name.match?(_1.label_prefix) }
+      label.name.match?(label_prefix)
+    end
 
-      [name, package, value].join("_") + "."
+    def label_prefix
+      if package
+        [name, package, value].join("_") + "."
+      else
+        /^#{name}_([A-Za-z]+_)?#{value}\./
+      end
     end
 
     def to_s = "#{name}=#{value}"
@@ -46,6 +59,10 @@ class Codinginfo
         .map { Cvar.new(name: _1, value: _2.to_i) }
     end
 
+    def has_matching_cvar?(label)
+      cvars.any? { _1.match?(label) }
+    end
+
     def description = @properties[:swfk_id]
   end
 
@@ -119,11 +136,17 @@ class Codinginfo
 
   def flatten_list(list)
     list
-      .select { !cvar_coded?(_1) || has_matching_cvar?(_1) }
+      .select { !cvar_coded?(_1) || variant.has_matching_cvar?(_1) }
       .map_int { _1.with(name: remove_cvar_prefix(_1.name)) }
       .with(headers: variants_description)
   end
 
+  def filter_list(list)
+    list
+      .select { |label| !cvar_coded?(label) || @variants.any? { _1.has_matching_cvar?(label) } }
+      .with(headers: variants_description)
+  end
+
   def cvar_coded?(label)
     label.name.match?(CVAR_PREFIX_REGEXP)
   end
@@ -132,10 +155,6 @@ class Codinginfo
     @assignments.key?(label.name)
   end
 
-  def has_matching_cvar?(label)
-    variant.cvars.any? { label.name.match?(_1.label_prefix) }
-  end
-
   def add_cvar_prefix(name, variant)
     variant
       .cvars

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dcm
-  VERSION = "0.0.17"
+  VERSION = "0.0.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcm
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.20
 platform: ruby
 authors:
 - Jonas Mueller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automotive-ecu