dust-deploy 0.8.1 → 0.8.2

data/changelog.md

@@ -1,6 +1,12 @@
 Changelog
 =============
 
+0.8.2
+------------
+
+-  cjdroute recipe fixes
+
+
 0.8.1
 ------------
 

data/lib/dust/recipes/cjdroute.rb

@@ -8,11 +8,11 @@ class Cjdroute< Recipe
 
     return unless install_dependencies
     return unless get_latest_version
-    return unless @node.mkdir "#{@config['build_dir']}/build"
 
     # clean up building directory, if --restart is given
     # using --restart, since there's no --cleanup
     return unless make_clean if @options.restart?
+    return unless @node.mkdir "#{@config['build_dir']}/build"
 
     # compiling action
     return unless run_cmake
@@ -98,12 +98,19 @@ class Cjdroute< Recipe
 
     return false unless @node.install_package 'cmake', :indent => 2
 
+    # check cmake version
+    ret = @node.exec 'cmake --version'
+    ver = ret[:stdout].match(/2.[0-9]/)[0].to_f
+    return ::Dust.print_failed 'cjdroute requires cmake 2.8 or higher' if ver < 2.8
+
+
     if @node.uses_apt?
       return false unless @node.install_package 'git-core', :indent => 2
       return false unless @node.install_package 'build-essential', :indent => 2
       return false unless @node.install_package 'coreutils', :indent => 2
     elsif @node.uses_rpm?
       return false unless @node.install_package 'git', :indent => 2
+      return false unless @node.install_package 'gcc', :indent => 2
       return false unless @node.install_package 'make', :indent => 2
     else 
       return ::Dust.print_failed 'sorry, your os is not supported by this script'
@@ -145,7 +152,7 @@ class Cjdroute< Recipe
 
   # remove and recreate building directory
   def make_clean
-    ::Dust.print_msg 'cleaning build directory'
+    ::Dust.print_msg 'cleaning up'
     return false unless ::Dust.print_result @node.exec("rm -rf #{@config['build_dir']}/build")[:exit_code]
     true
   end

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - kris kechagia