flipper-cloud 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35dc166068996854a78fc08810a942999539735d61f8f0215d6c10101a57d23d
-  data.tar.gz: bdccf48ff9d058fc20ded13e1c64d7f64964c2daad12fe0ccc11b8aafcd2d0ab
+  metadata.gz: ad99886efa608844beb4f7efdd5603ff60280c2ac5ca871a8de2e5fcbb2459f5
+  data.tar.gz: f5f162782dd28d9d5e55616030202eb47899438f700d12ec7de218bc9bdba353
 SHA512:
-  metadata.gz: a2f6190b1ff9a30ce518a0044323c55a9997db8cf3ec383c4d425ce5eb02121e99a355ca370928df1b9a23ea5add521133fb30a051b56a93b8ce088707d1f2a3
-  data.tar.gz: 132a9a42b22803fa362b85acfd1c741519ce7eff91d5443bf47b8d0d869cd29d6a161ded0e15ef80fa7a642d46b948a454a0c633a72ff5cbbc22949dd2459622
+  metadata.gz: 44632f5b5c82b6c72c447716f8946768c03d2388c60fbfcdc07b43ee79389f094d49da3c1a1b5c4f34b4a1172e72b1dd2dbc67128838210f9cb3fb0dace41193
+  data.tar.gz: d6968fb80d7cdc47ebb5bb692780e6eee715faf845644302c28cc5f86217c19c939df18456382e5e614d9a72f39d3793298d054aa7d8d076d143ae3393eee8fc

data/examples/cloud/basic.rb

@@ -1,5 +1,5 @@
 # Usage (from the repo root):
-#   env TOKEN=<token> bundle exec ruby examples/cloud/basic.rb
+# env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/basic.rb
 require 'pathname'
 require 'logger'
 root_path = Pathname(__FILE__).dirname.join('..').expand_path
@@ -7,7 +7,7 @@ lib_path  = root_path.join('lib')
 $:.unshift(lib_path)
 
 require 'flipper/cloud'
-flipper = Flipper::Cloud.new(ENV.fetch('TOKEN'))
+flipper = Flipper::Cloud.new
 
 flipper[:stats].enable
 

data/examples/cloud/cached_in_memory.rb

@@ -1,3 +1,4 @@
+# env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/cached_in_memory.rb
 require File.expand_path('../../example_setup', __FILE__)
 
 require 'flipper/cloud'
@@ -5,12 +6,11 @@ require 'flipper/adapters/active_support_cache_store'
 require 'active_support/cache'
 require 'active_support/cache/memory_store'
 
-token = ENV.fetch("TOKEN") { abort "TOKEN environment variable not set." }
 feature_name = ENV.fetch("FEATURE") { "testing" }.to_sym
 
 Flipper.configure do |config|
   config.default do
-    Flipper::Cloud.new(token) do |cloud|
+    Flipper::Cloud.new do |cloud|
       cloud.debug_output = STDOUT
       cloud.adapter do |adapter|
         Flipper::Adapters::ActiveSupportCacheStore.new(adapter,

data/examples/cloud/import.rb

@@ -1,5 +1,5 @@
 # Usage (from the repo root):
-#   env TOKEN=<token> bundle exec ruby examples/cloud/basic.rb
+#   env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/import.rb
 require 'pathname'
 require 'logger'
 root_path = Pathname(__FILE__).dirname.join('..').expand_path
@@ -10,14 +10,14 @@ require 'flipper'
 require 'flipper/cloud'
 
 memory_adapter = Flipper::Adapters::Memory.new
-memory_flipper = Flipper.new(memory_adapter)
+flipper = Flipper.new(memory_adapter)
 
-memory_flipper.enable(:test)
-memory_flipper.enable(:search)
-memory_flipper.enable_actor(:stats, Flipper::Actor.new("jnunemaker"))
-memory_flipper.enable_percentage_of_time(:logging, 5)
+flipper.enable(:test)
+flipper.enable(:search)
+flipper.enable_actor(:stats, Flipper::Actor.new("jnunemaker"))
+flipper.enable_percentage_of_time(:logging, 5)
 
-flipper = Flipper::Cloud.new(ENV.fetch('TOKEN'))
+cloud = Flipper::Cloud.new
 
-# wipes cloud clean and makes it identical to memory flipper
-flipper.import(memory_flipper)
+# makes cloud identical to memory flipper
+cloud.import(flipper)

data/examples/cloud/local_adapter.rb

@@ -5,13 +5,13 @@
 # never raise. You could get a slow request every now and then if cloud is
 # unavailable, but we are hoping to fix that soon by doing the cloud update in a
 # background thread.
+# env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/local_adapter.rb
 require File.expand_path('../../example_setup', __FILE__)
 
 require 'logger'
 require 'flipper/cloud'
 require 'flipper/adapters/redis'
 
-token = ENV.fetch("TOKEN") { abort "TOKEN environment variable not set." }
 feature_name = ENV.fetch("FEATURE") { "testing" }.to_sym
 
 redis = Redis.new(logger: Logger.new(STDOUT))
@@ -19,7 +19,7 @@ redis.flushdb
 
 Flipper.configure do |config|
   config.default do
-    Flipper::Cloud.new(token) do |cloud|
+    Flipper::Cloud.new do |cloud|
       cloud.debug_output = STDOUT
       cloud.local_adapter = Flipper::Adapters::Redis.new(redis)
       cloud.sync_interval = 10

data/lib/flipper/cloud/configuration.rb

@@ -1,3 +1,4 @@
+require "socket"
 require "flipper/adapters/http"
 require "flipper/adapters/memory"
 require "flipper/adapters/dual_write"
@@ -153,6 +154,11 @@ module Flipper
           headers: {
             "Flipper-Cloud-Token" => @token,
             "Feature-Flipper-Token" => @token,
+            "Client-Lang" => "ruby",
+            "Client-Lang-Version" => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
+            "Client-Platform" => RUBY_PLATFORM,
+            "Client-Engine" => defined?(RUBY_ENGINE) ? RUBY_ENGINE : "",
+            "Client-Hostname" => Socket.gethostname,
           },
         })
       end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.20.1'.freeze
