appraisal 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e5becde2c97891ac7e0d0cb0e8943653ec7b43ca3dcad2f60a8aa7becd9a977
-  data.tar.gz: bac9e06f7948cc07025d06572f373f444e8159422ac9c62aa5e29ae6e32f6fdb
+  metadata.gz: 0fe7f7616c7aef0aaa5544853800eb05b08f3bb619b4fc292b8e89bbd2e9ea4d
+  data.tar.gz: 43ef79f1e190735adc4fec2413b84b614938d2a94cae68760972ffe37ca3dff4
 SHA512:
-  metadata.gz: d9b23d137f23b270822cf4e49248cc2f2a3bd229668d96f44feaf3a7d804b7daddca6429ebe2dba8f5782ee5b4f9860da0e0976e9b25e5baf419180e463bb85e
-  data.tar.gz: de06629b275c669997f73c5e840458f6de44ca435a4e8a543ff49b8e4d7a6c98d44006dc780df173d37958a4b6e8286184571a135b19d9529465206f7f548d8d
+  metadata.gz: 45cb2de8908bd80ab3331a8c452d5f77e0d573670c48e92441cf359c6ae615e7297d5a22e3c157197d659358cd8d9d776aea5c4b55782c3c94fb14c56f356acc
+  data.tar.gz: e6f88c11dbd4e09849c2318bc14174a482a9e738790fe7ccbcee376856c06d964888d54663c81a2901ef448a7e8de22d64de098ec3dfe2c527ae68ff7ce6415f

data/README.md

@@ -115,6 +115,46 @@ When you prefix a command with `appraisal`, the command is run with the
 appropriate Gemfile for that appraisal, ensuring the correct dependencies
 are used.
 
+Removing Gems using Appraisal
+-------
+
+It is common while managing multiple Gemfiles for dependencies to become deprecated and no
+longer necessary, meaning they need to be removed from the Gemfile for a specific `appraisal`.
+To do this, use the `remove_gem` declaration within the necessary `appraise` block in your
+`Appraisals` file.
+
+### Example Usage
+
+**Gemfile**
+```ruby
+gem 'rails', '~> 4.2'
+
+group :test do
+  gem 'rspec', '~> 4.0'
+  gem 'test_after_commit'
+end
+```
+
+**Appraisals**
+```ruby
+appraise 'rails-5' do
+  gem 'rails', '~> 5.2'
+
+  group :test do
+    remove_gem :test_after_commit
+  end
+end
+```
+
+Using the `Appraisals` file defined above, this is what the resulting `Gemfile` will look like:
+```ruby
+gem 'rails', '~> 5.2'
+
+group :test do
+  gem 'rspec', '~> 4.0'
+end
+```
+
 Version Control
 ---------------
 

data/lib/appraisal/appraisal.rb

@@ -20,6 +20,10 @@ module Appraisal
       gemfile.gem(*args)
     end
 
+    def remove_gem(*args)
+      gemfile.remove_gem(*args)
+    end
+
     def source(*args, &block)
       gemfile.source(*args, &block)
     end

data/lib/appraisal/bundler_dsl.rb

@@ -28,6 +28,10 @@ module Appraisal
       @dependencies.add(name, substitute_git_source(requirements))
     end
 
+    def remove_gem(name)
+      @dependencies.remove(name)
+    end
+
     def group(*names, &block)
       @groups[names] ||=
         Group.new(names).tap { |g| g.git_sources = @git_sources.dup }

data/lib/appraisal/dependency_list.rb

@@ -4,10 +4,19 @@ module Appraisal
   class DependencyList
     def initialize
       @dependencies = Hash.new
+      @removed_dependencies = Set.new
     end
 
     def add(name, requirements)
-      @dependencies[name] = Dependency.new(name, requirements)
+      unless @removed_dependencies.include?(name)
+        @dependencies[name] = Dependency.new(name, requirements)
+      end
+    end
+
+    def remove(name)
+      if @removed_dependencies.add?(name)
+        @dependencies.delete(name)
+      end
     end
 
     def to_s

data/lib/appraisal/version.rb

@@ -1,3 +1,3 @@
 module Appraisal
-  VERSION = "2.3.0".freeze
+  VERSION = "2.4.0".freeze
 end

data/spec/acceptance/appraisals_file_bundler_dsl_compatibility_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe 'Appraisals file Bundler DSL compatibility' do
   it 'supports all Bundler DSL in Appraisals file' do
-    build_gems %w(bagel orange_juice milk waffle coffee ham sausage pancake)
+    build_gems %w(bagel orange_juice milk waffle coffee ham
+                  sausage pancake rotten_egg)
     build_git_gems %w(egg croissant pain_au_chocolat omelette)
 
     build_gemfile <<-Gemfile
@@ -24,6 +25,7 @@ describe 'Appraisals file Bundler DSL compatibility' do
       group :breakfast do
         gem 'orange_juice'
         gem "omelette", :custom_git_source => "omelette"
+        gem 'rotten_egg'
       end
 
       platforms :ruby, :jruby do
@@ -58,6 +60,7 @@ describe 'Appraisals file Bundler DSL compatibility' do
         end
 
         group :breakfast do
+          remove_gem 'rotten_egg'
           gem 'bacon'
 
           platforms :rbx do

data/spec/appraisal/dependency_list_spec.rb

@@ -28,4 +28,23 @@ describe Appraisal::DependencyList do
       expect(dependency_list.to_s).to eq %(gem "rails", "4.1.4")
     end
   end
+
+  describe "#remove" do
+    let(:dependency_list) { Appraisal::DependencyList.new }
+
+    before do
+      dependency_list.add("rails", ["4.1.4"])
+    end
+
+    it "removes the dependency from the list" do
+      dependency_list.remove("rails")
+      expect(dependency_list.to_s).to eq("")
+    end
+
+    it "respects the removal over an addition" do
+      dependency_list.remove("rails")
+      dependency_list.add("rails", ["4.1.0"])
+      expect(dependency_list.to_s).to eq("")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appraisal
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Joe Ferris
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Find out what your Ruby gems are worth