Merge branch 'hotfix/v0.8.1'

wavesoftware · Apr 16, 2015 · 88b6040 · 88b6040
2 parents 4fc3839 + 8ceac53
commit 88b6040
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/lib/puppet-herald/database.rb b/lib/puppet-herald/database.rb
@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'uri'
 
 # A module for Herald
 module PuppetHerald

diff --git a/lib/puppet-herald/javascript.rb b/lib/puppet-herald/javascript.rb
@@ -28,7 +28,7 @@ def files
     def uglify(mapname)
       require 'uglifier'
       filenames = files
-      sources = filenames.collect { |file| File.read("#{@base}/#{file}") }
+      sources = filenames.collect { |file| File.read(PuppetHerald.relative_dir("#{@base}/#{file}")) }
       source = sources.join "\n"
       options = {
         source_map_url:  mapname,

diff --git a/lib/puppet-herald/version.rb b/lib/puppet-herald/version.rb
@@ -14,7 +14,7 @@ def self.version_prep(desired)
   end
 
   # Version for Herald
-  VERSION     = version_prep '0.8.0'
+  VERSION     = version_prep '0.8.1'
   # Lincense for Herald
   LICENSE     = 'Apache-2.0'
   # Project name