legion-cache 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8af525a0967b0fd5cb1ac712c7e34a61d33328928713a89a1dbe2126e3100884
-  data.tar.gz: e08cdd2f12067cb126d5060d1d9230b8460650c5e69825067c51bf2d16fe6588
+  metadata.gz: 9a0e98b3a109f9afe974174f40b6e881b1bc0fc44d8425170414cea1bd035f80
+  data.tar.gz: 533023b2a19842e481108e8954e4085cb7a38c6773fd4d87482257791bce90bb
 SHA512:
-  metadata.gz: 9a91fd392e2d2eb6b02ae7e38d2dedc05841dc86f64cd829222c84b8c4a3d547e2db544fb57f93bbdd3fc2b121667e8fe27d5431b5bdd21182c82d190b9892da
-  data.tar.gz: a35558df6bec660463bafa24093cd383b522d4436d4cd69f5b0d1b4287949df08c8ccefd4783535a98bfb086b91358498b936e23ef682459ac540ac830abc706
+  metadata.gz: 202568edde877bd7a9e2c0e5b245e4283f818dfbb8118a316e9fbf145ca853910c2e1da44145cc6c71698846d7d62d391495fa965708d30063bce304d4519263
+  data.tar.gz: fbf7bfaa69f0d5f79e11d56b877481220a267d94775aeb2bcb8d243ab0baa49ecc18c6d6715ac18f5933ff3d7553ef232492c42528af548ffc264ef2d64c0c46

data/.circleci/config.yml

@@ -1,11 +1,12 @@
 version: 2.1
 orbs:
   ruby: circleci/ruby@0.2.1
+  sonarcloud: sonarsource/sonarcloud@1.0.1
 
 jobs:
   "rubocop":
     docker:
-      - image: circleci/ruby:2.5-node
+      - image: circleci/ruby:2.7-node
     steps:
       - checkout
       - ruby/load-cache
@@ -17,20 +18,28 @@ jobs:
   "ruby-two-five":
     docker:
       - image: circleci/ruby:2.5
+      - image: redis:alpine
       - image: memcached:1.5-alpine
     steps:
       - checkout
       - ruby/load-cache
+      - run:
+          name: update bundler
+          command: gem update bundler
       - ruby/install-deps
       - ruby/run-tests
       - ruby/save-cache
   "ruby-two-six":
     docker:
       - image: circleci/ruby:2.6
+      - image: redis:alpine
       - image: memcached:1.5-alpine
     steps:
       - checkout
       - ruby/load-cache
+      - run:
+          name: update bundler
+          command: gem update bundler
       - ruby/install-deps
       - ruby/run-tests
       - ruby/save-cache
@@ -38,12 +47,61 @@ jobs:
     docker:
       - image: circleci/ruby:2.7
       - image: memcached:1.5-alpine
+      - image: redis:alpine
     steps:
       - checkout
       - ruby/load-cache
       - ruby/install-deps
       - ruby/run-tests
       - ruby/save-cache
+  "jruby-nine-two":
+    docker:
+      - image: circleci/jruby:9.2-jre
+      - image: memcached:1.5-alpine
+      - image: redis:alpine
+    steps:
+      - checkout
+      - run:
+          name: Bundle Install
+          command: bundle install
+      - run:
+          name: Run RSpec
+          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
+          when: always
+      - store_test_results:
+          path: test-results
+      - sonarcloud/scan
+  "jruby-nine-two-e":
+    docker:
+      - image: circleci/jruby:9.2.11-jre
+      - image: memcached:1.5-alpine
+      - image: redis:alpine
+    steps:
+      - checkout
+      - run:
+          name: Bundle Install
+          command: bundle install
+      - run:
+          name: Run RSpec
+          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
+          when: always
+      - store_test_results:
+          path: test-results
+  "sonarcloud":
+    docker:
+      - image: circleci/ruby:2.7
+      - image: memcached:1.5-alpine
+      - image: redis:alpine
+    steps:
+      - checkout
+      - ruby/load-cache
+      - ruby/install-deps
+      - ruby/run-tests
+      - run:
+          name: Run Rubocop
+          command: bundle exec rubocop --format=json --out=rubocop-result.json
+      - sonarcloud/scan
+      - ruby/save-cache
 
 workflows:
   version: 2
@@ -58,4 +116,8 @@ workflows:
             - ruby-two-five
       - ruby-two-seven:
           requires:
-            - ruby-two-five
+            - ruby-two-five
+      - sonarcloud:
+          requires:
+            - ruby-two-seven
+            - ruby-two-six

data/.rubocop.yml

@@ -15,8 +15,11 @@ Layout/HashAlignment:
   EnforcedColonStyle: table
 Style/Documentation:
   Enabled: false
+Style/ModuleFunction:
+  Enabled: false
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 Style/FrozenStringLiteralComment:
   Enabled: false
 Naming/FileName:

data/Gemfile.lock

@@ -0,0 +1,86 @@
+PATH
+  remote: .
+  specs:
+    legion-cache (1.0.0)
+      connection_pool
+      dalli
+      redis
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.1)
+    connection_pool (2.2.3)
+    dalli (2.7.10)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    json (2.3.1)
+    legion-json (1.1.0)
+      multi_json
+    legion-logging (1.1.0)
+      rainbow (~> 3)
+    legion-settings (1.1.0)
+      legion-json
+      legion-logging
+    multi_json (1.15.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    redis (4.2.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.88.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.1.0, < 1.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.2.0)
+      parser (>= 2.7.0.1)
+    rubocop-performance (1.7.1)
+      rubocop (>= 0.82.0)
+    ruby-progressbar (1.10.1)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  legion-cache!
+  legion-logging
+  legion-settings
+  rake
+  rspec
+  rspec_junit_formatter
+  rubocop
+  rubocop-performance
+  simplecov (< 0.18.0)
+
+BUNDLED WITH
+   2.1.4

data/legion-cache.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `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.require_paths = ['lib']
 
@@ -34,7 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'simplecov', '< 0.18.0'
 
   spec.add_dependency 'connection_pool'
   spec.add_dependency 'dalli'

data/lib/legion/cache.rb

@@ -7,15 +7,9 @@ require_relative 'cache/redis'
 module Legion
   module Cache
     class << self
-      attr_reader :client
       include Legion::Cache::Memcached if Legion::Settings[:cache][:driver] == 'dalli'
       include Legion::Cache::Redis if Legion::Settings[:cache][:driver] == 'redis'
 
-      def setup
-        connect
-        Legion::Logging.info 'Legion::Cache connected and enabled'
-      end
-
       def shutdown
         Legion::Logging.info 'Shutting down Legion::Cache'
         close

data/lib/legion/cache/memcached.rb

@@ -3,42 +3,49 @@ require 'dalli'
 module Legion
   module Cache
     module Memcached
-      def connect
-        Legion::Logging.debug 'Using Memcached module for Legion::Cache'
+      extend self
+
+      def client(servers: Legion::Settings[:cache][:servers], **opts)
+        return @client unless @client.nil?
 
         Dalli.logger = Legion::Logging
-        @client = Dalli::Client.new(Legion::Settings[:cache][:servers], Legion::Settings[:cache])
-        Legion::Logging.debug "Legion::Cache successfully connected to #{Legion::Settings[:cache][:servers]}"
-        Legion::Settings[:cache][:connected] = true
+        @client = Dalli::Client.new(servers, Legion::Settings[:cache].merge(opts))
+        @connected = true
+        @client
+      end
+
+      def connected?
+        @connected ||= false
       end
 
       def close
-        @client.close
+        client.close
       end
 
       def restart
         close
-        connect
+        @client = nil
+        client
       end
 
       def get(key)
-        @client.get(key)
+        client.get(key)
       end
 
       def fetch(key, ttl = nil)
-        @client.fetch(key, ttl)
+        client.fetch(key, ttl)
       end
 
       def set(key, value, ttl = 180)
-        @client.set(key, value, ttl).positive?
+        client.set(key, value, ttl).positive?
       end
 
       def delete(key)
-        @client.delete(key) == true
+        client.delete(key) == true
       end
 
       def flush(delay = 0)
-        @client.flush(delay).first
+        client.flush(delay).first
       end
     end
   end

data/lib/legion/cache/redis.rb

@@ -3,36 +3,47 @@ require 'redis'
 module Legion
   module Cache
     module Redis
-      def connect
+      extend self
+
+      def client
+        return @client unless @client.nil?
+
         @client = ::Redis.new
+        @connected = true
+        @client
+      end
+
+      def connected?
+        @connected ||= false
       end
 
       def close
-        @client.close
+        client.close
       end
 
       def restart
         close
-        connect
+        @client = nil
+        client
       end
 
       def get(key)
-        @client.get(key)
+        client.get(key)
       end
       alias fetch get
 
       def set(key, value, ttl: nil)
         args = {}
         args[:ex] = ttl unless ttl.nil?
-        @client.set(key, value, **args) == 'OK'
+        client.set(key, value, **args) == 'OK'
       end
 
       def delete(key)
-        @client.del(key) == 1
+        client.del(key) == 1
       end
 
       def flush
-        @client.flushdb == 'OK'
+        client.flushdb == 'OK'
       end
     end
   end

data/lib/legion/cache/version.rb

@@ -2,6 +2,6 @@
 
 module Legion
   module Cache
-    VERSION = '0.2.1'
+    VERSION = '1.0.0'
   end
 end

data/sonar-project.properties

@@ -0,0 +1,13 @@
+sonar.projectKey=legion-io_legion-cache
+sonar.organization=legion-io
+sonar.projectName=Legion::Cache
+sonar.sources=.
+sonar.exclusions=vendor/**
+sonar.coverage.exclusions=spec/**
+sonar.cpd.exclusions=spec/**
+sonar.ruby.coverage.reportPath=coverage/.resultset.json
+sonar.ruby.file.suffixes=rb,ruby
+sonar.ruby.coverage.framework=RSpec
+sonar.ruby.rubocopConfig=.rubocop.yml
+sonar.ruby.rubocop.reportPath=rubocop-result.json
+sonar.ruby.rubocop.filePath=.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-cache
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Esity
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -173,26 +187,20 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
-- ".idea/.rakeTasks"
-- ".idea/legion-cache.iml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/vagrant.xml"
-- ".idea/workspace.xml"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - legion-cache.gemspec
 - lib/legion/cache.rb
 - lib/legion/cache/memcached.rb
 - lib/legion/cache/redis.rb
 - lib/legion/cache/settings.rb
 - lib/legion/cache/version.rb
+- sonar-project.properties
 homepage: https://bitbucket.org/legion-io/legion-cache
 licenses:
 - MIT
@@ -202,7 +210,7 @@ metadata:
   changelog_uri: https://bitbucket.org/legion-io/legion-cache/src/master/CHANGELOG.md
   wiki_uri: https://bitbucket.org/legion-io/legion-cache/wiki
   bug_tracker_uri: https://bitbucket.org/legion-io/legion-cache/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,8 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Legion::Cache integration
 test_files: []

data/.idea/.rakeTasks

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Settings><!--This file was automatically generated by Ruby plugin.
-You are allowed to: 
-1. Remove rake task
-2. Add existing rake tasks
-To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build legion-cache-0.2.0.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install legion-cache-0.2.0.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install legion-cache-0.2.0.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.2.0 and build and push legion-cache-0.2.0.gem to rubygems.org" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/.idea/legion-cache.iml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="ModuleRunConfigurationManager">
-    <shared />
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="connection_pool (v2.2.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="dalli (v2.7.10, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="docile (v1.3.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="legion-logging (v0.2.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.19.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parser (v2.7.0.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="redis (v4.1.3, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec_junit_formatter (v0.4.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.80.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.18.5, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.12.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.6.1, RVM: ruby-2.6.3) [gem]" level="application" />
-  </component>
-</module>

data/.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-2.6.3" project-jdk-type="RUBY_SDK" />
-</project>

data/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/legion-cache.iml" filepath="$PROJECT_DIR$/.idea/legion-cache.iml" />
-    </modules>
-  </component>
-</project>

data/.idea/vagrant.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VagrantProjectSettings">
-    <option name="instanceFolder" value="" />
-    <option name="provider" value="" />
-  </component>
-</project>

data/.idea/workspace.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CoverageOptionsProvider">
-    <option name="myAddOrReplace" value="0" />
-  </component>
-  <component name="Git.Settings">
-    <option name="PUSH_AUTO_UPDATE" value="true" />
-    <option name="ROOT_SYNC" value="DONT_SYNC" />
-  </component>
-  <component name="ProjectId" id="1Yl3LLXb9c4jt3mof9hHMP78fdY" />
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.vagrant" />
-  </component>
-</project>

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'legion/cache'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here