climate_control 0.2.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 21d2f4ce1d74f8b2e4650cd7ab4efd3d40dac9d6
-  data.tar.gz: d14c7f5bc3b4ae309682f529c0ada07a9a874d9b
+SHA256:
+  metadata.gz: aac4a1d4fe272e5369855d9d80c8bfd764b752f27d1bdfad2b19a607d5f0a44e
+  data.tar.gz: 8945986d5956f681810ef8a5f164323a3cd2a48e82368618c292f3c6fc7a6caa
 SHA512:
-  metadata.gz: 1c533460213a9e6a4285c3daa7fade227a4a5a5e4eb9a23e41d6bb06362c60468739476dd916be6b9ec3447b3e155dc1594e0fd89597ae58935acef27b850940
-  data.tar.gz: 1a9aefaad845f0cdcb147b77cd176e81c0004d28fa17979aab312d27fe1e5251653902bc6fe05581ccd1ecab49075f122b7d029953c708af350e6ad0809f575d
+  metadata.gz: c36a6b4ead29b23f93c95457e56f6bc3fd6c5cd596f66fe8243e736edcc5a11cfe9fd5fe62b1cf5fc8cd0c7f4fe72c051c0560338a6496e30c56b3cf095c92ec
+  data.tar.gz: cbdf93ff0a149ef67129db0ac0f25838f02c7d2faf6dea87f8ce0acaf54848fb129f4d1b8cbf0ad40c50358cd2186e5a726b2fed5d82fbc9de2c765f4a9bf94d

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+on: [pull_request]
+jobs:
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.0', 2.7, 2.6, 2.5]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install gems
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: Run tests
+        run: bundle exec rake
+      - name: Run StandardRB
+        run: bundle exec standardrb

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,6 @@
+# Code of Conduct
+
+By participating in this project, you agree to abide by the
+[thoughtbot code of conduct][1].
+
+[1]: https://thoughtbot.com/open-source-code-of-conduct

data/{LICENSE.txt → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Joshua Clayton and thoughtbot, inc.
+Copyright (c) 2012-2021 Joshua Clayton and thoughtbot, inc.
 
 MIT License
 

data/NEWS

@@ -1,3 +1,12 @@
+1.0.1 (May 26, 2021)
+  Require minimum Ruby version of 2.5.0
+
+1.0.0 (March 6, 2021)
+  Commit to supporting latest patch versions of Ruby 2.5+
+  Improve documentation
+  Format code with StandardRB
+  Bump gem dependencies
+
 0.2.0 (May 12, 2017)
   Allow nested environment changes in the same thread
 

data/README.md

@@ -24,8 +24,24 @@ within a block:
 ```ruby
 ClimateControl.modify CONFIRMATION_INSTRUCTIONS_BCC: 'confirmation_bcc@example.com' do
   sign_up_as 'john@example.com'
+
+  confirm_account_for_email 'john@example.com'
+
+  expect(current_email).to bcc_to('confirmation_bcc@example.com')
+end
+```
+
+To modify multiple environment variables:
+
+```ruby
+ClimateControl.modify CONFIRMATION_INSTRUCTIONS_BCC: 'confirmation_bcc@example.com',
+                      MAIL_FROM: 'us@example.com' do
+  sign_up_as 'john@example.com'
+
   confirm_account_for_email 'john@example.com'
-  current_email.should bcc_to('confirmation_bcc@example.com')
+
+  expect(current_email).to bcc_to('confirmation_bcc@example.com')
+  expect(current_email).to be_from('us@example.com')
 end
 ```
 
@@ -97,6 +113,8 @@ block, ensuring values are managed properly and consistently.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+This project uses [StandardRB](https://github.com/testdouble/standard) to ensure formatting.
+
 ## License
 
-climate_control is copyright 2012-2017 Joshua Clayton and thoughtbot, inc. It is free software and may be redistributed under the terms specified in the [LICENSE.txt](https://github.com/thoughtbot/climate_control/blob/master/LICENSE.txt) file.
+climate_control is copyright 2012-2021 Joshua Clayton and thoughtbot, inc. It is free software and may be redistributed under the terms specified in the [LICENSE](https://github.com/thoughtbot/climate_control/blob/main/LICENSE) file.

data/climate_control.gemspec

@@ -1,23 +1,25 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "climate_control/version"
 
 Gem::Specification.new do |gem|
-  gem.name          = "climate_control"
-  gem.version       = ClimateControl::VERSION
-  gem.authors       = ["Joshua Clayton"]
-  gem.email         = ["joshua.clayton@gmail.com"]
-  gem.description   = %q{Modify your ENV}
-  gem.summary       = %q{Modify your ENV easily with ClimateControl}
-  gem.homepage      = "https://github.com/thoughtbot/climate_control"
-  gem.license       = "MIT"
+  gem.name = "climate_control"
+  gem.version = ClimateControl::VERSION
+  gem.authors = ["Joshua Clayton"]
+  gem.email = ["joshua.clayton@gmail.com"]
+  gem.description = "Modify your ENV"
+  gem.summary = "Modify your ENV easily with ClimateControl"
+  gem.homepage = "https://github.com/thoughtbot/climate_control"
+  gem.license = "MIT"
 
-  gem.files         = `git ls-files`.split($/)
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.files = `git ls-files`.split($/)
+  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency "rspec", "~> 3.1.0"
-  gem.add_development_dependency "rake", "~> 10.3.2"
+  gem.required_ruby_version = ">= 2.5.0"
+
+  gem.add_development_dependency "rspec", "~> 3.10.0"
+  gem.add_development_dependency "rake", "~> 12.3.3"
   gem.add_development_dependency "simplecov", "~> 0.9.1"
+  gem.add_development_dependency "standard", "~> 1.0.0"
 end

data/lib/climate_control/environment.rb

@@ -1,4 +1,3 @@
-require "thread"
 require "forwardable"
 
 module ClimateControl
@@ -18,12 +17,10 @@ module ClimateControl
       end
 
       @semaphore.synchronize do
-        begin
-          @owner = Thread.current
-          yield if block_given?
-        ensure
-          @owner = nil
-        end
+        @owner = Thread.current
+        yield if block_given?
+      ensure
+        @owner = nil
       end
     end
 

data/lib/climate_control/modifier.rb

@@ -8,14 +8,12 @@ module ClimateControl
 
     def process
       @env.synchronize do
-        begin
-          prepare_environment_for_block
-          run_block
-        ensure
-          cache_environment_after_block
-          delete_keys_that_do_not_belong
-          revert_changed_keys
-        end
+        prepare_environment_for_block
+        run_block
+      ensure
+        cache_environment_after_block
+        delete_keys_that_do_not_belong
+        revert_changed_keys
       end
     end
 
@@ -33,12 +31,10 @@ module ClimateControl
 
     def copy_overrides_to_environment
       @environment_overrides.each do |key, value|
-        begin
-          @env[key] = value
-        rescue TypeError => e
-          raise UnassignableValueError,
-            "attempted to assign #{value} to #{key} but failed (#{e.message})"
-        end
+        @env[key] = value
+      rescue TypeError => e
+        raise UnassignableValueError,
+          "attempted to assign #{value} to #{key} but failed (#{e.message})"
       end
     end
 
@@ -55,7 +51,7 @@ module ClimateControl
     end
 
     def delete_keys_that_do_not_belong
-      (keys_to_remove - keys_changed_by_block).each {|key| @env.delete(key) }
+      (keys_to_remove - keys_changed_by_block).each { |key| @env.delete(key) }
     end
 
     def revert_changed_keys

data/lib/climate_control/version.rb

@@ -1,3 +1,3 @@
 module ClimateControl
-  VERSION = "0.2.0".freeze
+  VERSION = "1.0.1".freeze
 end

data/spec/acceptance/climate_control_spec.rb

@@ -1,5 +1,7 @@
 require "spec_helper"
 
+Thing = Class.new
+
 describe "Climate control" do
   it "allows modification of the environment" do
     block_run = false
@@ -87,22 +89,22 @@ describe "Climate control" do
     # 0.25s passes
     # [other_thread] thread resolves, FOO is removed, BAZ is copied back to ENV
 
-    thread_removing_env = Thread.new do
+    thread_removing_env = Thread.new {
       with_modified_env BAZ: "buzz" do
         sleep 0.5
       end
 
       expect(ENV["BAZ"]).to be_nil
-    end
+    }
 
-    other_thread = Thread.new do
+    other_thread = Thread.new {
       sleep 0.25
       with_modified_env FOO: "bar" do
         sleep 0.5
       end
 
       expect(ENV["FOO"]).to be_nil
-    end
+    }
 
     thread_removing_env.join
     other_thread.join
@@ -112,11 +114,11 @@ describe "Climate control" do
   end
 
   it "is re-entrant" do
-    ret = with_modified_env(FOO: "foo") do
+    ret = with_modified_env(FOO: "foo") {
       with_modified_env(BAR: "bar") do
         "bar"
       end
-    end
+    }
 
     expect(ret).to eq("bar")
 
@@ -125,12 +127,11 @@ describe "Climate control" do
   end
 
   it "raises when the value cannot be assigned properly" do
-    Thing = Class.new
     message = generate_type_error_for_object(Thing.new)
 
-    expect do
+    expect {
       with_modified_env(FOO: Thing.new)
-    end.to raise_error ClimateControl::UnassignableValueError, /attempted to assign .*Thing.* to FOO but failed \(#{message}\)$/
+    }.to raise_error ClimateControl::UnassignableValueError, /attempted to assign .*Thing.* to FOO but failed \(#{message}\)$/
   end
 
   def with_modified_env(options, &block)

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 begin
-  require 'simplecov'
+  require "simplecov"
   SimpleCov.start
 rescue LoadError
   warn "warning: simplecov gem not found; skipping coverage"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: climate_control
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Joshua Clayton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Modify your ENV
 email:
 - joshua.clayton@gmail.com
@@ -59,10 +73,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- CODE_OF_CONDUCT.md
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - NEWS
 - README.md
 - Rakefile
@@ -78,7 +93,7 @@ homepage: https://github.com/thoughtbot/climate_control
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,16 +101,15 @@ 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.5.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Modify your ENV easily with ClimateControl
 test_files:

data/.travis.yml

@@ -1,11 +0,0 @@
-rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-before_install:
-  - gem update --system
-  - gem update bundler
-install: "bundle install"
-branches:
-  only:
-    - master