Rename gemfile back to bundler

README

@@ -1,4 +1,4 @@
-gemfile is a replacement for bundler.
+This is a rewrite of bundler to offer more bundling power
 
 It currently lacks output and good exception handling for common cases. This is coming very soon. We wanted to open this so people could take a look at it.
 

Rakefile

@@ -2,22 +2,22 @@ $:.unshift File.expand_path("../lib", __FILE__)
 
 require 'rubygems'
 require 'rubygems/specification'
-require 'gemfile'
+require 'bundler'
 
 spec = Gem::Specification.new do |s|
-  s.name     = "gemfile"
-  s.version  = Gemfile::VERSION
+  s.name     = "bundler"
+  s.version  = Bundler::VERSION
   s.authors  = ["Carl Lerche", "Yehuda Katz"]
   s.email    = ["carlhuda@engineyard.com"]
-  s.homepage = "http://github.com/carlhuda/gemfile"
-  s.summary  = "Gemfiles are fun"
+  s.homepage = "http://github.com/carlhuda/bundler"
+  s.summary  = "Bundles are fun"
 
   s.platform = Gem::Platform::RUBY
 
   s.required_rubygems_version = ">= 1.3.5"
 
   s.files        = Dir.glob("{bin,lib}/**/*") + %w(LICENSE README)
-  s.executables  = ['gemfile']
+  s.executables  = ['bundle']
   s.require_path = 'lib'
 end
 

bin/bundle

@@ -0,0 +1,3 @@
+require 'bundler/cli'
+
+Bundler::CLI.start

lib/gemfile.rb → lib/bundler.rb

@@ -1,21 +1,21 @@
 require 'fileutils'
 require 'pathname'
 require 'yaml'
-require 'gemfile/rubygems'
+require 'bundler/rubygems'
 
-module Gemfile
+module Bundler
   VERSION = "0.9.0.pre"
 
-  autoload :Definition,          'gemfile/definition'
-  autoload :Dependency,          'gemfile/dependency'
-  autoload :Dsl,                 'gemfile/dsl'
-  autoload :Environment,         'gemfile/environment'
-  autoload :Index,               'gemfile/index'
-  autoload :Installer,           'gemfile/installer'
-  autoload :RemoteSpecification, 'gemfile/remote_specification'
-  autoload :Resolver,            'gemfile/resolver'
-  autoload :Source,              'gemfile/source'
-  autoload :Specification,       'gemfile/specification'
+  autoload :Definition,          'bundler/definition'
+  autoload :Dependency,          'bundler/dependency'
+  autoload :Dsl,                 'bundler/dsl'
+  autoload :Environment,         'bundler/environment'
+  autoload :Index,               'bundler/index'
+  autoload :Installer,           'bundler/installer'
+  autoload :RemoteSpecification, 'bundler/remote_specification'
+  autoload :Resolver,            'bundler/resolver'
+  autoload :Source,              'bundler/source'
+  autoload :Specification,       'bundler/specification'
 
   class GemfileNotFound < StandardError; end
   class GemNotFound     < StandardError; end

lib/gemfile/cli.rb → lib/bundler/cli.rb

@@ -1,12 +1,12 @@
 $:.unshift File.expand_path('../vendor', __FILE__)
 require 'thor'
-require 'gemfile'
+require 'bundler'
 require 'rubygems/config_file'
 
 # Work around a RubyGems bug
 Gem.configuration
 
-module Gemfile
+module Bundler
   class CLI < Thor
     def self.banner(task)
       task.formatted_usage(self, false)
@@ -25,7 +25,7 @@ def init
     desc "check", "Checks if the dependencies listed in Gemfile are satisfied by currently installed gems"
     def check
       with_rescue do
-        env = Gemfile.load
+        env = Bundler.load
         # Check top level dependencies
         missing = env.dependencies.select { |d| env.index.search(d).empty? }
         if missing.any?
@@ -44,18 +44,18 @@ def check
 
     desc "install", "Install the current environment to the system"
     def install
-      Installer.install(Gemfile.root, Gemfile.definition)
+      Installer.install(Bundler.root, Bundler.definition)
     end
 
     desc "lock", "Locks a resolve"
     def lock
