figaro 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a4b16b7aabf0f45581b9e38bbc91143a7754b53c
-  data.tar.gz: ac3ebd390b6558897caedf70588023c2f32d568d
+SHA256:
+  metadata.gz: bdaaa0a7cac3d362062d3d63ef74be9af676e302274f08fd43d443d85422927a
+  data.tar.gz: 05e57a8425d83a1d6eaf8f01cd9f4d037e1a2e4fe9e31284284496f0cd7947ac
 SHA512:
-  metadata.gz: d98407b51af7e1a3754c0e9c8508e022b92515b11112cc1d0632e446e7747386e968b52fea202b6ee34fbea3f4fa7cb6c61687eedf51a23d924cdb6bffe9c88b
-  data.tar.gz: 724b042e35ecceff47dccf0246cd73931dfc9fa663eda27f59e33205d82fabb8d674b34bc3ffb85a74630d8aee887420247111f8f7daa07d6d9edd2b2579d05e
+  metadata.gz: d7194d71d4b22877185bcd260b19f8d03101a051baa76712b8d56626c0418b2a60c5aceaf2b1731b3f496e9879b614e1970ce4fe3fe4dca4643b0ab2afb50a19
+  data.tar.gz: 2a3a0eeeef55d16d98a5ecff47d3da36a893d7ae074fb22e60c45a09305fdbceddb8ff9e5abe94e7f6823eb47eff0b9176625e22b87b5cfe63e598c3f46d4571

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [laserlemon]

data/.github/workflows/test.yml

@@ -0,0 +1,88 @@
+name: Test
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+    branches:
+    - main
+jobs:
+  test:
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
+    name: Test
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - gemfile: gemfiles/rails52.gemfile
+          ruby: "2.5"
+        - gemfile: gemfiles/rails52.gemfile
+          ruby: "2.6"
+        - gemfile: gemfiles/rails52.gemfile
+          ruby: "2.7"
+        - gemfile: gemfiles/rails60.gemfile
+          ruby: "2.5"
+        - gemfile: gemfiles/rails60.gemfile
+          ruby: "2.6"
+        - gemfile: gemfiles/rails60.gemfile
+          ruby: "2.7"
+        - gemfile: gemfiles/rails61.gemfile
+          ruby: "2.5"
+        - gemfile: gemfiles/rails61.gemfile
+          ruby: "2.6"
+        - gemfile: gemfiles/rails61.gemfile
+          ruby: "2.7"
+        - gemfile: gemfiles/rails61.gemfile
+          ruby: "3.0"
+        - gemfile: gemfiles/rails70.gemfile
+          ruby: "2.7"
+        - gemfile: gemfiles/rails70.gemfile
+          ruby: "3.0"
+        - gemfile: gemfiles/rails70.gemfile
+          ruby: "3.1"
+        - gemfile: gemfiles/rails70.gemfile
+          ruby: "3.2"
+        - gemfile: gemfiles/rails71.gemfile
+          ruby: "2.7"
+        - gemfile: gemfiles/rails71.gemfile
+          ruby: "3.0"
+        - gemfile: gemfiles/rails71.gemfile
+          ruby: "3.1"
+        - gemfile: gemfiles/rails71.gemfile
+          ruby: "3.2"
+        - gemfile: gemfiles/rails71.gemfile
+          ruby: "3.3"
+        - gemfile: gemfiles/rails72.gemfile
+          ruby: "3.1"
+        - gemfile: gemfiles/rails72.gemfile
+          ruby: "3.2"
+        - gemfile: gemfiles/rails72.gemfile
+          ruby: "3.3"
+        - gemfile: gemfiles/rails72.gemfile
+          ruby: "3.4"
+        - gemfile: gemfiles/rails80.gemfile
+          ruby: "3.2"
+        - gemfile: gemfiles/rails80.gemfile
+          ruby: "3.3"
+        - gemfile: gemfiles/rails80.gemfile
+          ruby: "3.4"
+        - gemfile: Gemfile
+          ruby: ruby
+        - gemfile: Gemfile
+          ruby: head
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Print dependency versions
+      run: |
+        ruby --version
+        bundle exec rails --version
+        bundle list
+    - name: Run RSpec
+      run: bundle exec rspec

data/.gitignore

@@ -1,6 +1,6 @@
 .bundle
+.ruby-version
 /Gemfile.lock
-/coverage
 /gemfiles/*.gemfile.lock
 /pkg
 /tmp

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.3.0 / 2025-06-25
+
+* [ENHANCEMENT] Drop support for Rubies before 2.5
+* [ENHANCEMENT] Add support for Rubies 3.0, 3.1, 3.2, 3.3, and 3.4
+* [ENHANCEMENT] Add support for Rails 6, 7, and 8
+
+## 1.2.0 / 2020-05-10
+
+* [ENHANCEMENT] Drop support for Rubies 1.9.3, 2.0, 2.1, and 2.2
+* [ENHANCEMENT] Add support for Rubies 2.5, 2.6, and 2.7
+* [ENHANCEMENT] Drop support for Rails 3 and 4
+* [ENHANCEMENT] Add support for Rails 5.2 and 6.0
+* [ENHANCEMENT] Proxy all ENV values via CLI to the "heroku" command
+
 ## 1.1.1 / 2015-04-30
 
 * [BUGFIX] Fix crash when environment-specific configuration is `nil`

data/Gemfile

@@ -2,11 +2,11 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rails", ">= 3.0.3", "< 4.3"
+gem "rails", ">= 5.2.0", "< 9"
 
 group :test do
-  gem "aruba", "~> 0.6.2"
-  gem "codeclimate-test-reporter", require: false
-  gem "rspec", "~> 3.1"
-  gem "sqlite3", "~> 1.3"
+  gem "aruba", "~> 2.1"
+  gem "ostruct"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3"
 end

data/README.md

@@ -1,30 +1,47 @@
-# ![Figaro](https://raw.githubusercontent.com/laserlemon/figaro/1f6e709/doc/title.png)
+> [!IMPORTANT]
+> Figaro [v2](https://github.com/laserlemon/figaro/tree/v2) development is underway but _stalled_. I need your help! Please consider [sponsoring Figaro's development](https://github.com/sponsors/laserlemon).
+>
+> With the constraints of a family and a full-time job, even the _emotional_ support that sponsorship provides is extremely valuable in re-energizing Figaro development. Thank you! 💛
+
+<h1>
+  <picture>
+    <source media="(prefers-color-scheme: light)" srcset="https://github.com/user-attachments/assets/5fc9ba97-8288-4228-ba4d-03b2bdcdf0f4">
+    <source media="(prefers-color-scheme: dark)" srcset="https://github.com/user-attachments/assets/1cd8ae2e-afd4-4930-bdc9-147b787ea3fe">
+    <img alt="Figaro" src="https://github.com/user-attachments/assets/5fc9ba97-8288-4228-ba4d-03b2bdcdf0f4" style="height:2em">
+  </picture>
+</h1>
 
 Simple, Heroku-friendly Rails app configuration using `ENV` and a single YAML file
 
-[![Gem Version](https://img.shields.io/gem/v/figaro.svg?style=flat-square)](http://badge.fury.io/rb/figaro)
-[![Build Status](https://img.shields.io/travis/laserlemon/figaro/master.svg?style=flat-square)](https://travis-ci.org/laserlemon/figaro)
-[![Code Climate](https://img.shields.io/codeclimate/github/laserlemon/figaro.svg?style=flat-square)](https://codeclimate.com/github/laserlemon/figaro)
-[![Coverage Status](https://img.shields.io/codeclimate/coverage/github/laserlemon/figaro.svg?style=flat-square)](https://codeclimate.com/github/laserlemon/figaro)
-[![Dependency Status](https://img.shields.io/gemnasium/laserlemon/figaro.svg?style=flat-square)](https://gemnasium.com/laserlemon/figaro)
+[![Made by laserlemon](https://img.shields.io/badge/laser-lemon-fc0?style=flat-square)](https://github.com/laserlemon)
+[![Gem Version](https://img.shields.io/gem/v/figaro?style=flat-square)](https://rubygems.org/gems/figaro)
+[![Build status](https://img.shields.io/github/checks-status/laserlemon/figaro/main?style=flat-square)](https://github.com/laserlemon/figaro/actions)
 
-**NOTE:** If you're using Figaro 0.7 or prior, please refer to the [appropriate documentation](https://github.com/laserlemon/figaro/tree/0-stable#readme) or [upgrade](#how-do-i-upgrade-to-figaro-10) to Figaro 1.0.
+**NOTE:** If you're using Figaro 0.7 or prior, please refer to the
+[appropriate documentation](https://github.com/laserlemon/figaro/tree/0-stable#readme)
+or [upgrade](#how-do-i-upgrade-to-figaro-10) to Figaro 1.0.
 
 ## Why does Figaro exist?
 
 Figaro was written to make it easy to securely configure Rails applications.
 
-Configuration values often include sensitive information. Figaro strives to be secure by default by encouraging a convention that keeps configuration out of Git.
+Configuration values often include sensitive information. Figaro strives to be
+secure by default by encouraging a convention that keeps configuration out of
+Git.
 
 ## How does Figaro work?
 
-Figaro is inspired by the [Twelve-Factor App](http://12factor.net) methodology, which states:
+Figaro is inspired by the [Twelve-Factor App](http://12factor.net) methodology,
+which states:
 
 > The twelve-factor app stores config in environment variables (often shortened to env vars or env). Env vars are easy to change between deploys without changing any code; unlike config files, there is little chance of them being checked into the code repo accidentally; and unlike custom config files, or other config mechanisms such as Java System Properties, they are a language- and OS-agnostic standard.
 
-This is straightforward in production environments but local development environments are often shared between multiple applications, requiring multiple configurations.
+This is straightforward in production environments but local development
+environments are often shared between multiple applications, requiring multiple
+configurations.
 
-Figaro parses a Git-ignored YAML file in your application and loads its values into `ENV`.
+Figaro parses a Git-ignored YAML file in your application and loads its values
+into `ENV`.
 
 ### Getting Started
 
@@ -38,10 +55,11 @@ Figaro installation is easy:
 
 
 ```bash
-$ figaro install
+$ bundle exec figaro install
 ```
 
-This creates a commented `config/application.yml` file and adds it to your `.gitignore`. Add your own configuration to this file and you're done!
+This creates a commented `config/application.yml` file and adds it to your
+`.gitignore`. Add your own configuration to this file and you're done!
 
 ### Example
 
@@ -65,11 +83,13 @@ Pusher.key    = ENV["pusher_key"]
 Pusher.secret = ENV["pusher_secret"]
 ```
 
-**Please note:** `ENV` is a simple key/value store. All values will be converted to strings. Deeply nested configuration structures are not possible.
+**Please note:** `ENV` is a simple key/value store. All values will be converted
+to strings. Deeply nested configuration structures are not possible.
 
 ### Environment-Specific Configuration
 
-Oftentimes, local configuration values change depending on Rails environment. In such cases, you can add environment-specific values to your configuration file:
+Oftentimes, local configuration values change depending on Rails environment. In
+such cases, you can add environment-specific values to your configuration file:
 
 ```yaml
 # config/application.yml
@@ -99,7 +119,9 @@ test:
 
 `Figaro.env` is a convenience that acts as a proxy to `ENV`.
 
-In testing, it is sometimes more convenient to stub and unstub `Figaro.env` than to set and reset `ENV`. Whether your application uses `ENV` or `Figaro.env` is entirely a matter of personal preference.
+In testing, it is sometimes more convenient to stub and unstub `Figaro.env` than
+to set and reset `ENV`. Whether your application uses `ENV` or `Figaro.env` is
+entirely a matter of personal preference.
 
 ```yaml
 # config/application.yml
@@ -121,7 +143,9 @@ Figaro.env.google_analytics_key? # => false
 
 ### Required Keys
 
-If a particular configuration value is required but not set, it's appropriate to raise an error. With Figaro, you can either raise these errors proactively or lazily.
+If a particular configuration value is required but not set, it's appropriate to
+raise an error. With Figaro, you can either raise these errors proactively or
+lazily.
 
 To proactively require configuration keys:
 
@@ -131,9 +155,12 @@ To proactively require configuration keys:
 Figaro.require_keys("pusher_app_id", "pusher_key", "pusher_secret")
 ```
 
-If any of the configuration keys above are not set, your application will raise an error during initialization. This method is preferred because it prevents runtime errors in a production application due to improper configuration.
+If any of the configuration keys above are not set, your application will raise
+an error during initialization. This method is preferred because it prevents
+runtime errors in a production application due to improper configuration.
 
-To require configuration keys lazily, reference the variables via "bang" methods on `Figaro.env`:
+To require configuration keys lazily, reference the variables via "bang" methods
+on `Figaro.env`:
 
 ```ruby
 # config/initializers/pusher.rb
@@ -145,7 +172,9 @@ Pusher.secret = Figaro.env.pusher_secret!
 
 ### Deployment
 
-Figaro is written with deployment in mind. In fact, [Heroku](https://www.heroku.com)'s use of `ENV` for application configuration was the original inspiration for Figaro.
+Figaro is written with deployment in mind. In fact, [Heroku](https://www.heroku.com)'s
+use of `ENV` for application configuration was the original inspiration for
+Figaro.
 
 #### Heroku
 
@@ -155,7 +184,8 @@ Heroku already makes setting application configuration easy:
 $ heroku config:set google_analytics_key=UA-35722661-5
 ```
 
-Using the `figaro` command, you can set values from your configuration file all at once:
+Using the `figaro` command, you can set values from your configuration file all
+at once:
 
 ```bash
 $ figaro heroku:set -e production
@@ -207,13 +237,15 @@ Figaro and dotenv were written around the same time to solve similar problems.
   * Figaro was written with a focus on Rails development and conventions.
   * Dotenv was written to accommodate any type of Ruby application.
 
-Either library may suit your configuration needs. It often boils down to personal preference.
+Either library may suit your configuration needs. It often boils down to
+personal preference.
 
 ## Is application.yml like [secrets.yml](https://github.com/rails/rails/blob/v4.1.0/railties/lib/rails/generators/rails/app/templates/config/secrets.yml)?
 
 Yes. Kind of.
 
-Rails 4.1 introduced the `secrets.yml` convention for Rails application configuration. Figaro predated the Rails 4.1 release by two years.
+Rails 4.1 introduced the `secrets.yml` convention for Rails application
+configuration. Figaro predated the Rails 4.1 release by two years.
 
 ### Similarities
 
@@ -239,7 +271,10 @@ Rails 4.1 introduced the `secrets.yml` convention for Rails application configur
   * Figaro is inspired by Twelve-Factor App's concept of proper [configuration](http://12factor.net/config).
   * Secrets are… not.
 
-The emergence of a configuration convention for Rails is an important step, but as long as the last three differences above exist, Figaro will continue to be developed as a more secure, more consistent, and more standards-compliant alternative to `secrets.yml`.
+The emergence of a configuration convention for Rails is an important step, but
+as long as the last three differences above exist, Figaro will continue to be
+developed as a more secure, more consistent, and more standards-compliant
+alternative to `secrets.yml`.
 
 For more information, read the original [The Marriage of Figaro… and Rails](http://www.collectiveidea.com/blog/archives/2013/12/18/the-marriage-of-figaro-and-rails/) blog post.
 
@@ -284,14 +319,33 @@ $ figaro help heroku:set
 **NOTE:** The environment option is required for the `heroku:set` command. The
 Rake task in Figaro 0.7 used the default of "development" if unspecified.
 
+### Spring Configuration
+
+If you're using Spring, either [stop](http://collectiveidea.com/blog/archives/2015/02/04/spring-is-dead-to-me)
+or add `config/application.yml` to the watch list:
+
+```rb
+# config/spring.rb
+
+%w(
+  ...
+  config/application.yml
+).each { |path| Spring.watch(path) }
+```
+
 ## Who wrote Figaro?
 
-My name is Steve Richert and I wrote Figaro in March, 2012 with overwhelming encouragement from my employer, [Collective Idea](http://www.collectiveidea.com). Figaro has improved very much since then, thanks entirely to [inspiration](https://github.com/laserlemon/figaro/issues) and [contribution](https://github.com/laserlemon/figaro/graphs/contributors) from developers everywhere.
+My name is Steve Richert and I wrote Figaro in March, 2012 with overwhelming
+encouragement from my employer, [Collective Idea](http://www.collectiveidea.com).
+Figaro has improved very much since then, thanks entirely to [inspiration](https://github.com/laserlemon/figaro/issues)
+and [contribution](https://github.com/laserlemon/figaro/graphs/contributors)
+from developers everywhere.
 
 **Thank you!**
 
 ## How can I help?
 
-Figaro is open source and contributions from the community are encouraged! No contribution is too small.
+Figaro is open source and contributions from the community are encouraged! No
+contribution is too small.
 
 See Figaro's [contribution guidelines](CONTRIBUTING.md) for more information.

data/figaro.gemspec

@@ -2,19 +2,21 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "figaro"
-  gem.version = "1.1.1"
+  gem.version = "1.3.0"
 
   gem.author      = "Steve Richert"
-  gem.email       = "steve.richert@gmail.com"
+  gem.email       = "steve.richert@hey.com"
   gem.summary     = "Simple Rails app configuration"
   gem.description = "Simple, Heroku-friendly Rails app configuration using ENV and a single YAML file"
   gem.homepage    = "https://github.com/laserlemon/figaro"
   gem.license     = "MIT"
 
-  gem.add_dependency "thor", "~> 0.14"
+  gem.required_ruby_version = ">= 2.5.0"
 
-  gem.add_development_dependency "bundler", "~> 1.7"
-  gem.add_development_dependency "rake", "~> 10.4"
+  gem.add_dependency "thor", ">= 0.14.0", "< 2"
+
+  gem.add_development_dependency "bundler", ">= 1.7.0", "< 3"
+  gem.add_development_dependency "rake", ">= 10.4.0", "< 14"
 
   gem.files      = `git ls-files`.split($\)
   gem.test_files = gem.files.grep(/^spec/)

data/gemfiles/rails52.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", "~> 5.2.0"
+
+group :test do
+  gem "aruba", "~> 2.1"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3", "~> 1.4"
+end

data/gemfiles/rails60.gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", "~> 6.0.0"
+
+# See: https://github.com/rails/rails/issues/54263
+gem "concurrent-ruby", "< 1.3.5"
+
+group :test do
+  gem "aruba", "~> 2.1"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3", "~> 1.4"
+end

data/gemfiles/rails61.gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", "~> 6.1.0"
+
+# See: https://github.com/rails/rails/issues/54263
+gem "concurrent-ruby", "< 1.3.5"
+
+group :test do
+  gem "aruba", "~> 2.1"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3", "~> 1.4"
+end

data/gemfiles/rails70.gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", "~> 7.0.0"
+
+# See: https://github.com/rails/rails/issues/54263
+gem "concurrent-ruby", "< 1.3.5"
+
+group :test do
+  gem "aruba", "~> 2.1"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3", "~> 1.4"
+end

data/gemfiles/rails71.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", "~> 7.1.0"
+
+group :test do
+  gem "aruba", "~> 2.1"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3"
+end

data/gemfiles/rails72.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", "~> 7.2.0"
+
+group :test do
+  gem "aruba", "~> 2.1"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3"
+end

data/gemfiles/rails80.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", "~> 8.0.0"
+
+group :test do
+  gem "aruba", "~> 2.1"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3"
+end

data/lib/figaro/cli/heroku_set.rb

@@ -4,7 +4,7 @@ module Figaro
   class CLI < Thor
     class HerokuSet < Task
       def run
-        system(configuration, command)
+        system(env, command)
       end
 
       private

data/lib/figaro/cli/install.rb

@@ -19,7 +19,7 @@ module Figaro
       end
 
       def ignore_configuration
-        if File.exists?(".gitignore")
+        if File.exist?(".gitignore")
           append_to_file(".gitignore", <<-EOF)
 
 # Ignore application configuration

data/lib/figaro/cli/task.rb

@@ -15,6 +15,10 @@ module Figaro
 
       private
 
+      def env
+        ENV.to_hash.update(configuration)
+      end
+
       def configuration
         application.configuration
       end

data/lib/figaro/cli.rb

@@ -31,6 +31,7 @@ module Figaro
       default: "config/application.yml",
       desc: "Specify a configuration file path"
     method_option "remote",
+      aliases: ["-r"],
       desc: "Specify a Heroku git remote"
 
     define_method "heroku:set" do

data/spec/figaro/cli/heroku_set_spec.rb

@@ -1,12 +1,12 @@
 describe "figaro heroku:set" do
   before do
-    create_dir("example")
+    create_directory("example")
     cd("example")
     write_file("config/application.yml", "foo: bar")
   end
 
   it "sends Figaro configuration to Heroku" do
-    run_simple("figaro heroku:set")
+    run_command_and_stop("figaro heroku:set")
 
     command = commands.last
     expect(command.name).to eq("heroku")
@@ -16,7 +16,7 @@ describe "figaro heroku:set" do
   it "respects path" do
     write_file("env.yml", "foo: bar")
 
-    run_simple("figaro heroku:set -p env.yml")
+    run_command_and_stop("figaro heroku:set -p env.yml")
 
     command = commands.last
     expect(command.name).to eq("heroku")
@@ -30,7 +30,7 @@ test:
   foo: baz
 EOF
 
-    run_simple("figaro heroku:set -e test")
+    run_command_and_stop("figaro heroku:set -e test")
 
     command = commands.last
     expect(command.name).to eq("heroku")
@@ -38,7 +38,7 @@ EOF
   end
 
   it "targets a specific Heroku app" do
-    run_simple("figaro heroku:set -a foo-bar-app")
+    run_command_and_stop("figaro heroku:set -a foo-bar-app")
 
     command = commands.last
     expect(command.name).to eq("heroku")
@@ -47,7 +47,7 @@ EOF
   end
 
   it "targets a specific Heroku git remote" do
-    run_simple("figaro heroku:set --remote production")
+    run_command_and_stop("figaro heroku:set -r production")
 
     command = commands.last
     expect(command.name).to eq("heroku")
@@ -58,7 +58,7 @@ EOF
   it "handles values with special characters" do
     overwrite_file("config/application.yml", "foo: bar baz")
 
-    run_simple("figaro heroku:set")
+    run_command_and_stop("figaro heroku:set")
 
     command = commands.last
     expect(command.name).to eq("heroku")

data/spec/figaro/cli/install_spec.rb

@@ -1,19 +1,19 @@
 describe "figaro install" do
   before do
-    create_dir("example")
+    create_directory("example")
     cd("example")
   end
 
   it "creates a configuration file" do
-    run_simple("figaro install")
+    run_command_and_stop("figaro install")
 
-    check_file_presence(["config/application.yml"], true)
+    expect("config/application.yml").to be_an_existing_file
   end
 
   it "respects path" do
-    run_simple("figaro install -p env.yml")
+    run_command_and_stop("figaro install -p env.yml")
 
-    check_file_presence(["env.yml"], true)
+    expect("env.yml").to be_an_existing_file
   end
 
   context "with a .gitignore file" do
@@ -25,25 +25,25 @@ EOF
     end
 
     it "Git-ignores the configuration file if applicable" do
-      run_simple("figaro install")
+      run_command_and_stop("figaro install")
 
-      check_file_content(".gitignore", %r(^/foo$), true)
-      check_file_content(".gitignore", %r(^/bar$), true)
-      check_file_content(".gitignore", %r(^/config/application\.yml$), true)
+      expect(".gitignore").to have_file_content(%r(^/foo$))
+      expect(".gitignore").to have_file_content(%r(^/bar$))
+      expect(".gitignore").to have_file_content(%r(^/config/application\.yml$))
     end
 
     it "respects path" do
-      run_simple("figaro install -p env.yml")
+      run_command_and_stop("figaro install -p env.yml")
 
-      check_file_content(".gitignore", %r(^/env\.yml$), true)
+      expect(".gitignore").to have_file_content(%r(^/env\.yml$))
     end
   end
 
   context "without a .gitignore file" do
     it "doesn't generate a new .gitignore file" do
-      run_simple("figaro install")
+      run_command_and_stop("figaro install")
 
-      check_file_presence([".gitignore"], false)
+      expect(".gitignore").not_to be_an_existing_file
     end
   end
 end

data/spec/rails_spec.rb

@@ -1,15 +1,24 @@
 describe Figaro::Rails do
   before do
-    run_simple(<<-CMD)
+    run_command_and_stop(<<-CMD)
       rails new example \
-        --skip-gemfile \
+        --api \
+        --minimal \
+        --no-rc \
+        --skip-asset-pipeline \
+        --skip-bootsnap \
         --skip-bundle \
+        --skip-gemfile \
+        --skip-git \
+        --skip-javascript \
         --skip-keeps \
+        --skip-listen \
+        --skip-spring \
         --skip-sprockets \
-        --skip-javascript \
-        --skip-test-unit \
-        --no-rc \
-        --quiet
+        --skip-test \
+        --skip-turbolinks \
+        --skip-webpack-install \
+        --skip-yarn
       CMD
     cd("example")
   end
@@ -20,9 +29,9 @@ describe Figaro::Rails do
     end
 
     it "loads application.yml" do
-      run_simple("rails runner 'puts Figaro.env.foo'")
+      run_command_and_stop("rails runner 'puts Figaro.env.foo'")
 
-      assert_partial_output("bar", all_stdout)
+      expect(all_stdout).to include("bar")
     end
 
     it "happens before database initialization" do
@@ -32,9 +41,9 @@ development:
   database: db/<%= ENV["foo"] %>.sqlite3
 EOF
 
-      run_simple("rake db:migrate")
+      run_command_and_stop("rake db:migrate")
 
-      check_file_presence(["db/bar.sqlite3"], true)
+      expect("db/bar.sqlite3").to be_an_existing_file
     end
 
     it "happens before application configuration" do
@@ -42,9 +51,9 @@ EOF
     config.foo = ENV["foo"]
 EOL
 
-      run_simple("rails runner 'puts Rails.application.config.foo'")
+      run_command_and_stop("rails runner 'puts Rails.application.config.foo'")
 
-      assert_partial_output("bar", all_stdout)
+      expect(all_stdout).to include("bar")
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
 require "bundler"
 Bundler.setup
 
-if ENV["CODECLIMATE_REPO_TOKEN"]
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-end
-
 require "figaro"
 
 Bundler.require(:test)

data/spec/support/aruba.rb

@@ -2,7 +2,7 @@ require "aruba/api"
 
 module ArubaHelpers
   def insert_into_file_after(file, pattern, addition)
-    content = prep_for_fs_check { IO.read(file) }
+    content = cd(".") { IO.read(file) }
     content.sub!(pattern, "\\0\n#{addition}")
     overwrite_file(file, content)
   end
@@ -13,7 +13,6 @@ RSpec.configure do |config|
   config.include(ArubaHelpers)
 
   config.before do
-    @aruba_timeout_seconds = 60
-    FileUtils.rm_rf(current_dir)
+    setup_aruba
   end
 end

metadata

@@ -1,68 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: figaro
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Steve Richert
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: 10.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '14'
 description: Simple, Heroku-friendly Rails app configuration using ENV and a single
   YAML file
-email: steve.richert@gmail.com
+email: steve.richert@hey.com
 executables:
 - figaro
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -71,12 +89,13 @@ files:
 - Rakefile
 - bin/figaro
 - figaro.gemspec
-- gemfiles/rails30.gemfile
-- gemfiles/rails31.gemfile
-- gemfiles/rails32.gemfile
-- gemfiles/rails40.gemfile
-- gemfiles/rails41.gemfile
-- gemfiles/rails42.gemfile
+- gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
+- gemfiles/rails71.gemfile
+- gemfiles/rails72.gemfile
+- gemfiles/rails80.gemfile
 - lib/figaro.rb
 - lib/figaro/application.rb
 - lib/figaro/cli.rb
@@ -107,7 +126,6 @@ homepage: https://github.com/laserlemon/figaro
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -115,16 +133,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.7.0.dev
 specification_version: 4
 summary: Simple Rails app configuration
 test_files:

data/.travis.yml

@@ -1,34 +0,0 @@
-before_install:
-  - gem update bundler rake
-before_script:
-  - unset RAILS_ENV
-  - unset RACK_ENV
-branches:
-  only:
-    - master
-cache: bundler
-env:
-  global:
-    secure: | # CODECLIMATE_REPO_TOKEN
-      Pm3j2/BtAzMtqRMP83rFvDtpUNeIAdLMzwH62In+3h/AE8gHDArGYS+jmChw
-      2hKVjwzVUTWZlpSEocqAg/YIDB3BJzWmyc6UP+VA0gji6HsufXYTmKAVPSVY
-      TQ7mPPP7hm95e3SkFbLdLbGkQfLdjIKeMY5lY/knX+QKUCjO52Y=
-gemfile:
-  - gemfiles/rails30.gemfile
-  - gemfiles/rails31.gemfile
-  - gemfiles/rails32.gemfile
-  - gemfiles/rails40.gemfile
-  - gemfiles/rails41.gemfile
-  - gemfiles/rails42.gemfile
-language: ruby
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-rvm:
-  - 1.9.3
-  - "2.0"
-  - "2.1"
-  - "2.2"
-  - ruby-head
-script: bundle exec rspec
-sudo: false

data/gemfiles/rails30.gemfile

@@ -1,12 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", "~> 3.0.3"
-
-group :test do
-  gem "aruba", "~> 0.6.2"
-  gem "codeclimate-test-reporter", require: false
-  gem "rspec", "~> 3.1"
-  gem "sqlite3", "~> 1.3"
-end

data/gemfiles/rails31.gemfile

@@ -1,12 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", "~> 3.1.0"
-
-group :test do
-  gem "aruba", "~> 0.6.2"
-  gem "codeclimate-test-reporter", require: false
-  gem "rspec", "~> 3.1"
-  gem "sqlite3", "~> 1.3"
-end

data/gemfiles/rails32.gemfile

@@ -1,12 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", "~> 3.2.0"
-
-group :test do
-  gem "aruba", "~> 0.6.2"
-  gem "codeclimate-test-reporter", require: false
-  gem "rspec", "~> 3.1"
-  gem "sqlite3", "~> 1.3"
-end

data/gemfiles/rails40.gemfile

@@ -1,12 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", "~> 4.0.0"
-
-group :test do
-  gem "aruba", "~> 0.6.2"
-  gem "codeclimate-test-reporter", require: false
-  gem "rspec", "~> 3.1"
-  gem "sqlite3", "~> 1.3"
-end

data/gemfiles/rails41.gemfile

@@ -1,12 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", "~> 4.1.0"
-
-group :test do
-  gem "aruba", "~> 0.6.2"
-  gem "codeclimate-test-reporter", require: false
-  gem "rspec", "~> 3.1"
-  gem "sqlite3", "~> 1.3"
-end

data/gemfiles/rails42.gemfile

@@ -1,12 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", "~> 4.2.0"
-
-group :test do
-  gem "aruba", "~> 0.6.2"
-  gem "codeclimate-test-reporter", require: false
-  gem "rspec", "~> 3.1"
-  gem "sqlite3", "~> 1.3"
-end