Upgrading to Rspec 2, locking down gems

.bundle/environment.rb

@@ -0,0 +1,276 @@
+# DO NOT MODIFY THIS FILE
+# Generated by Bundler 0.9.26
+
+require 'digest/sha1'
+require 'yaml'
+require 'pathname'
+require 'rubygems'
+Gem.source_index # ensure Rubygems is fully loaded in Ruby 1.9
+
+module Gem
+  class Dependency
+    if !instance_methods.map { |m| m.to_s }.include?("requirement")
+      def requirement
+        version_requirements
+      end
+    end
+  end
+end
+
+module Bundler
+  class Specification < Gem::Specification
+    attr_accessor :relative_loaded_from
+
+    def self.from_gemspec(gemspec)
+      spec = allocate
+      gemspec.instance_variables.each do |ivar|
+        spec.instance_variable_set(ivar, gemspec.instance_variable_get(ivar))
+      end
+      spec
+    end
+
+    def loaded_from
+      return super unless relative_loaded_from
+      source.path.join(relative_loaded_from).to_s
+    end
+
+    def full_gem_path
+      Pathname.new(loaded_from).dirname.expand_path.to_s
+    end
+  end
+
+  module SharedHelpers
+    attr_accessor :gem_loaded
+
+    def default_gemfile
+      gemfile = find_gemfile
+      gemfile or raise GemfileNotFound, "Could not locate Gemfile"
+      Pathname.new(gemfile)
+    end
+
+    def in_bundle?
+      find_gemfile
+    end
+
+    def env_file
+      default_gemfile.dirname.join(".bundle/environment.rb")
+    end
+
+  private
+
+    def find_gemfile
+      return ENV['BUNDLE_GEMFILE'] if ENV['BUNDLE_GEMFILE']
+
+      previous = nil
+      current  = File.expand_path(Dir.pwd)
+
+      until !File.directory?(current) || current == previous
+        filename = File.join(current, 'Gemfile')
+        return filename if File.file?(filename)
+        current, previous = File.expand_path("..", current), current
+      end
+    end
+
+    def clean_load_path
+      # handle 1.9 where system gems are always on the load path
+      if defined?(::Gem)
+        me = File.expand_path("../../", __FILE__)
+        $LOAD_PATH.reject! do |p|
+          next if File.expand_path(p).include?(me)
+          p != File.dirname(__FILE__) &&
+            Gem.path.any? { |gp| p.include?(gp) }
+        end
+        $LOAD_PATH.uniq!
+      end
+    end
+
+    def reverse_rubygems_kernel_mixin
+      # Disable rubygems' gem activation system
+      ::Kernel.class_eval do
+        if private_method_defined?(:gem_original_require)
+          alias rubygems_require require
+          alias require gem_original_require
+        end
+
+        undef gem
+      end
+    end
+
+    def cripple_rubygems(specs)
+      reverse_rubygems_kernel_mixin
+
+      executables = specs.map { |s| s.executables }.flatten
+      Gem.source_index # ensure RubyGems is fully loaded
+
+     ::Kernel.class_eval do
+        private
+        def gem(*) ; end
+      end
+
+      ::Kernel.send(:define_method, :gem) do |dep, *reqs|
+        if executables.include? File.basename(caller.first.split(':').first)
+          return
+        end
+        opts = reqs.last.is_a?(Hash) ? reqs.pop : {}
+
+        unless dep.respond_to?(:name) && dep.respond_to?(:requirement)
+          dep = Gem::Dependency.new(dep, reqs)
+        end
+
+        spec = specs.find  { |s| s.name == dep.name }
+
+        if spec.nil?
+          e = Gem::LoadError.new "#{dep.name} is not part of the bundle. Add it to Gemfile."
+          e.name = dep.name
+          e.version_requirement = dep.requirement
+          raise e
+        elsif dep !~ spec
+          e = Gem::LoadError.new "can't activate #{dep}, already activated #{spec.full_name}. " \
+                                 "Make sure all dependencies are added to Gemfile."
+          e.name = dep.name
+          e.version_requirement = dep.requirement
+          raise e
+        end
+
+        true
+      end
+
+      # === Following hacks are to improve on the generated bin wrappers ===
+
+      # Yeah, talk about a hack
+      source_index_class = (class << Gem::SourceIndex ; self ; end)
+      source_index_class.send(:define_method, :from_gems_in) do |*args|
+        source_index = Gem::SourceIndex.new
+        source_index.spec_dirs = *args
+        source_index.add_specs(*specs)
+        source_index
+      end
+
+      # OMG more hacks
+      gem_class = (class << Gem ; self ; end)
+      gem_class.send(:define_method, :bin_path) do |name, *args|
+        exec_name, *reqs = args
+
+        spec = nil
+
+        if exec_name
+          spec = specs.find { |s| s.executables.include?(exec_name) }
+          spec or raise Gem::Exception, "can't find executable #{exec_name}"
+        else
+          spec = specs.find  { |s| s.name == name }
+          exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}"
+        end
+
+        gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
+        gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
+        File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
+      end
+    end
+
+    extend self
+  end
+end
+
+module Bundler
+  ENV_LOADED   = true
+  LOCKED_BY    = '0.9.26'
+  FINGERPRINT  = "02d687b2b588c2a4d1661dec16df5af3364384a9"
+  HOME         = '/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/bundler'
+  AUTOREQUIRES = {:test=>[["activesupport", false], ["actionpack", false], ["activerecord", false], ["diff-lcs", false], ["nokogiri", false], ["rspec", false], ["rspec_tag_matchers", false], ["spork", false]]}
+  SPECS        = [
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/abstract-1.0.0/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/abstract-1.0.0.gemspec", :name=>"abstract"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/activesupport-3.0.0.beta4/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/activesupport-3.0.0.beta4.gemspec", :name=>"activesupport"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/builder-2.1.2/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/builder-2.1.2.gemspec", :name=>"builder"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/i18n-0.4.1/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/i18n-0.4.1.gemspec", :name=>"i18n"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/activemodel-3.0.0.beta4/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/activemodel-3.0.0.beta4.gemspec", :name=>"activemodel"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/erubis-2.6.6/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/erubis-2.6.6.gemspec", :name=>"erubis"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/rack-1.1.0/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/rack-1.1.0.gemspec", :name=>"rack"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/rack-mount-0.6.6/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/rack-mount-0.6.6.gemspec", :name=>"rack-mount"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/rack-test-0.5.4/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/rack-test-0.5.4.gemspec", :name=>"rack-test"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/tzinfo-0.3.22/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/tzinfo-0.3.22.gemspec", :name=>"tzinfo"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/actionpack-3.0.0.beta4/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/actionpack-3.0.0.beta4.gemspec", :name=>"actionpack"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/arel-0.4.0/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/arel-0.4.0.gemspec", :name=>"arel"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/activerecord-3.0.0.beta4/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/activerecord-3.0.0.beta4.gemspec", :name=>"activerecord"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/diff-lcs-1.1.2/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/diff-lcs-1.1.2.gemspec", :name=>"diff-lcs"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/nokogiri-1.4.2/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/nokogiri-1.4.2.gemspec", :name=>"nokogiri"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/rspec-core-2.0.0.beta.14/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/rspec-core-2.0.0.beta.14.gemspec", :name=>"rspec-core"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/rspec-expectations-2.0.0.beta.14/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/rspec-expectations-2.0.0.beta.14.gemspec", :name=>"rspec-expectations"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/rspec-mocks-2.0.0.beta.14/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/rspec-mocks-2.0.0.beta.14.gemspec", :name=>"rspec-mocks"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/rspec-2.0.0.beta.14/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/rspec-2.0.0.beta.14.gemspec", :name=>"rspec"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/rspec-rails-1.3.2/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/rspec-rails-1.3.2.gemspec", :name=>"rspec-rails"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/rspec_tag_matchers-1.0.0/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/rspec_tag_matchers-1.0.0.gemspec", :name=>"rspec_tag_matchers"},
+        {:load_paths=>["/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/gems/spork-0.8.4/lib"], :loaded_from=>"/Users/jgdavey/.rvm/gems/ruby-1.8.7-p299/specifications/spork-0.8.4.gemspec", :name=>"spork"},
+      ].map do |hash|
+    if hash[:virtual_spec]
+      spec = eval(hash[:virtual_spec], TOPLEVEL_BINDING, "<virtual spec for '#{hash[:name]}'>")
+    else
+      dir = File.dirname(hash[:loaded_from])
+      spec = Dir.chdir(dir){ eval(File.read(hash[:loaded_from]), TOPLEVEL_BINDING, hash[:loaded_from]) }
+    end
+    spec.loaded_from = hash[:loaded_from]
+    spec.require_paths = hash[:load_paths]
+    if spec.loaded_from.include?(HOME)
+      Bundler::Specification.from_gemspec(spec)
+    else
+      spec
+    end
+  end
+
+  extend SharedHelpers
+
+  def self.configure_gem_path_and_home(specs)
+    # Fix paths, so that Gem.source_index and such will work
+    paths = specs.map{|s| s.installation_path }
+    paths.flatten!; paths.compact!; paths.uniq!; paths.reject!{|p| p.empty? }
+    ENV['GEM_PATH'] = paths.join(File::PATH_SEPARATOR)
+    ENV['GEM_HOME'] = paths.first
+    Gem.clear_paths
+  end
+
+  def self.match_fingerprint
+    lockfile = File.expand_path('../../Gemfile.lock', __FILE__)
+    lock_print = YAML.load(File.read(lockfile))["hash"] if File.exist?(lockfile)
+    gem_print = Digest::SHA1.hexdigest(File.read(File.expand_path('../../Gemfile', __FILE__)))
+
+    unless gem_print == lock_print
+      abort 'Gemfile changed since you last locked. Please run `bundle lock` to relock.'
+    end
+
+    unless gem_print == FINGERPRINT
+      abort 'Your bundled environment is out of date. Run `bundle install` to regenerate it.'
+    end
+  end
+
+  def self.setup(*groups)
+    match_fingerprint
+    clean_load_path
+    cripple_rubygems(SPECS)
+    configure_gem_path_and_home(SPECS)
+    SPECS.each do |spec|
+      Gem.loaded_specs[spec.name] = spec
+      spec.require_paths.each do |path|
+        $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
+      end
+    end
+    self
+  end
+
+  def self.require(*groups)
+    groups = [:default] if groups.empty?
+    groups.each do |group|
+      (AUTOREQUIRES[group.to_sym] || []).each do |file, explicit|
+        if explicit
+          Kernel.require file
+        else
+          begin
+            Kernel.require file
+          rescue LoadError
+          end
+        end
+      end
+    end
+  end
+
+  # Set up load paths unless this file is being loaded after the Bundler gem
+  setup unless defined?(Bundler::GEM_LOADED)
+end

spec/spec.opts → .rspec

@@ -1,2 +1,2 @@
---diff
 --color
+--drb

Gemfile

@@ -2,11 +2,12 @@ source :rubygems
 
 group :test do
   gem 'nokogiri'
-  gem 'rspec', '>= 1.3.0', :require => 'spec'
+  gem 'spork'
+  gem 'rspec', '>= 2.0.0.beta.14'
   gem 'diff-lcs'
   gem 'rspec_tag_matchers'
 
-  gem 'activesupport', '3.0.0.beta3'
-  gem 'actionpack',    '3.0.0.beta3'
-  gem 'activerecord',  '3.0.0.beta3'
+  gem 'activesupport', '3.0.0.beta4'
+  gem 'actionpack',    '3.0.0.beta4'
+  gem 'activerecord',  '3.0.0.beta4'
 end

Gemfile.lock

@@ -0,0 +1,83 @@
+--- 
+dependencies: 
+  spork: 
+    group: 
+    - :test
+    version: ">= 0"
+  activerecord: 
+    group: 
+    - :test
+    version: = 3.0.0.beta4
+  diff-lcs: 
+    group: 
+    - :test
+    version: ">= 0"
+  rspec: 
+    group: 
+    - :test
+    version: ">= 2.0.0.beta.14"
+  rspec_tag_matchers: 
+    group: 
+    - :test
+    version: ">= 0"
+  actionpack: 
+    group: 
+    - :test
+    version: = 3.0.0.beta4
+  activesupport: 
+    group: 
+    - :test
+    version: = 3.0.0.beta4
+  nokogiri: 
+    group: 
+    - :test
+    version: ">= 0"
+specs: 
+- abstract: 
+    version: 1.0.0
+- activesupport: 
+    version: 3.0.0.beta4
+- builder: 
+    version: 2.1.2
+- i18n: 
+    version: 0.4.1
+- activemodel: 
+    version: 3.0.0.beta4
+- erubis: 
+    version: 2.6.6
+- rack: 
+    version: 1.1.0
+- rack-mount: 
+    version: 0.6.6
+- rack-test: 
+    version: 0.5.4
+- tzinfo: 
+    version: 0.3.22
+- actionpack: 
+    version: 3.0.0.beta4
+- arel: 
+    version: 0.4.0
+- activerecord: 
+    version: 3.0.0.beta4
+- diff-lcs: 
+    version: 1.1.2
+- nokogiri: 
+    version: 1.4.2
+- rspec-core: 
+    version: 2.0.0.beta.14
+- rspec-expectations: 
+    version: 2.0.0.beta.14
+- rspec-mocks: 
+    version: 2.0.0.beta.14
+- rspec: 
+    version: 2.0.0.beta.14
+- rspec-rails: 
+    version: 1.3.2
+- rspec_tag_matchers: 
+    version: 1.0.0
+- spork: 
+    version: 0.8.4
+hash: 02d687b2b588c2a4d1661dec16df5af3364384a9
+sources: 
+- Rubygems: 
+    uri: http://gemcutter.org

autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }