rusty_lru 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9399a03cbd7053c84f2ae56bb4946a48f1ea440ee47c718bfa7ce83801cfe4a7
-  data.tar.gz: a3e939c3f19dba442aab8a6f18f6db0f19ab73171939d08acc8f9cf9869649f4
+  metadata.gz: 30ed50fd6948de08b1f9f2bc8a58053f635a7faa13801cfb13572417cd7f9fec
+  data.tar.gz: efeafff2352f14125000dfa0fffabcfed70a2bb9549abc337dc7cf72925eeb6e
 SHA512:
-  metadata.gz: 187ddb3e30329533df0a14ab7de078aac83cba4cbd34c2990004c04c7f0949088b079b878aaaa91bfa1f002331263c5d6fc987bf14954e1fa75d9f502943e52a
-  data.tar.gz: e2b06a2dd7ce7ab705065e473ca839964e764b99cb5e5a28d0ed803595fc7e14d7e9bd7896398e7ae782ed6f210c1579391fb4b9a999f5a4990ff5fec886b7e6
+  metadata.gz: 6dec4ee648d15e81ffa8ba035d53802148bf14e7a9858cc78f40804db626a25d2f3835a459fe7d6d06c652cb069105c08280579a34ac1a38e90e2cf18c65a06a
+  data.tar.gz: 04c6053d58b507e978fd11c242e04ba937db3a195fc42caa8b3fca3fb0c638af740c689efa38ec7f41b40e1d463488ffa195023876495165f2690f1b4e2b694d

data/.github/workflows/ci.yml

@@ -0,0 +1,86 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  cargo-test:
+    name: Cargo test
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        rust-version: [stable, nightly]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Rust ${{ matrix.rust-version }}
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: ${{ matrix.rust-version }}
+        override: true
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0
+        bundler: latest
+        bundler-cache: true
+
+    - name: Cargo test
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+
+  rspec:
+    name: RSpec
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby-version: [3.0, 2.7, 2.6, 2.5]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: RSpec
+      run: bundle exec rake spec
+
+  rubocop:
+    name: Rubocop
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rubocop
+      run: bundle exec rubocop

data/.rubocop.yml

@@ -1,14 +1,35 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
-  TargetRubyVersion: 2.6.3
+  NewCops: enable
+  TargetRubyVersion: 2.5.0
   Exclude:
     - vendor/**/*
 
+Layout/LineLength:
+  Enabled: false
+
+Lint/EmptyBlock:
+  Enabled: false
+
 Metrics/BlockLength:
   Exclude:
     - ./*.gemspec
     - spec/**/*.rb
+    - tasks/**/*.rake
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/MultipleDescribes:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
 
-Metrics/LineLength:
+RSpec/VerifiedDoubles:
   Enabled: false
 
 Style/FrozenStringLiteralComment:

data/CHANGELOG.md

@@ -4,11 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+## [v0.1.2] - 2021-06-05
+### Changed
+- rutie bumped to v0.8.2.
+- lru bumped to v0.6.5.
+- Some other dev dependency bumps.
+
 ## [v0.1.1] - 2019-08-30
 ### Changed
 - Just an update to the README and the gemspec.
 
