redis_eval 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16236c0a6ea8bcbcc3928e5d51229b9659ffc995
-  data.tar.gz: 1f3cd2d258cf767257072d383475423d1bb0d8ac
+SHA256:
+  metadata.gz: a7813801dcf61d877300eb2ad00e6ff8723ba46314c8bbb776edaf63dcf85a95
+  data.tar.gz: 672a2bf10527362b15eb29635daa7dcba114f0e653f3d8fd992e613250295452
 SHA512:
-  metadata.gz: 1c20a35f547a2e8de7a237ba19a97474c6de8f70cfc1d772e682a8110c859ac060e37ca06df64d16bae7609e56e7f838c6d160b6dd166f790ef026726bc9ed4d
-  data.tar.gz: 7471481f48dcd325a0c89d9b6478a027d016946b88fb176b6cf22ce6fce6664ac233a5d1588b326e742b2a2ff78c9d31c76194a4722af24da47340cad14923fa
+  metadata.gz: 41c1ecd4e6ceed1e4e97b8f03fcd2968233b06cab191a4928476639ab447820cba1ae46dce7d71824fe225b5314d7282a0cd5b2547b459dbd31ab5b23687bef4
+  data.tar.gz: 31fac3fe265daedebfe389e95415045f302527c93c83e802b29a28586a75d4971db10471cde54a121019663a6e6c5de3920b3e400ea6e9a519b5e8d5b491ca77

data/.github/workflows/ci.yml

@@ -0,0 +1,69 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: CI
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  lint:
+    name: Rubocop
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.7"
+      - name: Set up Gems
+        run: |
+          gem update --system --no-document
+          gem install bundler --no-document
+          bundle config set path .bundle
+          bundle install -j 4
+      - name: Lint
+        run: bundle exec rubocop
+  test:
+    name: Test
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.0", "2.7", "2.6"]
+    runs-on: ubuntu-latest
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Cache dependent gems
+        uses: actions/cache@v1
+        with:
+          path: .bundle
+          key: "local-bundle-ruby-${{ matrix.ruby }}-0001"
+      - name: Install dependencies
+        run: |
+          gem update --system --no-document
+          gem install bundler --no-document
+          bundle config set path .bundle
+          bundle install -j 4
+      - name: Run tests
+        run: bundle exec rspec

data/.gitignore

@@ -1,10 +1,12 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
 /spec/reports/
 /tmp/
-.DS_Store
+/Gemfile.lock
+
+# rspec failure tracking
+.rspec_status

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,170 @@
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.6
+  Exclude:
+    - "node_modules/**/*"
+    - "vendor/**/*"
+    - "test/**/*"
+
+Layout/EmptyLineBetweenDefs:
+  Exclude:
+    - "lib/schema_serializer/errors.rb"
+
+# Private methods indent.
+Layout/IndentationConsistency:
+  EnforcedStyle: indented_internal_methods
+
+# Warning: 120 characters
+# Error:   160 characters
+# Make the library more restrictive.
+Layout/LineLength:
+  Max: 120
+
+# Multi-line indentation with receiver.
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented_relative_to_receiver
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - "spec/**/*_spec.rb"
+
+# May define constants within the block in spec.
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - "spec/**/*_spec.rb"
+
+Lint/InheritException:
+  EnforcedStyle: standard_error
+
+Lint/UnderscorePrefixedVariableName:
+  Enabled: false
+
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 24
+
+Metrics/BlockLength:
+  Exclude:
+    - "spec/**/*.rb"
+    - "Gemfile"
+    - "*.gemspec"
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/MethodLength:
+  Max: 20
+
+Security/YAMLLoad:
+  Enabled: false
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/AndOr:
+  EnforcedStyle: conditionals
+
+Style/AsciiComments:
+  Enabled: false
+
+Style/BlockDelimiters:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/CollectionMethods:
+  PreferredMethods:
+    detect: "detect"
+    find: "detect"
+    inject: "inject"
+    reduce: "inject"
+
+Style/Documentation:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/EmptyCaseCondition:
+  Enabled: false
+
+Style/EmptyElse:
+  EnforcedStyle: empty
+
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
+Style/FormatString:
+  EnforcedStyle: percent
+
+# Do not use frozen_string_literal comment.
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/HashSyntax:
+  Exclude:
+    - "Rakefile"
+
+Style/MultilineBlockChain:
+  Enabled: false
+
+Style/MixinUsage:
+  Exclude:
+    - "bin/setup"
+
+# Use _ when 7 digits or more.
+Style/NumericLiterals:
+  MinDigits: 7
+  Strict: true
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/OrAssignment:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# `has_xxx?` is more readable.
+Style/PreferredHashMethods:
+  EnforcedStyle: verbose
+
+# Do not use unnecessary returns. (Allow to return multiple values.)
+Style/RedundantReturn:
+  AllowMultipleReturnValues: true
+
+# Do not specify error class when rescuing StandardError.
+Style/RescueStandardError:
+  EnforcedStyle: implicit
+
+# String literals use double quotes.
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+# String literal inside the string interpolation use double quotes too.
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+# Percent(`%i(a b)`) and brackets(`[:a, :b]`) are acceptable.
+Style/SymbolArray:
+  Enabled: false
+
+# Put a trailing comma in argument list.
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+# Put a trailing comma in Array literal.
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+# Put a trailing comma in Hash literal.
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+# Percent(`%w(a b)`) and brackets(`["a", "b"]`) are acceptable.
+Style/WordArray:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/{LICENSE.txt → LICENSE}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 i2bskn
+Copyright (c) 2015 Ken Iiboshi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,7 +1,7 @@
 # RedisEval
 
