flipper 0.26.0.rc1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b6c4a5c4ef29f126e9a08cc7fc7c70be9831b179dfc55486b88b8c5da5fdf44
-  data.tar.gz: aab15578901fcab2b3717813aa37d3cc057554eea3d442f264f85707d94310f9
+  metadata.gz: e5edb0409042f8d4d5905b8d526fd1d240a75dbee2d947b8ae4adae0c534af5f
+  data.tar.gz: 6bc01d5f7c0ee5f3d64d30faaa599b155d6220e249006d2ead7168bc47938202
 SHA512:
-  metadata.gz: 79989c8d6149b13b6c960878d4ac701f98f5e3da9b44a567092a4ace82350ec8ccffcd7e9c9ea2619a2a2508b6a392e99c05b14ab14b59b5a0b3a58b4f211150
-  data.tar.gz: 5192a0b9e1bebc39a28503861ba4eb35a05010a1841595e1282437c7d0694e3eccd02f215fbc6928b228948c6a02c8e9d26f85a5e23ae271fd0b32bc84bf6b53
+  metadata.gz: 60fee2e4a0d97a26b7403736b4422c0e69a0e9e452469e3f29e7af684001c38f2c957acdfa3f8f0554315d021a7e7091bb40898247e45d4658b14b31bc1de22f
+  data.tar.gz: bf45e695be511513be967bffd75c4e48d3af0f05b05264ee3b13a9df8bba8af929ccbf6b7a1f05c6c3a7d5476ceb757e3dda852f8e42b745bf7171f42538fb14

data/Changelog.md

@@ -2,9 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
-## 0.26.0.rc1
+## 0.26.0
 
 * Cloud Background Polling (https://github.com/jnunemaker/flipper/pull/682)
+* Changed default branch from master to main
+* Allow configuring railtie via ENV vars (https://github.com/jnunemaker/flipper/pull/681)
+* flipper-ui: Fix issue preventing feature flags being enabled when confirm_fully_enable is on and feature_removal_enabled is off (https://github.com/jnunemaker/flipper/pull/680)
 
 ## 0.25.4
 

data/Rakefile

@@ -18,7 +18,7 @@ end
 desc 'Tags version, pushes to remote, and pushes gem'
 task release: :build do
   sh 'git', 'tag', "v#{Flipper::VERSION}"
-  sh 'git push origin master'
+  sh 'git push origin main'
   sh "git push origin v#{Flipper::VERSION}"
   puts "\nWhat OTP code should be used?"
   otp_code = STDIN.gets.chomp

data/lib/flipper/adapters/poll/poller.rb

@@ -7,9 +7,7 @@ module Flipper
   module Adapters
     class Poll
       class Poller
-        PREFIX = "[flipper http async poll adapter]".freeze
-
-        attr_reader :thread, :pid, :mutex, :logger, :interval, :last_synced_at
+        attr_reader :thread, :pid, :mutex, :interval, :last_synced_at
 
         def self.instances
           @instances ||= Concurrent::Map.new
@@ -21,7 +19,7 @@ module Flipper
         end
 
         def self.reset
-          instances.clear
+          instances.each {|_,poller| poller.stop }.clear
         end
 
         def initialize(options = {})
@@ -29,14 +27,14 @@ module Flipper
           @pid = Process.pid
           @mutex = Mutex.new
           @adapter = Memory.new
+          @instrumenter = options.fetch(:instrumenter, Instrumenters::Noop)
           @remote_adapter = options.fetch(:remote_adapter)
-          @logger = options.fetch(:logger) { Logger.new(STDOUT) }
           @interval = options.fetch(:interval, 10).to_f
           @lock = Concurrent::ReadWriteLock.new
           @last_synced_at = Concurrent::AtomicFixnum.new(0)
 
           if @interval < 1
-            warn "#{PREFIX} interval must be greater than or equal to 1 but was #{@interval}. Setting @interval to 1."
+            warn "Flipper::Cloud poll interval must be greater than or equal to 1 but was #{@interval}. Setting @interval to 1."
             @interval = 1
           end
 
@@ -57,7 +55,9 @@ module Flipper
         end
 
         def stop
-          logger.debug { "#{PREFIX} Stopping worker" }
+          @instrumenter.instrument("poller.#{InstrumentationNamespace}", {
+            operation: :stop,
+          })
           @thread&.kill
         end
 
@@ -66,15 +66,15 @@ module Flipper
             sleep jitter
             start = Concurrent.monotonic_time
             begin
-              logger.debug { "#{PREFIX} Making a checkity checkity" }
-
-              adapter = Memory.new
-              adapter.import(@remote_adapter)
+              @instrumenter.instrument("poller.#{InstrumentationNamespace}", operation: :poll) do
+                adapter = Memory.new
+                adapter.import(@remote_adapter)
 
-              @lock.with_write_lock { @adapter.import(adapter) }
-              @last_synced_at.update { |time| Concurrent.monotonic_time }
+                @lock.with_write_lock { @adapter.import(adapter) }
+                @last_synced_at.update { |time| Concurrent.monotonic_time }
+              end
             rescue => exception
-              logger.debug { "#{PREFIX} Exception: #{exception.inspect}" }
+              # you can instrument these using poller.flipper
             end
 
             sleep_interval = interval - (Concurrent.monotonic_time - start)
@@ -103,7 +103,9 @@ module Flipper
           begin
             return if thread_alive?
             @thread = Thread.new { run }
-            logger.debug { "#{PREFIX} Worker thread [#{@thread.object_id}] started" }
+            @instrumenter.instrument("poller.#{InstrumentationNamespace}", {
+              operation: :thread_start,
+            })
           ensure
             mutex.unlock
           end

data/lib/flipper/metadata.rb

@@ -1,5 +1,5 @@
 module Flipper
   METADATA = {
-    'changelog_uri' => 'https://github.com/jnunemaker/flipper/blob/master/Changelog.md',
+    'changelog_uri' => 'https://github.com/jnunemaker/flipper/blob/main/Changelog.md',
   }.freeze
 end

data/lib/flipper/railtie.rb

@@ -2,11 +2,11 @@ module Flipper
   class Railtie < Rails::Railtie
     config.before_configuration do
       config.flipper = ActiveSupport::OrderedOptions.new.update(
-        env_key: "flipper",
-        memoize: true,
-        preload: true,
-        instrumenter: ActiveSupport::Notifications,
-        log: true
+        env_key: ENV.fetch('FLIPPER_ENV_KEY', 'flipper'),
+        memoize: ENV.fetch('FLIPPER_MEMOIZE', 'true').casecmp('true').zero?,
+        preload: ENV.fetch('FLIPPER_PRELOAD', 'true').casecmp('true').zero?,
+        instrumenter: ENV.fetch('FLIPPER_INSTRUMENTER', 'ActiveSupport::Notifications').constantize,
+        log: ENV.fetch('FLIPPER_LOG', 'true').casecmp('true').zero?
       )
     end
 

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.26.0.rc1'.freeze
+  VERSION = '0.26.0'.freeze
 end

data/spec/flipper/railtie_spec.rb

@@ -18,6 +18,42 @@ RSpec.describe Flipper::Railtie do
   subject { application.initialize! }
 
   describe 'initializers' do
+    it 'can set env_key from ENV' do
+      ENV['FLIPPER_ENV_KEY'] = 'flopper'
+
+      subject
+      expect(config.env_key).to eq('flopper')
+    end
+
+    it 'can set memoize from ENV' do
+      ENV['FLIPPER_MEMOIZE'] = 'false'
+
+      subject
+      expect(config.memoize).to eq(false)
+    end
+
+    it 'can set preload from ENV' do
+      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)
+      ENV['FLIPPER_INSTRUMENTER'] = 'My::Cool::Instrumenter'
+
+      subject
+      expect(config.instrumenter).to eq(My::Cool::Instrumenter)
+    end
+
+    it 'can set log from ENV' do
+      ENV['FLIPPER_LOG'] = 'false'
+
+      subject
+      expect(config.log).to eq(false)
+    end
+
     it 'sets defaults' do
       subject # initialize
       expect(config.env_key).to eq("flipper")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper
 version: !ruby/object:Gem::Version
-  version: 0.26.0.rc1
+  version: 0.26.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -183,7 +183,7 @@ homepage: https://github.com/jnunemaker/flipper
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://github.com/jnunemaker/flipper/blob/master/Changelog.md
+  changelog_uri: https://github.com/jnunemaker/flipper/blob/main/Changelog.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -195,9 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: