ykxutils 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22fc7981cccfd35ad44ec562ea9ec2775c45becb73165b85163b552733e6d05
-  data.tar.gz: 06e6f4b69633c3c02b6be1f62c7d59b353bea43a6a25524e76aea8cf9baf65f2
+  metadata.gz: 92fcd39e4bac75f2d24f401f1b13df235df1edc1dbfcca02fac0706880bb7979
+  data.tar.gz: c2cf579546cea8112a272bc8ce5204656c603ab8e61ae52a3d4d8936e606e693
 SHA512:
-  metadata.gz: a61623d958984bc3a73a0f7295234a9ede65dbc572e39f7bc5702dfd05eac823d0b8bc6f8dd4a0bb30e39d41bdfcd6ad14c25bd71ab1a941fb8f0a0b7a22dc2f
-  data.tar.gz: b334748905b7b82cfd78f32dcb445476710e81fbcee0577bd03c6b97a6906912f37351896190fa36b8ad4ac555c8b92ab58e800a35692d981bded1d1cfe1aa41
+  metadata.gz: 9d8e3978c038d6884ac2c64c1f3bbe1c4711f3e457b9201f24f036ed9fd25422f2e5e49983fc7152a6fe1980cfc98ea80b6319761b333476b6e70ee74a4f4e4c
+  data.tar.gz: 0d3aac6c194299ebe39eaad5a3240343a7f8d42e104791340533105c2e18ed90936439bbe9399fd593aa7e10f2d835611497e504e44ceaeb2b0844f0e5c9241e

data/.rubocop.yml

@@ -6,6 +6,7 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   TargetRubyVersion: 2.6
+  NewCops: enable
 
 Style/StringLiterals:
   Enabled: true

data/.rubocop_todo.yml

@@ -1,54 +1,69 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-09-07 10:21:48 UTC using RuboCop version 1.35.0.
+# on 2022-09-14 22:49:41 UTC using RuboCop version 1.36.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: Include.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterGuardClause:
   Exclude:
-    - 'ykxutils.gemspec'
+    #- 'lib/ykxutils/gitcmd.rb'
 
-# Offense count: 3
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: normal, indented_internal_methods
-Layout/IndentationConsistency:
+Layout/EmptyLines:
   Exclude:
-    - 'lib/ykxutils/yamlx.rb'
+    #- 'lib/ykxutils/gitcmd.rb'
 
-# Offense count: 2
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IndentationWidth, EnforcedStyle.
-# SupportedStyles: spaces, tabs
-Layout/IndentationStyle:
+# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
+Layout/LeadingCommentSpace:
   Exclude:
-    - 'lib/ykxutils/yamlx.rb'
+    #- 'lib/ykxutils/gitcmd.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, AllowedPatterns, IgnoredPatterns.
-Layout/IndentationWidth:
+# Configuration parameters: .
+# SupportedStyles: space, no_space
+Layout/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
   Exclude:
-    - 'lib/ykxutils/yamlx.rb'
+    # - 'lib/ykxutils/gitcmd.rb'
 
-# Offense count: 21
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
-Layout/LeadingCommentSpace:
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceBeforeBlockBraces:
   Exclude:
-    - 'lib/ykxutils/yamlx.rb'
+    # - 'lib/ykxutils/gitcmd.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: space, compact, no_space
+Layout/SpaceInsideParens:
+  Exclude:
+    # - 'lib/ykxutils/gitcmd.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
   Exclude:
-    - 'lib/ykxutils/yamlx.rb'
+    # - 'lib/ykxutils/gitcmd.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -56,19 +71,35 @@ Lint/ScriptPermission:
   Exclude:
     - 'bin/console'
 
-# Offense count: 4
+# Offense count: 9
 Lint/UselessAssignment:
   Exclude:
-    - 'lib/ykxutils/yamlx.rb'
+    #- 'lib/ykxutils/gitcmd.rb'
+    #- 'lib/ykxutils/yamlx.rb'
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
   Max: 17
 
-# Offense count: 3
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: InverseMethods, InverseBlocks.
+Style/InverseMethods:
+  Exclude:
+    #- 'lib/ykxutils/gitcmd.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Methods.
+Style/RedundantArgument:
+  Exclude:
+    # - 'lib/ykxutils/gitcmd.rb'
+
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredName.
-Naming/RescuedExceptionsVariableName:
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
   Exclude:
-    - 'lib/ykxutils/yamlx.rb'
+    # - 'lib/ykxutils/gitcmd.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ykxutils (0.1.3)
+    ykxutils (0.1.5)
 
 GEM
   remote: https://rubygems.org/
@@ -28,7 +28,7 @@ GEM
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+    rspec-support (3.11.1)
     rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -43,7 +43,7 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.13.0)
