prigner 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,8 +1,18 @@
-= Prigner v0.3.0 (2010-11-25) - Changelog
+= Prigner v0.3.1 (2010-11-26) - Changelog
+
+== 2010-11-26
+
+* Releasing of version 0.3.1.
+* Improvements in listing of the templates.
+  * Details of templates can be showed in list. 
+  * The list show if user has customized templates. 
+  * Small improvements in code.
+* Fixes in Ruby/Sinatra template.
 
 == 2010-11-25
 
-* * Adding of command to copy templates.
+* Releasing of version 0.3.0.
+* Adding of command to copy templates.
 * Fixes in the templates that includes test.
 
 == 2010-11-19

data/doc/releases/v0.3.0.rdoc

@@ -0,0 +1,10 @@
+= Prigner v0.3.0
+
+Bug fixes and new commands for line interface.
+
+* Fixes in the shared templates that includes test.
+* Adding of command to copy templates to user home directory.
+* Small updates in documentation.
+
+For more informations about this release, please see the CHANGELOG file.
+

data/doc/releases/v0.3.1.rdoc

@@ -0,0 +1,11 @@
+= Prigner v0.3.1
+
+Improvements in command line interface.
+
+* Details of templates can be showed in list.
+* The list show if user has customized templates.
+* Small improvements in code.
+* Fixes in Ruby/Sinatra template.
+
+For more informations about this release, please see the CHANGELOG file.
+

data/lib/prigner.rb

@@ -1,7 +1,7 @@
 #@ --- 
 #@ :timestamp: 2009-07-16 14:05:16 -04:00
-#@ :date: 2010-11-25
-#@ :tag: 0.3.0
+#@ :date: 2010-11-26
+#@ :tag: 0.3.1
 
 # ---
 # encoding: UTF-8

data/lib/prigner/cli.rb

@@ -19,7 +19,7 @@ module Prigner::CLI
   # List all templates as commands.
   def self.templates
     Prigner::Template.all.map do |namespace, templates|
-      templates.map{ |template| template.mask }
+      templates.map{ |template, custom| template.mask }
     end.flatten
   end
 

data/lib/prigner/cli/copy.rb

@@ -27,7 +27,16 @@ begin
 
     arguments.separator "Options:"
 
-    arguments.on("-f", "--force", TrueClass, "Force copy.") { noforce = false }
+    arguments.on("-h", "--help", nil, "Show this message.") do
+      puts arguments
+      exit 0
+    end
+
+    arguments.on("-f", "--force", TrueClass, "Force copy.") do
+      noforce = false
+    end
+
+    arguments.separator ""
 
     unless ARGV.empty?
         arguments.parse!

data/lib/prigner/cli/list.rb

@@ -5,48 +5,97 @@ require "prigner"
 
 program = :prign
 command = File.basename(__FILE__, ".rb")
-@options = {}
 
-def templates_by_namespace(indent)
-  templates = Prigner::Template.all
+def templates_by_namespace(options = { :indent => nil, :details => false })
+  puts "#{Prigner::Version}"
+  puts "\nThe templates tagged with '*' are customized by user."
   message = []
-  templates.map do |namespace, list|
-    message << "* #{namespace}"
-    list.map do |template|
-      message << ("#{indent}> %-16s %s" % [template.name, template.spec.description])
+  Prigner::Template.all.map do |namespace, list|
+    message << "#{namespace}:"
+    list.map do |template, custom|
+      formatting = "#{options[:indent]}#{custom ? :* : :-} %s (%s)"
+      attributes = [template.name, template.spec.version]
+      if options[:details]
+        formatting = "#{options[:indent]}#{custom ? :* : :-} %s (%s)\n" +
+                     "#{options[:indent]}  %s\n" +
+                     "#{options[:indent]}  Written by %s <%s>\n"
+        attributes = [
+          template.name,
+          template.spec.version,
+          template.spec.description,
+          template.spec.author,
+          template.spec.email
+        ]
+      end
+      message << (formatting % attributes)
     end
   end
-  message.join("\n")
-end
-
-def show(message)
-  puts "#{Prigner::Version}"
-  puts "\n#{message}"
+  puts "\n#{message.join("\n")}"
 end
 
 begin
+  ARGV.options do |arguments|
+
+    arguments.summary_indent = "  "
+    arguments.summary_width  = 24
+    arguments.banner = <<-end_banner.gsub /^[ ]{4}/, ''
+      #{Prigner::Version}
 
-ARGV.options do |arguments|
+      List all templates.
 
-  arguments.summary_indent = "  "
-  arguments.summary_width  = 24
-  arguments.banner = <<-end_banner.gsub /^[ ]{4}/, ''
-    #{Prigner::Version}
+      Usage:
+        #{program} #{command} <namespace>[:template] [options]
+        #{program} #{command} [options]
 
-    List all templates.
+    end_banner
 
-    Usage:
-      #{program} #{command}
+    arguments.separator "Options:"
+
+    options = {
+      :indent  => arguments.summary_indent,
+      :details => false
+    }
+
+    arguments.on("-h", "--help", nil, "Show this message.") do
+      puts arguments
+      exit 0
+    end
+
+    arguments.on("-d", "--details", nil, "Show template details.") do
+      options[:details] = true
+    end
 
-  end_banner
+    arguments.separator ""
 
-  if ARGV.empty?
-    show(templates_by_namespace(arguments.summary_indent))
-    exit 0
-  else
     arguments.parse!
+
+    unless ARGV.empty?
+      name = ARGV.shift
+
+      if template = Prigner::Template.load(*name.split(":"))
+        arguments.banner = <<-end_banner.gsub /^[ ]{10}/, ''
+        #{Prigner::Version}
+
+        Template:
+        #{template.mask} v#{template.spec.version}
+
+        #{template.spec.description}
+
+          Written by #{template.spec.author} <#{template.spec.email}>.
+
+        Usage:
+        #{program} #{command} #{template.mask} <path> [options]
+
+        end_banner
+      else
+        raise RuntimeError, "unable to load template '#{name}'"
+      end
+    else
+      templates_by_namespace(options)
+      exit 0
+    end
+
   end
-end
 
 rescue => error
   puts "\n#{program}: #{command}: #{error.message} (#{error.class})"

data/lib/prigner/template.rb

@@ -86,8 +86,9 @@ class Prigner::Template
     all_template_paths.map do |path|
       new(path)
     end.inject({}) do |group, template|
+      customized = template.path.to_s =~ %r/#{Prigner.user_home_basedir}/
       group[template.namespace] ||= []
-      group[template.namespace] << template
+      group[template.namespace] << [ template, customized ]
       group
     end
   end

data/prigner.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |spec|
 
   #about
   spec.name = "prigner"
-  spec.summary = "Project designer."
+  spec.summary = "Prigner is a Project Design Kit (a.k.a. project builder)."
   spec.description = "Prigner is a Project Design Kit (a.k.a. project builder). That is, it is a tool which builds your projects using templates."
   spec.authors = ["Hallison Batista"]
   spec.email = "hallison@codigorama.com"
@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   #
 
   #version
-  spec.version = "0.3.0"
-  spec.date = "2010-11-25"
+  spec.version = "0.3.1"
+  spec.date = "2010-11-26"
   #
 
   #dependencies
@@ -34,6 +34,8 @@ Gem::Specification.new do |spec|
     "doc/releases/v0.2.0.rdoc",
     "doc/releases/v0.2.1.rdoc",
     "doc/releases/v0.2.2.rdoc",
+    "doc/releases/v0.3.0.rdoc",
+    "doc/releases/v0.3.1.rdoc",
     "doc/templates.rdoc",
     "lib/prigner.rb",
     "lib/prigner/builder.rb",

data/share/templates/ruby/sinatra/models/Rakefile

@@ -28,7 +28,7 @@ end
 def tag
   git(:tag).split("\n").last
 end
-
+<%if option.gem.enabled%>
 def specfile
   @specfile ||= Pathname.new("<%=project.name%>.gemspec")
 end
@@ -36,7 +36,7 @@ end
 def gemspec
   @gemspec ||= eval(specfile.read)
 end
-
+<%end%>
 # Test
 # =============================================================================
 
@@ -45,14 +45,14 @@ Rake::TestTask.new do |test|
   test.test_files = FileList["test/*_test.rb"]
   test.verbose = true
 end
-
+<%if option.gem.enabled%>
 # Packaging
 # =============================================================================
 
 Rake::GemPackageTask.new gemspec do |spec|
   spec.need_tar = true
 end
-
+<%end%>
 # Documentation
 # =============================================================================
 
@@ -96,6 +96,7 @@ namespace :version do
     puts version.to_hash.to_yaml
   end
 end
+<%if option.gem.enabled%>
 #
 # Packaging
 # =============================================================================
@@ -138,7 +139,7 @@ desc "Uninstall gem package #{gemspec.file_name}."
 task :uninstall do
   sh "gem uninstall #{gemspec.name} --version #{gemspec.version}"
 end
-
+<%end%>
 # Default
 # =============================================================================
 

data/share/templates/ruby/sinatra/models/module.rb

@@ -15,10 +15,10 @@ module <%=project.upper_camel_case_namespace%>
   # Standard library requirements
   require "pathname"
   require "yaml"
-
+<%if option.mvc.enabled%>
   # Internal requirements
   require "<%=project.name%>/config"
-
+<%end%>
   # Return the current version.
   def self.version
     @version ||= Version.current

data/share/templates/ruby/sinatra/specfile

@@ -3,7 +3,7 @@ author:
 email:
   hallison@codigorama.com
 version:
-  0.1.0
+  0.1.1
 description:
   Ruby/Sinatra application template.
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prigner
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Hallison Batista
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 -04:00
+date: 2010-11-26 00:00:00 -04:00
 default_executable: prign
 dependencies: []
 
@@ -40,6 +40,8 @@ files:
 - doc/releases/v0.2.0.rdoc
 - doc/releases/v0.2.1.rdoc
 - doc/releases/v0.2.2.rdoc
+- doc/releases/v0.3.0.rdoc
+- doc/releases/v0.3.1.rdoc
 - doc/templates.rdoc
 - lib/prigner.rb
 - lib/prigner/builder.rb
@@ -128,7 +130,7 @@ licenses: []
 
 post_install_message: |
   ------------------------------------------------------------------------------
-  Prigner v0.3.0
+  Prigner v0.3.1
   
   Thanks for use Prigner. See all shared templates running:
   
@@ -143,7 +145,7 @@ rdoc_options:
 - --main
 - Prigner
 - --title
-- Prigner v0.3.0 API Documentation
+- Prigner v0.3.1 API Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -170,6 +172,6 @@ rubyforge_project: prigner
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Project designer.
+summary: Prigner is a Project Design Kit (a.k.a. project builder).
 test_files: []