appraisal 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ab623ad895ec0d2c27cd4a0865a476ca268c355
-  data.tar.gz: 7525addf1bd53d5b424bcb314390b620ddee77e5
+  metadata.gz: 3e62486edd88ce962fe2bfa9385aaee5f7a18a3d
+  data.tar.gz: 87e7f4913a92cef3083029622223544ea4de2701
 SHA512:
-  metadata.gz: 564306857e229c592407c8f1c027d7da3a1b34ed62c49e51b4d3186a39346e1d68d6d14e0bad0887a15241dd4cb5597e7f0fea69125bdd4980ef0a3b9db6caa3
-  data.tar.gz: e24f07952fc90e2c088a2932dcd827d1a4590faa63469ae45168a1a870d6af48c65bd302eb8c75ca0dbd134977820c37b1c167afe4a12a10978f5d883537b6df
+  metadata.gz: 39c0aefe135188fb147aef623f10ff609e478daca8836855767c1260dc18576fc364c83dea9ee76aee39c84fc9afce5802a3c26b5a666c97e32b67b63a25a733
+  data.tar.gz: c80f38736122daa41bfc7f7c1773b2cc49e6b931707157d9c3dbca01ab4c35d30291ee858b29251a72f1506744d1fde3321f16447d4f370afbc097b3c0a93db7

data/appraisal.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('rake')
   s.add_runtime_dependency('bundler')
   s.add_runtime_dependency('thor', '>= 0.14.0')
-  s.add_runtime_dependency("activesupport", ">= 3.2.21")
 
+  s.add_development_dependency("activesupport", ">= 3.2.21")
   s.add_development_dependency('rspec', '~> 3.0')
 end

data/lib/appraisal/appraisal.rb

@@ -60,7 +60,12 @@ module Appraisal
         install_command(job_size)
       ].flatten.join(" ")
 
-      Command.new(command).run
+      if Bundler.settings[:path]
+        env = { 'BUNDLE_DISABLE_SHARED_GEMS' => '1' }
+        Command.new(command, :env => env).run
+      else
+        Command.new(command).run
+      end
     end
 
     def update(gems = [])

data/lib/appraisal/bundler_dsl.rb

@@ -1,5 +1,5 @@
 require "appraisal/dependency_list"
-require "active_support/ordered_hash"
+require "appraisal/ordered_hash"
 
 module Appraisal
   class BundlerDSL
@@ -13,10 +13,10 @@ module Appraisal
       @ruby_version = nil
       @dependencies = DependencyList.new
       @gemspec = nil
-      @groups = ActiveSupport::OrderedHash.new
-      @platforms = ActiveSupport::OrderedHash.new
-      @git_sources = ActiveSupport::OrderedHash.new
-      @path_sources = ActiveSupport::OrderedHash.new
+      @groups = OrderedHash.new
+      @platforms = OrderedHash.new
+      @git_sources = OrderedHash.new
+      @path_sources = OrderedHash.new
     end
 
     def run(&block)

data/lib/appraisal/dependency_list.rb

@@ -1,10 +1,10 @@
 require 'appraisal/dependency'
-require "active_support/ordered_hash"
+require 'appraisal/ordered_hash'
 
 module Appraisal
   class DependencyList
     def initialize
-      @dependencies = ActiveSupport::OrderedHash.new
+      @dependencies = OrderedHash.new
     end
 
     def add(name, requirements)

data/lib/appraisal/gemfile.rb

@@ -10,7 +10,9 @@ module Appraisal
   # 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)

data/lib/appraisal/ordered_hash.rb

@@ -0,0 +1,22 @@
+module Appraisal
+  # An ordered hash implementation for Ruby 1.8.7 compatibility. This is not
+  # a complete implementation, but it covers Appraisal's specific needs.
+  class OrderedHash < ::Hash
+    # Hashes are ordered in Ruby 1.9.
+    if RUBY_VERSION < '1.9'
+      def initialize(*args, &block)
+        super
+        @keys = []
+      end
+
+      def []=(key, value)
+        @keys << key unless has_key?(key)
+        super
+      end
+
+      def values
+        @keys.collect { |key| self[key] }
+      end
+    end
+  end
+end

data/lib/appraisal/travis_ci_helper.rb

@@ -3,8 +3,9 @@ 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+/, " ")

data/lib/appraisal/version.rb

@@ -1,3 +1,3 @@
 module Appraisal
-  VERSION = '2.0.1'.freeze
+  VERSION = "2.0.2".freeze
 end

data/spec/acceptance/bundle_with_custom_path_spec.rb

@@ -19,4 +19,52 @@ describe "Bundle with custom path" do
     expect(file "gemfiles/breakfast.gemfile").to be_exists
     expect(output).to include("Successfully installed bundler")
   end
+
+  context 'when already installed in vendor/another' do
+    let(:gem_name) { 'rack' }
+    let(:path) { 'vendor/bundle' }
+
+    before do
+      build_gemfile <<-Gemfile
+        source "https://rubygems.org"
+
+        gem '#{gem_name}'
+      Gemfile
+
+      run 'bundle install --path vendor/another'
+    end
+
+    it 'installs gems in the --path directory' do
+      build_gemfile <<-Gemfile
+        source "https://rubygems.org"
+
+        gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
+
+        if RUBY_VERSION < "1.9"
+          gem "i18n", "~> 0.6.0"
+          gem "activesupport", "~> 3.2.21"
+        end
+      Gemfile
+
+      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}/ruby/*/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
 end

data/spec/appraisal/file_spec.rb

@@ -7,6 +7,7 @@ require 'rspec/matchers/built_in/raise_error'
 
 describe Appraisal::File 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)
     expect { described_class.new }.to raise_error(Appraisal::AppraisalsNotFound)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appraisal
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Joe Ferris
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -60,7 +60,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.21
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -114,6 +114,7 @@ files:
 - lib/appraisal/gemspec.rb
 - lib/appraisal/git_source.rb
 - lib/appraisal/group.rb
+- lib/appraisal/ordered_hash.rb
 - lib/appraisal/path_source.rb
 - lib/appraisal/platform.rb
 - lib/appraisal/task.rb
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Find out what your Ruby gems are worth