dcm 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbf6bcb7bd2efaa34c2e3d53788c57162f2c81d33fe843c11fc94bf543c987f0
-  data.tar.gz: 1990cc9be7ad32ae74d961f853ec500bdbe7f02e2a412a805ab2201bad10a5ff
+  metadata.gz: 24fe5532820ef2590dd51fcb42433a4a3972b716ce5f77269653a58d33f93435
+  data.tar.gz: 96b84123a8fe6b36916aa1648729373f896712a0a2e6a8b5301854896091c409
 SHA512:
-  metadata.gz: 5acfc4e7067d8d1fc4e18bfcf5a597baaf1e9599732c1bdb876eda635ca81d3dbfd7eea0c64923dce36ffb313bc6ca3a4ac495872211ca7e14c5e0d50c397752
-  data.tar.gz: db4d5ca37d87e0598615dbe97f48d45a419d1bfd9494f94e38d70bbc8f554b284e5974548a2e2c7f54d5e62ceff622547cc74a7f3594a1b062b568b768bf01be
+  metadata.gz: 6725d774fdaa8b235463a141a3b3d504d4fbc5b52e77f8dc1f0fd0b5d56388b4381f4dd718f43b7a0c588ae4aeb1d64e816bb4f1c849709274facff262872657
+  data.tar.gz: ca12146d598edd1b8264eb19c766416c945e99df79d0ed1c020b68ef64fba92ce738416e9f4e0e05b1ceb6471b27e6e43a1a7244b394b7af6192358a0cbb9e7f

data/lib/cli.rb

@@ -18,6 +18,8 @@ module Dcm
 
   class CLI < Thor
 
+    ALLOWED_FILTERKEYS = [:swfk_id, :typekey, :devkey]
+
     desc "show FILE", "Show all labels in FILE"
     option :oneline, type: :boolean, aliases: ["-l"]
     def show(file=nil)
@@ -40,20 +42,20 @@ module Dcm
       loop { LabelSelector.choose_from(list) }
     end
 
-    desc "creta2begu ID CODING FILE", "Convert a hierarchical DCM to a flat DCM"
-    def creta2begu(id, codingpath, file)
+    desc "creta2begu FILTER CODING FILE", "Convert a hierarchical DCM to a flat DCM"
+    def creta2begu(expr, codingpath, file)
       list = parse_file(file)
 
-      puts Codinginfo.new([id], codingpath)
+      puts Codinginfo.new(codingpath, parse_filter(expr))
         .flatten_list(list)
         .to_dcm
     end
 
-    desc "begu2creta IDS CODING FILE", "Convert a flat DCM to a hierarchical DCM"
-    def begu2creta(ids, codingpath, file)
+    desc "begu2creta FILTER CODING FILE", "Convert a flat DCM to a hierarchical DCM"
+    def begu2creta(expr, codingpath, file)
       list = parse_file(file)
 
-      puts Codinginfo.new(ids.split(","), codingpath)
+      puts Codinginfo.new(codingpath, parse_filter(expr))
         .unflatten_list(list)
         .to_dcm
     end
@@ -254,6 +256,18 @@ module Dcm
       Ecu::LabelList.new([label])
     end
 
+    def check_filter(expr)
+      return if ALLOWED_FILTERKEYS.include?(expr.split(":").first)
+
+      fail "Unknown filter expression #{expr}. Possible keys are #{ALLOWED_FILTERKEYS.join(", ")}. Use key:value1,value2 syntax."
+    end
+
+    def parse_filter(expr)
+      expr
+        .split(":")
+        .then { { _1.to_sym => _2.split(",") } }
+    end
+
     def display_list(list:, detail:, format: :tty)
       case format
       when :tty

data/lib/codinginfo.rb

@@ -25,8 +25,8 @@ class Codinginfo
     def to_s = "#{name}=#{value}"
     def ==(other) = name == other.name
 
-    def merge(other)
-      fail "Cannot merge #{name} with #{other.name}" unless self == other
+    def combine(other)
+      fail "Cannot combine #{name} with #{other.name}" unless self == other
 
       self.class.new \
         name: name,
@@ -47,7 +47,7 @@ class Codinginfo
     end
   end
 
-  def initialize(ids, filepath)
+  def initialize(filepath, filter)
     @doc         = SimpleXlsxReader.open(filepath)
     @headers     = []
     @variants    = []
@@ -56,11 +56,8 @@ class Codinginfo
     overview_sheet
       .rows
       .each do |row|
-        parse_headers(row) if @headers.empty?
-        next if @headers.empty?
-        next if row[1].nil? || row[3].nil?
-        next unless ids.any? { row[1].match?(/#{_1}/i) }
-        next unless row[3].match?(/CVAR/)
+        next unless headers_parsed?(row)
+        next unless matches_filter?(row, *filter.to_a.first)
 
         @variants << Variant.new(@headers, row)
       end
@@ -88,6 +85,14 @@ class Codinginfo
       .tap { fail "Cannot find sheet Parameterdefinition" if _1.nil? }
   end
 
+  def matches_filter?(row, key, values)
+    return false unless row[3]
+    return false unless row[3].match?(/CVAR/)
+    return false unless @headers.include?(key)
+
+    values.any? { row[@headers.index(key)].match?(/#{_1}/i) }
+  end
+
   def variant
     fail "No variant matching #{id} found!" if @variants.empty?
     fail "More than one variant matching #{id} found!" if @variants.size > 1
@@ -99,11 +104,11 @@ class Codinginfo
     Ecu::LabelList.new \
       list.flat_map { |label|
         if has_cvar_assignment?(label)
-          @variants.map { label.with(name: add_cvar_prefix(label, _1)) }
+          @variants.map { label.with(name: add_cvar_prefix(label.name, _1)) }
         else
           label
         end
-      }
+      }.uniq
   end
 
   def flatten_list(list)
@@ -124,28 +129,33 @@ class Codinginfo
     variant.cvars.any? { label.name.match?(_1.label_prefix) }
   end
 
-  def add_cvar_prefix(label, variant)
+  def add_cvar_prefix(name, variant)
     variant
       .cvars
-      .find { _1 == @assignments[label.name] }
-      .then { _1.merge(@assignments[label.name]) }
-      .then { _1.label_prefix + label.name }
+      .find { _1 == @assignments[name] }
+      .then { _1.combine(@assignments[name]) }
+      .then { _1.label_prefix + name }
   end
 
   def remove_cvar_prefix(name)
     name.sub(CVAR_PREFIX_REGEXP, "")
   end
 
-  def parse_headers(row)
-    return unless row[1]&.match?(/SWFK-ID/)
-    return unless row[1]&.match?(/CVAR_BeguData/)
-    return unless row[2]&.match?(/Kommentar/)
+  def headers_parsed?(row)
+    return true if @headers.any?
+
+    return false unless row[1]&.match?(/SWFK-ID/)
+    return false unless row[1]&.match?(/CVAR_BeguData/)
+    return false unless row[2]&.match?(/Kommentar/)
 
     @headers = row
       .map(&:chomp)
       .map(&:lstrip)
       .map(&:strip)
       .map { _1.sub(/\n.*/, "") }
-      .tap { _1[0] = "typestr" }
+      .tap { _1[0] = :typestr }
+      .tap { _1[1] = :swfk_id }
+      .tap { _1[4] = :typekey }
+      .tap { _1[6] = :devkey }
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dcm
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dcm
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Jonas Mueller
@@ -70,33 +70,11 @@ description: Provides an wrapper for exporting/importing labels in *.dcm format
 email:
 - jonas@tigger.cloud
 executables:
-- bundle
-- cucumber
-- cucumber-html-formatter
 - dcm
-- gherkin
-- gherkin-ruby
-- htmldiff
-- ldiff
-- protoc-gen-ruby
-- rpc_server
-- rspec
-- thor
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/bundle
-- bin/cucumber
-- bin/cucumber-html-formatter
 - bin/dcm
-- bin/gherkin
-- bin/gherkin-ruby
-- bin/htmldiff
-- bin/ldiff
-- bin/protoc-gen-ruby
-- bin/rpc_server
-- bin/rspec
-- bin/thor
 - lib/cli.rb
 - lib/codinginfo.rb
 - lib/core_ext.rb

data/bin/bundle

@@ -1,114 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'bundle' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "rubygems"
-
-m = Module.new do
-  module_function
-
-  def invoked_as_script?
-    File.expand_path($0) == File.expand_path(__FILE__)
-  end
-
-  def env_var_version
-    ENV["BUNDLER_VERSION"]
-  end
-
-  def cli_arg_version
-    return unless invoked_as_script? # don't want to hijack other binstubs
-    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
-    bundler_version = nil
-    update_index = nil
-    ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
-        bundler_version = a
-      end
-      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1
-      update_index = i
-    end
-    bundler_version
-  end
-
-  def gemfile
-    gemfile = ENV["BUNDLE_GEMFILE"]
-    return gemfile if gemfile && !gemfile.empty?
-
-    File.expand_path("../../gems.rb", __FILE__)
-  end
-
-  def lockfile
-    lockfile =
-      case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
-      else "#{gemfile}.lock"
-      end
-    File.expand_path(lockfile)
-  end
-
-  def lockfile_version
-    return unless File.file?(lockfile)
-    lockfile_contents = File.read(lockfile)
-    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
-    Regexp.last_match(1)
-  end
-
-  def bundler_version
-    @bundler_version ||=
-      env_var_version || cli_arg_version ||
-        lockfile_version
-  end
-
-  def bundler_requirement
-    return "#{Gem::Requirement.default}.a" unless bundler_version
-
-    bundler_gem_version = Gem::Version.new(bundler_version)
-
-    requirement = bundler_gem_version.approximate_recommendation
-
-    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
-
-    requirement += ".a" if bundler_gem_version.prerelease?
-
-    requirement
-  end
-
-  def load_bundler!
-    ENV["BUNDLE_GEMFILE"] ||= gemfile
-
-    activate_bundler
-  end
-
-  def activate_bundler
-    gem_error = activation_error_handling do
-      gem "bundler", bundler_requirement
-    end
-    return if gem_error.nil?
-    require_error = activation_error_handling do
-      require "bundler/version"
-    end
-    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
-    exit 42
-  end
-
-  def activation_error_handling
-    yield
-    nil
-  rescue StandardError, LoadError => e
-    e
-  end
-end
-
-m.load_bundler!
-
-if m.invoked_as_script?
-  load Gem.bin_path("bundler", "bundle")
-end

data/bin/cucumber

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'cucumber' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("cucumber", "cucumber")

data/bin/cucumber-html-formatter

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'cucumber-html-formatter' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("cucumber-html-formatter", "cucumber-html-formatter")

data/bin/gherkin

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'gherkin' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("cucumber-gherkin", "gherkin")

data/bin/gherkin-ruby

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'gherkin-ruby' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("cucumber-gherkin", "gherkin-ruby")

data/bin/htmldiff

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'htmldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("diff-lcs", "htmldiff")

data/bin/ldiff

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'ldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("diff-lcs", "ldiff")

data/bin/protoc-gen-ruby

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'protoc-gen-ruby' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("protobuf-cucumber", "protoc-gen-ruby")

data/bin/rpc_server

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rpc_server' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("protobuf-cucumber", "rpc_server")

data/bin/rspec

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/thor

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'thor' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("thor", "thor")