prigner 0.1.0 → 0.1.1

data/Rakefile

@@ -1,7 +1,7 @@
 require "rake/clean"
 require "lib/prigner"
 
-# Helpers
+# Configurations
 # =============================================================================
 
 def rdoc(*args)
@@ -24,120 +24,125 @@ def test(pattern)
   end
 end
 
+def git(cmd, *args)
+  `git #{cmd.to_s.gsub('_','-')} #{args.join(' ')}`
+end
+
 def manifest
-  @manifest ||= `git ls-files`.split("\n").sort.reject do |out|
+  @manifest ||= git(:ls_files).split("\n").sort.reject do |out|
     out =~ /^\./ || out =~ /^doc/
   end.map do |file|
     "    #{file.inspect}"
   end.join(",\n")
 end
 
+def version
+  @version ||= Prigner.version
+end
+
+def tag
+  git(:tag).split("\n").last
+end
+
+def release_notes
+  @release_notes ||= Pathname.new("v#{spec.version}.rdoc")
+end
+
 def log
-  @log ||= `git log --date=short --format='%d;%cd;%s;%b;'`
+  yaml = git :log,
+             "--date=short",
+             "--format='- head: %d%n  date: %cd%n  summary: %s%n  notes: \"%n%b\"%n'"
+  YAML.load(yaml)
 end
 
-def version
-  @version ||= Prigner.version
+def specfile
+  @specfile ||= Pathname.new("prigner.gemspec")
+end
+
+def spec
+  @spec ||= eval(specfile.read)
 end
 
-def gemspec
-  @gemspec ||= Struct.new(:spec, :file).new
-  @gemspec.file ||= Pathname.new("prigner.gemspec")
-  @gemspec.spec ||= eval @gemspec.file.read
-  @gemspec
+def package_path
+  specfile.dirname.join("pkg").join("#{File.basename(spec.file_name, '.*')}")
+end
+
+def package(ext = "")
+  specfile.dirname.join("#{package_path}#{ext}")
 end
 
 # Documentation
 # =============================================================================
 
-namespace :doc do
+CLOBBER << FileList["doc/*"]
+
+file "doc/api/index.html" => FileList["lib/**/*.rb", "README.rdoc", "CHANGELOG"] do |filespec|
+  rm_rf "doc"
+  rdoc "--op", "doc/api",
+       "--charset", "utf8",
+       "--main", "'Prigner'",
+       "--title", "'Prigner v#{version.tag} API Documentation'",
+       "--inline-source",
+       "--promiscuous",
+       "--line-numbers",
+       filespec.prerequisites.join(" ")
+end
 
-  CLOBBER << FileList["doc/*"]
+desc "Build API documentation (doc/api)."
+task :doc => "doc/api/index.html"
 
-  file "doc/api/index.html" => FileList["lib/**/*.rb", "README.mkd", "CHANGELOG"] do |filespec|
-    rm_rf "doc"
-    rdoc "--op", "doc/api",
-         "--charset", "utf8",
-         "--main", "'Prigner'",
-         "--title", "'Prigner v#{version.tag} API Documentation'",
-         "--inline-source",
-         "--promiscuous",
-         "--line-numbers",
-         filespec.prerequisites.join(" ")
-  end
-
-  desc "Build API documentation (doc/api)"
-  task :api => "doc/api/index.html"
+desc "Build CHANGELOG file."
+task :changelog do
+  open("CHANGELOG", "w+") do |changelog|
+    title = lambda do |charlevel, text|
+      text << "\n" << charlevel
+    end
 
-  desc "Creates/updates CHANGELOG file."
-  task :changelog do |spec|
-    historic = {}
-    text     = ""
+    changelog << "= #{Prigner::Version} - Changelog"
 
-    log.scan(/(.*?);(.*?);(.*?);(.*?);/m) do |tag, date, subject, content|
-      
-      historic[date] = {
-        :release => "#{date} #{tag.match(/(v\d\..*)/im) ? tag : nil}",
-        :changes => []
-      } unless historic.has_key? date
+    historic = log.group_by { |entry| entry["date"] }
 
-      historic[date][:changes] << "\n* #{subject}\n"
-      historic[date][:changes] << content.gsub(/(.*?)\n/m){"\n  #{$1}\n"} unless content.empty?
-    end
+    historic.keys.sort.reverse.map do |date|
+      changelog << "\n\n" << "== #{date}" << "\n"
 
-    historic.keys.sort.reverse.each do |date|
-      entry = historic[date]
-      puts "Adding historic from date #{date} ..."
-      text  << <<-end_text.gsub(/^[ ]{8}/,'')
-        #{entry[:release]}
-        #{"-" * entry[:release].size}
-        #{entry[:changes]}
-      end_text
+      for entry in historic[date]
+        notes = entry["notes"]
+        changelog << "\n* #{entry["summary"]}."
+        unless notes.empty?
+          changelog << notes.strip.gsub(/([\*-].*?)/){ "\n  #{$1}" }
+        end
+      end
     end
 
-    File.open("CHANGELOG", "w+") { |changelog| changelog << text }
-    puts "Historic has #{historic.keys.size} entry dates"
-    puts "Successfully updated CHANGELOG file"
+    puts "Successfully updated the CHANGELOG file with #{historic.keys.size} dates."
   end
-
 end
 
+file "CHANGELOG" => :changelog
+
 # Versioning
 # =============================================================================
 
-namespace :version do
-
-  major, minor, patch, build = version.tag.split(".").map{ |key| key.to_i } << 0
-
-  desc "Dump major version"
-  task :major do
-    version.tag = "#{major+=1}.0.0"
-    version.save!
-    puts version.to_hash.to_yaml
-  end
-
-  desc "Dump minor version"
-  task :minor do
-    version.tag = "#{major}.#{minor+=1}.0"
-    version.save!
-    puts version.to_hash.to_yaml
-  end
+desc "Dump version (current v#{version.tag})."
+task :version, [:counter,:release] do |spec, args|
+  numbering = version.numbering
+  tagnames  = %w[major minor patch]
 
-  desc "Dump patch version"
-  task :patch do
-    version.tag = "#{major}.#{minor}.#{patch+=1}"
-    version.save!
-    puts version.to_hash.to_yaml
+  if index = tagnames.index(args[:counter])
+    numbering[index] += 1
+    numbering.fill(0, (index + 1)..-1)
+  else
+    numbering[-1] += 1
   end
 
-  desc "Dump build version"
-  task :build do
-    version.tag = "#{major}.#{minor}.#{patch}.#{build+=1}"
-    version.save!
-    puts version.to_hash.to_yaml
-  end
+  numbering[-1] = "#{numbering[-1]}#{args[:release]}"
+  version.tag   = numbering.join(".")
+  version.save!
+  puts version.to_hash.to_yaml
+end
 
-  desc "Update version date (current #{version.date})"
+namespace :version do
+  desc "Update version date (current #{version.date})."
   task :date, [:date] do |spec, args|
     require "parsedate"
     require "date"
@@ -148,58 +153,81 @@ namespace :version do
   end
 end
 
-task :version => "version:build"
-
-# RubyGems
+# Packaging
 # =============================================================================
 
-namespace :gem do
+CLOBBER << FileList["#{package_path.dirname}/*"]
 
-  file gemspec.file => FileList["{lib,test}/**", "Rakefile"] do
-    spec = gemspec.file.read
+task :tagged do
+  abort "The version #{version.tag} is not tagged, yet." unless tag[1..-1] == version.tag
+end
 
-    puts "Updating version ..."
-      spec.sub! /spec\.version\s*=\s*".*?"/,  "spec.version = #{version.tag.inspect}"
+file specfile => FileList["{bin,lib,test}/**", "Rakefile"] do
+  spec = specfile.read
 
-    puts "Updating date of version ..."
-      spec.sub! /spec\.date\s*=\s*".*?"/,     "spec.date = #{version.date.to_s.inspect}"
+  puts "Updating version ..."
+    spec.sub! /spec\.version\s*=\s*".*?"/,  "spec.version = #{version.tag.inspect}"
 
-    puts "Updating file list ..."
-      spec.sub! /spec\.files\s*=\s*\[.*?\]/m, "spec.files = [\n#{manifest}\n  ]"
+  puts "Updating date of version ..."
+    spec.sub! /spec\.date\s*=\s*".*?"/,     "spec.date = #{version.date.to_s.inspect}"
 
-    gemspec.file.open("w+") { |file| file << spec }
+  puts "Updating file list ..."
+    spec.sub! /spec\.files\s*=\s*\[.*?\]/m, "spec.files = [\n#{manifest}\n  ]"
 
-    puts "Successfully update #{gemspec.file} file"
-  end
+  specfile.open("w+") { |file| file << spec }
 
-  desc "Build gem package #{gemspec.spec.file_name}"
-  task :build => gemspec.file do
-    sh "gem build #{gemspec.file}"
-  end
+  puts "Successfully update #{specfile} file"
+end
 
-  desc "Deploy gem package to RubyGems.org"
-  task :deploy => :build do
-    sh "gem push #{gemspec.spec.file_name}"
-  end
+directory package_path.to_s
+
+file package(".gem") => [ specfile, package_path.dirname ] do |file|
+  sh "gem build #{specfile}"
+  mv spec.file_name, file.prerequisites.last
+end
 
