mattock 0.2.11 → 0.2.12

data/lib/mattock/configurable.rb

@@ -91,6 +91,20 @@ module Mattock
         end
       end
 
+      def to_hash(obj)
+        hash = if Configurable > superclass
+                 superclass.to_hash(obj)
+               else
+                 {}
+               end
+        hash.merge( Hash[default_values.keys.zip(default_values.keys.map{|key|
+          begin
+            obj.__send__(key)
+          rescue NoMethodError
+          end
+        }).to_a])
+      end
+
       #Creates an anonymous Configurable - useful in complex setups for nested
       #settings
       #@example SSH options
@@ -151,6 +165,10 @@ module Mattock
       self
     end
 
+    def to_hash
+      self.class.to_hash(self)
+    end
+
     #Call during initialize to set default values on settings - if you're using
     #Configurable outside of Mattock, be sure this gets called.
     def setup_defaults

data/lib/mattock/template-host.rb

@@ -42,17 +42,38 @@ module Mattock
     attr_accessor :valise
 
     def find_template(path)
-      valise.find(["templates"] + valise.unpath(path)).contents
+      valise.find(["templates"] + valise.unpath(path))
     end
 
-    def render(path, locals=nil)
+    def template_contents(path)
+      find_template(path).contents
+    end
+
+    def template_path(path)
+      find_template(path).full_path
+    end
+
+    def render(path, template_options = nil)
       template = TemplateHost::template_cache.fetch(path) do
-        Tilt.new(path) do |tmpl|
-          find_template(tmpl.file)
+        Tilt.new(path, template_options || {}) do |tmpl|
+          template_contents(tmpl.file)
         end
       end
 
-      template.render(self, locals)
+      template.render(self)
+    end
+  end
+
+  module TemplateTaskLib
+    include TemplateHost
+
+    def template_task(template_source, destination_path, template_options = nil)
+      file template_path(template_source)
+      file destination_path => template_path(template_source) do
+        File::open(destination_path, "w") do |file|
+          file.write(render(template_source, template_options))
+        end
+      end
     end
   end
 end

data/lib/mattock/yard_extensions.rb

@@ -13,7 +13,7 @@ module Mattock
             return true if [:CascadingDefinition, :Configurable, :Tasklib, :TaskLib].include? co.name and method == "define"
             return true if [:TaskMixin, :Task, :FileTask, :MultiTask].include? co.name and method == "action"
           end
-          check_list = check_list.find_all{|co| co.respond_to?(:mixins)}.map{|co| co.mixins}.flatten
+          check_list = (check_list.find_all{|co| co.respond_to?(:mixins)}||[]).map{|co| co.mixins}.flatten
         end
       end
 
@@ -90,7 +90,7 @@ module Mattock
 
         value = statement.parameters(false)[1]
         if !value.nil? and value.type == :fcall and value.jump(:ident)[0] == "nested"
-          remapped = value.parameters(false).first.map do |assoc|
+          remapped = (value.parameters.first||[]).map do |assoc|
             new_name =
                 append_name(statement.parameters[0], extract_name(assoc[0]))
             synthetic_setting(new_name, assoc[1])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mattock
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
-  requirement: &83456260 !ruby/object:Gem::Requirement
+  requirement: &71422620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *83456260
+  version_requirements: *71422620
 - !ruby/object:Gem::Dependency
   name: valise
-  requirement: &83455180 !ruby/object:Gem::Requirement
+  requirement: &71421560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *83455180
+  version_requirements: *71421560
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &83454630 !ruby/object:Gem::Requirement
+  requirement: &71545240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -45,7 +45,7 @@ dependencies:
         - 0
   type: :runtime
   prerelease: false
-  version_requirements: *83454630
+  version_requirements: *71545240
 description: ! "  If Rake won't do it by itself, you oughtta Mattock.\n\n  If you
   survived the pun, you might enjoy this gem.\n\n  Features:\n\n  * Extensions to
   Tasklibs to support powerful deerpaths.\n  * A commandline library that supports
@@ -98,7 +98,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- mattock-0.2.11 RDoc
+- mattock-0.2.12 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -318874223
+      hash: -458443345
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: