appraisal 0.4.1 → 0.5.0

data/.gitignore

@@ -4,3 +4,5 @@ pkg
 .swo
 *~
 *.gem
+Gemfile.lock
+.bundle

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+branches:
+  only:
+    - master

data/CONTRIBUTING.md

@@ -0,0 +1,38 @@
+We love pull requests. Here's a quick guide:
+
+1. Fork the repo.
+
+2. Run the tests. We only take pull requests with passing tests, and it's great
+to know that you have a clean slate: `bundle && rake`
+
+3. Add a test for your change. Only refactoring and documentation changes
+require no new tests. If you are adding functionality or fixing a bug, we need
+a test!
+
+4. Make the test pass.
+
+5. Push to your fork and submit a pull request.
+
+
+At this point you're waiting on us. We like to at least comment on, if not
+accept, pull requests within three business days (and, typically, one business
+day). We may suggest some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted,
+taken straight from the Ruby on Rails guide:
+
+* Use Rails idioms and helpers
+* Include tests that fail without your code, and pass with it
+* Update the documentation, the surrounding one, examples elsewhere, guides,
+  whatever is affected by your contribution
+
+Syntax:
+
+* Two spaces, no tabs.
+* No trailing whitespace. Blank lines should not have any space.
+* Prefer &&/|| over and/or.
+* MyClass.my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+* a = b and not a=b.
+* Follow the conventions you see used in the source already.
+
+And in case we didn't emphasize it enough: we love tests!

data/GOALS

@@ -0,0 +1,5 @@
+Appraisal hits 1.0.0 when:
+
+* It can reliably reproduce bugs in specific configurations of gems.
+* It has standalone binary for controlling the infrastructure.
+* It is transparent unless specifically interacted with.

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2011 thoughtbot, inc.
+Copyright (c) 2010-2012 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,5 +1,4 @@
-Appraisal
-=========
+# Appraisal [![Build Status](https://secure.travis-ci.org/thoughtbot/appraisal.png)](http://travis-ci.org/thoughtbot/appraisal?branch=master)
 
 Find out what your Ruby gems are worth.
 
@@ -8,7 +7,7 @@ Synopsis
 
 Appraisal integrates with bundler and rake to test your library against
 different versions of dependencies in repeatable scenarios called "appraisals."
-Appraisal is designed to make is easy to check for regressions in your library
+Appraisal is designed to make it easy to check for regressions in your library
 without interfering with day-to-day development using bundler.
 
 Installation
@@ -108,4 +107,4 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
 
-Appraisal is Copyright © 2011 Joe Ferris and thoughtbot. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.
+Appraisal is Copyright © 2010-2012 Joe Ferris and thoughtbot. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/features/appraisals.feature

@@ -10,6 +10,7 @@ Feature: run a rake task through several appraisals
       | dummy_rake | 0.8.7   |
       | dummy_rake | 0.9.0   |
       | dummy_sass | 3.1.0   |
+      | dummy_spec | 3.1.9   |
     When I cd to "projecto"
     And I write to "Gemfile" with:
     """
@@ -18,6 +19,9 @@ Feature: run a rake task through several appraisals
     group :assets do
       gem 'dummy_sass', "  ~> 3.1.0"
     end
+    group :test, :development do
+      gem 'dummy_spec', "  ~> 3.1.0"
+    end
     """
     When I add "appraisal" from this project as a dependency
     And I write to "Appraisals" with:

data/features/gemspec.feature

@@ -32,7 +32,7 @@ Feature: appraisals using an existing gemspec
     And I write to "Appraisals" with:
     """
     appraise "stock" do
-      gem "shoulda", "2.11.3"
+      gem "rake"
     end
     """
     When I write to "Rakefile" with:
@@ -68,3 +68,12 @@ Feature: appraisals using an existing gemspec
     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/support/aruba.rb

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

data/lib/appraisal.rb

@@ -2,4 +2,3 @@ require 'appraisal/version'
 require 'appraisal/task'
 
 Appraisal::Task.new
-

data/lib/appraisal/appraisal.rb

@@ -25,7 +25,7 @@ module Appraisal
     end
 
     def install
-      Command.new("bundle install --gemfile=#{gemfile_path}").run
+      Command.new(bundle_command).run
     end
 
     def gemfile_path
@@ -33,7 +33,12 @@ module Appraisal
         FileUtils.mkdir(gemfile_root)
       end
 
-      ::File.join(gemfile_root, "#{name}.gemfile")
+      ::File.join(gemfile_root, "#{clean_name}.gemfile")
+    end
+
+    def bundle_command
+      gemfile = "--gemfile='#{gemfile_path}'"
+      "bundle check #{gemfile} || bundle install #{gemfile}"
     end
 
     private
@@ -41,6 +46,9 @@ module Appraisal
     def gemfile_root
       ::File.join(Dir.pwd, "gemfiles")
     end
+
+    def clean_name
+      name.gsub(/\s+/, '_').gsub(/[^\w]/, '')
+    end
   end
 end
-

data/lib/appraisal/command.rb

@@ -62,4 +62,3 @@ module Appraisal
     end
   end
 end
-

data/lib/appraisal/dependency.rb

@@ -9,8 +9,7 @@ module Appraisal
     end
 
     def to_s
-      gem_name = %{gem "#{name}"}
-      if requirements.nil? || requirements.empty?
+      if no_requirements?
         gem_name
       else
         "#{gem_name}, #{inspect_requirements}"
@@ -19,9 +18,16 @@ module Appraisal
 
     private
 
+    def gem_name
+      %{gem "#{name}"}
+    end
+
+    def no_requirements?
+      requirements.nil? || requirements.empty?
+    end
+
     def inspect_requirements
       requirements.map { |requirement| requirement.inspect.gsub(/^\{|\}$/, '') }.join(", ")
     end
   end
 end
-

data/lib/appraisal/file.rb

@@ -30,7 +30,7 @@ module Appraisal
     private
 
     def run(definitions)
-      instance_eval definitions, __FILE__, __LINE__
+      instance_eval(definitions, __FILE__, __LINE__)
     end
 
     def path

data/lib/appraisal/gemfile.rb

@@ -24,7 +24,7 @@ module Appraisal
       @dependencies << Dependency.new(name, requirements)
     end
 
-    def group(name)
+    def group(*names)
       # ignore the group
     end
 
@@ -38,7 +38,7 @@ module Appraisal
 
     def dup
       gemfile = Gemfile.new
-      @sources.each { |source| gemfile.source source }
+      @sources.each { |source| gemfile.source(source) }
       dependencies.each do |dependency|
         gemfile.gem(dependency.name, *dependency.requirements)
       end

data/lib/appraisal/gemspec.rb

@@ -14,7 +14,9 @@ module Appraisal
     end
 
     def to_s
-      "gemspec #{exported_options.inspect.gsub(/^\{|\}$/, '')}" if exists?
+      if exists?
+        "gemspec #{exported_options.inspect.gsub(/^\{|\}$/, '')}"
+      end
     end
 
     private

data/lib/appraisal/task.rb

@@ -47,4 +47,3 @@ module Appraisal
     end
   end
 end
-

data/lib/appraisal/version.rb

@@ -1,3 +1,3 @@
 module Appraisal
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/spec/appraisal/appraisal_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'appraisal/appraisal'
+
+describe Appraisal::Appraisal do
+  it "creates a proper bundle command" do
+    appraisal = Appraisal::Appraisal.new('fake', 'fake')
+    appraisal.stub(:gemfile_path).and_return("/home/test/test directory")
+
+    appraisal.bundle_command.should == "bundle check --gemfile='/home/test/test directory' || bundle install --gemfile='/home/test/test directory'"
+  end
+
+  it "cleans up spaces and punctuation when outputting its gemfile" do
+    appraisal = Appraisal::Appraisal.new("This! is my appraisal name.", "Gemfile")
+    appraisal.gemfile_path.should =~ /This_is_my_appraisal_name.gemfile/
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appraisal
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70209726945840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209726945840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70209726945360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209726945360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70209726944480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70209726944480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209726943180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70209726943180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70209726942620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70209726942620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 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
@@ -73,11 +98,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .bundle/config
 - .gitignore
 - .rspec
+- .travis.yml
+- CONTRIBUTING.md
+- GOALS
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -96,6 +122,7 @@ files:
 - lib/appraisal/gemspec.rb
 - lib/appraisal/task.rb
 - lib/appraisal/version.rb
+- spec/appraisal/appraisal_spec.rb
 - spec/appraisal/gemfile_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/thoughtbot/appraisal
@@ -110,15 +137,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3878235132907510848
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3878235132907510848
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Find out what your Ruby gems are worth
@@ -128,5 +161,6 @@ test_files:
 - features/step_definitions/dependency_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
+- spec/appraisal/appraisal_spec.rb
 - spec/appraisal/gemfile_spec.rb
 - spec/spec_helper.rb

data/.bundle/config

@@ -1,2 +0,0 @@
---- {}
-

data/Gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: .
-  specs:
-    appraisal (0.4.1)
-      bundler
-      rake
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    aruba (0.4.5)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.1.9)
-      cucumber (>= 0.10.7)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.1)
-      rack (~> 1.0)
-    builder (3.0.0)
-    childprocess (0.2.0)
-      ffi (~> 1.0.6)
-    cucumber (1.0.2)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
-    ffi (1.0.9)
-    gherkin (2.4.5)
-      json (>= 1.4.6)
-    json (1.5.3)
-    rack (1.3.2)
-    rake (0.9.2.2)
-    rdiscount (1.6.8)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    term-ansicolor (1.0.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal!
-  aruba (~> 0.4.2)
-  cucumber (~> 1.0)
-  rspec (~> 2.6)