+  VERSION = '0.20.2'.freeze
 end

data/spec/flipper/cloud_spec.rb

@@ -114,4 +114,89 @@ RSpec.describe Flipper::Cloud do
       described_class.new('asdf', open_timeout: 1)
     end
   end
+
+  it 'can import' do
+    stub_request(:post, /www\.flippercloud\.io\/adapter\/features.*/).
+      with(headers: {
+          'Feature-Flipper-Token'=>'asdf',
+          'Flipper-Cloud-Token'=>'asdf',
+      }).to_return(status: 200, body: "{}", headers: {})
+
+    flipper = Flipper.new(Flipper::Adapters::Memory.new)
+
+    flipper.enable(:test)
+    flipper.enable(:search)
+    flipper.enable_actor(:stats, Flipper::Actor.new("jnunemaker"))
+    flipper.enable_percentage_of_time(:logging, 5)
+
+    cloud_flipper = Flipper::Cloud.new("asdf")
+
+    get_all = {
+      "logging" => {actors: Set.new, boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: "5"},
+      "search" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "stats" => {actors: Set["jnunemaker"], boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "test" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+    }
+
+    expect(flipper.adapter.get_all).to eq(get_all)
+    cloud_flipper.import(flipper)
+    expect(flipper.adapter.get_all).to eq(get_all)
+    expect(cloud_flipper.adapter.get_all).to eq(get_all)
+  end
+
+  it 'raises error for failure while importing' do
+    stub_request(:post, /www\.flippercloud\.io\/adapter\/features.*/).
+      with(headers: {
+          'Feature-Flipper-Token'=>'asdf',
+          'Flipper-Cloud-Token'=>'asdf',
+      }).to_return(status: 500, body: "{}")
+
+    flipper = Flipper.new(Flipper::Adapters::Memory.new)
+
+    flipper.enable(:test)
+    flipper.enable(:search)
+    flipper.enable_actor(:stats, Flipper::Actor.new("jnunemaker"))
+    flipper.enable_percentage_of_time(:logging, 5)
+
+    cloud_flipper = Flipper::Cloud.new("asdf")
+
+    get_all = {
+      "logging" => {actors: Set.new, boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: "5"},
+      "search" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "stats" => {actors: Set["jnunemaker"], boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "test" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+    }
+
+    expect(flipper.adapter.get_all).to eq(get_all)
+    expect { cloud_flipper.import(flipper) }.to raise_error(Flipper::Adapters::Http::Error)
+    expect(flipper.adapter.get_all).to eq(get_all)
+  end
+
+  it 'raises error for timeout while importing' do
+    stub_request(:post, /www\.flippercloud\.io\/adapter\/features.*/).
+      with(headers: {
+          'Feature-Flipper-Token'=>'asdf',
+          'Flipper-Cloud-Token'=>'asdf',
+      }).to_timeout
+
+    flipper = Flipper.new(Flipper::Adapters::Memory.new)
+
+    flipper.enable(:test)
+    flipper.enable(:search)
+    flipper.enable_actor(:stats, Flipper::Actor.new("jnunemaker"))
+    flipper.enable_percentage_of_time(:logging, 5)
+
+    cloud_flipper = Flipper::Cloud.new("asdf")
+
+    get_all = {
+      "logging" => {actors: Set.new, boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: "5"},
+      "search" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "stats" => {actors: Set["jnunemaker"], boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "test" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+    }
+
+    expect(flipper.adapter.get_all).to eq(get_all)
+    expect { cloud_flipper.import(flipper) }.to raise_error(Net::OpenTimeout)
+    expect(flipper.adapter.get_all).to eq(get_all)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-cloud
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.20.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.20.2
 description: 
 email:
 - nunemaker@gmail.com