helium 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.1.2 / 2010-03-09
+
+* Fix bug in custom loader function for `pageTracker`
+* Improve how we map branch/tag names to commits to cope correctly with multiple refs
+  pointing at the same commit and always picking the latest commit for a branch
+
+
 === 0.1.1 / 2009-11-09
 
 * Don't place style.css etc in the local app directory, serve them from the gem

data/lib/helium.rb

@@ -12,7 +12,7 @@ require 'oyster'
 
 module Helium
   
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   
   ROOT          = File.expand_path(File.dirname(__FILE__))
   TEMPLATES     = File.join(ROOT, '..', 'templates')
@@ -26,8 +26,10 @@ module Helium
   PACKAGES_MIN  = 'helium.js'
   WEB_ROOT      = 'js'
   
+  COMMIT        = /^[0-9a-f]{40}$/
   GIT           = '.git'
   HEAD          = 'HEAD'
+  HEAD_LIST     = 'heads.yml'
   
   JS_CLASS      = 'js.class'
   LOADER_FILE   = 'loader.js'

data/lib/helium/deployer.rb

@@ -71,32 +71,26 @@ module Helium
     end
     
     # Exports static copies of a project from every branch and tag in its Git repository.
-    # Existing static copies on disk are destroyed and replaced.
+    # Existing static copies on disk are removed. Mappings from branch/tag names to commit
+    # IDs are stored in heads.yml in the project directory.
     def export(project)
       repo_dir = repo_dir(project)
       repo     = Grit::Repo.new(repo_dir)
-      branches = repo.remotes + repo.tags
       
-      mkdir_p(static_dir(project))
+      export_directory = static_dir(project)
+      mkdir_p(export_directory)
       
-      branches.each do |branch|
-        name, commit = branch.name.split(SEP).last, branch.commit.id
-        next if HEAD == name
-        
+      heads = head_mappings(project)
+      File.open(static_dir(project, HEAD_LIST), 'w') { |f| f.write(YAML.dump(heads)) }
+      
+      heads.values.uniq.each do |commit|
         target = static_dir(project, commit)
+        next if File.directory?(target)
         
-        log :export, "Exporting branch '#{ name }' of '#{ project }' into #{ target }"
-        rm_rf(target) if File.directory?(target)
+        log :export, "Exporting commit '#{ commit }' of '#{ project }' into #{ target }"
         cp_r(repo_dir, target)
         
-        cd(target) {
-          if repo.branches.map { |b| b.name }.include?(name)
-            `git checkout #{ name }`
-            `git merge #{ branch.name }`
-          else
-            `git checkout -b #{ name } #{ branch.name }`
-          end
-        }
+        cd(target) { `git checkout #{commit}` }
       end
     end
     
@@ -111,14 +105,16 @@ module Helium
       @tree     = Trie.new
       @custom   = options[:custom]
       @location = options[:location]
-      manifest = []
+      manifest  = []
       
       # Loop over checked-out projects. Skip directories with no Jake file.
       Find.find(static_dir) do |path|
         next unless File.directory?(path) and File.file?(join(path, JAKE_FILE))
         
         project, commit = *path.split(SEP)[-2..-1]
-        branch = Grit::Repo.new(path).head.name
+        heads = YAML.load(File.read(join(path, '..', HEAD_LIST)))
+        branches = heads.select { |(head, id)| id == commit }.map { |pair| pair.first }
+        
         Jake.clear_hooks!
         
         # Event listener to capture file information from Jake
@@ -126,18 +122,21 @@ module Helium
           if build_type == :min
             @js_loader = file if File.basename(file) == LOADER_FILE and
                                  project == JS_CLASS and
-                                 branch  == @jsclass_version
+                                 branches.include?(@jsclass_version)
             
             file = file.sub(path, '')
             manifest << join(project, commit, file)
-            @tree[[project, branch]] = commit
-            @tree[[project, branch, file]] = package.meta
+            
+            branches.each do |branch|
+              @tree[[project, branch]] = commit
+              @tree[[project, branch, file]] = package.meta
+            end
           end
         end
         jake_hook(:file_created, &hook)
         jake_hook(:file_not_changed, &hook)
         
-        log :jake_build, "Building branch '#{ branch }' of '#{ project }' from #{ join(path, JAKE_FILE) }"
+        log :jake_build, "Building branch '#{ branches * "', '" }' of '#{ project }' from #{ join(path, JAKE_FILE) }"
         
         begin; Jake.build!(path)
         rescue; end
@@ -194,6 +193,16 @@ module Helium
       end
     end
     
+    # Returns a hash of branch/tag names to commit IDs for a project
+    def head_mappings(project)
+      repo = Grit::Repo.new(repo_dir(project))
+      (repo.remotes + repo.tags).inject({}) do |list, head|
+        commit = head.commit.id
+        list[head.name.split('/').last] = commit if commit =~ COMMIT
+        list
+      end
+    end
+    
     # Notifies observers by sending a log message.
     def log(*args)
       changed(true)

data/templates/web/custom.js

@@ -13,6 +13,7 @@ loader(function(cb) {
     try {
         window.pageTracker = _gat._getTracker(Helium.GOOGLE_ANALYTICS_ID);
     } catch (err) {}
+    cb();
 })  .provides('pageTracker')
     .requires('_gat');
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: helium
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - James Coglan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 +00:00
+date: 2010-03-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -80,7 +100,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.5.0
     version: 
 description: ""
 email: