rollout 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf240ab59dcfdebec335aee19df882f8936e7de5b7a0c347a3c28cfa8b3fc6d
-  data.tar.gz: 2ca7c2d7c761c6e539790421547b5e8eb82bbe8b56dca246975f6adc0773866d
+  metadata.gz: f3e6e9521ed03059b5b673616e985f89231d77d1ca42d8fa7ff00797ef906768
+  data.tar.gz: ac66f6f5f0da7e03bbf506d09f62d34e6afd7f1ea09b248b5193d74f3b6a720e
 SHA512:
-  metadata.gz: dc61fd463b60a94e85b5b141ad5fb7431f37249d9b899739b52524bd0fc28106135e039cbfe0130a0c35d0934b50339e426e38255516381636ec1ff226068e49
-  data.tar.gz: 5babd80ccaab8b4f7b4efeac63e5941709913014e5d5d37f71c5f8b04ae62d09a38e50f7f6236df8d09ce359384cb0d877452209a1b63b69284fd649bb49033c
+  metadata.gz: ccebf1c2024c332cd921a49b400a7ee8e9a5c0ce95cdf59f5e89fb302bef08684cc04ffae30c952e14ffd5acc97d583871ee590aebe6aa2c519cc416afc17b9f
+  data.tar.gz: fe0a400d1f694a6aefb5b1e7d89afb64a8cb28c07a1f510d01655d724bfb97d5b38e7c60e40669aec5fded5581e760549b53564078018cad92c968b6900753ee

data/.circleci/config.yml

@@ -3,24 +3,33 @@ version: 2.1
 workflows:
   main:
     jobs:
+      - ruby27
       - ruby26
       - ruby25
       - ruby24
       - ruby23
 
 executors:
+  ruby27:
+    docker:
+      - image: circleci/ruby:2.7
+      - image: circleci/redis:alpine
   ruby26:
     docker:
       - image: circleci/ruby:2.6
+      - image: circleci/redis:alpine
   ruby25:
     docker:
       - image: circleci/ruby:2.5
+      - image: circleci/redis:alpine
   ruby24:
     docker:
       - image: circleci/ruby:2.4
+      - image: circleci/redis:alpine
   ruby23:
     docker:
       - image: circleci/ruby:2.3
+      - image: circleci/redis:alpine
 
 commands:
   test:
@@ -31,7 +40,7 @@ commands:
 
       - run:
           name: Bundle Install
-          command: bundle check --path vendor/bundle || bundle install --deployment
+          command: bundle check --path vendor/bundle || bundle install
 
       - save_cache:
           key: bundler-{{ checksum "Gemfile.lock" }}
@@ -44,8 +53,8 @@ commands:
             bundle exec rspec --format documentation --format RspecJunitFormatter --out test_results/rspec.xml
 
 jobs:
-  ruby26:
-    executor: ruby26
+  ruby27:
+    executor: ruby27
     steps:
       - checkout
       - test
@@ -61,6 +70,12 @@ jobs:
       - store_test_results:
           path: test_results
 
+  ruby26:
+    executor: ruby26
+    steps:
+      - checkout
+      - test
+
   ruby25:
     executor: ruby25
     steps:

data/README.md

@@ -24,6 +24,14 @@ $redis = Redis.new
 $rollout = Rollout.new($redis)
 ```
 
+or even simpler
+
+```ruby
+require 'redis'
+$rollout = Rollout.new(Redis.current) # Will use REDIS_URL env var or default redis url
+```
+
+
 Update data specific to a feature:
 
 ```ruby

data/lib/rollout.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'rollout/feature'
 require 'rollout/version'
 require 'zlib'
 require 'set'
@@ -8,133 +9,6 @@ require 'json'
 class Rollout
   RAND_BASE = (2**32 - 1) / 100.0
 
-  class Feature
-    attr_accessor :groups, :users, :percentage, :data
-    attr_reader :name, :options
-
-    def initialize(name, string = nil, opts = {})
-      @options = opts
-      @name    = name
-
-      if string
-        raw_percentage, raw_users, raw_groups, raw_data = string.split('|', 4)
-        @percentage = raw_percentage.to_f
-        @users = users_from_string(raw_users)
-        @groups = groups_from_string(raw_groups)
-        @data = raw_data.nil? || raw_data.strip.empty? ? {} : JSON.parse(raw_data)
-      else
-        clear
-      end
-    end
-
-    def serialize
-      "#{@percentage}|#{@users.to_a.join(',')}|#{@groups.to_a.join(',')}|#{serialize_data}"
-    end
-
-    def add_user(user)
-      id = user_id(user)
-      @users << id unless @users.include?(id)
-    end
-
-    def remove_user(user)
-      @users.delete(user_id(user))
-    end
-
-    def add_group(group)
-      @groups << group.to_sym unless @groups.include?(group.to_sym)
-    end
-
-    def remove_group(group)
-      @groups.delete(group.to_sym)
-    end
-
-    def clear
-      @groups = groups_from_string('')
-      @users = users_from_string('')
-      @percentage = 0
-      @data = {}
-    end
-
-    def active?(rollout, user)
-      if user
-        id = user_id(user)
-        user_in_percentage?(id) ||
-          user_in_active_users?(id) ||
-          user_in_active_group?(user, rollout)
-      else
-        @percentage == 100
-      end
-    end
-
-    def user_in_active_users?(user)
-      @users.include?(user_id(user))
-    end
-
-    def to_hash
-      {
-        percentage: @percentage,
-        groups: @groups,
-        users: @users
-      }
-    end
-
-    private
-
-    def user_id(user)
-      if user.is_a?(Integer) || user.is_a?(String)
-        user.to_s
-      else
-        user.send(id_user_by).to_s
-      end
-    end
-
-    def id_user_by
-      @options[:id_user_by] || :id
-    end
-
-    def user_in_percentage?(user)
-      Zlib.crc32(user_id_for_percentage(user)) < RAND_BASE * @percentage
-    end
-
-    def user_id_for_percentage(user)
-      if @options[:randomize_percentage]
-        user_id(user).to_s + @name.to_s
-      else
-        user_id(user)
-      end
-    end
-
-    def user_in_active_group?(user, rollout)
-      @groups.any? do |g|
-        rollout.active_in_group?(g, user)
-      end
-    end
-
-    def serialize_data
-      return '' unless @data.is_a? Hash
-
-      @data.to_json
-    end
-
-    def users_from_string(raw_users)
-      users = (raw_users || '').split(',').map(&:to_s)
-      if @options[:use_sets]
-        users.to_set
-      else
-        users
-      end
-    end
-
-    def groups_from_string(raw_groups)
-      groups = (raw_groups || '').split(',').map(&:to_sym)
-      if @options[:use_sets]
-        groups.to_set
-      else
-        groups
-      end
-    end
-  end
-
   def initialize(storage, opts = {})
     @storage = storage
     @options = opts
@@ -296,7 +170,13 @@ class Rollout
   end
 
   def exists?(feature)
-    @storage.exists(key(feature))
+    # since redis-rb v4.2, `#exists?` replaces `#exists` which now returns integer value instead of boolean
+    # https://github.com/redis/redis-rb/pull/918
+    if @storage.respond_to?(:exists?)
+      @storage.exists?(key(feature))
+    else
+      @storage.exists(key(feature))
+    end
   end
 
   private

