bundler 0.8.0 → 0.8.1

data/lib/bundler.rb

@@ -19,10 +19,10 @@ require "bundler/dependency"
 require "bundler/remote_specification"
 
 module Bundler
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 
   class << self
-    attr_writer :logger
+    attr_writer :logger, :mode
 
     def logger
       @logger ||= begin
@@ -31,5 +31,19 @@ module Bundler
         logger
       end
     end
+
+    def local?
+      @mode == :local
+    end
+
+    def writable?
+      @mode != :readonly
+    end
+
+    def remote?
+      @mode == :readwrite
+    end
   end
+
+  self.mode = :readonly
 end

data/lib/bundler/bundle.rb

@@ -77,11 +77,6 @@ module Bundler
       end
       # ==========
 
-      # TODO: clean this up
-      sources.each do |s|
-        s.local = options[:cached]
-      end
-
       # Check to see whether the existing cache meets all the requirements
       begin
         valid = nil
@@ -130,11 +125,7 @@ module Bundler
     end
 
     def prune(options = {})
-      dependencies, sources = @environment.gem_dependencies, @environment.sources
-
-      sources.each do |s|
-        s.local = true
-      end
+      dependencies, sources = @environment.dependencies, @environment.sources
 
       sources = only_local(sources)
       bundle = Resolver.resolve(dependencies, [@cache] + sources)
@@ -181,7 +172,7 @@ module Bundler
   private
 
     def only_local(sources)
-      sources.select { |s| s.can_be_local? }
+      sources.select { |s| s.local? }
     end
 
     def download(bundle, options)

data/lib/bundler/cli.rb

@@ -31,6 +31,7 @@ module Bundler
     end
 
     def initialize(options)
+      Bundler.mode = options[:cached] ? :local : :readwrite
       @options = options
       @bundle = Bundle.load(@options[:manifest])
     end
@@ -62,6 +63,7 @@ module Bundler
     end
 
     def prune
+      Bundler.mode = :local
       @bundle.prune(@options)
     end
 

data/lib/bundler/environment.rb

@@ -33,7 +33,9 @@ module Bundler
     end
 
     def sources
-      @priority_sources + [SystemGemSource.new(@bundle)] + @sources + @default_sources
+      sources = @priority_sources + [SystemGemSource.new(@bundle)] + @sources + @default_sources
+      sources.reject! {|s| !s.local? } if Bundler.local?
+      sources
     end
 
     def add_source(source)
@@ -49,10 +51,6 @@ module Bundler
       @default_sources.clear
     end
 
-    def gem_dependencies
-      @gem_dependencies ||= dependencies.map { |d| d.to_gem_dependency }
-    end
-
     alias rubygems? rubygems
     alias system_gems? system_gems
 

data/lib/bundler/source.rb

@@ -4,7 +4,6 @@ module Bundler
   # Represents a source of rubygems. Initially, this is only gem repositories, but
   # eventually, this will be git, svn, HTTP
   class Source
-    attr_accessor :local
     attr_reader   :bundle
 
     def initialize(bundle, options)
@@ -33,7 +32,7 @@ module Bundler
       raise ArgumentError, "The source must be an absolute URI" unless @uri.absolute?
     end
 
-    def can_be_local?
+    def local?
       false
     end
 
@@ -115,7 +114,7 @@ module Bundler
       @source = Gem::SourceIndex.from_installed_gems
     end
 
-    def can_be_local?
+    def local?
       false
     end
 
@@ -149,7 +148,7 @@ module Bundler
       @location = options[:location]
     end
 
-    def can_be_local?
+    def local?
       true
     end
 
@@ -205,7 +204,7 @@ module Bundler
       end
     end
 
-    def can_be_local?
+    def local?
       true
     end
 
@@ -307,14 +306,19 @@ module Bundler
       @ref = options[:ref] || "origin/#{@branch}"
     end
 
+    def local?
+      raise SourceNotCached, "Git repository '#{@uri}' has not been cloned yet" unless location.directory?
+      super
+    end
+
     def location
       # TMP HAX to get the *.gemspec reading to work
       bundle.gem_path.join('dirs', File.basename(@uri, '.git'))
     end
 
     def gems
-      update
-      checkout
+      update if Bundler.remote?
+      checkout if Bundler.writable?
       super
     end
 
@@ -336,19 +340,11 @@ module Bundler
       end
 
       def fetch
-        unless local
-          Bundler.logger.info "Fetching git repository at: #{@uri}"
-          Dir.chdir(location) { `git fetch origin` }
-        end
+        Bundler.logger.info "Fetching git repository at: #{@uri}"
+        Dir.chdir(location) { `git fetch origin` }
       end
 
       def clone
-        # Raise an error if the source should run in local mode,
-        # but it has not been cached yet.
-        if local
-          raise SourceNotCached, "Git repository '#{@uri}' has not been cloned yet"
-        end
-
         Bundler.logger.info "Cloning git repository at: #{@uri}"
         FileUtils.mkdir_p(location.dirname)
         `git clone #{@uri} #{location} --no-hardlinks`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 -08:00
+date: 2010-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: []