litestream 0.11.0-x86_64-darwin → 0.11.1-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbab360a2b53a3c4db0a6283bd42afadc21b696c1ebff1ea9be305c1f292eb2a
-  data.tar.gz: 21b43d294c6517eb033cc0009f621226cdedc180bffe1de7123d14ef748abd26
+  metadata.gz: ea8c8b4ca2ce2a45c65b26751b768a65cebd624463f22d026b0fac55784dddc3
+  data.tar.gz: f7a2554185c15df60faaada4984f129e0f50c970ac342bc41b439fd16cfadee3
 SHA512:
-  metadata.gz: '020704796969169edecc2e259a685c04b32263ce279366a940e38cd47a6260ae74d7993d2fbf8fba7fee5ba8d54e8cc523a8a1922699e640851f7b13ebfda484'
-  data.tar.gz: 2271caf46835cd764a3a1f17230d6cd37e6e8da4b03b470137a4ccf348912f631a93785d0fcec3008504e83c41780c3982517b7aaa468fcde26dfa624e04df49
+  metadata.gz: 5b254af71960b2675a2b49b72b07e87b599b434bbca433c824f499a13c691bda00c5b26d89073cb680c2ca90a2a6ac98eb98e3fea1fbabd16406070e7b11c351
+  data.tar.gz: '0918a2ad620a4683531dd63f7b99d9d026a3749a1330d1eb9a2af6686ecc74ba3bef46f48119005fdea9be1f4b46848af1263d48d22ba56d343ce1971eb11f09'

data/app/controllers/litestream/application_controller.rb

@@ -3,7 +3,12 @@ module Litestream
     protect_from_forgery with: :exception
     around_action :force_english_locale!
 
-    http_basic_authenticate_with name: Litestream.username, password: Litestream.password if Litestream.password
+    if Litestream.password
+      http_basic_authenticate_with(
+        name: Litestream.username,
+        password: Litestream.password
+      )
+    end
 
     private
 

data/lib/litestream/commands.rb

@@ -118,11 +118,9 @@ module Litestream
       end
 
       def prepare(command, argv = {}, database = nil)
-        if Litestream.configuration
-          ENV["LITESTREAM_REPLICA_BUCKET"] ||= Litestream.configuration.replica_bucket
-          ENV["LITESTREAM_ACCESS_KEY_ID"] ||= Litestream.configuration.replica_key_id
-          ENV["LITESTREAM_SECRET_ACCESS_KEY"] ||= Litestream.configuration.replica_access_key
-        end
+        ENV["LITESTREAM_REPLICA_BUCKET"] ||= Litestream.replica_bucket
+        ENV["LITESTREAM_ACCESS_KEY_ID"] ||= Litestream.replica_key_id
+        ENV["LITESTREAM_SECRET_ACCESS_KEY"] ||= Litestream.replica_access_key
 
         args = {
           "--config" => Rails.root.join("config", "litestream.yml").to_s

data/lib/litestream/engine.rb

@@ -18,5 +18,9 @@ module Litestream
         Litestream.public_send(:"#{name}=", value)
       end
     end
+
+    initializer "deprecator" do |app|
+      app.deprecators[:litestream] = Litestream.deprecator
+    end
   end
 end

data/lib/litestream/generators/litestream/templates/initializer.rb

@@ -4,7 +4,7 @@
 # This allows you to configure Litestream using Rails encrypted credentials,
 # or some other mechanism where the values are only avaialble at runtime.
 
-Litestream.configure do |config|
+Rails.application.configure do
   # An example of using Rails encrypted credentials to configure Litestream.
   # litestream_credentials = Rails.application.credentials.litestream
 
@@ -19,15 +19,15 @@ Litestream.configure do |config|
   # any SFTP server.
   # In this example, we are using Rails encrypted credentials to store the URL to
   # our storage provider bucket.
-  # config.replica_bucket = litestream_credentials.replica_bucket
+  # config.litestream.replica_bucket = litestream_credentials&.replica_bucket
 
   # Replica-specific authentication key.
   # Litestream needs authentication credentials to access your storage provider bucket.
   # In this example, we are using Rails encrypted credentials to store the access key ID.
-  # config.replica_key_id = litestream_credentials.replica_key_id
+  # config.litestream.replica_key_id = litestream_credentials&.replica_key_id
 
   # Replica-specific secret key.
   # Litestream needs authentication credentials to access your storage provider bucket.
   # In this example, we are using Rails encrypted credentials to store the secret access key.
-  # config.replica_access_key = litestream_credentials.replica_access_key
+  # config.litestream.replica_access_key = litestream_credentials&.replica_access_key
 end

data/lib/litestream/version.rb

@@ -1,3 +1,3 @@
 module Litestream
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/lib/litestream.rb

@@ -3,11 +3,25 @@
 require "sqlite3"
 
 module Litestream
+  VerificationFailure = Class.new(StandardError)
+
   class << self
-    attr_accessor :configuration
+    attr_writer :configuration
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    def deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new("0.12.0", "Litestream")
+    end
   end
 
   def self.configure
+    deprecator.warn(
+      'Configuring Litestream via Litestream.configure is deprecated. Use Rails.application.configure { config.litestream.* = ... } instead.',
+      caller
+    )
     self.configuration ||= Configuration.new
     yield(configuration)
   end
@@ -19,11 +33,7 @@ module Litestream
     end
   end
 
-  VerificationFailure = Class.new(StandardError)
-
-  mattr_writer :username
-  mattr_writer :password
-  mattr_writer :queue
+  mattr_writer :username, :password, :queue, :replica_bucket, :replica_key_id, :replica_access_key
 
   class << self
     def verify!(database_path)
@@ -55,8 +65,6 @@ module Litestream
       @username ||= ENV["LITESTREAM_USERNAME"] || @@username || "litestream"
     end
 
-    # use method instead of attr_accessor to ensure
-    # this works if variable set after Litestream is loaded
     def password
       @password ||= ENV["LITESTREAM_PASSWORD"] || @@password
     end
@@ -65,6 +73,18 @@ module Litestream
       @queue ||= ENV["LITESTREAM_QUEUE"] || @@queue || "default"
     end
 
+    def replica_bucket
+      @replica_bucket ||= @@replica_bucket || configuration.replica_bucket
+    end
+
+    def replica_key_id
+      @replica_key_id ||= @@replica_key_id || configuration.replica_key_id
+    end
+
+    def replica_access_key
+      @replica_access_key ||= @@replica_access_key || configuration.replica_access_key
+    end
+
     def replicate_process
       info = {}
       if !`which systemctl`.empty?

data/lib/tasks/litestream_tasks.rake

@@ -1,14 +1,9 @@
 namespace :litestream do
   desc "Print the ENV variables needed for the Litestream config file"
   task env: :environment do
-    if Litestream.configuration.nil?
-      warn "You have not configured the Litestream gem with any values to generate ENV variables"
-      next
-    end
-
-    puts "LITESTREAM_REPLICA_BUCKET=#{Litestream.configuration.replica_bucket}"
-    puts "LITESTREAM_ACCESS_KEY_ID=#{Litestream.configuration.replica_key_id}"
-    puts "LITESTREAM_SECRET_ACCESS_KEY=#{Litestream.configuration.replica_access_key}"
+    puts "LITESTREAM_REPLICA_BUCKET=#{Litestream.replica_bucket}"
+    puts "LITESTREAM_ACCESS_KEY_ID=#{Litestream.replica_key_id}"
+    puts "LITESTREAM_SECRET_ACCESS_KEY=#{Litestream.replica_access_key}"
 
     true
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: litestream
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: x86_64-darwin
 authors:
 - Stephen Margheim
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logfmt
@@ -38,20 +38,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Integrate Litestream with the RubyGems infrastructure.