flipper 0.25.3 → 0.26.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 867d803ee2a6d83e2b779ec0396d3e41eba732273ac8cb60fa6188628018449e
-  data.tar.gz: 5330daddefc9c04dc728119d7f0c8d8f4e3a2054714e00c7e8c778d11433b722
+  metadata.gz: 5b6c4a5c4ef29f126e9a08cc7fc7c70be9831b179dfc55486b88b8c5da5fdf44
+  data.tar.gz: aab15578901fcab2b3717813aa37d3cc057554eea3d442f264f85707d94310f9
 SHA512:
-  metadata.gz: ee465d3f3bf14ce1c7ece8f305c2f77acaed940a2f48013c0c46ba808f915805690f1b205a8f447b864a14f95ba51b8cc8f219c4ce6d01d54c1e22e2b7c88b39
-  data.tar.gz: 991001108a2e480752132b7cdab8d85778ad6fb783bd8b39650abbeafaa37a118ebcf75c9ab6cac081f7730c53ea4a0f45cd5959956e5e0850de56e06a1f4167
+  metadata.gz: 79989c8d6149b13b6c960878d4ac701f98f5e3da9b44a567092a4ace82350ec8ccffcd7e9c9ea2619a2a2508b6a392e99c05b14ab14b59b5a0b3a58b4f211150
+  data.tar.gz: 5192a0b9e1bebc39a28503861ba4eb35a05010a1841595e1282437c7d0694e3eccd02f215fbc6928b228948c6a02c8e9d26f85a5e23ae271fd0b32bc84bf6b53

data/Changelog.md

@@ -1,3 +1,15 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## 0.26.0.rc1
+
+* Cloud Background Polling (https://github.com/jnunemaker/flipper/pull/682)
+
+## 0.25.4
+
+* Added read_only UI config option (https://github.com/jnunemaker/flipper/pull/679)
+
 ## 0.25.3
 
 * Added configurable confirm warning for fully enabling a feature (https://github.com/jnunemaker/flipper/pull/665)

data/Rakefile

@@ -20,7 +20,9 @@ task release: :build do
   sh 'git', 'tag', "v#{Flipper::VERSION}"
   sh 'git push origin master'
   sh "git push origin v#{Flipper::VERSION}"
-  sh 'ls pkg/*.gem | xargs -n 1 gem push'
+  puts "\nWhat OTP code should be used?"
+  otp_code = STDIN.gets.chomp
+  sh "ls pkg/*.gem | xargs -n 1 gem push --otp #{otp_code}"
 end
 
 require 'rspec/core/rake_task'

data/flipper.gemspec

@@ -35,4 +35,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Flipper::VERSION
   gem.metadata      = Flipper::METADATA
+
+  gem.add_dependency 'concurrent-ruby', '< 2'
 end

data/lib/flipper/adapters/dual_write.rb

@@ -4,7 +4,7 @@ module Flipper
       include ::Flipper::Adapter
 
       # Public: The name of the adapter.
-      attr_reader :name
+      attr_reader :name, :local, :remote
 
       # Public: Build a new sync instance.
       #

data/lib/flipper/adapters/http/client.rb

@@ -14,6 +14,10 @@ module Flipper
 
         HTTPS_SCHEME = "https".freeze
 
+        attr_reader :uri, :headers
+        attr_reader :basic_auth_username, :basic_auth_password
+        attr_reader :read_timeout, :open_timeout, :write_timeout, :max_retries, :debug_output
+
         def initialize(options = {})
           @uri = URI(options.fetch(:url))
           @headers = DEFAULT_HEADERS.merge(options[:headers] || {})
@@ -22,6 +26,7 @@ module Flipper
           @read_timeout = options[:read_timeout]
           @open_timeout = options[:open_timeout]
           @write_timeout = options[:write_timeout]
+          @max_retries = options.key?(:max_retries) ? options[:max_retries] : 0
           @debug_output = options[:debug_output]
         end
 
@@ -58,7 +63,8 @@ module Flipper
           http = Net::HTTP.new(uri.host, uri.port)
           http.read_timeout = @read_timeout if @read_timeout
           http.open_timeout = @open_timeout if @open_timeout
-          apply_write_timeout(http)
+          http.max_retries = @max_retries if @max_retries
+          http.write_timeout = @write_timeout if @write_timeout
           http.set_debug_output(@debug_output) if @debug_output
 
           if uri.scheme == HTTPS_SCHEME
@@ -91,16 +97,6 @@ module Flipper
 
           request
         end
-
-        def apply_write_timeout(http)
-          if @write_timeout
-            if RUBY_VERSION >= '2.6.0'
-              http.write_timeout = @write_timeout
-            else
-              Kernel.warn("Warning: option :write_timeout requires Ruby version 2.6.0 or later")
-            end
-          end
-        end
       end
     end
   end

data/lib/flipper/adapters/http.rb

@@ -10,7 +10,7 @@ module Flipper
     class Http
       include Flipper::Adapter
 
-      attr_reader :name
+      attr_reader :name, :client
 
       def initialize(options = {})
         @client = Client.new(url: options.fetch(:url),
@@ -19,6 +19,8 @@ module Flipper
                              basic_auth_password: options[:basic_auth_password],
                              read_timeout: options[:read_timeout],
                              open_timeout: options[:open_timeout],
+                             write_timeout: options[:write_timeout],
+                             max_retries: options[:max_retries],
                              debug_output: options[:debug_output])
         @name = :http
       end

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

@@ -0,0 +1,123 @@
+require 'logger'
+require 'concurrent/atomic/read_write_lock'
+require 'concurrent/utility/monotonic_time'
+require 'concurrent/map'
+
+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
+
+        def self.instances
+          @instances ||= Concurrent::Map.new
+        end
+        private_class_method :instances
+
+        def self.get(key, options = {})
+          instances.compute_if_absent(key) { new(options) }
+        end
+
+        def self.reset
+          instances.clear
+        end
+
+        def initialize(options = {})
+          @thread = nil
+          @pid = Process.pid
+          @mutex = Mutex.new
+          @adapter = Memory.new
+          @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."
+            @interval = 1
+          end
+
+          @start_automatically = options.fetch(:start_automatically, true)
+
+          if options.fetch(:shutdown_automatically, true)
+            at_exit { stop }
+          end
+        end
+
+        def adapter
+          @lock.with_read_lock { Memory.new(@adapter.get_all.dup) }
+        end
+
+        def start
+          reset if forked?
+          ensure_worker_running
+        end
+
+        def stop
+          logger.debug { "#{PREFIX} Stopping worker" }
+          @thread&.kill
+        end
+
+        def run
+          loop do
+            sleep jitter
+            start = Concurrent.monotonic_time
+            begin
+              logger.debug { "#{PREFIX} Making a checkity checkity" }
+
+              adapter = Memory.new
+              adapter.import(@remote_adapter)
+
+              @lock.with_write_lock { @adapter.import(adapter) }
+              @last_synced_at.update { |time| Concurrent.monotonic_time }
+            rescue => exception
+              logger.debug { "#{PREFIX} Exception: #{exception.inspect}" }
+            end
+
+            sleep_interval = interval - (Concurrent.monotonic_time - start)
+            sleep sleep_interval if sleep_interval.positive?
+          end
+        end
+
+        private
+
+        def jitter
+          rand
+        end
+
+        def forked?
+          pid != Process.pid
+        end
+
+        def ensure_worker_running
+          # Return early if thread is alive and avoid the mutex lock and unlock.
+          return if thread_alive?
+
+          # If another thread is starting worker thread, then return early so this
+          # thread can enqueue and move on with life.
+          return unless mutex.try_lock
+
+          begin
+            return if thread_alive?
+            @thread = Thread.new { run }
+            logger.debug { "#{PREFIX} Worker thread [#{@thread.object_id}] started" }
+          ensure
+            mutex.unlock
+          end
+        end
+
+        def thread_alive?
+          @thread && @thread.alive?
+        end
+
+        def reset
+          @pid = Process.pid
+          mutex.unlock if mutex.locked?
+        end
+      end
+    end
+  end
+end

data/lib/flipper/adapters/poll.rb

@@ -0,0 +1,35 @@
+require 'flipper/adapters/sync/synchronizer'
+
+module Flipper
+  module Adapters
+    class Poll
+      extend Forwardable
+      include ::Flipper::Adapter
+
+      # Public: The name of the adapter.
+      attr_reader :name, :adapter, :poller
+
+      def_delegators :synced_adapter, :features, :get, :get_multi, :get_all, :add, :remove, :clear, :enable, :disable
+
+      def initialize(poller, adapter)
+        @name = :poll
+        @adapter = adapter
+        @poller = poller
+        @last_synced_at = 0
+        @poller.start
+      end
+
+      private
+
+      def synced_adapter
+        @poller.start
+        poller_last_synced_at = @poller.last_synced_at.value
+        if poller_last_synced_at > @last_synced_at
+          Flipper::Adapters::Sync::Synchronizer.new(@adapter, @poller.adapter).call
+          @last_synced_at = poller_last_synced_at
+        end
+        @adapter
+      end
+    end
+  end
+end

data/lib/flipper/version.rb

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

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ Dir[FlipperRoot.join('spec/support/**/*.rb')].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.before(:example) do
-    Flipper::Cloud::Registry.default.clear if defined?(Flipper::Cloud)
+    Flipper::Adapters::Poll::Poller.reset if defined?(Flipper::Adapters::Poll::Poller)
     Flipper.unregister_groups
     Flipper.configuration = nil
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: flipper
 version: !ruby/object:Gem::Version
-  version: 0.25.3
+  version: 0.26.0.rc1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
-dependencies: []
+date: 2022-11-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description:
 email:
 - nunemaker@gmail.com
@@ -68,6 +82,8 @@ files:
 - lib/flipper/adapters/memoizable.rb
 - lib/flipper/adapters/memory.rb
 - lib/flipper/adapters/operation_logger.rb
+- lib/flipper/adapters/poll.rb
+- lib/flipper/adapters/poll/poller.rb
 - lib/flipper/adapters/pstore.rb
 - lib/flipper/adapters/read_only.rb
 - lib/flipper/adapters/sync.rb
@@ -179,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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key: