yuuki 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d008fa930697e3248e20acbc34df7cfcdbd1abbd9bd25ea21cea696e43aafd6d
-  data.tar.gz: 8a30c007f19d4215c96e5acd6ad427875411cb4d5f057cbe612e3c081d6cfec2
+  metadata.gz: 4bc4e09cca35420bedfbe0e86cef17ed348f490f525913ad57171fc4651bb666
+  data.tar.gz: 27fb3f53e3c5323fa993ccf0c6b6d7eb432d088b2a47474197be35adaa07fc66
 SHA512:
-  metadata.gz: f0014990d77135e9d2d93b07580d999b2694b645319cbf8d227938b2fb94f55239d3dff57db10ec6f3c6cd9dd5a99005e47d257c7a96bb8b9f4f62c0c240e3dc
-  data.tar.gz: e7275a43d674ef004158731998c577d751dcc72d4054238592d1d0e438af2744bba4465902a5f330e7fa174a531c498e7770654581356b9f08d0fc989d473493
+  metadata.gz: 264c26d8223f5dc39b0e646202980a307815fdc70e248179726bcbfa734f386c0d84eb83dee067b084c5deb78ccc342e63c5b30f4c9b924be0b00a63b3ee2a47
+  data.tar.gz: ac176b3a17eaea160b2ffa0a1ca8aa499ae0d1e87bf759c889c991bdc5a991adf5a13250558cbc57f09b8ca31ae6b04c10d24be86a95e5e3f5102e28cdbe8e69

data/.rubocop.yml

@@ -0,0 +1,42 @@
+AllCops:
+  TargetRubyVersion: 2.6
+
+Metrics/AbcSize:
+  Max: 170
+
+Metrics/BlockLength:
+  Max: 250
+
+Metrics/ClassLength:
+  Max: 1000
+
+Metrics/CyclomaticComplexity:
+  Max: 70
+
+Metrics/MethodLength:
+  Max: 100
+
+Metrics/ModuleLength:
+  Max: 1000
+
+Metrics/ParameterLists:
+  Max: 50
+
+Metrics/PerceivedComplexity:
+  Max: 80
+
+Layout/SpaceInsideBlockBraces:
+  EnforcedStyle: no_space
+  SpaceBeforeBlockParameters: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/NumericPredicate:
+  EnforcedStyle: comparison
+
+Style/MultilineBlockChain:
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  EnforcedStyle: use_perl_names

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in yuuki.gemspec
 gemspec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "yuuki"
+require 'bundler/setup'
+require 'yuuki'
 
-require "pry"
+require 'pry'
 Pry.start

data/lib/yuuki/caller.rb

@@ -2,6 +2,7 @@
 
 require 'set'
 require 'yuuki/runner'
+require 'yoshinon'
 
 module Yuuki
   class Caller
@@ -9,14 +10,15 @@ module Yuuki
     # @param [String] require_dir directory
     # @param [Boolean] recursive
     def self.require_dir(require_dir, recursive: false)
-      Dir.glob(recursive ? "#{require_dir}/**/*.rb" : "#{require_dir}/*.rb"){|file| require file}
+      Dir.glob(recursive ? "#{require_dir}/**/*.rb" : "#{require_dir}/*.rb").sort.each {|file| require file}
     end
 
     # @param [Object] instances
-    def initialize(*instances)
+    def initialize(*instances, use_yoshinon: true)
       @instances = Set.new
       @threads = []
       add(*instances)
+      @use_yoshinon = use_yoshinon
     end
 
     # adds instances to yuuki
@@ -27,13 +29,19 @@ module Yuuki
         if instance.is_a?(Class)
           klass = instance
           # check the klass is extended
-          raise Yuuki::Error, 'Runner instance must be extend Yuuki::Runner' unless klass.singleton_class.include?(Yuuki::Runner)
+          unless klass.singleton_class.include?(Yuuki::Runner)
+            raise Yuuki::Error, 'Runner instance must be extend Yuuki::Runner'
+          end
+
           instance = instance.allocate
           instance.instance_variable_set(:@yuuki, self)
           instance.send(:initialize)
         else
           # check the klass is extended
-          raise Yuuki::Error, 'Runner instance must be extend Yuuki::Runner' unless instance.class.singleton_class.include?(Yuuki::Runner)
+          unless instance.class.singleton_class.include?(Yuuki::Runner)
+            raise Yuuki::Error, 'Runner instance must be extend Yuuki::Runner'
+          end
+
           # add @yuuki to the instance
           instance.instance_variable_set(:@yuuki, self)
         end
@@ -48,19 +56,19 @@ module Yuuki
     def runners
       list = @instances.flat_map do |instance|
         methods = instance.class.instance_variable_get(:@yuuki_methods)
-        methods.select{|_sig, meta| meta[:enabled]}.map{|sig, meta| [instance.method(sig), meta]}
+        methods.select {|_sig, meta| meta[:enabled]}.map {|sig, meta| [instance.method(sig), meta]}
       end
-      list.sort_by{|_method, meta| -(meta[:priority] || 0)}
+      list.sort_by {|_method, meta| -(meta[:priority] || 0)}
     end
 
     # returns all tags defined as Set
     def tags
       tags = @instances.flat_map do |instance|
         methods = instance.class.instance_variable_get(:@yuuki_methods)
-        methods.select{|_sig, meta| meta[:enabled]}.flat_map{|_sig, meta| meta[:tags]}
+        methods.select {|_sig, meta| meta[:enabled]}.flat_map {|_sig, meta| meta[:tags]}
       end
       ret = Set.new
-      tags.each{|e| ret += e if e}
+      tags.each {|e| ret += e if e}
       ret
     end
 
@@ -90,9 +98,10 @@ module Yuuki
       tags.each do |e|
         next if t.include?(e)
         raise Yuuki::Error, "tag `#{e}` is not associated" unless @ignore_tag_error
+
         warn "Yuuki Warning: tag `#{e}` is not associated"
       end
-      run_select(proc{|_method, meta| meta[:tags]&.intersect?(tags)}, **args, &block)
+      run_select(proc {|_method, meta| meta[:tags]&.intersect?(tags)}, **args, &block)
     end
 
     # runs the specific method
@@ -142,6 +151,8 @@ module Yuuki
     def run_method_internal(method, args, &block)
       params = method.parameters
       return method[] if params.empty?
+
+      yoshinon = Yoshinon.lock if @use_yoshinon
       params_array = []
       params_hash = {}
       params_block = nil
@@ -149,11 +160,15 @@ module Yuuki
       params.each do |type, name|
         case type
         when :req
-          raise Yuuki::Error, "A required argument '#{name}' was not found on running #{method.owner}::#{method.name}" unless args.key?(name)
+          unless args.key?(name)
+            raise Yuuki::Error, "A required argument '#{name}' was not found on running #{method.owner}::#{method.name}"
+          end
+
           params_array << args[name]
         when :opt
           # if parameters do not contain the :opt argument, treat it as not specified
           next nonspecified_last_opt = name unless args.key?(name)
+
           if nonspecified_last_opt
             # if there already exist non-specified :opt arguments, no more specified :opt argument is allowed
             raise Yuuki::Error, "A required argument '#{nonspecified_last_opt}' was not found"\
@@ -162,6 +177,7 @@ module Yuuki
           params_array << args[name]
         when :rest
           next unless args.key?(name)
+
           if nonspecified_last_opt
             # if there already exist non-specified :opt arguments, the :rest argument cannot be handled
             raise Yuuki::Error, "A required argument '#{nonspecified_last_opt}' not found"\
@@ -173,12 +189,17 @@ module Yuuki
             params_array << args[name]
           end
         when :keyreq
-          raise Yuuki::Error, "A required key argument '#{name}' was not found on running #{method.owner}::#{method.name}" unless args.key?(name)
+          unless args.key?(name)
+            raise Yuuki::Error,
+                  "A required key argument '#{name}' was not found on running #{method.owner}::#{method.name}"
+          end
+
           params_hash[name] = args[name]
         when :key
           params_hash[name] = args[name] if args.key?(name)
         when :keyrest
           next unless args.key?(name)
+
           if args[name].respond_to?(:to_hash)
             params_hash.merge!(args[name])
           else
@@ -188,8 +209,10 @@ module Yuuki
           params_block = args[name]
         end
       end
-      params_block = block unless params.any?{|type, _| type == :block}
+      params_block = block unless params.any? {|type, _| type == :block}
       params_hash.empty? ? method[*params_array, &params_block] : method[*params_array, **params_hash, &params_block]
     end
+  ensure
+    yoshinon&.unlock if @use_yoshinon
   end
 end

data/lib/yuuki/periodic.rb

@@ -2,6 +2,7 @@
 
 require 'yuuki/caller'
 require 'yuuki/runner'
+require 'yoshinon'
 
 module Yuuki
   module Runner
@@ -35,7 +36,7 @@ module Yuuki
   class PeriodicCaller < Caller
     attr_reader :first_run, :current_time
 
-    def initialize(*instances)
+    def initialize(*instances, use_yoshinon: true)
       super
       @first_run = true
     end
@@ -59,18 +60,19 @@ module Yuuki
             next true if @first_run && meta[:first_run]
             next false unless meta[:periodic]
             next false unless last_time
+
             c = @current_time + gmtoff
             l = last_time + gmtoff
-            next true if (l.div(meta[:periodic]) + 1) * meta[:periodic] <= c
+            (l.div(meta[:periodic]) + 1) * meta[:periodic] <= c
           end
           run_select(select_proc, **args, &block)
-        rescue
+        rescue StandardError
           @on_error ? @on_error[$!] : raise
         end
         @first_run = false
 
         last_time = @current_time
-        ((@current_time + 1).floor - Time.now.to_f).tap{|e| sleep e if e > 0}
+        ((@current_time + 1).floor - Time.now.to_f).tap {|e| sleep e if e > 0}
       end
     end
   end

data/lib/yuuki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yuuki
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/yuuki.gemspec

@@ -18,12 +18,13 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/})}
+    `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/})}
   end
   spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f)}
+  spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f)}
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'yoshinon'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: yuuki
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ishotihadus
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: yoshinon
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +75,7 @@ extra_rdoc_files: []
 files:
 - ".DS_Store"
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md