appraisal 1.0.3 → 2.0.0

data/spec/acceptance/gemfile_dsl_compatibility_spec.rb

@@ -26,7 +26,7 @@ describe 'Gemfile DSL compatibility' do
         gem "waffle"
       end
 
-      gem 'appraisal', path: #{PROJECT_ROOT.inspect}
+      gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
 
       gemspec
     Gemfile
@@ -111,7 +111,7 @@ describe 'Gemfile DSL compatibility' do
     build_gem "bacon", "1.2.0"
 
     build_gemfile <<-Gemfile
-      gem "appraisal", path: #{PROJECT_ROOT.inspect}
+      gem "appraisal", :path => #{PROJECT_ROOT.inspect}
       gem "bacon", "1.2.0"
     Gemfile
 
@@ -142,7 +142,7 @@ describe 'Gemfile DSL compatibility' do
     build_gemspec
 
     build_gemfile <<-Gemfile
-      gem "appraisal", path: #{PROJECT_ROOT.inspect}
+      gem "appraisal", :path => #{PROJECT_ROOT.inspect}
 
       group :plugin do
         gemspec

data/spec/acceptance/gemspec_spec.rb

@@ -10,7 +10,7 @@ describe 'Gemspec' do
     build_gemspec
 
     write_file 'Gemfile', <<-Gemfile
-      gem 'appraisal', path: #{PROJECT_ROOT.inspect}
+      gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
 
       gemspec
     Gemfile
@@ -26,9 +26,9 @@ describe 'Gemspec' do
     build_gemspec 'specdir'
 
     write_file 'Gemfile', <<-Gemfile
-      gem 'appraisal', path: #{PROJECT_ROOT.inspect}
+      gem 'appraisal', :path => #{PROJECT_ROOT.inspect}
 
-      gemspec path: './specdir'
+      gemspec :path => './specdir'
     Gemfile
 
     run 'bundle install --local'

data/spec/acceptance/travis_ci_integration_spec.rb

@@ -0,0 +1,94 @@
+require "spec_helper"
+require "active_support/core_ext/kernel/reporting"
+require "appraisal/travis_ci_helper"
+
+describe "Travis CI integration" do
+  before do
+    build_appraisal_file <<-Appraisals.strip_heredoc
+      appraise "1.0.0" do
+        gem "dummy", "1.0.0"
+      end
+
+      appraise "1.1.0" do
+        gem "dummy", "1.1.0"
+      end
+    Appraisals
+  end
+
+  context "when user runs `appraisal generate --travis`" do
+    it "displays a correct Gemfile directive" do
+      output = run("appraisal generate --travis")
+
+      expect(output).to include <<-stdout.strip_heredoc
+        # Put this in your .travis.yml
+        gemfiles:
+          - gemfiles/1.0.0.gemfile
+          - gemfiles/1.1.0.gemfile
+      stdout
+    end
+  end
+
+  context "When user has .travis.yml" do
+    context "with no gemfiles directive" do
+      before do
+        write_file ".travis.yml", ""
+      end
+
+      it "displays a warning message when run `appraisal generate`" do
+        warning = run "appraisal generate 2>&1"
+
+        expect(warning).to include no_configuration_warning
+      end
+    end
+
+    context "with incorrect gemfiles directive" do
+      before do
+        write_file ".travis.yml", <<-travis_yml
+          gemfiles:
+            - gemfiles/1.0.0.gemfile
+            - gemfiles/1.0.1.gemfile
+        travis_yml
+      end
+
+      it "displays a warning message when run `appraisal generate`" do
+        warning = run "appraisal generate 2>&1"
+
+        expect(warning).to include invalid_configuration_warning
+      end
+    end
+
+    context "with correct gemfiles directive" do
+      before do
+        write_file ".travis.yml", <<-travis_yml
+          gemfiles:
+            - gemfiles/1.0.0.gemfile
+            - gemfiles/1.1.0.gemfile
+        travis_yml
+      end
+
+      it "does not display any warning when run `appraisal generate`" do
+        warning = run "appraisal generate 2>&1"
+
+        expect(warning).not_to include no_configuration_warning
+        expect(warning).not_to include invalid_configuration_warning
+      end
+    end
+  end
+
+  context "when user does not have .travis.yml" do
+    it "does not display any warning when run `appraisal generate`" do
+      warning = run "appraisal generate 2>&1"
+
+      expect(warning).not_to include no_configuration_warning
+      expect(warning).not_to include invalid_configuration_warning
+    end
+  end
+
+  def no_configuration_warning
+    Appraisal::TravisCIHelper::NO_CONFIGURATION_WARNING
+  end
+
+  def invalid_configuration_warning
+   Appraisal::TravisCIHelper::INVALID_CONFIGURATION_WARNING
+  end
+end

data/spec/appraisal/gemfile_spec.rb

@@ -17,6 +17,13 @@ describe Appraisal::Gemfile do
     expect(gemfile.to_s.strip).to eq %{source "one"\nsource "two"}
   end
 
+  it "ignores duplicate sources" do
+    gemfile = Appraisal::Gemfile.new
+    gemfile.source "one"
+    gemfile.source "one"
+    expect(gemfile.to_s.strip).to eq %{source "one"}
+  end
+
   it "preserves dependency order" do
     gemfile = Appraisal::Gemfile.new
     gemfile.gem "one"
@@ -45,22 +52,36 @@ describe Appraisal::Gemfile do
     GEMFILE
   end
 
-  it 'supports groups syntax, but with deprecation warning' do
+  it "supports nested DSL within group syntax" do
     gemfile = Appraisal::Gemfile.new
 
-    warning = capture(:stderr) do
-      gemfile.groups :development, :test do
+    gemfile.group :development, :test do
+      platforms :jruby do
         gem "one"
       end
+      git "git://example.com/repo.git" do
+        gem "two"
+      end
+      path ".." do
+        gem "three"
+      end
     end
 
     expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
       group :development, :test do
-        gem "one"
+        git "git://example.com/repo.git" do
+          gem "two"
+        end
+
+        path "../.." do
+          gem "three"
+        end
+
+        platforms :jruby do
+          gem "one"
+        end
       end
     GEMFILE
-
-    expect(warning).to match(/deprecated/)
   end
 
   it 'supports platform syntax' do
@@ -77,20 +98,130 @@ describe Appraisal::Gemfile do
     GEMFILE
   end
 
-  it 'supports platforms syntax' do
+  it "supports nested DSL within platform syntax" do
+    gemfile = Appraisal::Gemfile.new
+
+    gemfile.platform :jruby do
+      group :development, :test do
+        gem "one"
+      end
+      git "git://example.com/repo.git" do
+        gem "two"
+      end
+      path ".." do
+        gem "three"
+      end
+    end
+
+    expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
+      platforms :jruby do
+        git "git://example.com/repo.git" do
+          gem "two"
+        end
+
+        path "../.." do
+          gem "three"
+        end
+
+        group :development, :test do
+          gem "one"
+        end
+      end
+    GEMFILE
+  end
+
+  it "supports git syntax" do
     gemfile = Appraisal::Gemfile.new
 
-    gemfile.platforms :jruby do
+    gemfile.git "git://example.com/repo.git" do
       gem "one"
     end
 
     expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
+      git "git://example.com/repo.git" do
+        gem "one"
+      end
+    GEMFILE
+  end
+
+  it "supports nested DSL within git syntax" do
+    gemfile = Appraisal::Gemfile.new
+
+    gemfile.git "git://example.com/repo.git" do
+      group :development, :test do
+        gem "one"
+      end
       platforms :jruby do
+        gem "two"
+      end
+      path ".." do
+        gem "three"
+      end
+    end
+
+    expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
+      git "git://example.com/repo.git" do
+        path "../.." do
+          gem "three"
+        end
+
+        group :development, :test do
+          gem "one"
+        end
+
+        platforms :jruby do
+          gem "two"
+        end
+      end
+    GEMFILE
+  end
+
+  it "supports path syntax" do
+    gemfile = Appraisal::Gemfile.new
+
+    gemfile.path "../path" do
+      gem "one"
+    end
+
+    expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
+      path "../../path" do
         gem "one"
       end
     GEMFILE
   end
 
+  it "supports nested DSL within path syntax" do
+    gemfile = Appraisal::Gemfile.new
+
+    gemfile.path "../path" do
+      group :development, :test do
+        gem "one"
+      end
+      platforms :jruby do
+        gem "two"
+      end
+      git "git://example.com/repo.git" do
+        gem "three"
+      end
+    end
+
+    expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
+      path "../../path" do
+        git "git://example.com/repo.git" do
+          gem "three"
+        end
+
+        group :development, :test do
+          gem "one"
+        end
+
+        platforms :jruby do
+          gem "two"
+        end
+      end
+    GEMFILE
+  end
+
   context "excess new line" do
     context "no contents" do
       it "shows empty string" do
@@ -123,21 +254,21 @@ describe Appraisal::Gemfile do
     context "in :path option" do
       it "handles dot path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", path: "."
+        gemfile.gem "bacon", :path => "."
 
         expect(gemfile.to_s).to eq %(gem "bacon", :path => "../")
       end
 
       it "handles relative path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", path: "../bacon"
+        gemfile.gem "bacon", :path => "../bacon"
 
         expect(gemfile.to_s).to eq %(gem "bacon", :path => "../../bacon")
       end
 
       it "handles absolute path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", path: "/tmp"
+        gemfile.gem "bacon", :path => "/tmp"
 
         expect(gemfile.to_s).to eq %(gem "bacon", :path => "/tmp")
       end
@@ -146,28 +277,28 @@ describe Appraisal::Gemfile do
     context "in :git option" do
       it "handles dot git path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", git: "."
+        gemfile.gem "bacon", :git => "."
 
         expect(gemfile.to_s).to eq %(gem "bacon", :git => "../")
       end
 
       it "handles relative git path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", git: "../bacon"
+        gemfile.gem "bacon", :git => "../bacon"
 
         expect(gemfile.to_s).to eq %(gem "bacon", :git => "../../bacon")
       end
 
       it "handles absolute git path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", git: "/tmp"
+        gemfile.gem "bacon", :git => "/tmp"
 
         expect(gemfile.to_s).to eq %(gem "bacon", :git => "/tmp")
       end
 
       it "handles git uri" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", git: "git@github.com:bacon/bacon.git"
+        gemfile.gem "bacon", :git => "git@github.com:bacon/bacon.git"
 
         expect(gemfile.to_s).
           to eq %(gem "bacon", :git => "git@github.com:bacon/bacon.git")
@@ -279,7 +410,7 @@ describe Appraisal::Gemfile do
     context "in gemspec directive" do
       it "handles gemspec path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gemspec path: "."
+        gemfile.gemspec :path => "."
 
         expect(gemfile.to_s).to eq %(gemspec :path => "../")
       end

data/spec/appraisal/utils_spec.rb

@@ -4,17 +4,18 @@ 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', 'baz' => { :ball => 'boo' } }
+      hash = { :foo => 'bar' }
+      expect(Appraisal::Utils.format_string(hash)).to eq(':foo => "bar"')
 
-      expect(Appraisal::Utils.format_string(hash)).to eq(
-        ':foo => "bar", "baz" => { :ball => "boo" }'
-      )
+      hash = { 'baz' => { :ball => 'boo' }}
+      expect(Appraisal::Utils.format_string(hash)).
+        to eq('"baz" => { :ball => "boo" }')
     end
   end
 
   describe '.format_arguments' do
     it 'prints out arguments without enclosing square brackets' do
-      arguments = [:foo, bar: { baz: 'ball' }]
+      arguments = [:foo, { :bar => { :baz => 'ball' }}]
 
       expect(Appraisal::Utils.format_arguments(arguments)).to eq(
         ':foo, :bar => { :baz => "ball" }'

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
-require_relative 'support/acceptance_test_helpers'
-require_relative 'support/stream_helpers'
+require "./spec/support/acceptance_test_helpers"
+require "./spec/support/stream_helpers"
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze
 TMP_GEM_ROOT = File.join(PROJECT_ROOT, "tmp", "gems")
@@ -14,4 +14,8 @@ RSpec.configure do |config|
   end
 
   config.include AcceptanceTestHelpers, :type => :acceptance
+
+  config.before :suite do
+    FileUtils.rm_rf TMP_GEM_ROOT
+  end
 end

data/spec/support/acceptance_test_helpers.rb

@@ -1,8 +1,9 @@
 require 'rspec/expectations/expectation_target'
 require 'active_support/core_ext/string/strip'
+require 'active_support/core_ext/string/filters'
 require 'active_support/concern'
 require 'appraisal/utils'
-require_relative 'dependency_helpers'
+require "./spec/support/dependency_helpers"
 
 module AcceptanceTestHelpers
   extend ActiveSupport::Concern
@@ -14,15 +15,7 @@ module AcceptanceTestHelpers
   included do
     metadata[:type] = :acceptance
 
-    before :all do
-      build_default_dummy_gems
-    end
-
-    after :all do
-      cleanup_gem_home
-    end
-
-    before parallel: true do
+    before :parallel => true do
       unless Appraisal::Utils.support_parallel_installation?
         pending 'This Bundler version does not support --jobs flag.'
       end
@@ -32,6 +25,8 @@ module AcceptanceTestHelpers
       cleanup_artifacts
       save_environment_variables
       unset_bundler_environment_variables
+      build_default_dummy_gems
+      ensure_bundler_is_available
       add_binstub_path
       build_default_gemfile
     end
@@ -115,28 +110,39 @@ module AcceptanceTestHelpers
     FileUtils.rm_rf current_directory
   end
 
-  def cleanup_gem_home
-    FileUtils.rm_rf TMP_GEM_ROOT
-  end
-
   def build_default_dummy_gems
-    FileUtils.rm_rf(TMP_GEM_ROOT)
     FileUtils.mkdir_p(TMP_GEM_ROOT)
 
     build_gem 'dummy', '1.0.0'
     build_gem 'dummy', '1.1.0'
   end
 
+  def ensure_bundler_is_available
+    run "bundle -v 2>&1", false
+
+    if $?.exitstatus != 0
+      puts <<-WARNING.squish.strip_heredoc
+        Reinstall Bundler to #{TMP_GEM_ROOT} as `BUNDLE_DISABLE_SHARED_GEMS`
+        is enabled.
+      WARNING
+
+      run "gem install bundler --install-dir '#{TMP_GEM_ROOT}'"
+    end
+  end
+
   def build_default_gemfile
     build_gemfile <<-Gemfile
       source 'https://rubygems.org'
 
       gem 'appraisal', :path => '#{PROJECT_ROOT}'
+
+      if RUBY_VERSION < "1.9"
+        gem "i18n", "~> 0.6.0"
+        gem "activesupport", "~> 3.2.21"
+      end
     Gemfile
 
-    in_test_directory do
-      `bundle install --binstubs --local`
-    end
+    run "bundle install --binstubs --local"
   end
 
   def in_test_directory(&block)