dcm 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '083a9f5128ea210b24860f520c0986dffcf1f32d5224a210d8a000298305d12e'
-  data.tar.gz: 24c57b5aae318056f7eff402993f099b2656464f9ebd4e192d48eb3adce7cdae
+  metadata.gz: 65161f7f15cda14e21bccc5e9cf93eae4550445347d4c475a4df3a42cf1c55bf
+  data.tar.gz: 9b6a371e58bc90e1f0902c67914f2353cc0cc2d6585a5e927f2e1f3a8e641947
 SHA512:
-  metadata.gz: 0a873dcb28fc66e6599279b0d403e3c86777a04737fdad499f8959469e6379f672678a3da0924c47246ddd02674cacc2340f9f630833c61e2602385c46aa4e92
-  data.tar.gz: 07e50425f1cb85647cf375f1acdb3904b6d64fcc21ccfc133515efeca28641ea9e3d6a81e9c85a10c2ebab0699baafddf0e7ce3461f91ba1ff9a940ff4fdf1ed
+  metadata.gz: 02f722a7eee85fa27be30fb7c91014a5adc733378f2d9d3ceb90b1c9069abef875617f8a0ca61d29ace96813b39b15e04ef16f1c8c40efadb3a966ee9635dc30
+  data.tar.gz: 2c59583f6d8220c8d7daf03df45f7cbde46b7bd3dae8d40207c65d1a0c3246ea0640776941bf113d56341304e2dd36af259c5f79300464ca1486fdf02175ebe7

data/lib/cli.rb

@@ -1,6 +1,3 @@
-require "rubygems"
-require "bundler"
-
 require "ecu"
 require "thor"
 require "filesize"
@@ -19,14 +16,11 @@ require_relative "list_augmenter"
 require_relative "core_ext"
 require_relative "version"
 
-if defined?(RubyVM::YJIT) && RubyVM::YJIT.respond_to?(:enable)
-  RubyVM::YJIT.enable
-end
-
 module Dcm
 
   class CLI < Thor
 
+    MERGE_PRIORITIES = %i[left right].freeze
     LASTOUTPUTCACHE = File.join(Dir.tmpdir, "lastoutput.dcm")
 
     def help(*cmds)
@@ -283,12 +277,18 @@ module Dcm
 
     desc "merge FILE1 FILE2 [FILE3 ...]", "Merge several files into a single DCM"
     option :priority, aliases: ["-p"], default: "RIGHT"
+    option :indented, aliases: ["-i"], type: :boolean, default: false
     def merge(*files)
+      priority = options[:priority].downcase.to_sym
+      unless MERGE_PRIORITIES.include?(priority)
+        fail "Invalid priority #{options[:priority]} (use LEFT or RIGHT)"
+      end
+
       baselist = parse_file(files.shift)
       while not files.empty?
         mergelist = parse_file(files.shift)
         baselist = Ecu::LabelListComparison.new(baselist, mergelist).
-          merge(priority: options[:priority].downcase.to_sym)
+          merge(priority: priority)
       end
       puts baselist.to_dcm(options[:indented])
     end
@@ -323,6 +323,9 @@ module Dcm
       STDERR.puts e.message
       STDERR.puts e.context
       exit 1
+    rescue ArgumentError => e
+      STDERR.puts e.message
+      exit 1
     end
 
     def parse_spec(spec)

data/lib/codinginfo.rb

@@ -1,4 +1,3 @@
-require "simple_xlsx_reader"
 require_relative "file_cache"
 
 class Codinginfo
@@ -155,6 +154,8 @@ class Codinginfo
   private
 
   def parse_xlsx(filepath)
+    require "simple_xlsx_reader" # slow to load, only needed here
+
     doc = SimpleXlsxReader.open(filepath)
     headers = []
     rows = []

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dcm
-  VERSION = "0.1.37"
+  VERSION = "0.1.38"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dcm
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - Jonas Mueller
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement