flipper 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44c0c17f50251b0bfff9bd7cf3566b9ecffdf2f9941fcf64f0253b04e6d9b5e7
-  data.tar.gz: 1407983190dbad2d02e07390d7acf8ac3e0fca4aaae610c02c72c4f16594d197
+  metadata.gz: 6ff734c4221d1ea2694fdf4e9e463085f60242e698b8702389c53ccc6a17e87b
+  data.tar.gz: 5666852d9f7416d30919a188c5e3c46cb202d66d332c482aba56c3d496437282
 SHA512:
-  metadata.gz: 8e8de77bc356a0eb0e4ff147aaf2060847ccf05a71b214bdced861ae7a5d6ca83b3fbdf187b4318289530e0e1f01598687bd936a6c5fa772643af021571493d9
-  data.tar.gz: f5ae3a78490ac77ca4a9ebd57c75ca82e62d1cf5906ee7adfa87a296342c54425aed8223115966ac16398048fea76c253fc240aedbc35366085d254f54dc85d5
+  metadata.gz: c48de5bfe83ff53d969d496f96a3df9335af8f1fe8d41559158930c9ae3dd94b91f245f7b4cfbceea1c85ab453a4dd94057e4a46e3f928d9b27ddc417f04c718
+  data.tar.gz: 2ed4dd3a74bbf07fe289d57b9545e073527971e5ab7f393ee96ea8f31904a9a550db4cda0ba492f080a14b1eb8b4982eb680e88b1c2bcfeea2e74e032207b1f4

data/Gemfile

@@ -24,7 +24,6 @@ gem 'stackprof'
 gem 'benchmark-ips'
 gem 'stackprof-webnav'
 gem 'flamegraph'
-gem 'climate_control'
 gem 'mysql2'
 gem 'pg'
 gem 'cuprite'

data/lib/flipper/cli.rb

@@ -209,8 +209,12 @@ module Flipper
       "#{count} #{count == 1 ? singular : plural}"
     end
 
-    def colorize(text, options)
-      IRB::Color.colorize(text, options)
+    def colorize(text, colors)
+      if defined?(Bundler)
+        Bundler.ui.add_color(text, *colors)
+      else
+        text
+      end
     end
 
     def indent(text, spaces)

data/lib/flipper/test_help.rb

@@ -1,17 +1,24 @@
 module Flipper
   module TestHelp
+    extend self
+
     def flipper_configure
-      # Create a single shared memory adapter instance for each test
-      @flipper_adapter = Flipper::Adapters::Memory.new
+      # Use a shared Memory adapter for all tests. This is instantiated outside of the
+      # `configure` block so the same instance is returned in new threads.
+      adapter = Flipper::Adapters::Memory.new
 
       Flipper.configure do |config|
-        config.adapter { @flipper_adapter }
+        config.adapter { adapter }
         config.default { Flipper.new(config.adapter) }
       end
     end
 
     def flipper_reset
-      Flipper.instance = nil # Reset previous flipper instance
+      # Remove all features
+      Flipper.features.each(&:remove) rescue nil
+
+      # Reset previous DSL instance
+      Flipper.instance = nil
     end
   end
 end
@@ -19,19 +26,17 @@ end
 if defined?(RSpec) && RSpec.respond_to?(:configure)
   RSpec.configure do |config|
     config.include Flipper::TestHelp
-    config.before(:each) do
-      flipper_reset
-      flipper_configure
-    end
+    config.before(:suite) { Flipper::TestHelp.flipper_configure }
+    config.before(:each) { flipper_reset }
   end
 end
-
 if defined?(ActiveSupport)
   ActiveSupport.on_load(:active_support_test_case) do
+    Flipper::TestHelp.flipper_configure
+
     ActiveSupport::TestCase.class_eval do
       include Flipper::TestHelp
 
-      setup :flipper_configure
       setup :flipper_reset
     end
   end

data/lib/flipper/version.rb

@@ -1,5 +1,5 @@
 module Flipper
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 
   REQUIRED_RUBY_VERSION = '2.6'.freeze
   NEXT_REQUIRED_RUBY_VERSION = '3.0'.freeze

data/spec/flipper/cli_spec.rb

@@ -16,14 +16,14 @@ RSpec.describe Flipper::CLI do
   describe "enable" do
     describe "feature" do
       it do
-        expect(subject).to have_attributes(status: 0, stdout: /feature.*enabled/)
+        expect(subject).to have_attributes(status: 0, stdout: /feature.*\e\[32m.*enabled/)
         expect(Flipper).to be_enabled(:feature)
       end
     end
 
     describe "-a User;1 feature" do
       it do
-        expect(subject).to have_attributes(status: 0, stdout: /feature.*enabled.*User;1/m)
+        expect(subject).to have_attributes(status: 0, stdout: /feature.*\e\[33m.*enabled.*User;1/m)
         expect(Flipper).to be_enabled(:feature, Flipper::Actor.new("User;1"))
       end
     end
@@ -142,6 +142,28 @@ RSpec.describe Flipper::CLI do
     end
   end
 
+  context "bundler is not installed" do
+    let(:argv) { "list" }
+
+    around do |example|
+      original_bundler = Bundler
+      begin
+        Object.send(:remove_const, :Bundler)
+        example.run
+      ensure
+        Object.const_set(:Bundler, original_bundler)
+      end
+    end
+
+    it "should not raise an error" do
+      Flipper.enable(:enabled_feature)
+      Flipper.enable_group(:enabled_groups, :admins)
+      Flipper.add(:disabled_feature)
+
+      expect(subject).to have_attributes(status: 0, stdout: /enabled_feature.*enabled_groups.*disabled_feature/m)
+    end
+  end
+
   def run(argv)
     original_stdout = $stdout
     original_stderr = $stderr
@@ -150,6 +172,9 @@ RSpec.describe Flipper::CLI do
     $stderr = StringIO.new
     status = 0
 
+    # Prentend this a TTY so we can test colorization
+    allow($stdout).to receive(:tty?).and_return(true)
+
     begin
       Flipper::CLI.run(argv)
     rescue SystemExit => e

data/spec/flipper/cloud/configuration_spec.rb

@@ -12,10 +12,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set token from ENV var" do
-    with_env "FLIPPER_CLOUD_TOKEN" => "from_env" do
-      instance = described_class.new(required_options.reject { |k, v| k == :token })
-      expect(instance.token).to eq("from_env")
-    end
+    ENV["FLIPPER_CLOUD_TOKEN"] = "from_env"
+    instance = described_class.new(required_options.reject { |k, v| k == :token })
+    expect(instance.token).to eq("from_env")
   end
 
   it "can set instrumenter" do
@@ -30,10 +29,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set read_timeout from ENV var" do
-    with_env "FLIPPER_CLOUD_READ_TIMEOUT" => "9" do
-      instance = described_class.new(required_options.reject { |k, v| k == :read_timeout })
-      expect(instance.read_timeout).to eq(9)
-    end
+    ENV["FLIPPER_CLOUD_READ_TIMEOUT"] = "9"
+    instance = described_class.new(required_options.reject { |k, v| k == :read_timeout })
+    expect(instance.read_timeout).to eq(9)
   end
 
   it "can set open_timeout" do
@@ -42,10 +40,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set open_timeout from ENV var" do
-    with_env "FLIPPER_CLOUD_OPEN_TIMEOUT" => "9" do
-      instance = described_class.new(required_options.reject { |k, v| k == :open_timeout })
-      expect(instance.open_timeout).to eq(9)
-    end
+    ENV["FLIPPER_CLOUD_OPEN_TIMEOUT"] = "9"
+    instance = described_class.new(required_options.reject { |k, v| k == :open_timeout })
+    expect(instance.open_timeout).to eq(9)
   end
 
   it "can set write_timeout" do
@@ -54,10 +51,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set write_timeout from ENV var" do
-    with_env "FLIPPER_CLOUD_WRITE_TIMEOUT" => "9" do
-      instance = described_class.new(required_options.reject { |k, v| k == :write_timeout })
-      expect(instance.write_timeout).to eq(9)
-    end
+    ENV["FLIPPER_CLOUD_WRITE_TIMEOUT"] = "9"
+    instance = described_class.new(required_options.reject { |k, v| k == :write_timeout })
+    expect(instance.write_timeout).to eq(9)
   end
 
   it "can set sync_interval" do
@@ -66,10 +62,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set sync_interval from ENV var" do
-    with_env "FLIPPER_CLOUD_SYNC_INTERVAL" => "15" do
-      instance = described_class.new(required_options.reject { |k, v| k == :sync_interval })
-      expect(instance.sync_interval).to eq(15)
-    end
+    ENV["FLIPPER_CLOUD_SYNC_INTERVAL"] = "15"
+    instance = described_class.new(required_options.reject { |k, v| k == :sync_interval })
+    expect(instance.sync_interval).to eq(15)
   end
 
   it "passes sync_interval into sync adapter" do
@@ -87,10 +82,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "defaults debug_output to STDOUT if FLIPPER_CLOUD_DEBUG_OUTPUT_STDOUT set to true" do
-    with_env "FLIPPER_CLOUD_DEBUG_OUTPUT_STDOUT" => "true" do
-      instance = described_class.new(required_options)
+    ENV["FLIPPER_CLOUD_DEBUG_OUTPUT_STDOUT"] = "true"
+    instance = described_class.new(required_options)
     expect(instance.debug_output).to eq(STDOUT)
-    end
   end
 
   it "defaults adapter block" do
@@ -128,10 +122,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can override URL using ENV var" do
-    with_env "FLIPPER_CLOUD_URL" => "https://example.com" do
-      instance = described_class.new(required_options.reject { |k, v| k == :url })
-      expect(instance.url).to eq("https://example.com")
-    end
+    ENV["FLIPPER_CLOUD_URL"] = "https://example.com"
+    instance = described_class.new(required_options.reject { |k, v| k == :url })
+    expect(instance.url).to eq("https://example.com")
   end
 
   it "defaults sync_method to :poll" do
@@ -150,12 +143,11 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "sets sync_method to :webhook if FLIPPER_CLOUD_SYNC_SECRET set" do
-    with_env "FLIPPER_CLOUD_SYNC_SECRET" => "abc" do
-      instance = described_class.new(required_options)
+    ENV["FLIPPER_CLOUD_SYNC_SECRET"] = "abc"
+    instance = described_class.new(required_options)
 
-      expect(instance.sync_method).to eq(:webhook)
-      expect(instance.adapter).to be_instance_of(Flipper::Adapters::DualWrite)
-    end
+    expect(instance.sync_method).to eq(:webhook)
+    expect(instance.adapter).to be_instance_of(Flipper::Adapters::DualWrite)
   end
 
   it "can set sync_secret" do
@@ -164,10 +156,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can override sync_secret using ENV var" do
-    with_env "FLIPPER_CLOUD_SYNC_SECRET" => "from_env" do
-      instance = described_class.new(required_options.reject { |k, v| k == :sync_secret })
-      expect(instance.sync_secret).to eq("from_env")
-    end
+    ENV["FLIPPER_CLOUD_SYNC_SECRET"] = "from_env"
+    instance = described_class.new(required_options.reject { |k, v| k == :sync_secret })
+    expect(instance.sync_secret).to eq("from_env")
   end
 
   it "can sync with cloud" do

data/spec/flipper/cloud/telemetry/backoff_policy_spec.rb

@@ -49,19 +49,18 @@ RSpec.describe Flipper::Cloud::Telemetry::BackoffPolicy do
     end
 
     it "from env" do
-      env = {
+      ENV.update(
         "FLIPPER_BACKOFF_MIN_TIMEOUT_MS" => "1000",
         "FLIPPER_BACKOFF_MAX_TIMEOUT_MS" => "2000",
         "FLIPPER_BACKOFF_MULTIPLIER" => "1.9",
         "FLIPPER_BACKOFF_RANDOMIZATION_FACTOR" => "0.1",
-      }
-      with_env env do
-        policy = described_class.new
-        expect(policy.min_timeout_ms).to eq(1000)
-        expect(policy.max_timeout_ms).to eq(2000)
-        expect(policy.multiplier).to eq(1.9)
-        expect(policy.randomization_factor).to eq(0.1)
-      end
+      )
+
+      policy = described_class.new
+      expect(policy.min_timeout_ms).to eq(1000)
+      expect(policy.max_timeout_ms).to eq(2000)
+      expect(policy.multiplier).to eq(1.9)
+      expect(policy.randomization_factor).to eq(0.1)
     end
   end
 

data/spec/flipper/cloud_spec.rb

@@ -55,9 +55,8 @@ RSpec.describe Flipper::Cloud do
   end
 
   it 'can initialize with no token explicitly provided' do
-    with_env 'FLIPPER_CLOUD_TOKEN' => 'asdf' do
-      expect(described_class.new).to be_instance_of(Flipper::Cloud::DSL)
-    end
+    ENV['FLIPPER_CLOUD_TOKEN'] = 'asdf'
+    expect(described_class.new).to be_instance_of(Flipper::Cloud::DSL)
   end
 
   it 'can set instrumenter' do

data/spec/flipper/engine_spec.rb

@@ -33,28 +33,25 @@ RSpec.describe Flipper::Engine do
     let(:adapter) { Flipper.adapter.adapter }
 
     it 'can set strict=true from ENV' do
-      with_env 'FLIPPER_STRICT' => 'true' do
-        subject
-        expect(config.strict).to eq(:raise)
-        expect(adapter).to be_instance_of(Flipper::Adapters::Strict)
-      end
+      ENV['FLIPPER_STRICT'] = 'true'
+      subject
+      expect(config.strict).to eq(:raise)
+      expect(adapter).to be_instance_of(Flipper::Adapters::Strict)
     end
 
     it 'can set strict=warn from ENV' do
-      with_env 'FLIPPER_STRICT' => 'warn' do
-        subject
-        expect(config.strict).to eq(:warn)
-        expect(adapter).to be_instance_of(Flipper::Adapters::Strict)
-        expect(adapter.handler).to be(:warn)
-      end
+      ENV['FLIPPER_STRICT'] = 'warn'
+      subject
+      expect(config.strict).to eq(:warn)
+      expect(adapter).to be_instance_of(Flipper::Adapters::Strict)
+      expect(adapter.handler).to be(:warn)
     end
 
     it 'can set strict=false from ENV' do
-      with_env 'FLIPPER_STRICT' => 'false' do
-        subject
-        expect(config.strict).to eq(false)
-        expect(adapter).to be_instance_of(Flipper::Adapters::Memory)
-      end
+      ENV['FLIPPER_STRICT'] = 'false'
+      subject
+      expect(config.strict).to eq(false)
+      expect(adapter).to be_instance_of(Flipper::Adapters::Memory)
     end
 
     [true, :raise, :warn].each do |value|
@@ -104,39 +101,34 @@ RSpec.describe Flipper::Engine do
     it_behaves_like 'config.strict'
 
     it 'can set env_key from ENV' do
-      with_env 'FLIPPER_ENV_KEY' => 'flopper' do
-        subject
-        expect(config.env_key).to eq('flopper')
-      end
+      ENV['FLIPPER_ENV_KEY'] = 'flopper'
+      subject
+      expect(config.env_key).to eq('flopper')
     end
 
     it 'can set memoize from ENV' do
-      with_env 'FLIPPER_MEMOIZE' => 'false' do
-        subject
-        expect(config.memoize).to eq(false)
-      end
+      ENV['FLIPPER_MEMOIZE'] = 'false'
+      subject
+      expect(config.memoize).to eq(false)
     end
 
     it 'can set preload from ENV' do
-      with_env 'FLIPPER_PRELOAD' => 'false' do
-        subject
-        expect(config.preload).to eq(false)
-      end
+      ENV['FLIPPER_PRELOAD'] = 'false'
+      subject
+      expect(config.preload).to eq(false)
     end
 
     it 'can set instrumenter from ENV' do
       stub_const('My::Cool::Instrumenter', Class.new)
-      with_env 'FLIPPER_INSTRUMENTER' => 'My::Cool::Instrumenter' do
-        subject
-        expect(config.instrumenter).to eq(My::Cool::Instrumenter)
-      end
+      ENV['FLIPPER_INSTRUMENTER'] = 'My::Cool::Instrumenter'
+      subject
+      expect(config.instrumenter).to eq(My::Cool::Instrumenter)
     end
 
     it 'can set log from ENV' do
-      with_env 'FLIPPER_LOG' => 'false' do
-        subject
-        expect(config.log).to eq(false)
-      end
+      ENV['FLIPPER_LOG'] = 'false'
+      subject
+      expect(config.log).to eq(false)
     end
 
     it 'sets defaults' do
@@ -220,10 +212,8 @@ RSpec.describe Flipper::Engine do
   end
 
   context 'with cloud' do
-    around do |example|
-      with_env "FLIPPER_CLOUD_TOKEN" => "test-token" do
-        example.run
-      end
+    before do
+      ENV["FLIPPER_CLOUD_TOKEN"] = "test-token"
     end
 
     # App for Rack::Test
@@ -248,10 +238,8 @@ RSpec.describe Flipper::Engine do
     end
 
     context "with CLOUD_SYNC_SECRET" do
-      around do |example|
-        with_env "FLIPPER_CLOUD_SYNC_SECRET" => "test-secret" do
-          example.run
-        end
+      before do
+        ENV["FLIPPER_CLOUD_SYNC_SECRET"] = "test-secret"
       end
 
       let(:request_body) do
@@ -296,10 +284,9 @@ RSpec.describe Flipper::Engine do
 
     context "without FLIPPER_CLOUD_TOKEN" do
       it "gracefully skips configuring webhook app" do
-        with_env "FLIPPER_CLOUD_TOKEN" => nil do
-          application.initialize!
-          expect(Flipper.instance).to be_a(Flipper::DSL)
-        end
+        ENV["FLIPPER_CLOUD_TOKEN"] = nil
+        application.initialize!
+        expect(Flipper.instance).to be_a(Flipper::DSL)
 
         post "/_flipper"
         expect(last_response.status).to eq(404)

data/test_rails/system/test_help_test.rb

@@ -29,10 +29,15 @@ end
 
 class TestHelpTest < ActionDispatch::SystemTestCase
   # Any driver that runs the app in a separate thread will test what we want here.
-  driven_by :cuprite
+  driven_by :cuprite, options: { process_timeout: 30 }
 
-  # Ensure this test uses this app instance
-  setup { Rails.application = TestApp.instance }
+  setup do
+    # Reconfigure Flipper since other tests change the adapter.
+    flipper_configure
+
+    # Ensure this test uses this app instance
+    Rails.application = TestApp.instance
+  end
 
   test "configures a shared adapter between tests and app" do
     Flipper.disable(:test)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - John Nunemaker
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -286,7 +286,6 @@ files:
 - spec/flipper_spec.rb
 - spec/spec_helper.rb
 - spec/support/actor_names.yml
-- spec/support/climate_control.rb
 - spec/support/descriptions.yml
 - spec/support/fake_backoff_policy.rb
 - spec/support/fake_udp_socket.rb
@@ -307,7 +306,7 @@ metadata:
   homepage_uri: https://www.flippercloud.io
   source_code_uri: https://github.com/flippercloud/flipper
   bug_tracker_uri: https://github.com/flippercloud/flipper/issues
-  changelog_uri: https://github.com/flippercloud/flipper/releases/tag/v1.2.1
+  changelog_uri: https://github.com/flippercloud/flipper/releases/tag/v1.2.2
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -421,7 +420,6 @@ test_files:
 - spec/flipper_spec.rb
 - spec/spec_helper.rb
 - spec/support/actor_names.yml
-- spec/support/climate_control.rb
 - spec/support/descriptions.yml
 - spec/support/fake_backoff_policy.rb
 - spec/support/fake_udp_socket.rb

data/spec/support/climate_control.rb

@@ -1,7 +0,0 @@
-require 'climate_control'
-
-RSpec.configure do |config|
-  def with_env(options = {}, &block)
-    ClimateControl.modify(options, &block)
-  end
-end