appraisal 0.3.8 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    appraisal (0.3.8)
+    appraisal (0.4.0)
       bundler
       rake
 
@@ -31,7 +31,7 @@ GEM
       json (>= 1.4.6)
     json (1.5.3)
     rack (1.3.2)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rdiscount (1.6.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)

data/README.md

@@ -85,6 +85,15 @@ control to ensure that the same versions are always used. When running rake
 tasks for an appraisal, the rake task is run with the appropriate Gemfile for
 that appraisal, ensuring the correct dependencies are used.
 
+Version Control
+--------------
+
+When using Appraisal, we recommend that you check your Gemfile.lock into
+version control, as well as the gemfiles directory generated by Appraisal. This
+will ensure that your tests are always green when you check out a fresh copy.
+It also allows you to create reproducible regression tests for version-specific
+bugs.
+
 Credits
 -------
 

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'rake/gempackagetask'
+require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
 eval("$specification = #{IO.read('appraisal.gemspec')}")
@@ -9,11 +10,15 @@ Rake::GemPackageTask.new($specification) do |package|
   package.need_tar = true
 end
 
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+end
+
 Cucumber::Rake::Task.new(:cucumber) do |t|
   t.fork = true
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
 
 desc "Default: run the cucumber scenarios"
-task :default => :cucumber
+task :default => [:spec, :cucumber]
 

data/features/appraisals.feature

@@ -1,23 +1,33 @@
+@disable-bundler
 Feature: run a rake task through several appraisals
 
   Background:
     Given a directory named "projecto"
+    And the following installed dummy gems:
+      | name       | version |
+      | dummy_girl | 1.3.0   |
+      | dummy_girl | 1.3.2   |
+      | dummy_rake | 0.8.7   |
+      | dummy_rake | 0.9.0   |
+      | dummy_sass | 3.1.0   |
     When I cd to "projecto"
     And I write to "Gemfile" with:
     """
-    source "http://rubygems.org"
-    gem "rake", "0.8.7"
-    gem "factory_girl"
+    gem "dummy_rake", "0.8.7"
+    gem "dummy_girl"
+    group :assets do
+      gem 'dummy_sass', "  ~> 3.1.0"
+    end
     """
     When I add "appraisal" from this project as a dependency
     And I write to "Appraisals" with:
     """
     appraise "1.3.2" do
-      gem "factory_girl", "1.3.2"
+      gem "dummy_girl", "1.3.2"
     end
     appraise "1.3.0" do
-      gem "factory_girl", "1.3.0"
-      gem "rake", "0.9.0"
+      gem "dummy_girl", "1.3.0"
+      gem "dummy_rake", "0.9.0"
     end
     """
     When I write to "Rakefile" with:
@@ -26,59 +36,52 @@ Feature: run a rake task through several appraisals
     require 'bundler/setup'
     require 'appraisal'
     task :version do
-      require 'factory_girl'
-      puts "Loaded #{Factory::VERSION}"
+      require 'dummy_girl'
+      puts "Loaded #{$dummy_girl_version}"
     end
     task :fail do
