appraisal 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b0fc3ea3d75b4caacecc601a02f5cc3dbe9aad9
-  data.tar.gz: 12d540aa5afe3fe1a12813e21dbccbf65e3c2b9f
+  metadata.gz: 398a456edb84cd58cc28ce0e4f1f48fa71fba9ec
+  data.tar.gz: f345bc81392798434127f0809c9038f73901822c
 SHA512:
-  metadata.gz: bb0850ae7207e6f668668dcfdd0debb6c06b38989ca7bf557530a0e40ecb71aca98404d9d469106b60f2f5469833a40a49743acb96690fb31a492df51f1115b5
-  data.tar.gz: 6ec513b116b30e95f775df2e5f88d06a5eafad736e922cbd5db3c0f6b2703b655750e9417f700d73cc34f95e30a3c9bd04e55cfd9b9dfe2579fcccd3c73f864a
+  metadata.gz: 5828d0980b60a878098edb125dcb09582d5328315c0724e50522489e9d3bdd63f7c68b353d372d8442521e98d4dbc84fc2373f32aedf7dafabc5a88a81ecf625
+  data.tar.gz: a6fc78e3735ed05b871ac0ddb7f1f7dc64b0734985ace8992b0a7198a28eeb2f9dd1910b925a2fe9c2ca3f50cbe46bea4d28d93db5712a9366c2eb9e52a3a207

data/.travis.yml

@@ -3,12 +3,13 @@ sudo: false
 before_install: gem install bundler
 
 rvm:
-  - 1.8
-  - 1.9
-  - 2.0
-  - 2.1
-  - 2.2
-  - rbx-2
+  - 1.8.7-head
+  - 1.9.3-p551
+  - 2.0.0-p648
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0-preview3
   - jruby-19mode
   - ruby-head
   - jruby-head
@@ -16,7 +17,7 @@ rvm:
 matrix:
   fast_finish: true
   allow_failures:
-    - rvm: rbx-2
     - rvm: jruby-19mode
-    - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: ruby-head
+    - rvm: 2.4.0-preview3

data/Gemfile

@@ -1,11 +1,12 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
 # This here to make sure appraisal works with Rails 3.0.0.
-gem 'thor', '~> 0.14.0'
+gem "thor", "~> 0.14.0"
 
 if RUBY_VERSION < "1.9"
-  gem "i18n", "~> 0.6.0"
-  gem "activesupport", "~> 3.2.21"
+  eval File.read("Gemfile-1.8")
+elsif RUBY_VERSION < "2.2"
+  eval File.read("Gemfile-2.1")
 end

data/Gemfile-1.8

@@ -0,0 +1,5 @@
+# These gems are locked for Ruby 1.8.7 compatibility
+gem "i18n", "~> 0.6.0"
+gem "activesupport", "~> 3.2.21"
+gem "rake", "~> 10.5"
+gem "rack", "~> 1.6.5"

data/Gemfile-2.1

@@ -0,0 +1,3 @@
+# These gems are locked for Ruby 2.1.0 compatibility
+gem "activesupport", "~> 4.2.7"
+gem "rack", "~> 1.6.5"

data/README.md

@@ -5,7 +5,7 @@ Appraisal
 
 Find out what your Ruby gems are worth.
 
-[Build Status Image]: https://secure.travis-ci.org/thoughtbot/appraisal.png?branch=master
+[Build Status Image]: https://secure.travis-ci.org/thoughtbot/appraisal.svg?branch=master
 [Build Status]: http://travis-ci.org/thoughtbot/appraisal
 
 Synopsis
@@ -23,18 +23,19 @@ In your Gemfile:
 
     gem "appraisal"
 
-Note that gems must be bundled in the global namespace. Bundling gems to a local
-location or vendoring plugins is not supported. If you do not want to pollute the
-global namespace, one alternative is [RVM's Gemsets](http://rvm.io/gemsets).
+Note that gems must be bundled in the global namespace. Bundling gems to a
+local location or vendoring plugins is not supported. If you do not want to
+pollute the global namespace, one alternative is
+[RVM's Gemsets](http://rvm.io/gemsets).
 
 Setup
 -----
 
-Setting up appraisal requires an Appraisals file (similar to a Gemfile) in your
-project root, named "Appraisals" (note the case), and some slight changes to
-your project's Rakefile.
+Setting up appraisal requires an `Appraisals` file (similar to a `Gemfile`) in
+your project root, named "Appraisals" (note the case), and some slight changes
+to your project's `Rakefile`.
 
-An Appraisals file consists of several appraisal definitions. An appraisal
+An `Appraisals` file consists of several appraisal definitions. An appraisal
 definition is simply a list of gem dependencies. For example, to test with a
 few versions of Rails:
 
@@ -46,8 +47,8 @@ few versions of Rails:
       gem "rails", "4.0.0"
     end
 
-The dependencies in your Appraisals file are combined with dependencies in your
-Gemfile, so you don't need to repeat anything that's the same for each
+The dependencies in your `Appraisals` file are combined with dependencies in
+your `Gemfile`, so you don't need to repeat anything that's the same for each
 appraisal. If something is specified in both the Gemfile and an appraisal, the
 version from the appraisal takes precedence.
 
@@ -63,18 +64,18 @@ Usage
 Once you've configured the appraisals you want to use, you need to install the
 dependencies for each appraisal:
 
-    appraisal install
+    $ appraisal install
 
 This will resolve, install, and lock the dependencies for that appraisal using
 bundler. Once you have your dependencies set up, you can run any command in a
 single appraisal:
 
-    appraisal rails-3 rake test
+    $ appraisal rails-3 rake test
 
 This will run `rake test` using the dependencies configured for Rails 3. You can
 also run each appraisal in turn:
 
-    appraisal rake test
+    $ appraisal rake test
 
 If you want to use only the dependencies from your Gemfile, just run `rake
 test` as normal. This allows you to keep running with the latest versions of
@@ -139,15 +140,38 @@ all versions of its dependency, you might have to set a `script` setting:
 That will make sure that each of the test sub-job are not getting run more than
 one time.
 
-You can also running your test against multiple versions of Ruby locally, just
+You can also run your tests against multiple versions of Ruby locally, just
 like running on Travis CI, by using [WWTD].
 
 [WWTD]: https://github.com/grosser/wwtd
 
+Circle CI Integration
+---------------------
+
+In Circle CI you can override the default testing behaviour to customize your
+testing. Using this feature you can configure appraisal to execute your tests.
+
+In order to this you can put the following configuration in your circle.yml file:
+
+```yml
+dependencies:
+  post:
+    - bundle exec appraisal install
+test:
+  pre:
+    - bundle exec appraisal rake db:create
+    - bundle exec appraisal rake db:migrate
+  override:
+    - bundle exec appraisal rspec
+```
+
+Notice that we are running an rspec suite. You can customize your testing
+command in the `override` section and use your favourite one.
+
 Credits
 -------
 
-![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
+![thoughtbot](http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg)
 
 Appraisal is maintained and funded by [thoughtbot, inc][thoughtbot]
 

data/lib/appraisal/appraisal.rb

@@ -7,6 +7,8 @@ require 'pathname'
 module Appraisal
   # Represents one appraisal and its dependencies
   class Appraisal
+    DEFAULT_INSTALL_OPTIONS = { "jobs" => 1 }.freeze
+
     attr_reader :name, :gemfile
 
     def initialize(name, source_gemfile)
@@ -46,19 +48,25 @@ module Appraisal
       gemfile.gemspec(options)
     end
 
+    def git_source(*args, &block)
+      gemfile.git_source(*args, &block)
+    end
+
     def write_gemfile
-      ::File.open(gemfile_path, "w") do |file|
+      File.open(gemfile_path, "w") do |file|
         signature = "# This file was generated by Appraisal"
         file.puts([signature, gemfile.to_s].join("\n\n"))
       end
     end
 
-    def install(job_size = 1)
-      command = [
-        check_command,
-        "||",
-        install_command(job_size)
-      ].flatten.join(" ")
+    def install(options = {})
+      commands = [install_command(options).join(" ")]
+
+      if options["without"].nil? || options["without"].empty?
+        commands.unshift(check_command.join(" "))
+      end
+
+      command = commands.join(" || ")
 
       if Bundler.settings[:path]
         env = { 'BUNDLE_DISABLE_SHARED_GEMS' => '1' }
@@ -69,8 +77,7 @@ module Appraisal
     end
 
     def update(gems = [])
-      command, env = update_command(gems)
-      Command.new(command, :env => env).run
+      Command.new(update_command(gems), :gemfile => gemfile_path).run
     end
 
     def gemfile_path
@@ -82,15 +89,15 @@ module Appraisal
     end
 
     def relative_gemfile_path
-      ::File.join("gemfiles", gemfile_name)
+      File.join("gemfiles", gemfile_name)
     end
 
     def relativize
       current_directory = Pathname.new(Dir.pwd)
       relative_path = current_directory.relative_path_from(gemfile_root).cleanpath
-      lockfile_content = ::File.read(lockfile_path)
+      lockfile_content = File.read(lockfile_path)
 
-      ::File.open(lockfile_path, 'w') do |file|
+      File.open(lockfile_path, 'w') do |file|
         file.write lockfile_content.gsub(/#{current_directory}/, relative_path.to_s)
       end
     end
@@ -102,19 +109,17 @@ module Appraisal
       ['bundle', 'check', gemfile_option]
     end
 
-    def install_command(job_size)
+    def install_command(options = {})
       gemfile_option = "--gemfile='#{gemfile_path}'"
-      ['bundle', 'install', gemfile_option, bundle_parallel_option(job_size)].compact
+      ['bundle', 'install', gemfile_option, bundle_options(options)].compact
     end
 
     def update_command(gems)
-      env = { "BUNDLE_GEMFILE" => gemfile_path }
-      command = ['bundle', 'update', *gems].compact
-      [command, env]
+      ['bundle', 'update', *gems].compact
     end
 
     def gemfile_root
-      Pathname.new(::File.join(Dir.pwd, "gemfiles"))
+      Pathname.new(File.join(Dir.pwd, "gemfiles"))
     end
 
     def gemfile_name
@@ -129,15 +134,24 @@ module Appraisal
       name.gsub(/[^\w\.]/, '_')
     end
 
-    def bundle_parallel_option(job_size)
-      if job_size > 1
+    def bundle_options(options)
+      full_options = DEFAULT_INSTALL_OPTIONS.dup.merge(options)
+      options_strings = []
+      jobs = full_options.delete("jobs")
+      if jobs > 1
         if Utils.support_parallel_installation?
-          "--jobs=#{job_size}"
+          options_strings << "--jobs=#{jobs}"
         else
           warn 'Your current version of Bundler does not support parallel installation. Please ' +
             'upgrade Bundler to version >= 1.4.0, or invoke `appraisal` without `--jobs` option.'
         end
       end
+
+      full_options.each do |flag, val|
+        options_strings << "--#{flag} #{val}"
+      end
+
+      options_strings.join(" ") if options_strings != []
     end
   end
 end

data/lib/appraisal/{file.rb → appraisal_file.rb}

@@ -4,7 +4,7 @@ require 'appraisal/gemfile'
 
 module Appraisal
   # Loads and parses Appraisals file
-  class File
+  class AppraisalFile
     attr_reader :appraisals, :gemfile
 
     def self.each(&block)
@@ -16,7 +16,7 @@ module Appraisal
       @gemfile = Gemfile.new
       @gemfile.load(ENV['BUNDLE_GEMFILE'] || 'Gemfile')
 
-      if ::File.exist? path
+      if File.exist? path
         run IO.read(path)
       else
         raise AppraisalsNotFound

data/lib/appraisal/bundler_dsl.rb

@@ -5,19 +5,20 @@ module Appraisal
   class BundlerDSL
     attr_reader :dependencies
 
-    PARTS = %w(source ruby_version git_sources path_sources dependencies groups
+    PARTS = %w(source ruby_version gits paths dependencies groups
       platforms source_blocks gemspec)
 
     def initialize
       @sources = []
       @ruby_version = nil
       @dependencies = DependencyList.new
-      @gemspec = nil
+      @gemspecs = []
       @groups = OrderedHash.new
       @platforms = OrderedHash.new
-      @git_sources = OrderedHash.new
-      @path_sources = OrderedHash.new
+      @gits = OrderedHash.new
+      @paths = OrderedHash.new
       @source_blocks = OrderedHash.new
+      @git_sources = {}
     end
 
     def run(&block)
@@ -25,7 +26,7 @@ module Appraisal
     end
 
     def gem(name, *requirements)
-      @dependencies.add(name, requirements)
+      @dependencies.add(name, substitute_git_source(requirements))
     end
 
     def group(*names, &block)
@@ -54,13 +55,13 @@ module Appraisal
     end
 
     def git(source, options = {}, &block)
-      @git_sources[source] ||= GitSource.new(source, options)
-      @git_sources[source].run(&block)
+      @gits[source] ||= Git.new(source, options)
+      @gits[source].run(&block)
     end
 
     def path(source, options = {}, &block)
-      @path_sources[source] ||= PathSource.new(source, options)
-      @path_sources[source].run(&block)
+      @paths[source] ||= Path.new(source, options)
+      @paths[source].run(&block)
     end
 
     def to_s
@@ -72,9 +73,17 @@ module Appraisal
     end
 
     def gemspec(options = {})
-      @gemspec = Gemspec.new(options)
+      @gemspecs << Gemspec.new(options)
     end
 
+    def git_source(source, &block)
+      @git_sources[source] = block
+    end
+
+    protected
+
+    attr_writer :git_sources
+
     private
 
     def source_entry
@@ -91,25 +100,23 @@ module Appraisal
 
     alias_method :ruby_version_entry_for_dup, :ruby_version_entry
 
-    [:dependencies, :gemspec].each do |method_name|
-      class_eval <<-METHODS, __FILE__, __LINE__
-        private
+    def gemspec_entry
+      @gemspecs.map(&:to_s).join("\n")
+    end
 
-        def #{method_name}_entry
-          if @#{method_name}
-            @#{method_name}.to_s
-          end
-        end
+    def gemspec_entry_for_dup
+      @gemspecs.map(&:for_dup).join("\n")
+    end
 
-        def #{method_name}_entry_for_dup
-          if @#{method_name}
-            @#{method_name}.for_dup
-          end
-        end
-      METHODS
+    def dependencies_entry
+      @dependencies.to_s
+    end
+
+    def dependencies_entry_for_dup
+      @dependencies.for_dup
     end
 
-    [:git_sources, :path_sources, :platforms, :groups, :source_blocks].
+    [:gits, :paths, :platforms, :groups, :source_blocks].
       each do |method_name|
       class_eval <<-METHODS, __FILE__, __LINE__
         private
@@ -127,5 +134,16 @@ module Appraisal
     def indent(string)
       string.strip.gsub(/^(.+)$/, '  \1')
     end
+
+    def substitute_git_source(requirements)
+      requirements.each do |requirement|
+        if requirement.is_a?(Hash)
+          (requirement.keys & @git_sources.keys).each do |matching_source|
+            value = requirement.delete(matching_source)
+            requirement[:git] = @git_sources[matching_source].call(value)
+          end
+        end
+      end
+    end
   end
 end

data/lib/appraisal/cli.rb

@@ -19,11 +19,11 @@ module Appraisal
           appraisal, otherwise it runs the EXTERNAL_COMMAND against all appraisals.
       help
 
-      if ::File.exist?('Appraisals')
+      if File.exist?('Appraisals')
         shell.say
         shell.say 'Available Appraisal(s):'
 
-        File.each do |appraisal|
+        AppraisalFile.each do |appraisal|
           shell.say "  - #{appraisal.name}"
         end
       end
@@ -41,11 +41,16 @@ module Appraisal
     method_option 'jobs', :aliases => 'j', :type => :numeric, :default => 1,
       :banner => 'SIZE',
       :desc => 'Install gems in parallel using the given number of workers.'
+    method_option 'retry', :type => :numeric, :default => 1,
+      :desc => 'Retry network and git requests that have failed'
+    method_option "without", :banner => "GROUP_NAMES",
+      :desc => "A space-separated list of groups referencing gems to skip " +
+        "during installation. Bundler will remember this option."
     def install
       invoke :generate, [], {}
 
-      File.each do |appraisal|
-        appraisal.install(options[:jobs])
+      AppraisalFile.each do |appraisal|
+        appraisal.install(options)
         appraisal.relativize
       end
     end
@@ -53,7 +58,7 @@ module Appraisal
     desc 'generate', 'Generate a gemfile for each appraisal'
     method_option "travis", :type => :boolean, :default => false
     def generate
-      File.each do |appraisal|
+      AppraisalFile.each do |appraisal|
         appraisal.write_gemfile
       end
 
@@ -73,14 +78,14 @@ module Appraisal
     def update(*gems)
       invoke :generate, []
 
-      File.each do |appraisal|
+      AppraisalFile.each do |appraisal|
         appraisal.update(gems)
       end
     end
 
     desc 'list', 'List the names of the defined appraisals'
     def list
-      File.new.appraisals.each { |appraisal| puts appraisal.name }
+      AppraisalFile.new.appraisals.each { |appraisal| puts appraisal.name }
     end
 
     desc "version", "Display the version and exit"
@@ -91,12 +96,14 @@ module Appraisal
     private
 
     def method_missing(name, *args, &block)
-      matching_appraisal = File.new.appraisals.detect { |appraisal| appraisal.name == name.to_s }
+      matching_appraisal = AppraisalFile.new.appraisals.detect do |appraisal|
+        appraisal.name == name.to_s
+      end
 
       if matching_appraisal
         Command.new(args, :gemfile => matching_appraisal.gemfile_path).run
       else
-        File.each do |appraisal|
+        AppraisalFile.each do |appraisal|
           Command.new(ARGV, :gemfile => appraisal.gemfile_path).run
         end
       end

data/lib/appraisal/command.rb

@@ -43,12 +43,15 @@ module Appraisal
     def ensure_bundler_is_available
       unless system %(gem list -q "^bundler$" | grep -q bundler)
         puts ">> Reinstall Bundler into #{ENV["GEM_HOME"]}"
+        version = Utils.bundler_version
 
-        unless system "gem install bundler"
+        unless system "gem install bundler --version #{version}"
           puts
           puts <<-ERROR.strip.gsub(/\s+/, " ")
-            Bundler installation failed. Please try running
-            `GEM_HOME="#{ENV["GEM_HOME"]}" gem install bundler` manually.
+            Bundler installation failed.
+            Please try running:
+              `GEM_HOME="#{ENV["GEM_HOME"]}" gem install bundler --version #{version}`
+            manually.
           ERROR
           exit(1)
         end

data/lib/appraisal/gemfile.rb

@@ -2,16 +2,16 @@ require "appraisal/bundler_dsl"
 
 module Appraisal
   autoload :Gemspec, "appraisal/gemspec"
-  autoload :GitSource, "appraisal/git_source"
+  autoload :Git, "appraisal/git"
   autoload :Group, "appraisal/group"
-  autoload :PathSource, "appraisal/path_source"
+  autoload :Path, "appraisal/path"
   autoload :Platform, "appraisal/platform"
   autoload :Source, "appraisal/source"
 
   # Load bundler Gemfiles and merge dependencies
   class Gemfile < BundlerDSL
     def load(path)
-      if ::File.exist?(path)
+      if File.exist?(path)
         run(IO.read(path))
       end
     end
@@ -22,6 +22,7 @@ module Appraisal
 
     def dup
       Gemfile.new.tap do |gemfile|
+        gemfile.git_sources = @git_sources
         gemfile.run(for_dup)
       end
     end

data/lib/appraisal/{git_source.rb → git.rb}

@@ -2,7 +2,7 @@ require "appraisal/bundler_dsl"
 require 'appraisal/utils'
 
 module Appraisal
-  class GitSource < BundlerDSL
+  class Git < BundlerDSL
     def initialize(source, options = {})
       super()
       @source = source

data/lib/appraisal/{path_source.rb → path.rb}

@@ -2,7 +2,7 @@ require "appraisal/bundler_dsl"
 require 'appraisal/utils'
 
 module Appraisal
-  class PathSource < BundlerDSL
+  class Path < BundlerDSL
     def initialize(source, options = {})
       super()
       @source = source

data/lib/appraisal/task.rb

@@ -1,4 +1,4 @@
-require 'appraisal/file'
+require 'appraisal/appraisal_file'
 require 'rake/tasklib'
 
 module Appraisal
@@ -29,7 +29,7 @@ module Appraisal
         end
 
         begin
-          File.each do |appraisal|
+          AppraisalFile.each do |appraisal|
             desc "DEPRECATED: Run the given task for appraisal #{appraisal.name}"
             task appraisal.name do
               ARGV.shift

data/lib/appraisal/travis_ci_helper.rb

@@ -1,4 +1,4 @@
-require "appraisal/file"
+require "appraisal/appraisal_file"
 require "yaml"
 
 module Appraisal
@@ -20,7 +20,7 @@ module Appraisal
       puts "# Put this in your .travis.yml"
       puts "#{GEMFILES_CONFIGURATION_KEY}:"
 
-      File.each do |appraisal|
+      AppraisalFile.each do |appraisal|
         puts "  - #{appraisal.relative_gemfile_path}"
       end
     end
@@ -45,7 +45,7 @@ module Appraisal
       private
 
       def has_configuration_file?
-        ::File.exist?(CONFIGURATION_FILE)
+        File.exist?(CONFIGURATION_FILE)
       end
 
       def has_no_gemfiles_configuration?
@@ -55,7 +55,7 @@ module Appraisal
       def has_invalid_gemfiles_configuration?
         if configuration && configuration[GEMFILES_CONFIGURATION_KEY]
           appraisal_paths =
-            File.new.appraisals.map(&:relative_gemfile_path).sort
+            AppraisalFile.new.appraisals.map(&:relative_gemfile_path).sort
           travis_gemfile_paths = configuration[GEMFILES_CONFIGURATION_KEY].sort
           appraisal_paths != travis_gemfile_paths
         end

data/lib/appraisal/utils.rb

@@ -9,7 +9,7 @@ module Appraisal
       case object
       when Hash
         items = object.map do |key, value|
-          "#{format_string(key, true)} => #{format_string(value, true)}"
+          format_hash_value(key, value)
         end
 
         if enclosing_object
@@ -22,6 +22,17 @@ module Appraisal
       end
     end
 
+    def self.format_hash_value(key, value)
+      key = format_string(key, true)
+      value = format_string(value, true)
+
+      if RUBY_VERSION >= "1.9" && key.start_with?(":")
+        "#{key.sub(/^:/, "")}: #{value}"
+      else
+        "#{key} => #{value}"
+      end
+    end
+
     def self.format_arguments(arguments)
       unless arguments.empty?
         arguments.map { |object| format_string(object, false) }.join(', ')
@@ -35,10 +46,17 @@ module Appraisal
     def self.prefix_path(path)
       if path !~ /^(?:\/|\S:)/ && path !~ /^\S+:\/\// && path !~ /^\S+@\S+:/
         cleaned_path = path.gsub(/(^|\/)\.(?:\/|$)/, "\\1")
-        ::File.join("..", cleaned_path)
+        File.join("..", cleaned_path)
       else
         path
       end
     end
+
+    def self.bundler_version
+      Gem::Specification.
+        detect { |spec| spec.name == "bundler" }.
+        version.
+        to_s
+    end
   end
 end

data/lib/appraisal/version.rb

@@ -1,3 +1,3 @@
 module Appraisal
-  VERSION = "2.1.0".freeze
+  VERSION = "2.2.0".freeze
 end

data/spec/acceptance/appraisals_file_bundler_dsl_compatibility_spec.rb

@@ -3,13 +3,15 @@ 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_git_gem 'egg'
+    build_git_gems %w(egg croissant pain_au_chocolat)
 
     build_gemfile <<-Gemfile
       source 'https://rubygems.org'
+      git_source(:custom_git_source) { |repo| "../gems/\#{repo}" }
       ruby RUBY_VERSION
 
       gem 'bagel'
+      gem "croissant", :custom_git_source => "croissant"
 
       git '../gems/egg' do
         gem 'egg'
@@ -44,6 +46,7 @@ describe 'Appraisals file Bundler DSL compatibility' do
         ruby "1.8.7"
 
         gem 'bread'
+        gem "pain_au_chocolat", :custom_git_source => "pain_au_chocolat"
 
         git '../gems/egg' do
           gem 'porched_egg'
@@ -70,6 +73,7 @@ describe 'Appraisals file Bundler DSL compatibility' do
         end
 
         gemspec
+        gemspec :path => "sitepress"
       end
     Appraisals
 
@@ -95,8 +99,10 @@ describe 'Appraisals file Bundler DSL compatibility' do
       end
 
       gem "bagel"
+      gem "croissant", :git => "../../gems/croissant"
       gem "appraisal", :path => #{PROJECT_ROOT.inspect}
       gem "bread"
+      gem "pain_au_chocolat", :git => "../../gems/pain_au_chocolat"
 
       group :breakfast do
         gem "orange_juice"
@@ -122,6 +128,7 @@ describe 'Appraisals file Bundler DSL compatibility' do
       end
 
       gemspec :path => "../"
+      gemspec :path => "../sitepress"
     Gemfile
   end
 end

data/spec/acceptance/bundle_with_custom_path_spec.rb

@@ -41,8 +41,9 @@ describe "Bundle with custom path" do
         gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
 
         if RUBY_VERSION < "1.9"
-          gem "i18n", "~> 0.6.0"
-          gem "activesupport", "~> 3.2.21"
+          #{File.read(File.join(PROJECT_ROOT, "Gemfile-1.8"))}
+        elsif RUBY_VERSION < "2.2"
+          #{File.read(File.join(PROJECT_ROOT, "Gemfile-2.1"))}
         end
       Gemfile
 

data/spec/acceptance/bundle_without_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+
+describe "Bundler without flag" do
+  it "passes --without flag to Bundler on install" do
+    build_gems %w(pancake orange_juice waffle coffee sausage soda)
+
+    build_gemfile <<-Gemfile
+      source "https://rubygems.org"
+
+      gem "pancake"
+      gem "rake", "~> 10.5", :platform => :ruby_18
+
+      group :drinks do
+        gem "orange_juice"
+      end
+
+      gem "appraisal", :path => #{PROJECT_ROOT.inspect}
+    Gemfile
+
+    build_appraisal_file <<-Appraisals
+      appraise "breakfast" do
+        gem "waffle"
+
+        group :drinks do
+          gem "coffee"
+        end
+      end
+
+      appraise "lunch" do
+        gem "sausage"
+
+        group :drinks do
+          gem "soda"
+        end
+      end
+    Appraisals
+
+    run "bundle install --local"
+    output = run "appraisal install --without drinks"
+
+    expect(output).to include("Bundle complete")
+    expect(output).to include("Gems in the group drinks were not installed.")
+    expect(output).not_to include("orange_juice")
+    expect(output).not_to include("coffee")
+    expect(output).not_to include("soda")
+
+    output = run "appraisal install"
+
+    expect(output).to include("The Gemfile's dependencies are satisfied")
+  end
+end

data/spec/acceptance/cli/update_spec.rb

@@ -25,8 +25,9 @@ describe 'CLI', 'appraisal update' do
 
   context 'with no arguments' do
     it 'updates all the gems' do
-      run 'appraisal update'
+      output = run 'appraisal update'
 
+      expect(output).to include("gemfiles/dummy.gemfile bundle update")
       expect(content_of 'gemfiles/dummy.gemfile.lock').to include 'dummy (1.0.1)'
       expect(content_of 'gemfiles/dummy.gemfile.lock').to include 'dummy2 (1.0.1)'
     end

data/spec/acceptance/gemspec_spec.rb

@@ -67,6 +67,7 @@ describe 'Gemspec' do
         s.name = 'gemspec_project'
         s.version = '0.1'
         s.summary = 'Awesome Gem!'
+        s.authors = "Appraisal"
 
         s.add_development_dependency('dummy', '1.1.0')
       end

data/spec/appraisal/{file_spec.rb → appraisal_file_spec.rb}

@@ -1,14 +1,14 @@
 require 'spec_helper'
-require 'appraisal/file'
+require 'appraisal/appraisal_file'
 
 # Requiring this to make the test pass on Rubinius 2.2.5
 # https://github.com/rubinius/rubinius/issues/2934
 require 'rspec/matchers/built_in/raise_error'
 
-describe Appraisal::File do
+describe Appraisal::AppraisalFile do
   it "complains when no Appraisals file is found" do
-    allow(::File).to receive(:exist?).with(/Gemfile/).and_return(true)
-    allow(::File).to receive(:exist?).with("Appraisals").and_return(false)
+    allow(File).to receive(:exist?).with(/Gemfile/).and_return(true)
+    allow(File).to receive(:exist?).with("Appraisals").and_return(false)
     expect { described_class.new }.to raise_error(Appraisal::AppraisalsNotFound)
   end
 end

data/spec/appraisal/appraisal_spec.rb

@@ -41,7 +41,7 @@ describe Appraisal::Appraisal do
       stub_const('Bundler::VERSION', '1.3.0')
 
       warning = capture(:stderr) do
-        @appraisal.install(42)
+        @appraisal.install("jobs" => 42)
       end
 
       expect(Appraisal::Command).to have_received(:new).
@@ -52,12 +52,19 @@ describe Appraisal::Appraisal do
     it 'runs parallel install command on Bundler >= 1.4.0' do
       stub_const('Bundler::VERSION', '1.4.0')
 
-      @appraisal.install(42)
+      @appraisal.install("jobs" => 42)
 
       expect(Appraisal::Command).to have_received(:new).
         with("#{bundle_check_command} || #{bundle_parallel_install_command}")
     end
 
+    it 'runs install command with retries on Bundler' do
+      @appraisal.install("retry" => 3)
+
+      expect(Appraisal::Command).to have_received(:new).
+        with("#{bundle_check_command} || #{bundle_install_command_with_retries}")
+    end
+
     def bundle_check_command
       "bundle check --gemfile='/home/test/test directory'"
     end
@@ -69,5 +76,9 @@ describe Appraisal::Appraisal do
     def bundle_parallel_install_command
       "bundle install --gemfile='/home/test/test directory' --jobs=42"
     end
+
+    def bundle_install_command_with_retries
+      "bundle install --gemfile='/home/test/test directory' --retry 3"
+    end
   end
 end

data/spec/appraisal/gemfile_spec.rb

@@ -251,6 +251,8 @@ describe Appraisal::Gemfile do
   end
 
   context "relative path handling" do
+    before { stub_const('RUBY_VERSION', '1.8.7') }
+
     context "in :path option" do
       it "handles dot path" do
         gemfile = Appraisal::Gemfile.new
@@ -416,4 +418,16 @@ describe Appraisal::Gemfile do
       end
     end
   end
+
+  context "git_source support" do
+    before { stub_const('RUBY_VERSION', '1.8.7') }
+
+    it "stores git_source declaration and apply it as git option" do
+      gemfile = Appraisal::Gemfile.new
+      gemfile.git_source(:custom_source) { |repo| "path/#{repo}" }
+      gemfile.gem "bacon", :custom_source => "bacon_pancake"
+
+      expect(gemfile.to_s).to eq %(gem "bacon", :git => "../path/bacon_pancake")
+    end
+  end
 end

data/spec/appraisal/utils_spec.rb

@@ -3,17 +3,30 @@ require 'appraisal/utils'
 
 describe Appraisal::Utils do
   describe '.format_string' do
-    it 'prints out a nice looking hash without a brackets' do
-      hash = { :foo => 'bar' }
-      expect(Appraisal::Utils.format_string(hash)).to eq(':foo => "bar"')
+    if RUBY_VERSION > "1.9"
+      it "prints out a nice looking hash without brackets with new syntax" do
+        hash = { :foo => 'bar' }
+        expect(Appraisal::Utils.format_string(hash)).to eq('foo: "bar"')
 
-      hash = { 'baz' => { :ball => 'boo' }}
-      expect(Appraisal::Utils.format_string(hash)).
-        to eq('"baz" => { :ball => "boo" }')
+        hash = { 'baz' => { :ball => 'boo' }}
+        expect(Appraisal::Utils.format_string(hash)).
+          to eq('"baz" => { ball: "boo" }')
+      end
+    else
+      it "prints out a nice looking hash without brackets with old syntax" do
+        hash = { :foo => 'bar' }
+        expect(Appraisal::Utils.format_string(hash)).to eq(':foo => "bar"')
+
+        hash = { 'baz' => { :ball => 'boo' }}
+        expect(Appraisal::Utils.format_string(hash)).
+          to eq('"baz" => { :ball => "boo" }')
+      end
     end
   end
 
   describe '.format_arguments' do
+    before { stub_const('RUBY_VERSION', '1.8.7') }
+
     it 'prints out arguments without enclosing square brackets' do
       arguments = [:foo, { :bar => { :baz => 'ball' }}]
 
@@ -58,4 +71,16 @@ describe Appraisal::Utils do
       ).to eq("https://github.com/bacon/bacon.git")
     end
   end
+
+  describe ".bundler_version" do
+    it "returns the bundler version" do
+      bundler = double("Bundler", :name => "bundler", :version => "a.b.c")
+      allow(Gem::Specification).to receive(:detect).and_return(bundler)
+
+      version = Appraisal::Utils.bundler_version
+
+      expect(version).to eq "a.b.c"
+      expect(Gem::Specification).to have_received(:detect)
+    end
+  end
 end

data/spec/support/acceptance_test_helpers.rb

@@ -80,12 +80,17 @@ module AcceptanceTestHelpers
         s.name = 'stage'
         s.version = '0.1'
         s.summary = 'Awesome Gem!'
+        s.authors = "Appraisal"
       end
     gemspec
   end
 
   def content_of(path)
-    file(path).read
+    file(path).read.tap do |content|
+      if RUBY_VERSION >= "1.9"
+        content.gsub!(/(\S+): /, ":\\1 => ")
+      end
+    end
   end
 
   def file(path)
@@ -125,8 +130,9 @@ module AcceptanceTestHelpers
         Reinstall Bundler to #{TMP_GEM_ROOT} as `BUNDLE_DISABLE_SHARED_GEMS`
         is enabled.
       WARNING
+      version = Utils.bundler_version
 
-      run "gem install bundler --install-dir '#{TMP_GEM_ROOT}'"
+      run "gem install bundler --version #{version} --install-dir '#{TMP_GEM_ROOT}'"
     end
   end
 
@@ -137,8 +143,9 @@ module AcceptanceTestHelpers
       gem 'appraisal', :path => '#{PROJECT_ROOT}'
 
       if RUBY_VERSION < "1.9"
-        gem "i18n", "~> 0.6.0"
-        gem "activesupport", "~> 3.2.21"
+        #{File.read(File.join(PROJECT_ROOT, "Gemfile-1.8"))}
+      elsif RUBY_VERSION < "2.2"
+        #{File.read(File.join(PROJECT_ROOT, "Gemfile-2.1"))}
       end
     Gemfile
 

data/spec/support/dependency_helpers.rb

@@ -53,4 +53,8 @@ module DependencyHelpers
       FileUtils.rm_r(path)
     end
   end
+
+  def build_git_gems(gems)
+    gems.each { |gem| build_git_gem(gem) }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appraisal
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Joe Ferris
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,6 +96,8 @@ files:
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile-1.8
+- Gemfile-2.1
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -103,19 +105,19 @@ files:
 - bin/appraisal
 - lib/appraisal.rb
 - lib/appraisal/appraisal.rb
+- lib/appraisal/appraisal_file.rb
 - lib/appraisal/bundler_dsl.rb
 - lib/appraisal/cli.rb
 - lib/appraisal/command.rb
 - lib/appraisal/dependency.rb
 - lib/appraisal/dependency_list.rb
 - lib/appraisal/errors.rb
-- lib/appraisal/file.rb
 - lib/appraisal/gemfile.rb
 - lib/appraisal/gemspec.rb
-- lib/appraisal/git_source.rb
+- lib/appraisal/git.rb
 - lib/appraisal/group.rb
 - lib/appraisal/ordered_hash.rb
-- lib/appraisal/path_source.rb
+- lib/appraisal/path.rb
 - lib/appraisal/platform.rb
 - lib/appraisal/source.rb
 - lib/appraisal/task.rb
@@ -124,6 +126,7 @@ files:
 - lib/appraisal/version.rb
 - spec/acceptance/appraisals_file_bundler_dsl_compatibility_spec.rb
 - spec/acceptance/bundle_with_custom_path_spec.rb
+- spec/acceptance/bundle_without_spec.rb
 - spec/acceptance/cli/clean_spec.rb
 - spec/acceptance/cli/generate_spec.rb
 - spec/acceptance/cli/help_spec.rb
@@ -136,9 +139,9 @@ files:
 - spec/acceptance/gemfile_dsl_compatibility_spec.rb
 - spec/acceptance/gemspec_spec.rb
 - spec/acceptance/travis_ci_integration_spec.rb
+- spec/appraisal/appraisal_file_spec.rb
 - spec/appraisal/appraisal_spec.rb
 - spec/appraisal/dependency_list_spec.rb
-- spec/appraisal/file_spec.rb
 - spec/appraisal/gemfile_spec.rb
 - spec/appraisal/utils_spec.rb
 - spec/spec_helper.rb
@@ -165,13 +168,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Find out what your Ruby gems are worth
 test_files:
 - spec/acceptance/appraisals_file_bundler_dsl_compatibility_spec.rb
 - spec/acceptance/bundle_with_custom_path_spec.rb
+- spec/acceptance/bundle_without_spec.rb
 - spec/acceptance/cli/clean_spec.rb
 - spec/acceptance/cli/generate_spec.rb
 - spec/acceptance/cli/help_spec.rb
@@ -184,9 +188,9 @@ test_files:
 - spec/acceptance/gemfile_dsl_compatibility_spec.rb
 - spec/acceptance/gemspec_spec.rb
 - spec/acceptance/travis_ci_integration_spec.rb
+- spec/appraisal/appraisal_file_spec.rb
 - spec/appraisal/appraisal_spec.rb
 - spec/appraisal/dependency_list_spec.rb
-- spec/appraisal/file_spec.rb
 - spec/appraisal/gemfile_spec.rb
 - spec/appraisal/utils_spec.rb
 - spec/spec_helper.rb