data/lib/rollout/feature.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+class Rollout
+  class Feature
+    attr_accessor :groups, :users, :percentage, :data
+    attr_reader :name, :options
+
+    def initialize(name, string = nil, opts = {})
+      @options = opts
+      @name    = name
+
+      if string
+        raw_percentage, raw_users, raw_groups, raw_data = string.split('|', 4)
+        @percentage = raw_percentage.to_f
+        @users = users_from_string(raw_users)
+        @groups = groups_from_string(raw_groups)
+        @data = raw_data.nil? || raw_data.strip.empty? ? {} : JSON.parse(raw_data)
+      else
+        clear
+      end
+    end
+
+    def serialize
+      "#{@percentage}|#{@users.to_a.join(',')}|#{@groups.to_a.join(',')}|#{serialize_data}"
+    end
+
+    def add_user(user)
+      id = user_id(user)
+      @users << id unless @users.include?(id)
+    end
+
+    def remove_user(user)
+      @users.delete(user_id(user))
+    end
+
+    def add_group(group)
+      @groups << group.to_sym unless @groups.include?(group.to_sym)
+    end
+
+    def remove_group(group)
+      @groups.delete(group.to_sym)
+    end
+
+    def clear
+      @groups = groups_from_string('')
+      @users = users_from_string('')
+      @percentage = 0
+      @data = {}
+    end
+
+    def active?(rollout, user)
+      if user
+        id = user_id(user)
+        user_in_percentage?(id) ||
+          user_in_active_users?(id) ||
+          user_in_active_group?(user, rollout)
+      else
+        @percentage == 100
+      end
+    end
+
+    def user_in_active_users?(user)
+      @users.include?(user_id(user))
+    end
+
+    def to_hash
+      {
+        percentage: @percentage,
+        groups: @groups,
+        users: @users
+      }
+    end
+
+    private
+
+    def user_id(user)
+      if user.is_a?(Integer) || user.is_a?(String)
+        user.to_s
+      else
+        user.send(id_user_by).to_s
+      end
+    end
+
+    def id_user_by
+      @options[:id_user_by] || :id
+    end
+
+    def user_in_percentage?(user)
+      Zlib.crc32(user_id_for_percentage(user)) < RAND_BASE * @percentage
+    end
+
+    def user_id_for_percentage(user)
+      if @options[:randomize_percentage]
+        user_id(user).to_s + @name.to_s
+      else
+        user_id(user)
+      end
+    end
+
+    def user_in_active_group?(user, rollout)
+      @groups.any? do |g|
+        rollout.active_in_group?(g, user)
+      end
+    end
+
+    def serialize_data
+      return '' unless @data.is_a? Hash
+
+      @data.to_json
+    end
+
+    def users_from_string(raw_users)
+      users = (raw_users || '').split(',').map(&:to_s)
+      if @options[:use_sets]
+        users.to_set
+      else
+        users
+      end
+    end
+
+    def groups_from_string(raw_groups)
+      groups = (raw_groups || '').split(',').map(&:to_sym)
+      if @options[:use_sets]
+        groups.to_set
+      else
+        groups
+      end
+    end
+  end
+end

data/lib/rollout/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Rollout
-  VERSION = '2.4.5'
+  VERSION = '2.4.6'
 end

data/rollout.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'redis', '~> 4.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'fakeredis'
+  spec.add_development_dependency 'bundler', '>= 1.17'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
   spec.add_development_dependency 'rubocop', '~> 0.71'
-  spec.add_development_dependency 'simplecov', '~> 0.16'
+  spec.add_development_dependency 'simplecov', '0.17'
 end

data/spec/rollout_spec.rb

@@ -2,8 +2,7 @@ require "spec_helper"
 
 RSpec.describe "Rollout" do
   before do
-    @redis   = Redis.new
-    @rollout = Rollout.new(@redis)
+    @rollout = Rollout.new(Redis.current)
   end
 
   describe "when a group is activated" do

data/spec/spec_helper.rb

@@ -5,8 +5,14 @@ require 'simplecov'
 SimpleCov.start
 
 require 'bundler/setup'
-require ENV["USE_REAL_REDIS"] == "true" ? "redis" : "fakeredis"
-require "rollout"
+require 'redis'
+require 'rollout'
+
+Redis.current = Redis.new(
+  host: ENV.fetch('REDIS_HOST', '127.0.0.1'),
+  port: ENV.fetch('REDIS_PORT', '6379'),
+  db: ENV.fetch('REDIS_DB', '7'),
+)
 
 RSpec.configure do |config|
   config.example_status_persistence_file_path = '.rspec_status'
@@ -17,5 +23,5 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.before { Redis.new.flushdb }
+  config.before { Redis.current.flushdb }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollout
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - James Golick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -28,18 +28,18 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: fakeredis
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,16 +98,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
 description: Feature flippers with redis.
 email:
 - jamesgolick@gmail.com
@@ -121,11 +121,11 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - lib/rollout.rb
+- lib/rollout/feature.rb
 - lib/rollout/version.rb
 - rollout.gemspec
 - spec/rollout_spec.rb

data/Gemfile.lock

@@ -1,65 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rollout (2.4.5)
-      redis (~> 4.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    fakeredis (0.7.0)
-      redis (>= 3.2, < 5.0)
-    jaro_winkler (1.5.3)
-    json (2.2.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
-    redis (4.1.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rspec_junit_formatter (0.4.1)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.72.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.6)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    unicode-display_width (1.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.17)
-  fakeredis
-  rollout!
-  rspec (~> 3.0)
-  rspec_junit_formatter (~> 0.4)
-  rubocop (~> 0.71)
-  simplecov (~> 0.16)
-
-BUNDLED WITH
-   1.17.2