-      require 'factory_girl'
-      puts "Fail #{Factory::VERSION}"
+      require 'dummy_girl'
+      puts "Fail #{$dummy_girl_version}"
       raise
     end
     task :default => :version
     """
-    When I successfully run `bundle exec rake appraisal:install --trace`
+    When I successfully run `bundle install --local`
+    And I successfully run `bundle exec rake appraisal:install --trace`
 
-  @disable-bundler
   Scenario: run a specific task with one appraisal
     When I successfully run `bundle exec rake appraisal:1.3.0 version --trace`
     Then the output should contain "Loaded 1.3.0"
 
-  @disable-bundler
   Scenario: run a specific task with all appraisals
     When I successfully run `bundle exec rake appraisal version --trace`
     Then the output should contain "Loaded 1.3.0"
     And the output should contain "Loaded 1.3.2"
     And the output should not contain "Invoke version"
 
-  @disable-bundler
   Scenario: run the default task with one appraisal
     When I successfully run `bundle exec rake appraisal:1.3.0 --trace`
     Then the output should contain "Loaded 1.3.0"
 
-  @disable-bundler
   Scenario: run the default task with all appraisals
     When I successfully run `bundle exec rake appraisal --trace`
     Then the output should contain "Loaded 1.3.0"
     And the output should contain "Loaded 1.3.2"
 
-  @disable-bundler
   Scenario: run a failing task with one appraisal
     When I run `bundle exec rake appraisal:1.3.0 fail --trace`
     Then the output should contain "Fail 1.3.0"
     And the exit status should be 1
 
-  @disable-bundler
   Scenario: run a failing task with all appraisals
     When I run `bundle exec rake appraisal fail --trace`
     Then the output should contain "Fail 1.3.2"
     But the output should not contain "Fail 1.3.0"
     And the exit status should be 1
 
-  @disable-bundler
   Scenario: run a cleanup task
     When I run `bundle exec rake appraisal:cleanup --trace`
     Then a file named "gemfiles/1.3.0.gemfile" should not exist
     And a file named "gemfiles/1.3.0.gemfile.lock" should not exist
     And a file named "gemfiles/1.3.2.gemfile" should not exist
     And a file named "gemfiles/1.3.2.gemfile.lock" should not exist
-

data/features/gemspec.feature

@@ -1,70 +1,70 @@
+@disable-bundler
 Feature: appraisals using an existing gemspec
 
-Background:
-  Given a directory named "gemspecced"
-  When I cd to "gemspecced"
-  And I write to "gemspecced.gemspec" with:
-  """
-  Gem::Specification.new do |s|
-      s.name        = %q{gemspecced}
-      s.version     = '0.1'
-      s.summary     = %q{featureful!}
+  Background:
+    Given a directory named "gemspecced"
+    And the following installed dummy gems:
+      | name       | version |
+      | dummy_girl | 1.3.0   |
+      | dummy_girl | 1.3.2   |
+    When I cd to "gemspecced"
+    And I write to "gemspecced.gemspec" with:
+    """
+    Gem::Specification.new do |s|
+        s.name        = %q{gemspecced}
+        s.version     = '0.1'
+        s.summary     = %q{featureful!}
 
-      s.add_runtime_dependency('mocha')
-      s.add_development_dependency('factory_girl', '1.3.2')
-  end
-  """
-  And a directory named "specdir"
-  And I write to "specdir/gemspecced.gemspec" with:
-  """
-  Gem::Specification.new do |s|
-      s.name        = %q{gemspecced}
-      s.version     = '0.1'
-      s.summary     = %q{featureful!}
+        s.add_development_dependency('dummy_girl', '1.3.2')
+    end
+    """
+    And a directory named "specdir"
+    And I write to "specdir/gemspecced.gemspec" with:
+    """
+    Gem::Specification.new do |s|
+        s.name        = %q{gemspecced}
+        s.version     = '0.1'
+        s.summary     = %q{featureful!}
 
-      s.add_runtime_dependency('mocha')
-      s.add_development_dependency('factory_girl', '1.3.0')
-  end
-  """
-  And I write to "Appraisals" with:
-  """
-  appraise "stock" do
-    gem "shoulda", "2.11.3"
-  end
-  """
-  When I write to "Rakefile" with:
-  """
-  require 'rubygems'
-  require 'bundler/setup'
-  require 'appraisal'
-  task :version do
-    require 'factory_girl'
-    puts "Loaded #{Factory::VERSION}"
-  end
-  """
+        s.add_development_dependency('dummy_girl', '1.3.0')
+    end
+    """
+    And I write to "Appraisals" with:
+    """
+    appraise "stock" do
+      gem "shoulda", "2.11.3"
+    end
+    """
+    When I write to "Rakefile" with:
+    """
+    require 'rubygems'
+    require 'bundler/setup'
+    require 'appraisal'
+    task :version do
+      require 'dummy_girl'
+      puts "Loaded #{$dummy_girl_version}"
+    end
+    """
 
-@disable-bundler
-Scenario: run a gem in the gemspec
-  And I write to "Gemfile" with:
-  """
-  source "http://rubygems.org"
-  gemspec
-  """
-  When I add "appraisal" from this project as a dependency
-  When I successfully run `bundle exec rake appraisal:install --trace`
-  When I run `bundle exec rake appraisal version --trace`
-  Then the output should contain "Loaded 1.3.2"
+  Scenario: run a gem in the gemspec
+    And I write to "Gemfile" with:
+    """
+    gemspec
+    """
+    When I add "appraisal" from this project as a dependency
+    And I successfully run `bundle install --local`
+    And I successfully run `bundle exec rake appraisal:install --trace`
+    And I run `bundle exec rake appraisal version --trace`
+    Then the output should contain "Loaded 1.3.2"
 
 
-@disable-bundler
-Scenario: run a gem in the gemspec via path
-  And I write to "Gemfile" with:
-  """
-  source "http://rubygems.org"
-  gemspec :path => './specdir'
-  """
-  When I add "appraisal" from this project as a dependency
-  When I successfully run `bundle exec rake appraisal:install --trace`
-  When I run `bundle exec rake appraisal version --trace`
-  Then the output should contain "Loaded 1.3.0"
+  Scenario: run a gem in the gemspec via path
+    And I write to "Gemfile" with:
+    """
+    gemspec :path => './specdir'
+    """
+    When I add "appraisal" from this project as a dependency
+    When I successfully run `bundle exec rake appraisal:install --trace`
+    When I run `bundle exec rake appraisal version --trace`
+    Then the output should contain "Loaded 1.3.0"
 

data/features/step_definitions/dependency_steps.rb

@@ -2,3 +2,30 @@ When /^I add "([^"]*)" from this project as a dependency$/ do |gem_name|
   append_to_file('Gemfile', %{\ngem "#{gem_name}", :path => "#{PROJECT_ROOT}"})
 end
 
+Given /^the following installed dummy gems:$/ do |table|
+  table.hashes.each do |hash|
+    name = hash["name"]
+    version = hash["version"]
+    create_dir(name)
+    cd(name)
+    create_dir("lib")
+    gem_path = "#{name}.gemspec"
+    version_path = "lib/#{name}.rb"
+    spec = <<-SPEC
+      Gem::Specification.new do |s|
+        s.name    = '#{name}'
+        s.version = '#{version}'
+        s.authors = 'Mr. Smith'
+        s.summary = 'summary'
+        s.files   = '#{version_path}'
+      end
+    SPEC
+    write_file(gem_path, spec)
+    write_file(version_path, "$#{name}_version = '#{version}'")
+    in_current_dir { `gem build #{gem_path} 2>&1` }
+    set_env("GEM_HOME", TMP_GEM_ROOT)
+    in_current_dir { `gem install #{name}-#{version}.gem 2>&1` }
+    FileUtils.rm_rf(File.join(current_dir, name))
+    dirs.pop
+  end
+end

data/features/support/env.rb

@@ -1,4 +1,11 @@
 require 'aruba/cucumber'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
+TMP_GEM_ROOT = File.join(PROJECT_ROOT, "tmp", "gems")
 
+Before do
+  FileUtils.rm_rf(TMP_GEM_ROOT)
+  FileUtils.mkdir_p(TMP_GEM_ROOT)
+end
+
+ENV["GEM_PATH"] = [TMP_GEM_ROOT, ENV["GEM_PATH"]].join(":")

data/lib/appraisal/gemfile.rb

@@ -7,7 +7,8 @@ module Appraisal
     attr_reader :dependencies
 
     def initialize
-      @dependencies = {}
+      @sources = []
+      @dependencies = []
     end
 
     def load(path)
@@ -19,11 +20,16 @@ module Appraisal
     end
 
     def gem(name, *requirements)
-      @dependencies[name] = Dependency.new(name, requirements)
+      @dependencies.reject! { |dependency| dependency.name == name }
+      @dependencies << Dependency.new(name, requirements)
+    end
+
+    def group(name)
+      # ignore the group
     end
 
     def source(source)
-      @source = source
+      @sources << source
     end
 
     def to_s
@@ -32,8 +38,8 @@ module Appraisal
 
     def dup
       gemfile = Gemfile.new
-      gemfile.source @source
-      dependencies.values.each do |dependency|
+      @sources.each { |source| gemfile.source source }
+      dependencies.each do |dependency|
         gemfile.gem(dependency.name, *dependency.requirements)
       end
       gemfile.gemspec(@gemspec.options) if @gemspec
@@ -47,11 +53,11 @@ module Appraisal
     protected
 
     def source_entry
-      %(source "#{@source}")
+      @sources.map { |source| "source #{source.inspect}" }.join("\n")
     end
 
     def dependencies_entry
-      dependencies.values.map { |dependency| dependency.to_s }.join("\n")
+      dependencies.map { |dependency| dependency.to_s }.join("\n")
     end
 
     def gemspec_entry

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appraisal
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 8
-  version: 0.3.8
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Joe Ferris
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -04:00
-default_executable: 
+date: 2011-11-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +28,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  version_requirements: *id001
-  name: cucumber
+  requirement: *id001
+  type: :development
   prerelease: false
+  name: cucumber
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +43,12 @@ dependencies:
         - 2
         - 6
         version: "2.6"
-  version_requirements: *id002
-  name: rspec
+  requirement: *id002
+  type: :development
   prerelease: false
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +59,12 @@ dependencies:
         - 4
         - 2
         version: 0.4.2
-  version_requirements: *id003
-  name: aruba
+  requirement: *id003
+  type: :development
   prerelease: false
+  name: aruba
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,12 +73,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
-  name: rake
+  requirement: *id004
+  type: :runtime
   prerelease: false
+  name: rake
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,9 +87,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: bundler
+  requirement: *id005
+  type: :runtime
   prerelease: false
+  name: bundler
 description: Appraisal integrates with bundler and rake to test your library against different versions of dependencies in repeatable scenarios called "appraisals."
 email: jferris@thoughtbot.com
 executables: []
@@ -119,7 +118,6 @@ files:
 - features/step_definitions/dependency_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
-has_rdoc: true
 homepage: http://github.com/thoughtbot/appraisal
 licenses: []
 
@@ -149,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Find out what your Ruby gems are worth