appraisal 2.0.1 → 2.4.0

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,23 @@ 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."
+    method_option "full-index", :type => :boolean,
+                                :desc => "Run bundle install with the " \
+                                         "full-index argument."
+    method_option "path", type: :string,
+                          desc: "Install gems in the specified directory. " \
+                                "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 +65,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 +85,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 +103,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

@@ -41,14 +41,17 @@ module Appraisal
     end
 
     def ensure_bundler_is_available
-      unless system %(gem list -q "^bundler$" | grep -q bundler)
+      version = Utils.bundler_version
+      unless system %(gem list -i bundler -v #{version})
         puts ">> Reinstall Bundler into #{ENV["GEM_HOME"]}"
 
-        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/dependency_list.rb

@@ -1,14 +1,22 @@
 require 'appraisal/dependency'
-require "active_support/ordered_hash"
 
 module Appraisal
   class DependencyList
     def initialize
-      @dependencies = ActiveSupport::OrderedHash.new
+      @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/gemfile.rb

@@ -2,15 +2,18 @@ require "appraisal/bundler_dsl"
 
 module Appraisal
   autoload :Gemspec, "appraisal/gemspec"
-  autoload :GitSource, "appraisal/git_source"
-  autoload :PathSource, "appraisal/path_source"
+  autoload :Git, "appraisal/git"
   autoload :Group, "appraisal/group"
+  autoload :Path, "appraisal/path"
   autoload :Platform, "appraisal/platform"
+  autoload :Source, "appraisal/source"
 
   # Load bundler Gemfiles and merge dependencies
   class Gemfile < BundlerDSL
     def load(path)
-      run(IO.read(path))
+      if File.exist?(path)
+        run(IO.read(path))
+      end
     end
 
     def run(definitions)
@@ -19,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/source.rb

@@ -0,0 +1,30 @@
+require "appraisal/bundler_dsl"
+require "appraisal/utils"
+
+module Appraisal
+  class Source < BundlerDSL
+    def initialize(source)
+      super()
+      @source = source
+    end
+
+    def to_s
+      formatted_output indent(super)
+    end
+
+    # :nodoc:
+    def for_dup
+      formatted_output indent(super)
+    end
+
+    private
+
+    def formatted_output(output_dependencies)
+      <<-OUTPUT.strip
+source #{@source.inspect} do
+#{output_dependencies}
+end
+        OUTPUT
+    end
+  end
+end

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,10 +1,11 @@
-require "appraisal/file"
+require "appraisal/appraisal_file"
 require "yaml"
 
 module Appraisal
   class TravisCIHelper
-    NO_CONFIGURATION_WARNING = <<-WARNING.strip
-      Note: Run with --travis to generate Travis CI configuration.
+    NO_CONFIGURATION_WARNING = <<-WARNING.strip.gsub(/\s+/, " ")
+      Note: Run `appraisal generate --travis` to generate Travis CI
+      configuration.
     WARNING
 
     INVALID_CONFIGURATION_WARNING = <<-WARNING.strip.gsub(/\s+/, " ")
@@ -19,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
@@ -44,7 +45,7 @@ module Appraisal
       private
 
       def has_configuration_file?
-        ::File.exist?(CONFIGURATION_FILE)
+        File.exist?(CONFIGURATION_FILE)
       end
 
       def has_no_gemfiles_configuration?
@@ -54,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 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.0.1'.freeze
+  VERSION = "2.4.0".freeze
 end

data/spec/acceptance/appraisals_file_bundler_dsl_compatibility_spec.rb

@@ -2,14 +2,17 @@ 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)
-    build_git_gem 'egg'
+    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
       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'
@@ -21,6 +24,8 @@ 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
@@ -31,15 +36,20 @@ describe 'Appraisals file Bundler DSL compatibility' do
         end
       end
 
+      source "https://other-rubygems.org" do
+        gem "sausage"
+      end
+
       gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
     Gemfile
 
     build_appraisal_file <<-Appraisals
       appraise 'breakfast' do
         source 'http://some-other-source.com'
-        ruby "1.8.7"
+        ruby "2.3.0"
 
         gem 'bread'
+        gem "pain_au_chocolat", :custom_git_source => "pain_au_chocolat"
 
         git '../gems/egg' do
           gem 'porched_egg'
@@ -50,6 +60,7 @@ describe 'Appraisals file Bundler DSL compatibility' do
         end
 
         group :breakfast do
+          remove_gem 'rotten_egg'
           gem 'bacon'
 
           platforms :rbx do
@@ -61,7 +72,12 @@ describe 'Appraisals file Bundler DSL compatibility' do
           gem 'yoghurt'
         end
 
+        source "https://other-rubygems.org" do
+          gem "pancake"
+        end
+
         gemspec
+        gemspec :path => "sitepress"
       end
     Appraisals
 
@@ -74,7 +90,7 @@ describe 'Appraisals file Bundler DSL compatibility' do
       source "https://rubygems.org"
       source "http://some-other-source.com"
 
-      ruby "1.8.7"
+      ruby "2.3.0"
 
       git "../../gems/egg" do
         gem "egg"
@@ -87,11 +103,14 @@ 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"
+        gem "omelette", :git => "../../gems/omelette"
         gem "bacon"
 
         platforms :rbx do
@@ -108,7 +127,13 @@ describe 'Appraisals file Bundler DSL compatibility' do
         end
       end
 
+      source "https://other-rubygems.org" do
+        gem "sausage"
+        gem "pancake"
+      end
+
       gemspec :path => "../"
+      gemspec :path => "../sitepress"
     Gemfile
   end
 end

data/spec/acceptance/bundle_with_custom_path_spec.rb

@@ -1,22 +1,53 @@
 require "spec_helper"
 
 describe "Bundle with custom path" do
-  it "supports --path option" do
-    build_gemfile <<-Gemfile
-      source "https://rubygems.org"
+  let(:gem_name) { 'rack' }
+  let(:path) { 'vendor/bundle' }
 
-      gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
-    Gemfile
+  shared_examples :gemfile_dependencies_are_satisfied do
 
-    build_appraisal_file <<-Appraisals
-      appraise "breakfast" do
-      end
-    Appraisals
+    it 'installs gems in the --path directory' do
+      build_gemfile <<-Gemfile
+        source "https://rubygems.org"
 
-    run %(bundle install --path="vendor/bundle")
-    output = run "appraisal install"
+        gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
+      Gemfile
 
-    expect(file "gemfiles/breakfast.gemfile").to be_exists
-    expect(output).to include("Successfully installed bundler")
+      build_appraisal_file <<-Appraisals
+        appraise "#{gem_name}" do
+          gem '#{gem_name}'
+        end
+      Appraisals
+
+      run %(bundle install --path="#{path}")
+      run 'bundle exec appraisal install'
+
+      installed_gem = Dir.glob("tmp/stage/#{path}/#{Gem.ruby_engine}/*/gems/*").
+                      map    { |path| path.split('/').last }.
+                      select { |gem| gem.include?(gem_name) }
+      expect(installed_gem).not_to be_empty
+
+      bundle_output = run 'bundle check'
+      expect(bundle_output).to include("The Gemfile's dependencies are satisfied")
+
+      appraisal_output = run 'bundle exec appraisal install'
+      expect(appraisal_output).to include("The Gemfile's dependencies are satisfied")
+    end
+  end
+
+  include_examples :gemfile_dependencies_are_satisfied
+
+  context 'when already installed in vendor/another' do
+    before do
+      build_gemfile <<-Gemfile
+        source "https://rubygems.org"
+
+        gem '#{gem_name}'
+      Gemfile
+
+      run 'bundle install --path vendor/another'
+    end
+
+    include_examples :gemfile_dependencies_are_satisfied
   end
 end