-[![Build Status](https://travis-ci.org/i2bskn/redis_eval.svg)](https://travis-ci.org/i2bskn/redis_eval)
-[![codecov](https://codecov.io/gh/i2bskn/redis_eval/branch/master/graph/badge.svg)](https://codecov.io/gh/i2bskn/redis_eval)
+[![Gem Version](https://badge.fury.io/rb/redis_eval.svg)](https://badge.fury.io/rb/redis_eval)
+[![CI](https://github.com/i2bskn/redis_eval/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/i2bskn/redis_eval/actions?query=workflow%3ACI)
 
 Evaluate Lua scripts with Redis.
 

data/Rakefile

@@ -1,10 +1,8 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
-end
+RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
 
-task :default => :test
+task :default => %i(spec rubocop)

data/lib/redis_eval/script.rb

@@ -2,9 +2,10 @@ module RedisEval
   class Script
     attr_accessor :parent
     attr_reader :source, :sha
+    attr_writer :redis
 
     def self.build_from_parent(src, parent, with_load: true)
-      script        = new(src, with_load: false)
+      script = new(src, with_load: false)
       script.parent = parent
       script.load if with_load
       script
@@ -12,8 +13,7 @@ module RedisEval
 
     def initialize(src, with_load: true)
       @source = src
-      @sha    = Digest::SHA1.hexdigest(@source)
-      @redis  = nil
+      @sha = Digest::SHA1.hexdigest(@source)
       self.load if with_load
     end
 
@@ -28,20 +28,16 @@ module RedisEval
     def execute(keys = [], argv = [])
       redis.evalsha(sha, Array(keys), Array(argv))
     rescue Redis::CommandError => e
-      if e.message =~ /NOSCRIPT/
-        redis.eval(source, Array(keys), Array(argv))
-      else
-        raise
-      end
+      raise unless e.message =~ /NOSCRIPT/
+
+      redis.eval(source, Array(keys), Array(argv))
     end
 
     def redis
-      return @redis if @redis
-      parent ? parent.redis : Redis.current
-    end
+      return @redis if instance_variable_defined?(:@redis)
+      return parent.redis unless parent.nil?
 
-    def redis=(conn)
-      @redis = conn
+      Redis.current
     end
 
     private

data/lib/redis_eval/script_set.rb

@@ -2,15 +2,15 @@ module RedisEval
   class ScriptSet
     attr_reader :path
 
-    SCRIPT_SUFFIX = ".lua"
+    SCRIPT_SUFFIX = ".lua".freeze
 
     def initialize(target_path, conn = nil)
-      @path  = pathname(target_path)
+      @path = pathname(target_path)
       @redis = conn
     end
 
     def load(name)
-      source = ERB.new(script_path(name).read).result
+      source = ERB.new(script_path(name).read).result(__binding__)
       loaded_scripts[name.to_s] ||= RedisEval::Script.build_from_parent(source, self)
     end
 
@@ -23,9 +23,7 @@ module RedisEval
       @redis || Redis.current
     end
 
-    def redis=(conn)
-      @redis = conn
-    end
+    attr_writer :redis
 
     private
 
@@ -45,7 +43,7 @@ module RedisEval
         super unless respond_to?(name)
 
         self.load(name)
-        define_singleton_method(name) { |*a, &b| loaded_scripts[name.to_s] }
+        define_singleton_method(name) { |*_a| loaded_scripts[name.to_s] }
         send(name, *args, &block)
       end
 

data/lib/redis_eval/version.rb

@@ -1,3 +1,3 @@
 module RedisEval
-  VERSION = "0.2.2"
+  VERSION = "0.3.0".freeze
 end

data/redis_eval.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "redis_eval/version"
 
@@ -7,24 +6,27 @@ Gem::Specification.new do |spec|
   spec.name          = "redis_eval"
   spec.version       = RedisEval::VERSION
   spec.authors       = ["i2bskn"]
-  spec.email         = ["i2bskn@gmail.com"]
+  spec.email         = ["iiboshi@craftake.co.jp"]
 
-  spec.summary       = %q{Evaluate Lua scripts with Redis.}
-  spec.description   = %q{Evaluate Lua scripts with Redis.}
+  spec.summary       = "Evaluate Lua scripts with Redis."
+  spec.description   = "Evaluate Lua scripts with Redis."
   spec.homepage      = "https://github.com/i2bskn/redis_eval"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.6"
+
   spec.add_dependency "redis"
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "codecov"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "bundler", ">= 2.1.0"
+  spec.add_development_dependency "pry", "~> 0.14.0"
+  spec.add_development_dependency "rake", "~> 13.0.0"
+  spec.add_development_dependency "rspec", "~> 3.10.0"
+  spec.add_development_dependency "rubocop", "~> 1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_eval
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - i2bskn
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -28,97 +28,86 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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'
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.0
 description: Evaluate Lua scripts with Redis.
 email:
-- i2bskn@gmail.com
+- iiboshi@craftake.co.jp
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - lib/redis_eval.rb
@@ -130,7 +119,7 @@ homepage: https://github.com/i2bskn/redis_eval
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,16 +127,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Evaluate Lua scripts with Redis.
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.3
-  - 2.4.1
-before_install: gem install bundler -v 1.14.6
-services:
-  - redis-server