-## [v0.1.0] - 2019-08-29
+## [v0.1.0] - 2019-08-30
 ### Added
 - Implement basic Hash-like functionality by using
   [rutie](https://rubygems.org/gems/rutie) to wrap the
@@ -17,5 +24,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [YARD](https://yardoc.org/) docs.
 - [Rubocop](https://www.rubocop.org/).
 
+[v0.1.2]: https://github.com/asppsa/rusty_lru/compare/v0.1.1...v0.1.2
 [v0.1.1]: https://github.com/asppsa/rusty_lru/compare/v0.1.0...v0.1.1
 [v0.1.0]: https://github.com/asppsa/rusty_lru/releases/tag/v0.1.0

data/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "rusty_lru"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Alastair Pharo <me@asph.dev>"]
 edition = "2018"
 
 [dependencies]
-rutie = "0.6.1"
-lru = "0.1.17"
-lazy_static = "1.3.0"
+rutie = "0.8.2"
+lru = "0.6.5"
+lazy_static = "1.4.0"
 
 [lib]
 name = "rusty_lru"

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rusty_lru.gemspec
 gemspec
+
+group :benchmark do
+  gem 'lru_redux', '~> 1.1'
+end

data/README.md

@@ -1,6 +1,7 @@
 # RustyLRU
 
-[![Build Status](https://travis-ci.org/asppsa/rusty_lru.svg?branch=master)](https://travis-ci.org/asppsa/rusty_lru)
+[![Gem Version](https://badge.fury.io/rb/rusty_lru.svg)](https://badge.fury.io/rb/rusty_lru)
+[![CI](https://github.com/asppsa/rusty_lru/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/asppsa/rusty_lru/actions/workflows/ci.yml)
 
 This gem provides an [LRU
 cache](https://en.wikipedia.org/wiki/Cache_replacement_policies#Least_recently_used_(LRU))

data/Rakefile

@@ -1,8 +1,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-load 'tasks/cargo.rake'
+Dir['tasks/*.rake'].each(&method(:load))
 
 RSpec::Core::RakeTask.new(spec: 'cargo:build')
 
+desc 'Run Ruby and Rust tests'
 task test: [:spec, 'cargo:test']
 task default: :test

data/lib/rusty_lru.rb

@@ -7,5 +7,5 @@ module RustyLRU
   Rutie.new(:rusty_lru).init 'Init_rusty_lru', __dir__
 
   # Now load the additional methods
-  require_relative './rusty_lru/cache.rb'
+  require_relative './rusty_lru/cache'
 end

data/lib/rusty_lru/version.rb

@@ -1,3 +1,3 @@
 module RustyLRU
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/rusty_lru.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |spec|
   spec.version       = RustyLRU::VERSION
   spec.authors       = ['Alastair Pharo']
   spec.email         = ['me@asph.dev']
+  spec.required_ruby_version = '>= 2.5'
 
   spec.summary       = 'An LRU cache implemented in Rust'
   spec.description   = <<-DESC
@@ -34,8 +35,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rutie', '~> 0.0.3'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'irb', '~> 1.0.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'irb', '~> 1.3.5'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.74.0'
+  spec.add_development_dependency 'rubocop', '~> 1.16.0'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.3.0'
 end

data/src/lib.rs

@@ -13,7 +13,7 @@ pub struct HashableObject {
 
 impl HashableObject {
   fn get_hash<T: Object>(object: &T) -> i64 {
-    object.send("hash", &[])
+    unsafe { object.send("hash", &[]) }
       .try_convert_to::<Integer>()
       .map_err(|e| VM::raise_ex(e))
       .unwrap()
@@ -297,7 +297,7 @@ mod tests {
     let mut hasher1 = DefaultHasher::new();
     let mut hasher2 = DefaultHasher::new();
 
-    nil.send("hash", &[]).try_convert_to::<Integer>().unwrap().to_i64().hash(&mut hasher1);
+    unsafe { nil.send("hash", &[]) }.try_convert_to::<Integer>().unwrap().to_i64().hash(&mut hasher1);
     ho.hash(&mut hasher2);
 
     let hash1 = hasher1.finish();

data/tasks/cargo.rake

@@ -1,8 +1,10 @@
 namespace :cargo do
+  desc 'Cargo build'
   task :build do
     sh 'cargo build --release'
   end
 
+  desc 'Cargo test'
   task :test do
     sh 'cargo test'
   end

data/tasks/check.rake

@@ -0,0 +1,72 @@
+namespace :check do
+  desc 'Benchmark Rusty against lru_redux'
+  task bench: 'cargo:build' do
+    require 'benchmark'
+    require 'lru_redux'
+    require 'rusty_lru'
+
+    rusty = RustyLRU::Cache.new(1_000)
+
+    redux = LruRedux::Cache.new(1_000)
+    redux_thread_safe = LruRedux::ThreadSafeCache.new(1_000)
+
+    Benchmark.bmbm do |bm|
+      bm.report 'RustyLRU::Cache' do
+        1_000_000.times { rusty[rand(2_000)] = :value }
+      end
+
+      bm.report 'LruRedux::Cache' do
+        1_000_000.times { redux[rand(2_000)] = :value }
+      end
+
+      bm.report 'LruRedux::ThreadSafeCache' do
+        1_000_000.times { redux_thread_safe[rand(2_000)] = :value }
+      end
+    end
+  end
+
+  desc 'Check memory consumption'
+  task mem: 'cargo:build' do
+    require 'rusty_lru'
+    require 'securerandom'
+
+    rusty = RustyLRU::Cache.new(1_000_000)
+    statm = File.open("/proc/#{Process.pid}/statm")
+
+    loop do
+      1_000_000.times { rusty[SecureRandom.random_bytes(100)] ||= SecureRandom.random_bytes(100) }
+      p %i[size resident shared text lib data dt].zip(statm.read.split.map(&:to_i)).to_h.slice(:size, :resident, :data)
+      statm.rewind
+    end
+  end
+
+  desc 'Check thread safety'
+  task threadsafe: 'cargo:build' do
+    require 'rusty_lru'
+    require 'securerandom'
+
+    rusty = RustyLRU::Cache.new(1000)
+    pairs = (0..100).map do |j|
+      [j, SecureRandom.uuid]
+    end
+
+    return_values = pairs.map do |j, v|
+      Thread.new do
+        (0...100).map do
+          # Each thread tries to create the same pair.  Only one should
+          # succeed.
+          Thread.new { rusty.create(j, v) }
+        end.map(&:value)
+      end
+    end
+
+    return_values.each do |values|
+      count = values.select(&:itself).size
+      raise "#{j}: Got #{count}" unless count == 1
+    end
+
+    pairs.each do |k, v|
+      p [k, v, rusty.delete(k) == v]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rusty_lru
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alastair Pharo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rutie
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 1.16.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 description: |2
     This gem provides an LRU cache with an interface close to Hash. It uses Rutie
     to wrap the Rust 'lru' crate.
@@ -104,10 +132,10 @@ extensions:
 - ext/Rakefile
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Cargo.toml
 - Gemfile
@@ -122,6 +150,7 @@ files:
 - rusty_lru.gemspec
 - src/lib.rs
 - tasks/cargo.rake
+- tasks/check.rake
 homepage: https://github.com/asppsa/rusty_lru
 licenses:
 - Apache-2.0
@@ -130,7 +159,7 @@ metadata:
   documentation_uri: https://rubydoc.info/gems/rusty_lru
   homepage_uri: https://github.com/asppsa/rusty_lru
   source_code_uri: https://github.com/asppsa/rusty_lru.git
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,15 +167,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: An LRU cache implemented in Rust
 test_files: []

data/.travis.yml

@@ -1,29 +0,0 @@
-language: ruby
-os:
-  - osx
-  - linux
-rvm:
-  - 2.6
-  - 2.5
-  - 2.4
-env:
-  - RUST_VERSION=stable
-  - RUST_VERSION=nightly
-before_install:
-  - gem update --system
-  - gem install bundler
-  - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VERSION
-  - source $HOME/.cargo/env
-cache:
-  bundler: true
-  directories:
-    - $HOME/.cargo
-script:
-  - LD_LIBRARY_PATH=$(ruby -e "print RbConfig::CONFIG['libdir']") cargo test
-  - bundle exec rake spec
-  - bundle exec rubocop
-matrix:
-  allow_failures:
-    - env: RUST_VERSION=nightly
-branches:
-  only: master