haml-edge 2.3.69 → 2.3.70

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.69
+2.3.70

data/VERSION

@@ -1 +1 @@
-2.3.69
+2.3.70

data/init.rb

@@ -1,8 +1,16 @@
 begin
   require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here
 rescue LoadError
-  require 'haml' # From gem
+  begin
+    require 'haml' # From gem
+  rescue LoadError => e
+    # gems:install may be run to install Haml with the skeleton plugin
+    # but not the gem itself installed.
+    # Don't die if this is the case.
+    raise e unless defined?(Rake) && Rake.application.top_level_tasks.include?('gems:install')
+  end
 end
 
-# Load Haml and Sass
-Haml.init_rails(binding)
+# Load Haml and Sass.
+# Haml may be undefined if we're running gems:install.
+Haml.init_rails(binding) if defined?(Haml)

data/test/linked_rails.rb

@@ -5,9 +5,8 @@ if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib
   puts "[ using linked Rails ]"
   $:.unshift linked_rails + '/activesupport/lib'
   $:.unshift linked_rails + '/actionpack/lib'
-else
-  require 'rubygems'
 end
+require 'rubygems'
 require 'action_controller'
 require 'action_view'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.69
+  version: 2.3.70
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -05:00
+date: 2009-11-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency