cook 2.0.6 → 2.0.7

data/Rakefile

@@ -34,7 +34,7 @@ end
 
 Hoe.spec 'cook' do
   developer('Stephen Gaito', 'stephen@perceptisys.co.uk')
-  dependency('rake', '~> 0.9.2');
+  dependency('rake', '~> 10.3.1');
   dependency('construct', '~> 0.1.7');
   dependency('erubis', '~> 2.7');
   dependency('greenletters', '~> 0.2');

data/lib/cook.rb

@@ -1,3 +1,3 @@
 class Cook
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end

data/lib/rake/config.rb

@@ -114,6 +114,10 @@ end
 
 class Construct
 
+  def cloneData()
+    @data = @data.clone;
+  end
+
   def empty?()
     @data.empty?();
   end
@@ -196,6 +200,21 @@ class Construct
     end
     return result;
   end
+
+  def prettyPrint(result, prefix)
+    if empty? then
+      result.puts(prefix+'=emptyConstruct');
+    else
+      data.keys.sort{ |x,y| x.to_s <=> y.to_s }.each do | aKey |
+        aValue = data[aKey];
+        if aValue.respond_to?(:prettyPrint) then
+          aValue.prettyPrint(result, prefix+'.'+aKey.to_s);
+        else
+          result.puts(prefix+'.'+aKey.to_s+"="+aValue.to_s);
+        end
+      end
+    end
+  end
   
 end
 
@@ -339,6 +358,13 @@ class Conf
   end
 
   def self.add_recipes_path(aRecipesPath)
+    #
+    # Make sure the recipeDir is in the load path
+    #
+    $LOAD_PATH.unshift(aRecipesPath);
+    #
+    # Add this path to the collection of recipe paths to search
+    #
     @@recipePaths.push(aRecipesPath);
   end
 
@@ -458,6 +484,12 @@ class Conf
     end
   end
 
+  def self.prettyPrint
+    result = StringIO.new;
+    @@data.prettyPrint(result, "Conf");
+    result.string;
+  end
+
 end
 
 module Rake
@@ -494,9 +526,9 @@ module Rake
       return options;
     end
 
-    alias_method :rake_config_original_collect_tasks, :collect_tasks
-    def collect_tasks
-      rake_config_original_collect_tasks;
+    alias_method :rake_config_original_collect_command_line_tasks, :collect_command_line_tasks
+    def collect_command_line_tasks
+      rake_config_original_collect_command_line_tasks;
       @top_level_tasks.unshift("cookPostConfig");
       @top_level_tasks.unshift("cookConfig");
       @top_level_tasks.unshift("cookPreConfig");
@@ -809,7 +841,11 @@ config :cookPostConfig do
     Rake::Application.mesg "--------------------\nTasks defined\n\n";
     Rake::Application.mesg_pp Rake.application.tasks;
     Rake::Application.mesg "--------------------\nConfiguration data\n\n";
-    Rake::Application.mesg_pp Conf.data;
+    Rake::Application.mesg_conf # Conf.data;
+    Rake::Application.mesg "--------------------\nRecipe paths\n\n";
+    Rake::Application.mesg_pp Conf.get_recipe_paths
+    Rake::Application.mesg "--------------------\nRuby load paths\n\n";
+    Rake::Application.mesg_pp $LOAD_PATH
     Rake::Application.mesg "--------------------\n\n";
   end
 end

data/lib/rake/cookUtils.rb

@@ -251,6 +251,14 @@ end
 #############################################################################
 # Apply templates and/or copy resources
 
+def apply_partial(aPartialResourcePath)
+  require 'erubis'
+  templateFileName = find_resource(aPartialResourcePath);
+  mesg "Applying erubis partial template: [#{templateFileName}]";
+  eruby = Erubis::Eruby.new(IO.read(templateFileName));
+  eruby.result(binding()).chomp();
+end
+
 def applyTemplate(templateFileName, resultFileName, mode = nil, owner = nil, group = nil)
   require 'erubis'
   mesg "Applying erubis template: [#{templateFileName}]\nto produce: [#{resultFileName}]";

data/lib/rake/extensions.rb

@@ -1,8 +1,54 @@
 require 'logger';
-require 'pp'
-require 'stringio'
+require 'pp';
+require 'yaml';
+require 'stringio';
 require 'greenletters';
 
+class Hash
+
+  def cloneData()
+  end
+
+  def prettyPrint(result, prefix)
+    if empty? then
+      result.puts(prefix+'=emptyHash');
+    else 
+      keys.sort{ |x,y| x.to_s <=> y.to_s }.each do | aKey |
+        aValue = self[aKey];
+        if aValue.respond_to?(:prettyPrint) then
+          aValue.prettyPrint(result, prefix+'.'+aKey.to_s);
+        else
+          result.puts(prefix+'.'+aKey.to_s+"="+aValue.to_s);
+        end
+      end
+    end
+  end
+end
+
+class Array
+  def prettyPrint(result, prefix)
+    if empty? then
+      result.puts(prefix+'=emptyArray');
+    else
+      index = 0;
+      each do | aValue |
+        if aValue.respond_to?(:prettyPrint) then
+          aValue.prettyPrint(result, prefix+'['+index.to_s+']');
+        else
+          result.puts(prefix+'['+index.to_s+']='+aValue.to_s);
+        end
+        index += 1;
+      end
+    end
+  end
+end
+
+class String
+  def prettyPrint(result, prefix)
+    result.puts(prefix+'="'+to_s+'"');
+  end
+end
+
 module Greenletters
   #
   # We need to add the Greenletters::Process#result method to return the 
@@ -86,36 +132,46 @@ module Rake
     def self.logger()
       return @logger;
     end
+
     def self.logFile()
       return @logFile;
     end
+
     def self.logData(someData)
       @logFile.write(someData) if @logFile;
     end
+
     def self.set_logger(aLogger, aLogFile=nil)
       @logFile = aLogFile;
       oldLogger = @logger;
       @logger = aLogger;
       return oldLogger;
     end
+
     def self.log(*args)
       @logger.log(*args) if @logger;
     end
+
     def self.fatal(*args)
       @logger.fatal(*args) if @logger;
     end
+
     def self.error(*args)
       @logger.error(*args) if @logger;
     end
+
     def self.warn(*args)
       @logger.warn(*args) if @logger;
     end
+
     def self.info(*args)
       @logger.info(*args) if @logger;
     end
+
     def self.debug(*args)
       @logger.debug(*args) if @logger;
     end
+
     def self.mesg(*args)
       @logger.info(*args) if @logger;
       $stderr.puts(*args) if @logToStderr;
@@ -135,6 +191,20 @@ module Rake
       $stderr.puts(s.string) if @logToStderr;
     end
 
+    def self.mesg_yaml(*args)
+      args.each do | anArg |
+        str = YAML.dump(anArg);
+        @logger.info(str);
+        $stderr.puts(str) if @logToStderr;
+      end
+    end
+
+    def self.mesg_conf
+      str = Conf.prettyPrint;
+      @logger.info(str);
+      $stderr.puts(str) if @logToStderr;
+    end
+
   end
 
   module DSL
@@ -147,6 +217,13 @@ module Rake
       Rake::Application.mesg_pp(*args);
     end
 
+    def mesg_yaml(*args)
+      Rake::Application.mesg_yaml(*args);
+    end
+
+    def mesg_conf
+      Rake::Application.mesg_conf;
+    end
   end
 
   class Task
@@ -156,7 +233,7 @@ module Rake
     def invoke_with_call_chain(task_args, invocation_chain) # :nodoc:
       new_chain = InvocationChain.append(self, invocation_chain)
       @lock.synchronize do
-        if application.options.trace
+        if application.options.trace then
           Rake::Application.mesg "** Invoke #{name} #{format_trace_flags}"
         end
         return if @already_invoked
@@ -172,11 +249,11 @@ module Rake
     # Execute the actions associated with this task.
     def execute(args=nil)
       args ||= EMPTY_TASK_ARGS
-      if application.options.dryrun
+      if application.options.dryrun then
         Rake::Application.mesg "** Execute (dry run) #{name}"
         return
       end
-      if application.options.trace
+      if application.options.trace then
         Rake::Application.mesg "** Execute #{name}"
       end
       application.enhance_with_matching_rule(name) if @actions.empty?
@@ -189,11 +266,10 @@ module Rake
         end
       end
     end
-
   end
 
 end
 
-self.extend Rake::DSL
+#self.extend Rake::DSL
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cook
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.3.1
 - !ruby/object:Gem::Dependency
   name: construct
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.11'
 description: ! "cook is a rake extension with:\n\n1. configuration file,\n1. the ability
   to retrieve passwords from encrypted configuration files,\n1. the ability to create
   files using Erubis templates,\n1. the ablity to interact with both local and remote
@@ -174,7 +174,8 @@ files:
 - test/test_cook.rb
 - .gemtest
 homepage: https://github.com/stephengaito/rGems-cook
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --main
@@ -194,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: cook
+rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3