appraisal 0.2.0 → 0.3.1

data/Gemfile

@@ -1,5 +1,3 @@
 source "http://rubygems.org"
-gem "cucumber"
-gem "aruba"
-gem "rake"
-gem "rspec"
+
+gemspec

data/Gemfile.lock

@@ -1,38 +1,47 @@
+PATH
+  remote: .
+  specs:
+    appraisal (0.3.1)
+      aruba (~> 0.3.6)
+      bundler
+      rake
+
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.2.4)
-      background_process
-      cucumber (~> 0.9.3)
-    background_process (1.2)
-    builder (2.1.2)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
+    aruba (0.3.6)
+      childprocess (>= 0.1.7)
+      cucumber (>= 0.10.0)
+      rspec (>= 2.5.0)
+    builder (3.0.0)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (0.10.3)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.8)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    gherkin (2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    json (1.4.6)
-    rake (0.8.7)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    ffi (1.0.9)
+    gherkin (2.3.9)
+      json (>= 1.4.6)
+    json (1.5.1)
+    rake (0.9.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.3)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.6.0)
     term-ansicolor (1.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  cucumber
-  rake
-  rspec
+  appraisal!
+  cucumber (~> 0.10)
+  rspec (~> 2.6)

data/features/appraisals.feature

@@ -36,40 +36,40 @@ Feature: run a rake task through several appraisals
     end
     task :default => :version
     """
-    When I successfully run "bundle exec rake appraisal:install --trace"
+    When 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"
+    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"
+    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"
+    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"
+    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"
+    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"
+    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

data/features/gemspec.feature

@@ -0,0 +1,70 @@
+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!}
+
+      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_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
+  """
+
+@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"
+
+
+@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"
+

data/features/support/aruba.rb

@@ -0,0 +1,4 @@
+Before do
+  # Extend the timeout before Aruba will kill the process to 5 minute.
+  @aruba_timeout_seconds = 18000
+end

data/features/support/env.rb

@@ -1,4 +1,4 @@
-require 'aruba'
+require 'aruba/cucumber'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
 

data/lib/appraisal/command.rb

@@ -43,7 +43,11 @@ module Appraisal
     end
 
     def announce
-      puts ">> BUNDLE_GEMFILE=#{@gemfile} #{@command}"
+      if @gemfile
+        puts ">> BUNDLE_GEMFILE=#{@gemfile} #{@command}"
+      else
+        puts ">> #{@command}"
+      end
     end
 
     def unset_bundler_env_vars

data/lib/appraisal/dependency.rb

@@ -20,7 +20,7 @@ module Appraisal
     private
 
     def inspect_requirements
-      requirements.map { |requirement| requirement.inspect }.join(", ")
+      requirements.map { |requirement| requirement.inspect.gsub(/^\{|\}$/, '') }.join(", ")
     end
   end
 end

data/lib/appraisal/gemfile.rb

@@ -1,4 +1,5 @@
 require 'appraisal/dependency'
+require 'appraisal/gemspec'
 
 module Appraisal
   # Load bundler Gemfiles and merge dependencies
@@ -26,8 +27,7 @@ module Appraisal
     end
 
     def to_s
-      %{source "#{@source}"\n} <<
-        dependencies.values.map { |dependency| dependency.to_s }.join("\n")
+      [source_entry, dependencies_entry, gemspec_entry].join("\n\n")
     end
 
     def dup
@@ -36,7 +36,26 @@ module Appraisal
         dependencies.values.each do |dependency|
           gemfile.gem(dependency.name, *dependency.requirements)
         end
+        gemfile.gemspec(@gemspec.options) if @gemspec
       end
     end
+
+    def gemspec(options = {})
+      @gemspec = Gemspec.new(options)
+    end
+
+    protected
+
+    def source_entry
+      %(source "#{@source}")
+    end
+
+    def dependencies_entry
+      dependencies.values.map { |dependency| dependency.to_s }.join("\n")
+    end
+
+    def gemspec_entry
+      @gemspec.to_s
+    end
   end
 end

data/lib/appraisal/gemspec.rb

@@ -0,0 +1,23 @@
+require 'pathname'
+
+module Appraisal
+  class Gemspec
+    attr_reader :options
+
+    def initialize(options = {})
+      @options = options
+
+      # figure out the right path for the gemspec
+      @options[:path] ||= '.'
+      @options[:path] = ::File.expand_path(@options[:path])
+    end
+
+    def exists?
+      Dir[::File.join(@options[:path], "*.gemspec")].size > 0
+    end
+
+    def to_s
+      "gemspec #{@options.inspect.gsub(/^\{|\}$/, '')}" if exists?
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: appraisal
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Joe Ferris
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -04:00
+date: 2011-05-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,20 +18,20 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "0.10"
   type: :development
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  name: rspec
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "2.6"
   type: :development
   prerelease: false
   version_requirements: *id002
@@ -57,6 +57,17 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
 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: []
@@ -75,10 +86,13 @@ files:
 - lib/appraisal/dependency.rb
 - lib/appraisal/file.rb
 - lib/appraisal/gemfile.rb
+- lib/appraisal/gemspec.rb
 - lib/appraisal/task.rb
 - lib/appraisal.rb
 - features/appraisals.feature
+- features/gemspec.feature
 - features/step_definitions/dependency_steps.rb
+- features/support/aruba.rb
 - features/support/env.rb
 has_rdoc: true
 homepage: http://github.com/thoughtbot/appraisal
@@ -94,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3413517185819594219
+      hash: 1018536850827095615
       segments: 
       - 0
       version: "0"
@@ -103,6 +117,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 1018536850827095615
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
@@ -113,5 +130,7 @@ specification_version: 3
 summary: Find out what your Ruby gems are worth
 test_files: 
 - features/appraisals.feature
+- features/gemspec.feature
 - features/step_definitions/dependency_steps.rb
+- features/support/aruba.rb
 - features/support/env.rb