Skip to content
Browse files

update bundler

  • Loading branch information...
1 parent ea1c143 commit 0e1c94d3af2fda22fe8a5e64d5537eec8691ab4b @komagata committed Aug 30, 2010
Showing with 41 additions and 333 deletions.
  1. +2 −1 .bundle/config
  2. +0 −267 .bundle/environment.rb
  3. +1 −0 .gitignore
  4. +0 −1 Gemfile
  5. +38 −64 Gemfile.lock
View
3 .bundle/config
@@ -1,3 +1,4 @@
---
+BUNDLE_DISABLE_SHARED_GEMS: "1"
BUNDLE_WITHOUT: production
-BUNDLE_PATH: vendor/bundle
+BUNDLE_PATH: bundle
View
267 .bundle/environment.rb
@@ -1,267 +0,0 @@
-# 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 = "75bc5e874fa34add8bb4bc4bd79e6acf2a88b5d8"
- HOME = '/Users/komagata/Sites/cloister/vendor/bundle/bundler'
- AUTOREQUIRES = {:test=>[["shoulda", false]], :default=>[["bundler", false], ["haml", false], ["pagination_scope", false]], :development=>[["sqlite3-ruby", false]]}
- SPECS = [
- {:load_paths=>["/opt/local/lib/ruby/gems/1.8/gems/rake-0.8.7/lib"], :loaded_from=>"/opt/local/lib/ruby/gems/1.8/specifications/rake-0.8.7.gemspec", :name=>"rake"},
- {:load_paths=>["/opt/local/lib/ruby/gems/1.8/gems/activesupport-2.3.8/lib"], :loaded_from=>"/opt/local/lib/ruby/gems/1.8/specifications/activesupport-2.3.8.gemspec", :name=>"activesupport"},
- {:load_paths=>["/opt/local/lib/ruby/gems/1.8/gems/rack-1.1.0/lib"], :loaded_from=>"/opt/local/lib/ruby/gems/1.8/specifications/rack-1.1.0.gemspec", :name=>"rack"},
- {:load_paths=>["/opt/local/lib/ruby/gems/1.8/gems/actionpack-2.3.8/lib"], :loaded_from=>"/opt/local/lib/ruby/gems/1.8/specifications/actionpack-2.3.8.gemspec", :name=>"actionpack"},
- {:load_paths=>["/opt/local/lib/ruby/gems/1.8/gems/actionmailer-2.3.8/lib"], :loaded_from=>"/opt/local/lib/ruby/gems/1.8/specifications/actionmailer-2.3.8.gemspec", :name=>"actionmailer"},
- {:load_paths=>["/opt/local/lib/ruby/gems/1.8/gems/activerecord-2.3.8/lib"], :loaded_from=>"/opt/local/lib/ruby/gems/1.8/specifications/activerecord-2.3.8.gemspec", :name=>"activerecord"},
- {:load_paths=>["/opt/local/lib/ruby/gems/1.8/gems/activeresource-2.3.8/lib"], :loaded_from=>"/opt/local/lib/ruby/gems/1.8/specifications/activeresource-2.3.8.gemspec", :name=>"activeresource"},
- {:load_paths=>["/opt/local/lib/ruby/gems/1.8/gems/bundler-0.9.26/lib"], :loaded_from=>"/opt/local/lib/ruby/gems/1.8/specifications/bundler-0.9.26.gemspec", :name=>"bundler"},
- {:load_paths=>["/Users/komagata/Sites/cloister/vendor/bundle/gems/haml-3.0.15/lib"], :loaded_from=>"/Users/komagata/Sites/cloister/vendor/bundle/specifications/haml-3.0.15.gemspec", :name=>"haml"},
- {:load_paths=>["/Users/komagata/Sites/cloister/vendor/bundle/gems/pagination_scope-0.1.2/lib"], :loaded_from=>"/Users/komagata/Sites/cloister/vendor/bundle/specifications/pagination_scope-0.1.2.gemspec", :name=>"pagination_scope"},
- {:load_paths=>["/opt/local/lib/ruby/gems/1.8/gems/rails-2.3.8/lib"], :loaded_from=>"/opt/local/lib/ruby/gems/1.8/specifications/rails-2.3.8.gemspec", :name=>"rails"},
- {:load_paths=>["/Users/komagata/Sites/cloister/vendor/bundle/gems/shoulda-2.11.1/lib"], :loaded_from=>"/Users/komagata/Sites/cloister/vendor/bundle/specifications/shoulda-2.11.1.gemspec", :name=>"shoulda"},
- {:load_paths=>["/opt/local/lib/ruby/gems/1.8/gems/sqlite3-ruby-1.2.5/lib", "/opt/local/lib/ruby/gems/1.8/gems/sqlite3-ruby-1.2.5/ext"], :loaded_from=>"/opt/local/lib/ruby/gems/1.8/specifications/sqlite3-ruby-1.2.5.gemspec", :name=>"sqlite3-ruby"},
- ].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
View
1 .gitignore
@@ -4,3 +4,4 @@ log/*.log
tmp/sass-cache
vendor/bundle
tmp/pids
+bundle
View
1 Gemfile
@@ -1,6 +1,5 @@
source :gemcutter
-gem 'bundler', '0.9.26'
gem 'rails', '2.3.8', :require => nil
gem 'haml', '3.0.15'
gem 'pagination_scope', '0.1.2'
View
102 Gemfile.lock
@@ -1,65 +1,39 @@
----
-dependencies:
- pg:
- group:
- - :production
- version: = 0.9.0
- rails:
- group:
- - :default
- version: = 2.3.8
- require: []
+GEM
+ remote: http://rubygems.org/
+ specs:
+ actionmailer (2.3.8)
+ actionpack (= 2.3.8)
+ actionpack (2.3.8)
+ activesupport (= 2.3.8)
+ rack (~> 1.1.0)
+ activerecord (2.3.8)
+ activesupport (= 2.3.8)
+ activeresource (2.3.8)
+ activesupport (= 2.3.8)
+ activesupport (2.3.8)
+ haml (3.0.15)
+ pagination_scope (0.1.2)
+ activesupport (>= 1.3.1)
+ pg (0.9.0)
+ rack (1.1.0)
+ rails (2.3.8)
+ actionmailer (= 2.3.8)
+ actionpack (= 2.3.8)
+ activerecord (= 2.3.8)
+ activeresource (= 2.3.8)
+ activesupport (= 2.3.8)
+ rake (>= 0.8.3)
+ rake (0.8.7)
+ shoulda (2.11.1)
+ sqlite3-ruby (1.2.5)
- haml:
- group:
- - :default
- version: = 3.0.15
- sqlite3-ruby:
- group:
- - :development
- version: = 1.2.5
- shoulda:
- group:
- - :test
- version: = 2.11.1
- pagination_scope:
- group:
- - :default
- version: = 0.1.2
- bundler:
- group:
- - :default
- version: = 0.9.26
-specs:
-- rake:
- version: 0.8.7
-- activesupport:
- version: 2.3.8
-- rack:
- version: 1.1.0
-- actionpack:
- version: 2.3.8
-- actionmailer:
- version: 2.3.8
-- activerecord:
- version: 2.3.8
-- activeresource:
- version: 2.3.8
-- bundler:
- version: 0.9.26
-- haml:
- version: 3.0.15
-- pagination_scope:
- version: 0.1.2
-- pg:
- version: 0.9.0
-- rails:
- version: 2.3.8
-- shoulda:
- version: 2.11.1
-- sqlite3-ruby:
- version: 1.2.5
-hash: 75bc5e874fa34add8bb4bc4bd79e6acf2a88b5d8
-sources:
-- Rubygems:
- uri: http://gemcutter.org
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ haml (= 3.0.15)
+ pagination_scope (= 0.1.2)
+ pg (= 0.9.0)
+ rails (= 2.3.8)
+ shoulda (= 2.11.1)
+ sqlite3-ruby (= 1.2.5)

0 comments on commit 0e1c94d

Please sign in to comment.
Something went wrong with that request. Please try again.