ykxutils 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40a9c8960f5a5f9fdd20a1ffa620987f76c61b90f602c9beae391290232bd224
-  data.tar.gz: ab77e98dc0de6d80a062e5d263d0d31b5034c1be47754612a3b32a6a86e04953
+  metadata.gz: c0659659032f5707b2cdeade5612ba9450d0b031766aa3ae592c0ac33e598543
+  data.tar.gz: a101d3eb24966539154012d769913cb0be13fac416eb1de173a77034bf6576e5
 SHA512:
-  metadata.gz: 70e64fc12c1bf0b45fc1cdbb7ae8254e962731f707351f3a47293422096ec3049c73fc09eb6ded2a7172bb3909e552712163202ae2e489d8cb5827561714e47b
-  data.tar.gz: fc0a7733b0c29d19a1872e877e67213d7826e7dda7e5f1c464f568bd968a1114465f073b981c0b3de8576704e7c5d7627548e8564c9187d79eb85a84af58bc19
+  metadata.gz: 623fb0b29f44a21eaaf84ead317c17b104d701cd81f28345f9788d513a3690f79c644e5e12f8450b90c27d0f6dc9dbabff19db4124abbde81a61eabeb5536281
+  data.tar.gz: b4a226775f324625a513cc9c802ee2779ef9593b66da85abc798e998c56bc91cc9a4ee3b25f5e64030733da1da6de53ffe74858239d86f2b23ab9822addc6b07

data/.rubocop.yml

@@ -27,3 +27,12 @@ Layout/LineLength:
 
 Style/Documentation:
   Enabled: false
+
+#追加
+#
+Style/StringConcatenation:
+  Enabled: false
+#
+Naming/AccessorMethodName:
+  Enabled: false
+

data/.rubocop_todo.yml

@@ -1,156 +1,49 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-12-12 09:49:25 UTC using RuboCop version 1.36.0.
+# on 2024-02-06 17:44:56 UTC using RuboCop version 1.59.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: IgnoreImplicitReferences.
-Lint/ShadowedArgument:
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
   Exclude:
-#    - 'lib/ykxutils/yamlx.rb'
+#    - 'Gemfile'
 
 # Offense count: 1
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
+  Exclude:
+#    - 'Gemfile'
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 19
 
 # Offense count: 3
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 15
+  Max: 14
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 1
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: as, at, by, db, id, in, io, ip, of, on, os, pp, to
-Naming/MethodParameterName:
-  Exclude:
-#    - 'lib/ykxutils/nginxconfigfiles.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: be, be_nil
-RSpec/BeNil:
-  Exclude:
-#    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 1
-RSpec/BeforeAfterAll:
-  Exclude:
-#    - 'spec/spec_helper.rb'
-#    - 'spec/rails_helper.rb'
-#    - 'spec/support/**/*.rb'
-#    - 'spec/ykxutils_spec.rb'
-
 # Offense count: 2
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 9
+  Max: 8
 
 # Offense count: 1
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
 #    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 1
-RSpec/NoExpectationExample:
-  Exclude:
-#    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: not_to, to_not
-RSpec/NotToNot:
-  Exclude:
-#    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 8
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# AllowedMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-#    - 'lib/ykxutils/erubyx.rb'
-#    - 'lib/ykxutils/gridlist.rb'
-#    - 'lib/ykxutils/nginxconfig.rb'
-#    - 'lib/ykxutils/nginxconfigfiles.rb'
-#    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-Style/ColonMethodCall:
-  Exclude:
-#    - 'lib/ykxutils/gridlist.rb'
-#    - 'lib/ykxutils/nginxconfig.rb'
-#    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/EachWithObject:
-  Exclude:
-#    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-# SupportedShorthandSyntax: always, never, either, consistent
-Style/HashSyntax:
-  Exclude:
-#    - 'lib/ykxutils/gridlist.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-#    - 'lib/ykxutils/erubyx.rb'
-#    - 'lib/ykxutils/gridlist.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
-  Exclude:
-#    - 'lib/ykxutils/gridlist.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, MinBodyLength.
-# SupportedStyles: skip_modifier_ifs, always
-Style/Next:
-  Exclude:
-#    - 'lib/ykxutils/nginxconfig.rb'
-#    - 'lib/ykxutils/nginxconfigfiles.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-#    - 'lib/ykxutils/gridlist.rb'
-
-# Offense count: 45
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-#    - 'Gemfile'
-#    - 'lib/ykxutils/erubyx.rb'
-#    - 'lib/ykxutils/gridlist.rb'
-#    - 'lib/ykxutils/nginxconfigfiles.rb'
-#    - 'ykxutils.gemspec'

