Changeset 493

Timestamp:

03/17/2008 11:11:43 (5 months ago)

Author:

why

Message:

• lib/shoes/cache.rb: continuing work on the gem setup routines.
  

Location:

trunk/lib

Files:

• shoes.rb (modified) (1 diff)
• shoes/cache.rb (modified) (4 diffs)

trunk/lib/shoes.rb

@@ -143 +143 @@
     return if @setups[line]
     script = line[/^(.+?):/, 1]
-    Shoes::Setup.new(script, &blk)
+    set = Shoes::Setup.new(script, &blk)
     @setups[line] = true
-    raise SettingUp
+    unless set.steps.empty?
+      raise SettingUp
+    end
   end
 

trunk/lib/shoes/cache.rb

@@ -54 +54 @@
 
     gem_reset
-    install_sources
+    install_sources if Gem.source_index.find_name('sources').empty?
   end
 
   def self.gem_reset
-    if Gem.const_defined? :ConfigFile
-      Gem.configuration = Gem::ConfigFile.new(:gemhome => GEM_DIR, :gempath => GEM_DIR)
-    end
     Gem.use_paths(GEM_DIR, [GEM_DIR])
     Gem.source_index.refresh!
@@ -83 +80 @@
             Thread.start(self) do |app|
               begin
-                sleep(1) until app.started?
                 setup.start
               rescue => e
@@ -99 +95 @@
     @steps = []
     @script = script
-    @app = self.class.setup_app(self)
     instance_eval &blk
+    unless @steps.empty?
+      @app = self.class.setup_app(self)
+    end
   end
 
   def gem name, version = nil
-    @steps << [:gem, "#{name} #{version}".strip]
+    arg = "#{name} #{version}".strip
+    name, version = arg.split(/\s+/, 2)
+    if Gem.source_index.find_name(name, version).empty?
+      @steps << [:gem, arg]
+    end
   end
 
@@ -113 +115 @@
     ui.progress count, total
 
-    @steps.each do |act, arg|
+    steps.each do |act, arg|
       case act
       when :gem