-      environment = Gemfile.load
+      environment = Bundler.load
       environment.lock
     end
 
     desc "pack", "Packs all the gems to vendor/cache"
     def pack
-      environment = Gemfile.load
+      environment = Bundler.load
       environment.pack
     end
 

lib/gemfile/definition.rb → lib/bundler/definition.rb

@@ -1,4 +1,4 @@
-module Gemfile
+module Bundler
   class Definition
     def self.from_gemfile(gemfile)
       gemfile = Pathname.new(gemfile).expand_path
@@ -56,7 +56,7 @@ def initialize(details)
       def sources
         @sources ||= @details["sources"].map do |args|
           name, options = args.to_a.flatten
-          Gemfile::Source.const_get(name).new(options)
+          Bundler::Source.const_get(name).new(options)
         end
       end
 

lib/gemfile/dependency.rb → lib/bundler/dependency.rb

@@ -1,6 +1,6 @@
 require 'rubygems/dependency'
 
-module Gemfile
+module Bundler
   class Dependency < Gem::Dependency
     attr_accessor :source
 

lib/gemfile/dsl.rb → lib/bundler/dsl.rb

@@ -1,4 +1,4 @@
-module Gemfile
+module Bundler
   class DslError < StandardError; end
 
   class Dsl

lib/gemfile/environment.rb → lib/bundler/environment.rb

@@ -1,4 +1,4 @@
-module Gemfile
+module Bundler
   class Environment
     attr_reader :root
 

lib/gemfile/index.rb → lib/bundler/index.rb

@@ -1,4 +1,4 @@
-module Gemfile
+module Bundler
   class Index
     def self.from_installed_gems
       # TODO: Why can't we memoize this? It is being mutated somewhere

lib/gemfile/installer.rb → lib/bundler/installer.rb

@@ -1,6 +1,6 @@
 require 'rubygems/dependency_installer'
 
-module Gemfile
+module Bundler
   class Installer
     def self.install(root, definition)
       new(root, definition).run

lib/gemfile/remote_specification.rb → lib/bundler/remote_specification.rb

@@ -1,4 +1,4 @@
-module Gemfile
+module Bundler
   # Represents a lazily loaded gem specification, where the full specification
   # is on the source server in rubygems' "quick" index. The proxy object is to
   # be seeded with what we're given from the source's abbreviated index - the

lib/gemfile/resolver.rb → lib/bundler/resolver.rb

@@ -19,7 +19,7 @@ def required_by
   end
 end
 
-module Gemfile
+module Bundler
   class Resolver
 
     attr_reader :errors

lib/gemfile/source.rb → lib/bundler/source.rb

@@ -2,7 +2,7 @@
 require "rubygems/format"
 require "digest/sha1"
 
-module Gemfile
+module Bundler
   module Source
     class Rubygems
       attr_reader :uri, :options
@@ -131,7 +131,7 @@ def options
       end
 
       def path
-        Gemfile.install_path.join("#{base_name}-#{uri_hash}-#{ref}")
+        Bundler.install_path.join("#{base_name}-#{uri_hash}-#{ref}")
       end
 
       def specs
@@ -188,7 +188,7 @@ def uri_hash
       end
 
       def cache_path
-        @cache_path ||= Gemfile.cache.join("git", "#{base_name}-#{uri_hash}")
+        @cache_path ||= Bundler.cache.join("git", "#{base_name}-#{uri_hash}")
       end
 
       def cache

lib/gemfile/specification.rb → lib/bundler/specification.rb

@@ -1,4 +1,4 @@
-module Gemfile
+module Bundler
   class Specification < Gem::Specification
     attr_accessor :relative_loaded_from
 

lib/gemfile/templates/environment.erb → lib/bundler/templates/environment.erb

@@ -1,5 +1,5 @@
 # DO NOT MODIFY THIS FILE
-module Gemfile
+module Bundler
 <% load_paths.each do |path| -%>
   $LOAD_PATH.unshift "<%= path %>"
 <% end -%>

spec/runtime/load_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
-describe "Gemfile.load" do
+describe "Bundler.load" do
 
   before :each do
     in_app_root
@@ -13,7 +13,7 @@
       gem "rack"
     G
 