data/Gemfile

@@ -11,12 +11,14 @@ gem "rake", "~> 13.1"
 gem "tilt"
 
 group :development do
+  gem "debug"
   gem "yard"
 end
 
 group :test do
   gem "rspec", "~> 3.12"
   gem "rubocop"
+  gem "rubocop-performance"
   gem "rubocop-rake", require: false
   gem "rubocop-rspec", require: false
 end

data/Gemfile.lock

@@ -1,28 +1,37 @@
 PATH
   remote: .
   specs:
-    ykxutils (0.1.10)
-      bundler
-      erubi
-      rake (~> 13.0)
-      tilt
+    ykxutils (0.1.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    debug (1.9.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     diff-lcs (1.5.0)
     erubi (1.12.0)
+    io-console (0.7.2)
+    irb (1.11.1)
+      rdoc
+      reline (>= 0.4.2)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
     parallel (1.24.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
+    psych (5.1.2)
+      stringio
     racc (1.7.3)
     rainbow (3.1.1)
     rake (13.1.0)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
     regexp_parser (2.8.3)
+    reline (0.4.2)
+      io-console (~> 0.5)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -64,6 +73,7 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
+    stringio (3.1.0)
     tilt (2.3.0)
     unicode-display_width (2.5.0)
     yard (0.9.34)
@@ -73,6 +83,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  debug
   erubi
   rake (~> 13.1)
   rspec (~> 3.12)

data/lib/ykxutils/fileop.rb

@@ -0,0 +1,51 @@
+require "yaml"
+require "pathname"
+
+module Ykxutils
+  module_function
+
+  def make_output_filename(prefix, basename, postfix, extname, extname_pn)
+    if extname == nil
+      if extname_pn.size <= 1
+        extname = ""
+      else
+        extname = extname_pn.to_s
+      end
+    end
+    "#{prefix}#{basename}#{postfix}#{extname}"
+  end
+
+  def make_output_file_pn(out_dir, ofname, input_pn)
+    case out_dir
+    when nil
+      Pathname.new(ofname)
+    when :SAME
+      parent = input_pn.parent
+      parent + ofname
+    else
+      out_dir_pn = Pathname.new(out_dir)
+      out_dir_pn + ofname
+    end
+  end
+
+  def make_output_path( input_path:, out_dir: nil, prefix: "", postfix: "", extname: nil)
+    input_pn = Pathname.new(input_path)
+    basename = input_pn.basename(".*")
+    extname_pn = input_pn.extname
+    ofname = make_output_filename(prefix, basename, postfix, extname, extname_pn)
+    output_pn = make_output_file_pn(out_dir, ofname, input_pn)
+    if input_pn.expand_path('/') === output_pn.expand_path('/')
+      nil
+    else
+      output_pn.to_s
+    end
+  end
+
+  def file_convert(infile, outfile, &block)
+    if block
+      block.call(infile, outfile)
+    else
+      false
+    end
+  end
+end

data/lib/ykxutils/htmlparsex.rb

@@ -0,0 +1,30 @@
+require "yaml"
+
+module Ykxutils
+  module_function
+
+  def complemente_dt_tag(line)
+    if line =~ /<DT>/
+      # p "complemente_dt_tag T"
+      line + "</DT>" 
+    elsif line =~ /<dt>/
+      line + "</dt>" 
+    else
+      # p "complemente_dt_tag F"
+      line
+    end
+  end
+
+  def reform_dt_tag(infilename, outfilename)
+    infile = File.open(infilename)
+    outfile = File.open(outfilename, 'w')
+
+    Ykxutils::file_convert(infile, outfile){ |infile, outfile|
+      while line = infile.gets
+        line.chomp!
+        oline = Ykxutils.complemente_dt_tag(line)
+        outfile.write( oline + "\n" ) 
+      end
+    }
+  end
+end

data/lib/ykxutils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ykxutils
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/lib/ykxutils/yamlx.rb

@@ -4,7 +4,7 @@ module Ykxutils
   SUCCESS = 0
   ARGUMENT_ERROR = 1
   STANDARD_ERROR = 2
-  
+
   module_function
 
   def yaml_load_file_aliases(yaml_file_path, use_aliases: true)

data/lib/ykxutils.rb

@@ -8,6 +8,8 @@ require_relative "ykxutils/gitcmd"
 require_relative "ykxutils/nginxconfig"
 require_relative "ykxutils/nginxconfigfiles"
 require_relative "ykxutils/gridlist"
+require_relative "ykxutils/fileop"
+require_relative "ykxutils/htmlparsex"
 
 module Ykxutils
   class Error < StandardError; end

data/test_data/fileop/in.html

@@ -0,0 +1 @@
+<dt>abc

data/test_data/fileop/out.html

@@ -0,0 +1 @@
+<dt>abc</dt>

data/test_data/fileop/out_0.html

@@ -0,0 +1 @@
+<dt>abc</dt>

data/ykxutils.gemspec

@@ -31,19 +31,19 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "bundler"
+  # spec.add_runtime_dependency "bundler"
   # spec.add_runtime_dependency 'debug'
-  spec.add_runtime_dependency "erubi"
-  spec.add_runtime_dependency "rake", "~> 13.0"
-  spec.add_runtime_dependency "tilt"
+  # spec.add_runtime_dependency "erubi"
+  # spec.add_runtime_dependency "rake", "~> 13.0"
+  # spec.add_runtime_dependency "tilt"
 
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "rubocop-rake"
-  spec.add_development_dependency "rubocop-rspec"
+  # spec.add_development_dependency "rspec", "~> 3.0"
+  # spec.add_development_dependency "rubocop"
+  # spec.add_development_dependency "rubocop-performance"
+  # spec.add_development_dependency "rubocop-rake"
+  # spec.add_development_dependency "rubocop-rspec"
 
-  spec.add_development_dependency "yard"
+  # spec.add_development_dependency "yard"
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"

metadata

@@ -1,155 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ykxutils
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - ykominami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: erubi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2024-03-09 00:00:00.000000000 Z
+dependencies: []
 description: New version of utilty function created by yk.
 email:
 - ykominami@gmail.com
@@ -171,14 +31,20 @@ files:
 - a.northern-cross.net.conf
 - lib/ykxutils.rb
 - lib/ykxutils/erubyx.rb
+- lib/ykxutils/fileop.rb
 - lib/ykxutils/gitcmd.rb
 - lib/ykxutils/gridlist.rb
+- lib/ykxutils/htmlparsex.rb
 - lib/ykxutils/nginxconfig.rb
 - lib/ykxutils/nginxconfigfiles.rb
 - lib/ykxutils/pstorex.rb
 - lib/ykxutils/version.rb
 - lib/ykxutils/yamlx.rb
 - test_data/4servers.erb
+- test_data/a.txt
+- test_data/fileop/in.html
+- test_data/fileop/out.html
+- test_data/fileop/out_0.html
 - test_data/test.yaml
 - test_data/v103-3-189-127/4servers.erb
 - test_data/v103-3-189-127/a.northern-cross.net/base.yml