cog 0.0.13 → 0.0.14

data/bin/cog

@@ -37,7 +37,9 @@ command :generator do |c|
     else
       # Create
       args.each do |name|
-        Cog::Generator.create name, options
+        unless Cog::Generator.create name, options
+          puts "Failed to create generator #{name}"
+        end
       end
     end
   end

data/lib/cog/generator.rb

@@ -33,15 +33,17 @@ module Cog
     # ==== Returns
     # Whether or not the generator was created successfully
     def self.create(name, opt={})
-      return false unless Config.instance.project?
-      filename = File.join Config.instance.project_generators_path, "#{name}.rb"
-      return false if File.exists? filename
       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"
+      return false if File.exists?(gen_name) || File.exists?(template_name)
       Object.new.instance_eval do
         extend Generator
         @name = name
         @class_name = name.to_s.camelize
-        stamp 'cog/generator/basic.rb', filename
+        stamp 'cog/generator/basic.rb', gen_name, :absolute_destination => true
+        stamp 'cog/generator/basic-template.txt.erb', template_name, :absolute_destination => true
       end
       true
     end
@@ -80,17 +82,19 @@ module Cog
     #
     # ==== Options
     # * <tt>:absolute_template_path</tt> - is the +template_path+ argument absolute? (default: +false+)
+    # * <tt>:absolute_destination</tt> - is the +destination+ argument absolute? (default: +false+)
     def stamp(template_path, destination, opt={})
       t = get_template template_path, :absolute => opt[:absolute_template_path]
       b = opt[:binding] || binding
-      FileUtils.mkpath File.dirname(destination) unless File.exists? destination
-      scratch = "#{destination}.scratch"
+      dest = opt[:absolute_destination] ? dest : File.join(Config.instance.project_source_path, destination)
+      FileUtils.mkpath File.dirname(dest) unless File.exists? dest
+      scratch = "#{dest}.scratch"
       File.open(scratch, 'w') {|file| file.write t.result(b)}
-      if same? destination, scratch
+      if same? dest, scratch
         FileUtils.rm scratch
       else
-        puts "Generated #{destination}"
-        FileUtils.mv scratch, destination
+        puts "Generated #{dest}"
+        FileUtils.mv scratch, dest
       end
       nil
     end

data/lib/cog/tool.rb

@@ -22,15 +22,15 @@ module Cog
         @email = 'youremail@...'
         @description = 'A one-liner'
         @cog_version = Cog::VERSION
-        stamp 'cog/tool/tool.rb', "#{@name}/lib/#{@name}.rb"
-        stamp 'cog/tool/version.rb', "#{@name}/lib/#{@name}/version.rb"
-        stamp 'cog/tool/generator.rb', "#{@name}/cog/templates/#{@name}/generator.rb.erb"
-        stamp 'cog/tool/Gemfile', "#{@name}/Gemfile"
-        stamp 'cog/tool/Rakefile', "#{@name}/Rakefile"
-        stamp 'cog/tool/tool.gemspec', "#{@name}/#{@name}.gemspec"
-        stamp 'cog/tool/API.rdoc', "#{@name}/API.rdoc"
-        stamp 'cog/tool/LICENSE', "#{@name}/LICENSE"
-        stamp 'cog/tool/README.markdown', "#{@name}/README.markdown"
+        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/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
+        stamp 'cog/tool/API.rdoc', "#{@name}/API.rdoc", :absolute_destination => true
+        stamp 'cog/tool/LICENSE', "#{@name}/LICENSE", :absolute_destination => true
+        stamp 'cog/tool/README.markdown', "#{@name}/README.markdown", :absolute_destination => true
       end
     end
   end

data/lib/cog/version.rb

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

data/templates/cog/generator/basic-template.txt.erb.erb

@@ -0,0 +1 @@
+This is some context: <%%= @some_context %>!

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

@@ -4,7 +4,8 @@ class <%= @class_name %>
   include Cog::Generator
   
   def generate
-    # TODO: create a template and use stamp here to generate source code
+    @some_context = :my_context_value
+    stamp '<%= @name %>.txt', 'generated_<%= @name %>.txt'
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cog
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Kevin Tonon
@@ -57,6 +57,7 @@ files:
 - bin/cog
 - Default.cogfile
 - LICENSE
+- templates/cog/generator/basic-template.txt.erb.erb
 - templates/cog/generator/basic.rb.erb
 - templates/cog/snippets/c++/generated_warning.h.erb
 - templates/cog/snippets/generated_warning.txt