-    env = Gemfile.load
+    env = Bundler.load
     env.dependencies.should have_dep("rack", ">= 0")
   end
 
@@ -24,20 +24,20 @@
       gem "rack"
     G
 
-    env = Gemfile.load
+    env = Bundler.load
     env.gems.should have_gem("rack-1.0.0")
   end
 
   it "raises an exception if the default gemfile is not found" do
     lambda {
-      Gemfile.load
-    }.should raise_error(Gemfile::GemfileNotFound, /default/)
+      Bundler.load
+    }.should raise_error(Bundler::GemfileNotFound, /default/)
   end
 
   it "raises an exception if a specified gemfile is not found" do
     lambda {
-      Gemfile.load("omg.rb")
-    }.should raise_error(Gemfile::GemfileNotFound, /omg\.rb/)
+      Bundler.load("omg.rb")
+    }.should raise_error(Bundler::GemfileNotFound, /omg\.rb/)
   end
 
   describe "when locked" do
@@ -60,7 +60,7 @@
         gem "activerecord"
       G
 
-      lambda { Gemfile.load }.should raise_error(Gemfile::GemfileError)
+      lambda { Bundler.load }.should raise_error(Bundler::GemfileError)
     end
 
     it "raises an exception if the Gemfile removes a dependency" do
@@ -77,7 +77,7 @@
         gem "rack"
       G
 
-      lambda { Gemfile.load }.should raise_error(Gemfile::GemfileError)
+      lambda { Bundler.load }.should raise_error(Bundler::GemfileError)
     end
 
     it "raises an exception if the Gemfile changes a dependency in an incompatible way" do
@@ -95,7 +95,7 @@
         gem "activerecord", "2.3.1"
       G
 
-      lambda { Gemfile.load }.should raise_error(Gemfile::GemfileError)
+      lambda { Bundler.load }.should raise_error(Bundler::GemfileError)
     end
 
     it "raises an exception if the Gemfile replaces a root with a child dep of the root" do
@@ -113,7 +113,7 @@
         gem "activesupport"
       G
 
-      lambda { Gemfile.load }.should raise_error(Gemfile::GemfileError)
+      lambda { Bundler.load }.should raise_error(Bundler::GemfileError)
     end
 
     it "works if the Gemfile changes in a compatible way" do
@@ -131,7 +131,7 @@
         gem "activerecord", ">= 2.0.0"
       G
 
-      lambda { Gemfile.load }.should_not raise_error(Gemfile::GemfileError)
+      lambda { Bundler.load }.should_not raise_error(Bundler::GemfileError)
     end
   end
 end

spec/runtime/setup_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
-describe "Gemfile.setup" do
+describe "Bundler.setup" do
 
   before :each do
     in_app_root

spec/spec_helper.rb

@@ -3,7 +3,7 @@
 
 require 'fileutils'
 require 'rubygems'
-require 'gemfile'
+require 'bundler'
 
 Dir["#{File.expand_path('../support', __FILE__)}/*.rb"].each do |file|
   require file

spec/support/helpers.rb

@@ -28,7 +28,7 @@ def run_in_context(cmd)
     end
 
     def run(cmd)
-      setup = "require 'rubygems' ; require 'gemfile' ; Gemfile.setup\n"
+      setup = "require 'rubygems' ; require 'bundler' ; Bundler.setup\n"
       @out = ruby(setup + cmd)
     end
 
@@ -37,7 +37,7 @@ def lib
     end
 
     def bbl(cmd)
-      gemfile = File.expand_path('../../../bin/gemfile', __FILE__)
+      gemfile = File.expand_path('../../../bin/bundle', __FILE__)
       @out = %x{#{Gem.ruby} -I#{lib} #{gemfile} #{cmd}}.strip
     end
 

spec/support/matchers.rb

@@ -2,7 +2,7 @@ module Spec
   module Matchers
     def have_dep(*args)
       simple_matcher "have dependency" do |given, matcher|
-        dep = Gemfile::Dependency.new(*args)
+        dep = Bundler::Dependency.new(*args)
 
         # given.length == args.length / 2
         given.length == 1 && given.all? { |d| d == dep }