+    rubocop-rspec (2.13.1)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     unicode-display_width (2.2.0)

data/lib/ykxutils/gitcmd.rb

@@ -0,0 +1,58 @@
+require "open3"
+
+module Ykxutils
+  module_function
+
+  def func_git_log(target_line)
+    line_no = 1
+    buf = []
+    buf_error = []
+    prog = "git log --oneline"
+    _stdin, stdout, stderr = Open3.popen3(prog)
+    stdout.each do |line|
+      buf << line
+      break if line_no == target_line
+
+      line_no += 1
+    end
+    stderr.each do |line_e|
+      buf_error << line_e
+    end
+
+    [buf, buf_error]
+  end
+
+  def func_get_commit_id(target)
+    commit_id = ""
+    buf, buf_error = func_git_log(target)
+    puts buf_error
+    index = target - 1
+    str = buf[index]
+    commit_id = str.split.first if str
+
+    commit_id
+  end
+
+  def func_git_diff_tree(commit_id)
+    buf = []
+    return buf if commit_id == ""
+
+    prog = "git diff-tree --name-status -r #{commit_id}"
+    _stdin, stdout, _stderr = Open3.popen3(prog)
+    stdout.each do |line|
+      buf << line
+    end
+
+    buf
+  end
+
+  def func_get_files_from_commit(target)
+    commit_id = func_get_commit_id(target)
+    # puts commit_id
+    buf = func_git_diff_tree(commit_id)
+
+    lines = buf.grep_v(/^D/)
+    lines.map { |x| x.split[1] }
+    # files.map{|x| puts x}
+  end
+end

data/lib/ykxutils/version.rb

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

data/lib/ykxutils/yamlx.rb

@@ -4,43 +4,43 @@ module Ykxutils
   module_function
 
   def yaml_load_file_compati(yaml_file_path)
-  	setting = {}
-  	valid = false
+    setting = {}
+    valid = false
     begin
       setting = YAML.load_file(yaml_file_path, aliases: true)
       valid = true
-    rescue ArgumentError => ex
-      #p "yaml_load_file_compat 1"
-      #p ex.class
-      #p ex.inspect
-      #p ex.message
-      #p ex.backtrace
-      #exit#
-    rescue StandardError => ex
-      #p "yaml_load_file_compat 1-2"
-      #p ex.class
-      #p ex.inspect
-      #p ex.message
-      #p ex.backtrace
+    rescue ArgumentError
+      # p "yaml_load_file_compat 1"
+      # p ex.class
+      # p ex.inspect
+      # p ex.message
+      # p ex.backtrace
+      # exit#
+    rescue StandardError
+      # p "yaml_load_file_compat 1-2"
+      # p ex.class
+      # p ex.inspect
+      # p ex.message
+      # p ex.backtrace
     end
-  
+
     if valid != true
       begin
         setting = YAML.load_file(yaml_file_path)
-        valid = true
+        # valid = true
       rescue ArgumentError
-        #p "yaml_load_file_compat 2"
-        #p ex.class
-        #p ex.inspect
-        #p ex.message
-        #p ex.backtrace
+        # p "yaml_load_file_compat 2"
+        # p ex.class
+        # p ex.inspect
+        # p ex.message
+        # p ex.backtrace
         #
-      rescue StandardError => ex
-        #p "yaml_load_file_compat 2-2"
-        #p ex.class
-        #p ex.inspect
-        #p ex.message
-        #p ex.backtrace
+      rescue StandardError
+        # p "yaml_load_file_compat 2-2"
+        # p ex.class
+        # p ex.inspect
+        # p ex.message
+        # p ex.backtrace
       end
     end
     setting

data/lib/ykxutils.rb

@@ -3,6 +3,7 @@
 require_relative "ykxutils/version"
 require_relative "ykxutils/yamlx"
 require_relative "ykxutils/pstorex"
+require_relative "ykxutils/gitcmd"
 
 module Ykxutils
   class Error < StandardError; end

data/ykxutils.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "New version of utilty function created by yk."
   spec.homepage      = "https://ykominami.github.io/ykxutils"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.8")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -43,4 +43,5 @@ Gem::Specification.new do |spec|
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ykxutils
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - ykominami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,6 +130,7 @@ files:
 - bin/console
 - bin/setup
 - lib/ykxutils.rb
+- lib/ykxutils/gitcmd.rb
 - lib/ykxutils/pstorex.rb
 - lib/ykxutils/version.rb
 - lib/ykxutils/yamlx.rb
@@ -141,6 +142,7 @@ licenses:
 metadata:
   homepage_uri: https://ykominami.github.io/ykxutils
   source_code_uri: https://github.com/ykominami/ykxutils
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -149,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.8
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="