cog 0.0.18 → 0.0.19

data/lib/cog/config.rb

@@ -32,6 +32,12 @@ module Cog
     def project?
       !@project_root.nil?
     end
+
+    # A value which is set by the active tool
+    attr_writer :tool_templates_path
+    
+    # A value which is set by the active tool
+    attr_accessor :tool_generator_template
     
     # A list of directories in which to find ERB template files.
     # Priority should be given first to last.

data/lib/cog/generator.rb

@@ -33,25 +33,41 @@ module Cog
     # ==== Returns
     # Whether or not the generator was created successfully
     def self.create(name, opt={})
-      tool = (opt[:tool] || :basic).to_s
       return false unless Config.instance.project?
+
       gen_name = File.join Config.instance.project_generators_path, "#{name}.rb"
-      template_name = File.join Config.instance.project_templates_path, "#{name}.txt.erb"
       if File.exists? gen_name
         STDERR.write "Generator '#{gen_name}' already exists\n".color(:red)
-        false
-      elsif File.exists? template_name
+        return false
+      end
+
+      tool = (opt[:tool] || :basic).to_s
+      template_name = File.join Config.instance.project_templates_path, "#{name}.txt.erb"
+      if tool == 'basic' && File.exists?(template_name)
         STDERR.write "Template '#{template_name}' already exists\n".color(:red)
-        false
-      else
-        Object.new.instance_eval do
-          extend Generator
-          @name = name
-          @class_name = name.to_s.camelize
+        return false
+      end
+      
+      Object.new.instance_eval do
+        extend Generator
+        @name = name
+        @class_name = name.to_s.camelize
+        if tool == 'basic'
           stamp 'cog/generator/basic.rb', gen_name, :absolute_destination => true
           stamp 'cog/generator/basic-template.txt.erb', template_name, :absolute_destination => true
+        else
+          tool_path = Tool.find(tool)
+          if tool_path.nil?
+            STDERR.write "No such tool '#{tool}'"
+            false
+          else
+            require tool_path
+            @absolute_require = tool_path != tool
+            @tool_parent_path = File.dirname(tool_path)
+            stamp Config.instance.tool_generator_template, gen_name, :absolute_destination => true
+            true
+          end
         end
-        true
       end
     end
     
@@ -97,7 +113,7 @@ module Cog
           found.empty? && File.exists?(x) ? x : found
         end
       end
-      raise Errors::MissingTemplate.new fullpath unless File.exists? fullpath
+      raise Errors::MissingTemplate.new path unless File.exists? fullpath
       ERB.new File.read(fullpath), 0, '>'
     end
     

data/lib/cog/spec_helpers.rb

@@ -53,7 +53,7 @@ module Cog
     
     # Path to the test tool with the given name
     def tool(name)
-      File.expand_path File.join(spec_root, 'tools', name.to_s)
+      File.expand_path File.join(spec_root, 'tools', name.to_s, 'lib', "#{name}.rb")
     end
     
     # The next cog spec will execute in a fresh copy of the given fixture directory.

data/lib/cog/tool.rb

@@ -10,11 +10,11 @@ module Cog
     # A list of available tools
     def self.list(verbose=false)
       x = (ENV['COG_TOOLS'] || '').split ':'
-      if x.all? {|path| File.exists?(path) && File.directory?(path)}
+      if x.all? {|path| path.slice(-3..-1) != '.rb' || File.exists?(path)}
         if verbose
-          x.collect {|path| File.expand_path path}
+          x.collect {|path| path.slice(-3..-1) == '.rb' ? File.expand_path(path) : path}
         else
-          x.collect {|path| File.basename path}
+          x.collect {|path| path.slice(-3..-1) == '.rb' ? File.basename(path).slice(0..-4) : path}
         end
       else
         x.each do |path|
@@ -41,13 +41,15 @@ module Cog
           extend Generator
           @name = name.to_s.downcase
           @module_name = name.to_s.capitalize
+          @letter = name.to_s.slice(0,1).downcase
           @author = '<Your name goes here>'
           @email = 'youremail@...'
           @description = 'A one-liner'
           @cog_version = Cog::VERSION
           stamp 'cog/tool/tool.rb', "#{@name}/lib/#{@name}.rb", :absolute_destination => true
           stamp 'cog/tool/version.rb', "#{@name}/lib/#{@name}/version.rb", :absolute_destination => true
-          stamp 'cog/tool/generator.rb', "#{@name}/cog/templates/#{@name}/generator.rb.erb", :absolute_destination => true
+          stamp 'cog/tool/generator.rb.erb', "#{@name}/cog/templates/#{@name}/generator.rb.erb", :absolute_destination => true
+          stamp 'cog/tool/template.txt.erb', "#{@name}/cog/templates/#{@name}/#{@name}.txt.erb", :absolute_destination => true
           stamp 'cog/tool/Gemfile', "#{@name}/Gemfile", :absolute_destination => true
           stamp 'cog/tool/Rakefile', "#{@name}/Rakefile", :absolute_destination => true
           stamp 'cog/tool/tool.gemspec', "#{@name}/#{@name}.gemspec", :absolute_destination => true
@@ -58,6 +60,22 @@ module Cog
         true
       end
     end
-  end
 
+    # Find an available tool with the given name
+    #
+    # ==== Returns
+    # A fully qualified tool path, which can be required
+    def self.find(name)
+      x = (ENV['COG_TOOLS'] || '').split ':'
+      x.each do |path|
+        if path.slice(-3..-1) == '.rb'
+          short = File.basename(path).slice(0..-4)
+          return path if short == name
+        else
+          return path if path == name
+        end
+      end
+    end
+
+  end
 end

data/lib/cog/version.rb

@@ -1,3 +1,3 @@
 module Cog
-  VERSION = '0.0.18' unless const_defined? :VERSION
+  VERSION = '0.0.19' unless const_defined? :VERSION
 end

data/templates/cog/tool/generator.rb.erb.erb

@@ -0,0 +1,6 @@
+<%% if @absolute_require %>$LOAD_PATH << "<%%= @tool_parent_path %>"
+<%% end %>require '<%= @name %>'
+
+<%= @module_name %>.widget '<%%= @name %>' do |w|
+  w.context = 'this is the context'
+end

data/templates/cog/tool/template.txt.erb.erb

@@ -0,0 +1 @@
+This is a custom generator template with context: <%%= @context %>!

data/templates/cog/tool/tool.rb.erb

@@ -1,4 +1,42 @@
+$LOAD_PATH << File.join(File.dirname(__FILE__))
 require '<%= @name %>/version'
+require 'cog'
 
+# Inject this tools templates onto the cog template lookup path
+# Do not remove this line
+Cog::Config.instance.tool_templates_path = File.expand_path(File.join(__FILE__, '..', '..', 'cog', 'templates'))
+
+# Set the template which is used to create generators for this tool
+# Do not remove this line
+Cog::Config.instance.tool_generator_template = '<%= @name %>/generator.rb'
+
+# Custom cog tool <%= @name %> 
 module <%= @module_name %> 
+
+  # Root of the DSL
+  # Feel free to rename this to something more appropriate
+  def self.widget(generator_name, &block)
+    w = Widget.new generator_name
+    block.call w
+    w.generate
+    nil
+  end
+
+  # Root type of the DSL
+  # You'll want to rename this to something more meaningful
+  # and probably place it in a separate file.
+  class Widget
+    
+    include Cog::Generator
+    
+    attr_accessor :context
+    
+    def initialize(generator_name)
+      @generator_name = generator_name
+    end
+    
+    def generate
+      stamp '<%= @name %>/<%= @name %>.txt', "generated_#{@generator_name}.txt"
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cog
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Kevin Tonon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-04 00:00:00 Z
+date: 2012-11-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gli
@@ -91,10 +91,11 @@ files:
 - templates/cog/snippets/generated_warning.txt
 - templates/cog/tool/API.rdoc.erb
 - templates/cog/tool/Gemfile.erb
-- templates/cog/tool/generator.rb.erb
+- templates/cog/tool/generator.rb.erb.erb
 - templates/cog/tool/LICENSE.erb
 - templates/cog/tool/Rakefile.erb
 - templates/cog/tool/README.markdown.erb
+- templates/cog/tool/template.txt.erb.erb
 - templates/cog/tool/tool.gemspec.erb
 - templates/cog/tool/tool.rb.erb
 - templates/cog/tool/version.rb.erb

data/templates/cog/tool/generator.rb.erb

@@ -1,5 +0,0 @@
-require '<%= @name %>'
-
-<%= @module_name %>.define do |definition|
-
-end