diff options
-rw-r--r-- | Rakefile | 4 | ||||
-rw-r--r-- | bundler08.gemspec (renamed from bundler.gemspec) | 8 | ||||
-rw-r--r-- | lib/bundler08.rb (renamed from lib/bundler.rb) | 24 | ||||
-rw-r--r-- | lib/bundler08/bundle.rb (renamed from lib/bundler/bundle.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/cli.rb (renamed from lib/bundler/cli.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/commands/bundle_command.rb (renamed from lib/bundler/commands/bundle_command.rb) | 2 | ||||
-rw-r--r-- | lib/bundler08/commands/exec_command.rb (renamed from lib/bundler/commands/exec_command.rb) | 2 | ||||
-rw-r--r-- | lib/bundler08/dependency.rb (renamed from lib/bundler/dependency.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/dsl.rb (renamed from lib/bundler/dsl.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/environment.rb (renamed from lib/bundler/environment.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/finder.rb (renamed from lib/bundler/finder.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/gem_bundle.rb (renamed from lib/bundler/gem_bundle.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/gem_ext.rb (renamed from lib/bundler/gem_ext.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/remote_specification.rb (renamed from lib/bundler/remote_specification.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/resolver.rb (renamed from lib/bundler/resolver.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/runtime.rb (renamed from lib/bundler/runtime.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/source.rb (renamed from lib/bundler/source.rb) | 0 | ||||
-rw-r--r-- | lib/bundler08/templates/Gemfile (renamed from lib/bundler/templates/Gemfile) | 0 | ||||
-rw-r--r-- | lib/bundler08/templates/app_script.erb (renamed from lib/bundler/templates/app_script.erb) | 0 | ||||
-rw-r--r-- | lib/bundler08/templates/environment.erb (renamed from lib/bundler/templates/environment.erb) | 0 | ||||
-rw-r--r-- | lib/bundler08/templates/environment_picker.erb (renamed from lib/bundler/templates/environment_picker.erb) | 0 | ||||
-rw-r--r-- | lib/rubygems_plugin.rb | 4 | ||||
-rw-r--r-- | spec/spec_helper.rb | 2 |
23 files changed, 23 insertions, 23 deletions
@@ -1,11 +1,11 @@ $:.unshift File.join(File.dirname(__FILE__), 'lib') require 'rubygems' unless ENV['NO_RUBYGEMS'] require 'rubygems/specification' -require 'bundler' +require 'bundler08' require 'date' spec = Gem::Specification.new do |s| - s.name = "bundler" + s.name = "bundler08" s.version = Bundler::VERSION s.authors = ["Yehuda Katz", "Carl Lerche"] s.email = ["wycats@gmail.com", "clerche@engineyard.com"] diff --git a/bundler.gemspec b/bundler08.gemspec index 649efb36f3..860eb9d9ee 100644 --- a/bundler.gemspec +++ b/bundler08.gemspec @@ -1,16 +1,16 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |s| - s.name = %q{bundler} - s.version = "0.8.0" + s.name = %q{bundler08} + s.version = "0.8.2" s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version= s.authors = ["Yehuda Katz", "Carl Lerche"] - s.date = %q{2010-01-04} + s.date = %q{2010-02-19} s.description = %q{An easy way to vendor gem dependencies} s.email = ["wycats@gmail.com", "clerche@engineyard.com"] s.extra_rdoc_files = ["README.markdown", "LICENSE"] - s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/bundler/bundle.rb", "lib/bundler/cli.rb", "lib/bundler/commands/bundle_command.rb", "lib/bundler/commands/exec_command.rb", "lib/bundler/dependency.rb", "lib/bundler/dsl.rb", "lib/bundler/environment.rb", "lib/bundler/finder.rb", "lib/bundler/gem_bundle.rb", "lib/bundler/gem_ext.rb", "lib/bundler/remote_specification.rb", "lib/bundler/resolver.rb", "lib/bundler/runtime.rb", "lib/bundler/source.rb", "lib/bundler/templates/app_script.erb", "lib/bundler/templates/environment.erb", "lib/bundler/templates/environment_picker.erb", "lib/bundler.rb", "lib/rubygems_plugin.rb"] + s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/bundler08/bundle.rb", "lib/bundler08/cli.rb", "lib/bundler08/commands/bundle_command.rb", "lib/bundler08/commands/exec_command.rb", "lib/bundler08/dependency.rb", "lib/bundler08/dsl.rb", "lib/bundler08/environment.rb", "lib/bundler08/finder.rb", "lib/bundler08/gem_bundle.rb", "lib/bundler08/gem_ext.rb", "lib/bundler08/remote_specification.rb", "lib/bundler08/resolver.rb", "lib/bundler08/runtime.rb", "lib/bundler08/source.rb", "lib/bundler08/templates/app_script.erb", "lib/bundler08/templates/environment.erb", "lib/bundler08/templates/environment_picker.erb", "lib/bundler08/templates/Gemfile", "lib/bundler08.rb", "lib/rubygems_plugin.rb"] s.homepage = %q{http://github.com/wycats/bundler} s.require_paths = ["lib"] s.rubygems_version = %q{1.3.5} diff --git a/lib/bundler.rb b/lib/bundler08.rb index e3a61c8aa9..746ca0e290 100644 --- a/lib/bundler.rb +++ b/lib/bundler08.rb @@ -6,20 +6,20 @@ require 'erb' require "rubygems/remote_fetcher" require "rubygems/installer" -require "bundler/gem_bundle" -require "bundler/source" -require "bundler/finder" -require "bundler/gem_ext" -require "bundler/resolver" -require "bundler/environment" -require "bundler/dsl" -require "bundler/cli" -require "bundler/bundle" -require "bundler/dependency" -require "bundler/remote_specification" +require "bundler08/gem_bundle" +require "bundler08/source" +require "bundler08/finder" +require "bundler08/gem_ext" +require "bundler08/resolver" +require "bundler08/environment" +require "bundler08/dsl" +require "bundler08/cli" +require "bundler08/bundle" +require "bundler08/dependency" +require "bundler08/remote_specification" module Bundler - VERSION = "0.8.1" + VERSION = "0.8.2" class << self attr_writer :logger, :mode diff --git a/lib/bundler/bundle.rb b/lib/bundler08/bundle.rb index 4f695c3453..4f695c3453 100644 --- a/lib/bundler/bundle.rb +++ b/lib/bundler08/bundle.rb diff --git a/lib/bundler/cli.rb b/lib/bundler08/cli.rb index 3a9cee4ffe..3a9cee4ffe 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler08/cli.rb diff --git a/lib/bundler/commands/bundle_command.rb b/lib/bundler08/commands/bundle_command.rb index 6883f8e4e1..3a1c8dd745 100644 --- a/lib/bundler/commands/bundle_command.rb +++ b/lib/bundler08/commands/bundle_command.rb @@ -59,7 +59,7 @@ Bundle stuff def execute # Prevent the bundler from getting required unless it is actually being used - require 'bundler' + require 'bundler08' if options[:cache] Bundler::CLI.run(:cache, options) elsif options[:prune] diff --git a/lib/bundler/commands/exec_command.rb b/lib/bundler08/commands/exec_command.rb index 1edea2c514..15e98c80cc 100644 --- a/lib/bundler/commands/exec_command.rb +++ b/lib/bundler08/commands/exec_command.rb @@ -29,7 +29,7 @@ class Gem::Commands::ExecCommand < Gem::Command def execute # Prevent the bundler from getting required unless it is actually being used - require 'bundler' + require 'bundler08' Bundler::CLI.run(:exec, options) end diff --git a/lib/bundler/dependency.rb b/lib/bundler08/dependency.rb index 6899c28e46..6899c28e46 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler08/dependency.rb diff --git a/lib/bundler/dsl.rb b/lib/bundler08/dsl.rb index 4365edda48..4365edda48 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler08/dsl.rb diff --git a/lib/bundler/environment.rb b/lib/bundler08/environment.rb index 304e9abbe3..304e9abbe3 100644 --- a/lib/bundler/environment.rb +++ b/lib/bundler08/environment.rb diff --git a/lib/bundler/finder.rb b/lib/bundler08/finder.rb index b77ca65709..b77ca65709 100644 --- a/lib/bundler/finder.rb +++ b/lib/bundler08/finder.rb diff --git a/lib/bundler/gem_bundle.rb b/lib/bundler08/gem_bundle.rb index 225a49dce6..225a49dce6 100644 --- a/lib/bundler/gem_bundle.rb +++ b/lib/bundler08/gem_bundle.rb diff --git a/lib/bundler/gem_ext.rb b/lib/bundler08/gem_ext.rb index 707f582608..707f582608 100644 --- a/lib/bundler/gem_ext.rb +++ b/lib/bundler08/gem_ext.rb diff --git a/lib/bundler/remote_specification.rb b/lib/bundler08/remote_specification.rb index bdef408945..bdef408945 100644 --- a/lib/bundler/remote_specification.rb +++ b/lib/bundler08/remote_specification.rb diff --git a/lib/bundler/resolver.rb b/lib/bundler08/resolver.rb index 7c3ba77938..7c3ba77938 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler08/resolver.rb diff --git a/lib/bundler/runtime.rb b/lib/bundler08/runtime.rb index 27e0254966..27e0254966 100644 --- a/lib/bundler/runtime.rb +++ b/lib/bundler08/runtime.rb diff --git a/lib/bundler/source.rb b/lib/bundler08/source.rb index f221bbf0f3..f221bbf0f3 100644 --- a/lib/bundler/source.rb +++ b/lib/bundler08/source.rb diff --git a/lib/bundler/templates/Gemfile b/lib/bundler08/templates/Gemfile index bd31ed1bbb..bd31ed1bbb 100644 --- a/lib/bundler/templates/Gemfile +++ b/lib/bundler08/templates/Gemfile diff --git a/lib/bundler/templates/app_script.erb b/lib/bundler08/templates/app_script.erb index a09a6a401e..a09a6a401e 100644 --- a/lib/bundler/templates/app_script.erb +++ b/lib/bundler08/templates/app_script.erb diff --git a/lib/bundler/templates/environment.erb b/lib/bundler08/templates/environment.erb index 0a25eb0253..0a25eb0253 100644 --- a/lib/bundler/templates/environment.erb +++ b/lib/bundler08/templates/environment.erb diff --git a/lib/bundler/templates/environment_picker.erb b/lib/bundler08/templates/environment_picker.erb index 23b0cdfc6e..23b0cdfc6e 100644 --- a/lib/bundler/templates/environment_picker.erb +++ b/lib/bundler08/templates/environment_picker.erb diff --git a/lib/rubygems_plugin.rb b/lib/rubygems_plugin.rb index f493bcb691..abaa8dd2d3 100644 --- a/lib/rubygems_plugin.rb +++ b/lib/rubygems_plugin.rb @@ -1,6 +1,6 @@ require 'rubygems/command_manager' -require 'bundler/commands/bundle_command' -require 'bundler/commands/exec_command' +require 'bundler08/commands/bundle_command' +require 'bundler08/commands/exec_command' Gem::CommandManager.instance.register_command :bundle Gem::CommandManager.instance.register_command :exec
\ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5ec2d19d6f..a7472b2f4a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,7 +3,7 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')) require "pp" require "rubygems" -require "bundler" +require "bundler08" require "spec" require "rbconfig" |