From 2690a1a8a09d9ab2dc1ce7cf6398bdf1b0140f19 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Fri, 19 Feb 2010 13:32:50 -0800 Subject: [PATCH] Rename bundler gem to bundler08 --- Rakefile | 4 ++-- bundler.gemspec => bundler08.gemspec | 8 +++---- lib/{bundler.rb => bundler08.rb} | 24 +++++++++---------- lib/{bundler => bundler08}/bundle.rb | 0 lib/{bundler => bundler08}/cli.rb | 0 .../commands/bundle_command.rb | 2 +- .../commands/exec_command.rb | 2 +- lib/{bundler => bundler08}/dependency.rb | 0 lib/{bundler => bundler08}/dsl.rb | 0 lib/{bundler => bundler08}/environment.rb | 0 lib/{bundler => bundler08}/finder.rb | 0 lib/{bundler => bundler08}/gem_bundle.rb | 0 lib/{bundler => bundler08}/gem_ext.rb | 0 .../remote_specification.rb | 0 lib/{bundler => bundler08}/resolver.rb | 0 lib/{bundler => bundler08}/runtime.rb | 0 lib/{bundler => bundler08}/source.rb | 0 lib/{bundler => bundler08}/templates/Gemfile | 0 .../templates/app_script.erb | 0 .../templates/environment.erb | 0 .../templates/environment_picker.erb | 0 lib/rubygems_plugin.rb | 4 ++-- spec/spec_helper.rb | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) rename bundler.gemspec => bundler08.gemspec (55%) rename lib/{bundler.rb => bundler08.rb} (63%) rename lib/{bundler => bundler08}/bundle.rb (100%) rename lib/{bundler => bundler08}/cli.rb (100%) rename lib/{bundler => bundler08}/commands/bundle_command.rb (99%) rename lib/{bundler => bundler08}/commands/exec_command.rb (96%) rename lib/{bundler => bundler08}/dependency.rb (100%) rename lib/{bundler => bundler08}/dsl.rb (100%) rename lib/{bundler => bundler08}/environment.rb (100%) rename lib/{bundler => bundler08}/finder.rb (100%) rename lib/{bundler => bundler08}/gem_bundle.rb (100%) rename lib/{bundler => bundler08}/gem_ext.rb (100%) rename lib/{bundler => bundler08}/remote_specification.rb (100%) rename lib/{bundler => bundler08}/resolver.rb (100%) rename lib/{bundler => bundler08}/runtime.rb (100%) rename lib/{bundler => bundler08}/source.rb (100%) rename lib/{bundler => bundler08}/templates/Gemfile (100%) rename lib/{bundler => bundler08}/templates/app_script.erb (100%) rename lib/{bundler => bundler08}/templates/environment.erb (100%) rename lib/{bundler => bundler08}/templates/environment_picker.erb (100%) diff --git a/Rakefile b/Rakefile index cf855708f71..4f1588b4f6c 100644 --- a/Rakefile +++ b/Rakefile @@ -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 similarity index 55% rename from bundler.gemspec rename to bundler08.gemspec index 649efb36f3a..860eb9d9eef 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 similarity index 63% rename from lib/bundler.rb rename to lib/bundler08.rb index e3a61c8aa92..746ca0e2909 100644 --- a/lib/bundler.rb +++ b/lib/bundler08.rb @@ -6,20 +6,20 @@ 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 similarity index 100% rename from lib/bundler/bundle.rb rename to lib/bundler08/bundle.rb diff --git a/lib/bundler/cli.rb b/lib/bundler08/cli.rb similarity index 100% rename from lib/bundler/cli.rb rename to lib/bundler08/cli.rb diff --git a/lib/bundler/commands/bundle_command.rb b/lib/bundler08/commands/bundle_command.rb similarity index 99% rename from lib/bundler/commands/bundle_command.rb rename to lib/bundler08/commands/bundle_command.rb index 6883f8e4e11..3a1c8dd7456 100644 --- a/lib/bundler/commands/bundle_command.rb +++ b/lib/bundler08/commands/bundle_command.rb @@ -59,7 +59,7 @@ def description # :nodoc: 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 similarity index 96% rename from lib/bundler/commands/exec_command.rb rename to lib/bundler08/commands/exec_command.rb index 1edea2c5146..15e98c80cc9 100644 --- a/lib/bundler/commands/exec_command.rb +++ b/lib/bundler08/commands/exec_command.rb @@ -29,7 +29,7 @@ def description # :nodoc: 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 similarity index 100% rename from lib/bundler/dependency.rb rename to lib/bundler08/dependency.rb diff --git a/lib/bundler/dsl.rb b/lib/bundler08/dsl.rb similarity index 100% rename from lib/bundler/dsl.rb rename to lib/bundler08/dsl.rb diff --git a/lib/bundler/environment.rb b/lib/bundler08/environment.rb similarity index 100% rename from lib/bundler/environment.rb rename to lib/bundler08/environment.rb diff --git a/lib/bundler/finder.rb b/lib/bundler08/finder.rb similarity index 100% rename from lib/bundler/finder.rb rename to lib/bundler08/finder.rb diff --git a/lib/bundler/gem_bundle.rb b/lib/bundler08/gem_bundle.rb similarity index 100% rename from lib/bundler/gem_bundle.rb rename to lib/bundler08/gem_bundle.rb diff --git a/lib/bundler/gem_ext.rb b/lib/bundler08/gem_ext.rb similarity index 100% rename from lib/bundler/gem_ext.rb rename to lib/bundler08/gem_ext.rb diff --git a/lib/bundler/remote_specification.rb b/lib/bundler08/remote_specification.rb similarity index 100% rename from lib/bundler/remote_specification.rb rename to lib/bundler08/remote_specification.rb diff --git a/lib/bundler/resolver.rb b/lib/bundler08/resolver.rb similarity index 100% rename from lib/bundler/resolver.rb rename to lib/bundler08/resolver.rb diff --git a/lib/bundler/runtime.rb b/lib/bundler08/runtime.rb similarity index 100% rename from lib/bundler/runtime.rb rename to lib/bundler08/runtime.rb diff --git a/lib/bundler/source.rb b/lib/bundler08/source.rb similarity index 100% rename from lib/bundler/source.rb rename to lib/bundler08/source.rb diff --git a/lib/bundler/templates/Gemfile b/lib/bundler08/templates/Gemfile similarity index 100% rename from lib/bundler/templates/Gemfile rename to lib/bundler08/templates/Gemfile diff --git a/lib/bundler/templates/app_script.erb b/lib/bundler08/templates/app_script.erb similarity index 100% rename from lib/bundler/templates/app_script.erb rename to lib/bundler08/templates/app_script.erb diff --git a/lib/bundler/templates/environment.erb b/lib/bundler08/templates/environment.erb similarity index 100% rename from lib/bundler/templates/environment.erb rename to lib/bundler08/templates/environment.erb diff --git a/lib/bundler/templates/environment_picker.erb b/lib/bundler08/templates/environment_picker.erb similarity index 100% rename from lib/bundler/templates/environment_picker.erb rename to lib/bundler08/templates/environment_picker.erb diff --git a/lib/rubygems_plugin.rb b/lib/rubygems_plugin.rb index f493bcb6910..abaa8dd2d39 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 5ec2d19d6fb..a7472b2f4af 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,7 +3,7 @@ require "pp" require "rubygems" -require "bundler" +require "bundler08" require "spec" require "rbconfig"