helium 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.1 / 2009-11-09
+
+* Don't place style.css etc in the local app directory, serve them from the gem
+* Allow a `location` field in `deploy.yml` that changes the paths rendered in `helium.js`
+
+
 === 0.1.0 / 2009-11-02
 
 * First public release under the GPL v2

data/Manifest.txt

@@ -13,6 +13,9 @@ lib/helium/logger.rb
 lib/helium/trie.rb
 lib/helium/web.rb
 lib/helium/web_helpers.rb
+lib/helium/public/prettify.css
+lib/helium/public/prettify.js
+lib/helium/public/style.css
 lib/helium/views/deploy.erb
 lib/helium/views/edit.erb
 lib/helium/views/index.erb
@@ -27,9 +30,6 @@ templates/project/test/index.html.erb
 templates/web/config.ru
 templates/web/deploy.yml
 templates/web/custom.js
-templates/web/public/prettify.css
-templates/web/public/prettify.js
-templates/web/public/style.css
 test/test_helium.rb
 test/deploy.yml
 test/index.html

data/README.txt

@@ -71,8 +71,6 @@ using the <tt>he install</tt> command with the name of the directory to create:
 This will give you the following files:
 
   helium-app/
-      public/
-          style.css etc.
       config.ru
       custom.js
       deploy.yml

data/lib/helium.rb

@@ -12,7 +12,7 @@ require 'oyster'
 
 module Helium
   
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   
   ROOT          = File.expand_path(File.dirname(__FILE__))
   TEMPLATES     = File.join(ROOT, '..', 'templates')

data/lib/helium/deployer.rb

@@ -22,15 +22,19 @@ module Helium
       @options    = options
     end
     
+    # Returns the deserialized contents of `deploy.yml`.
+    def config
+      @config_data ||= YAML.load(File.read(@config))
+    end
+    
     # Returns a hash of projects names and their Git URLs.
     def projects
       return @projects if defined?(@projects)
       
-      data = YAML.load(File.read(@config))
-      raise "No configuration for JS.Class" unless js_class = data[JS_CLASS]
+      raise "No configuration for JS.Class" unless js_class = config[JS_CLASS]
       @jsclass_version = js_class['version']
       
-      @projects = data['projects'] || {}
+      @projects = config['projects'] || {}
       @projects[JS_CLASS] = js_class['repository']
       @projects
     end
@@ -104,9 +108,9 @@ module Helium
     def run_builds!(options = nil)
       options ||= @options
       
-      @tree    = Trie.new
-      @custom  = options[:custom]
-      @domain  = options[:domain]
+      @tree     = Trie.new
+      @custom   = options[:custom]
+      @location = options[:location]
       manifest = []
       
       # Loop over checked-out projects. Skip directories with no Jake file.

data/lib/helium/public/prettify.css

@@ -0,0 +1,14 @@
+/* Pretty printing styles. Used with prettify.js. */
+
+.str{color:#d14}
+.kwd{color:#000;font-weight:bold}
+.com{color:#998;font-style:italic}
+.typ{color:#458}
+.lit{color:#099}
+.pun{color:#666}
+.pln{color:#000}
+.tag{color:#000080}
+.atn{color:#008080}
+.atv{color:#008080}
+.dec{color:#000;font-weight:bold}
+

data/lib/helium/web.rb

@@ -7,7 +7,7 @@ module Helium
   class Web < Sinatra::Base
     
     
-    ROOT_DIR = File.dirname(__FILE__)
+    ROOT_DIR = File.expand_path(File.dirname(__FILE__))
     require File.join(ROOT_DIR, '..', 'helium')
     require File.join(ROOT_DIR, 'web_helpers')
     
@@ -26,8 +26,7 @@ module Helium
     
     before do
       @projects = project_config
-      @domain   = env['HTTP_HOST']
-      @location = @domain + '/' + Helium::WEB_ROOT
+      @location = get_location
     end
     
     ## Home page -- just loads the project list and renders.
@@ -62,7 +61,7 @@ module Helium
         deployer.cleanup!
         
         custom = File.file?(CUSTOM) ? File.read(CUSTOM) : nil
-        files = deployer.run_builds!(:custom => custom, :domain => @domain)
+        files = deployer.run_builds!(:custom => custom, :location => @location)
         
         FileUtils.rm_rf(PUBLIC) if File.exists?(PUBLIC)
         
@@ -114,6 +113,11 @@ module Helium
       erb :edit
     end
     
+    ## Catch requests for public files and serve them from the gem
+    get '/*' do
+      send_file(File.join(ROOT_DIR, 'public', env['PATH_INFO']))
+    end
+    
   end
 end
 

data/lib/helium/web_helpers.rb

@@ -7,6 +7,14 @@ module Helium
         Helium::Deployer.new(File.dirname(CONFIG)).projects
       end
       
+      # Returns the domain and path from which script files are served.
+      def get_location
+        location = Helium::Deployer.new(File.dirname(CONFIG)).config['location'] ||
+                   env['HTTP_HOST'] + '/' + Helium::WEB_ROOT
+        
+        location.gsub(/\/*$/, '')
+      end
+      
       # Returns the list of IP addresses that have write access to the app.
       def allowed_ips
         Helium::Web.config.allow_ips

data/templates/packages.js.erb

@@ -1,10 +1,8 @@
-<% if @domain -%>
 (function() {
     var protocol = ("https:" == document.location.protocol) ? "https:" : "http:";
     window.JSCLASS_PATH = window.JSCLASS_PATH ||
-                          protocol + "//<%= @domain %>/<%= WEB_ROOT %><%= File.dirname(@js_loader.sub(static_dir, '')) %>";
+                          protocol + "//<%= @location %><%= File.dirname(@js_loader.sub(static_dir, '')) %>";
 })();
-<% end -%>
 
 <%= File.read(@js_loader) %>
 
@@ -17,7 +15,7 @@
  * then use the `require()` function to load objects on demand.
  * 
  *     <!-- Step 1. Load JS.Class and the package listing -->
- *     <script type="text/javascript" src="http://<%= @domain || 'js.example.com' %>/<%= WEB_ROOT %>/<%= PACKAGES_MIN %>"></script>
+ *     <script type="text/javascript" src="http://<%= @location %>/<%= PACKAGES_MIN %>"></script>
  *     
  *     <!-- Step 2. Declare which branches to use -->
  *     <script type="text/javascript">
@@ -73,10 +71,8 @@ JS.Packages(function() { with(this) {
     
     window.Helium = window.Helium || {};
     
-<% if @domain -%>
     var protocol = ("https:" == document.location.protocol) ? "https:" : "http:";
-    Helium.PATH = protocol + "//<%= @domain %>/<%= WEB_ROOT %>";
-<% end -%>
+    Helium.PATH = protocol + "//<%= @location %>";
     
     /**
      * Helium.use(project, branch) -> undefined

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: helium
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - James Coglan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 +00:00
+date: 2009-11-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,9 @@ files:
 - lib/helium/trie.rb
 - lib/helium/web.rb
 - lib/helium/web_helpers.rb
+- lib/helium/public/prettify.css
+- lib/helium/public/prettify.js
+- lib/helium/public/style.css
 - lib/helium/views/deploy.erb
 - lib/helium/views/edit.erb
 - lib/helium/views/index.erb
@@ -123,14 +126,13 @@ files:
 - templates/web/config.ru
 - templates/web/deploy.yml
 - templates/web/custom.js
-- templates/web/public/prettify.css
-- templates/web/public/prettify.js
-- templates/web/public/style.css
 - test/test_helium.rb
 - test/deploy.yml
 - test/index.html
 has_rdoc: true
 homepage: http://github.com/othermedia/helium
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -152,9 +154,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: helium
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ""
 test_files: 
 - test/test_helium.rb

data/templates/web/public/prettify.css

@@ -1,6 +0,0 @@
-/* Defaults */
-.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun{color:#660}.pln{color:#000}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec{color:#606}@media print{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun{color:#440}.pln{color:#000}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}
-
-/* Overrides */
-.str{color:#d14}.kwd{color:#000;font-weight:bold}.com{color:#998;font-style:italic}.typ{color:#458}.lit{color:#099}.pun{color:#666}.pln{color:#000}.tag{color:#000080}.atn{color:#008080}.atv{color:#008080}.dec{color:#000;font-weight:bold}
-