-  desc "Install gem package #{gemspec.spec.file_name}"
-  task :install => :build do
-    sh "gem install #{gemspec.spec.file_name} --local"
+file package(".tar.gz") => [ specfile, package_path ] do |file|
+  spec.files.each do |source|
+    package_path.join(source).dirname.mkpath
+    cp source, package_path.join(source)
   end
+  cd package_path.dirname do
+    sh "tar czvf #{package(".tar.gz").basename} #{package_path.basename}/*"
+  end
+end
 
-  desc "Uninstall gem package #{gemspec.spec.file_name}"
-  task :uninstall do
-    sh "gem uninstall #{gemspec.spec.name} --version #{gemspec.spec.version}"
+desc "Build packages."
+task :package => [package(".gem"), package(".tar.gz")]
+
+desc "Release gem package to repositories."
+task :release => [ :tagged, :package ] do
+  sh "gem push #{package('.gem')}"
+  { :release => ".gem", :file => ".tar.gz" }.each do |file, ext|
+    sh "rubyforge add_#{file}",
+       "#{spec.rubyforge_project}",
+       "#{spec.name} #{spec.version} #{package(ext)}"
+  end
+  if release_notes.exist?
+    sh "rubyforge add_news 'Prigner v#{spec.version} released' '#{release_notes.read}'"
   end
+end
+
+desc "Install gem package #{spec.file_name}."
+task :install => :package do
+  sh "gem install #{package('.gem')} --local"
+end
 
+desc "Uninstall gem package #{spec.file_name}."
+task :uninstall do
+  sh "gem uninstall #{spec.name} --version #{spec.version}"
 end
 
-task :gem => "gem:build"
+task :gem => package(".gem")
 
 # Test
 # =============================================================================
 
-desc "Run tests"
+desc "Run tests."
 task :test, [:pattern] do |spec, args|
   test(args[:pattern] ? "test/#{args[:pattern]}_test.rb" : "test/*_test.rb")
 end
@@ -207,5 +235,5 @@ end
 # Default
 # =============================================================================
 
-task :default => "test"
+task :default => :test
 

data/lib/prigner/cli/copy.rb

@@ -0,0 +1,39 @@
+# Copyright (c) 2010 Hallison Batista
+
+require "prigner"
+
+program = :prign
+command = File.basename(__FILE__, ".rb")
+
+begin
+  ARGV.options do |arguments|
+
+    arguments.summary_indent = "  "
+    arguments.summary_width  = 24
+    arguments.banner = <<-end_banner.gsub /^[ ]{6}/, ''
+      #{Prigner::Version}
+
+      Usage:
+        #{program} #{command} <namespace>[:template] <path>
+
+      Templates:
+        #{Prigner::CLI.templates.sort.join("\n" + arguments.summary_indent)}
+
+    end_banner
+
+    if ARGV.empty?
+      puts arguments
+      exit 0
+    else
+      arguments.parse!
+    end
+
+  end
+
+rescue => error
+  puts "#{program}: #{command}: #{error.message} (#{error.class})"
+  puts "Try '#{program} #{command} -h' or '#{program} #{command} --help' for more information."
+  exit 1
+end
+
+

data/lib/prigner/cli/new.rb

@@ -22,8 +22,9 @@ begin
     end_banner
 
     unless ARGV.empty?
-      name  = ARGV.shift
-      path  = ARGV.shift unless name.nil?
+      arguments.parse!
+
+      name = ARGV.shift
 
       template = Prigner::Template.load(*name.split(":"))
 
@@ -52,12 +53,13 @@ begin
       end
     end
 
-    unless path
-      puts arguments
-      exit 0
-    end
-
-    arguments.parse!
+    path = unless ARGV.empty?
+             arguments.parse!
+             path = ARGV.shift unless name.nil?
+           else
+             puts arguments
+             exit 0
+           end
 
     project = Prigner::Project.new(path)
     builder = Prigner::Builder.new(project, template)

data/lib/prigner/extensions.rb

@@ -58,9 +58,24 @@ class Struct
 end
 
 class Pathname
+  def get(file)
+    result = self.join(file.gsub(/^\/(.*?)$/){$1})
+    def result.to_s
+      return [self.inspect, self.read].join("\n")
+    end
+    result
+  end
+
+  alias read_body read
+
+  alias address expand_path
+
+  def port
+    nil
+  end
 
-  def chpath(source, path)
-    self.path.gsub(%r{#{source}}, path).to_path
+  def start
+    block_given? ? (yield self) : self
   end
 
 end

data/lib/prigner/template.rb

@@ -64,39 +64,17 @@ class Prigner::Template
   # Load template from shared directories. The shared path set the home user
   # directory and Prigner::Template shared files.
   def self.load(namespace, template = :default)
-    shared_path.map do |source|
+    Prigner.shared_path.map do |source|
       path = "#{source}/#{namespace}/#{template}"
       return new(path) if File.exist? path
     end
     nil
   end
 
-  # Look at user home and template shared path.
-  def self.shared_path
-    user_home_templates = File.join(user_home_basedir, "templates")
-    [ user_home_templates, "#{Prigner::ROOT}/share/templates" ]
-  end
-
-  # User home.
-  def self.user_home
-    File.expand_path "~"
-  rescue
-    if File::ALT_SEPARATOR then
-      "C:/"
-    else
-      "/"
-    end
-  end
-
-  # User home base directory for Prigner files.
-  def self.user_home_basedir
-    File.join(user_home, ".prigner")
-  end
-
   # Return all template paths placed in shared user or in project base
   # directory.
   def self.all_template_paths
-    shared_path.map do |source|
+    Prigner.shared_path.map do |source|
       Dir.glob("#{source}/*/*")
     end.flatten.compact
   end

data/lib/prigner.rb

@@ -1,8 +1,7 @@
 #@ --- 
 #@ :timestamp: 2009-07-16 14:05:16 -04:00
-#@ :date: 2010-10-18
-#@ :tag: 0.1.0
-#@ :milestone: Alpha
+#@ :date: 2010-10-21
+#@ :tag: 0.1.1
 # encoding: UTF-8
 
 # Copyright (c) 2009, 2010, Hallison Batista
@@ -28,6 +27,7 @@ module Prigner
   autoload :Project,  "prigner/project"
   autoload :Model,    "prigner/model"
   autoload :Template, "prigner/template"
+  autoload :Source,   "prigner/source"
   autoload :Builder,  "prigner/builder"
   autoload :CLI,      "prigner/cli"
 
@@ -36,13 +36,17 @@ module Prigner
     @version ||= Version.current
   end
 
-  class Version #:nodoc:
+  # The objective of this class is to implement various ideas proposed by the
+  # Semantic Versioning Specification (see reference[http://semver.org/]).
+  class Version
 
     FILE = Pathname.new(__FILE__).freeze
 
-    attr_accessor :tag, :date, :milestone
+    attr_accessor :date, :tag
+
     attr_reader :timestamp
 
+    # Basic initialization of the attributes using a single hash.
     def initialize(attributes = {})
       attributes.each do |attribute, value|
         send("#{attribute}=", value) if respond_to? "#{attribute}="
@@ -50,17 +54,27 @@ module Prigner
       @timestamp = attributes[:timestamp]
     end
 
+    # The numbering of the major, minor and patch values.
+    def numbering
+      self.tag.split(".").map do |key|
+        if key.match(/^(\d{1,})(\w+).*$/)
+          [ $1.to_i, $2 ]
+        else
+          key.to_i
+        end
+      end.flatten
+    end
+
     def to_hash
-      [:tag, :date, :milestone, :timestamp].inject({}) do |hash, key|
+      [:tag, :date, :timestamp].inject({}) do |hash, key|
         hash[key] = send(key)
         hash
       end
     end
 
     def save!
-      @date = Date.today
       source = FILE.readlines
-      source[0..4] = self.to_hash.to_yaml.to_s.gsub(/^/, '#@ ')
+      source[0..3] = self.to_hash.to_yaml.to_s.gsub(/^/, '#@ ')
       FILE.open("w+") do |file|
         file << source.join("")
       end
@@ -69,7 +83,7 @@ module Prigner
 
     class << self
       def current
-        yaml = FILE.readlines[0..4].
+        yaml = FILE.readlines[0..3].
                  join("").
                  gsub(/\#@ /,'')
         new(YAML.load(yaml))
@@ -77,7 +91,7 @@ module Prigner
 
       def to_s
         name.match(/(.*?)::.*/)
-        "#{$1} v#{current.tag}, #{current.date} (#{current.milestone})"
+        "#{$1} v#{current.tag} (#{current.date})"
       end
     end # self
 
@@ -182,5 +196,27 @@ module Prigner
 
   end
 
+  # Look at user home and template shared path.
+  def self.shared_path
+    user_home_templates = File.join(user_home_basedir, "templates")
+    [ user_home_templates, "#{Prigner::ROOT}/share/templates" ]
+  end
+
+  # User home base directory for Prigner files.
+  def self.user_home_basedir
+    File.join(user_home, ".prigner")
+  end
+
+  # User home.
+  def self.user_home
+    File.expand_path(ENV["HOME"])
+  rescue
+    if File::ALT_SEPARATOR then
+      "C:/"
+    else
+      "/"
+    end
+  end
+
 end # Prigner