nagoro 2009.05 → 2013.03

data/spec/nagoro/pipe/include.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 describe "Nagoro::Pipe::Include" do
   def compile(obj)

data/spec/nagoro/pipe/instruction.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 describe "Nagoro::Pipe::Instruction" do
   behaves_like 'xpath'

data/spec/nagoro/pipe/morph.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 
 describe "Nagoro::Pipe::Morph" do
   def compile(obj)

data/spec/nagoro/pipe/tidy.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../helper', __FILE__)
 require 'nagoro/pipe/tidy'
 
 describe "Nagoro::Pipe::Tidy" do

data/spec/nagoro/template.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../helper', __FILE__)
 
 describe "Nagoro" do
   should '::compile from filename' do
@@ -102,4 +102,15 @@ describe "Nagoro::Template" do
 
     Nagoro.render(comment).should == comment
   end
+
+  it "ignores javascript in parameter" do
+    @stuff = 'nothing'
+    tag = %q|<a href="stuff" onmouseover='this.src="#{@stuff}"'>stuff</a>|
+
+    Nagoro.render(tag, :binding => binding).should == %|<a href="stuff" onmouseover='this.src="#{@stuff}"'>stuff</a>|
+  end
+
+  it 'The param tag should be left open if it is not closed' do
+    Nagoro.render('<param><tag>foo</tag></param>').should == '<param><tag>foo</tag></param>'
+  end
 end

data/tasks/authors.rake

@@ -0,0 +1,30 @@
+# Once git has a fix for the glibc in handling .mailmap and another fix for
+# allowing empty mail address to be mapped in .mailmap we won't have to handle
+# them manually.
+
+desc 'Update AUTHORS'
+task :authors do
+  authors = Hash.new(0)
+
+  `git shortlog -nse`.scan(/(\d+)\s(.+)\s<(.*)>$/) do |count, name, email|
+    case name
+    when "ahoward"
+      name, email = "Ara T. Howard", "ara.t.howard@gmail.com"
+    when "Martin Hilbig blueonyx@dev-area.net"
+      name, email = "Martin Hilbig", "blueonyx@dev-area.net"
+    when "Michael Fellinger m.fellinger@gmail.com"
+      name, email = "Michael Fellinger", "m.fellinger@gmail.com"
+    end
+
+    authors[[name, email]] += count.to_i
+  end
+
+  File.open('AUTHORS', 'w+') do |io|
+    io.puts "Following persons have contributed to #{GEMSPEC.name}."
+    io.puts '(Sorted by number of submitted patches, then alphabetically)'
+    io.puts ''
+    authors.sort_by{|(n,e),c| [-c, n.downcase] }.each do |(name, email), count|
+      io.puts("%6d %s <%s>" % [count, name, email])
+    end
+  end
+end

data/tasks/bacon.rake

@@ -1,49 +1,68 @@
+require 'fileutils'
+
 desc 'Run all bacon specs with pretty output'
-task :bacon => :install_dependencies do
+task :bacon do
   require 'open3'
   require 'scanf'
+  require 'matrix'
 
   specs = PROJECT_SPECS
 
   some_failed = false
-  total = specs.size
+  specs_size = specs.size
   len = specs.map{|s| s.size }.sort.last
-  tt = ta = tf = te = 0
+  total_tests = total_assertions = total_failures = total_errors = 0
+  totals = Vector[0, 0, 0, 0]
 
   red, yellow, green = "\e[31m%s\e[0m", "\e[33m%s\e[0m", "\e[32m%s\e[0m"
   left_format = "%4d/%d: %-#{len + 11}s"
   spec_format = "%d specifications (%d requirements), %d failures, %d errors"
 
   specs.each_with_index do |spec, idx|
-    print(left_format % [idx + 1, total, spec])
+    print(left_format % [idx + 1, specs_size, spec])
 
-    Open3.popen3(RUBY, spec) do |sin, sout, serr|
-      out = sout.read
-      err = serr.read
+    Open3.popen3(FileUtils::RUBY, '-w', spec) do |sin, sout, serr|
+      out = sout.read.strip
+      err = serr.read.strip
 
-      ran = false
+      # this is conventional, see spec/innate/state/fiber.rb for usage
+      if out =~ /^Bacon::Error: (needed .*)/
+        puts(yellow % ("%6s %s" % ['', $1]))
+      else
+        total = nil
 
-      out.each_line do |line|
-        tests, assertions, failures, errors = all = line.scanf(spec_format)
-        next unless all.any?
-        ran = true
-        tt += tests; ta += assertions; tf += failures; te += errors
+        out.each_line do |line|
+          scanned = line.scanf(spec_format)
 
-        if tests == 0 || failures + errors > 0
-          puts((red % spec_format) % all)
-          puts out
-          puts err
-        else
-          puts((green % "%6d passed") % tests)
+          next unless scanned.size == 4
+
+          total = Vector[*scanned]
+          break
         end
 
-        break
-      end
+        if total
+          totals += total
+          tests, assertions, failures, errors = total_array = total.to_a
 
-      puts(yellow % "       skipped") unless ran
+          if tests > 0 && failures + errors == 0
+            puts((green % "%6d passed") % tests)
+          else
+            some_failed = true
+            puts(red % "       failed")
+            puts out unless out.empty?
+            puts err unless err.empty?
+          end
+        else
+          some_failed = true
+          puts(red % "       failed")
+          puts out unless out.empty?
+          puts err unless err.empty?
+        end
+      end
     end
   end
 
-  puts(spec_format % [tt, ta, tf, te])
+  total_color = some_failed ? red : green
+  puts(total_color % (spec_format % totals.to_a))
   exit 1 if some_failed
 end

data/tasks/gem.rake

@@ -1,5 +1,3 @@
-require 'rake/gempackagetask'
-
 task :gemspec => [:manifest, :changelog] do
   gemspec_file = "#{GEMSPEC.name}.gemspec"
   File.open(gemspec_file, 'w+'){|gs| gs.puts(GEMSPEC.to_ruby) }
@@ -16,7 +14,6 @@ task :uninstall => [:clean] do
   sh %{gem uninstall -x #{GEMSPEC.name}}
 end
 
-Rake::GemPackageTask.new(GEMSPEC) do |p|
-  p.need_tar = true
-  p.need_zip = true
+Gem::PackageTask.new(GEMSPEC) do |pkg|
+  pkg.need_tar = true
 end

data/tasks/release.rake

@@ -1,52 +1,41 @@
 namespace :release do
-  task :all => [:release_github, :release_rubyforge]
+  task :prepare => [:reversion, :authors, :gemspec]
+  task :all => ['release:github', 'release:gemcutter']
 
-  desc 'Display instructions to release on github'
-  task :github => [:reversion, :gemspec] do
+  desc 'Release on github'
+  task :github => :prepare do
     name, version = GEMSPEC.name, GEMSPEC.version
 
-    puts <<INSTRUCTIONS
-First add the relevant files:
+    sh('git', 'add',
+       'MANIFEST', 'CHANGELOG', 'AUTHORS',
+       "#{name}.gemspec",
+       "lib/#{name}/version.rb")
 
-git add MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb
+    puts <<-INSTRUCTIONS
+================================================================================
 
-Then commit them, tag the commit, and push:
+I added the relevant files, you can commit them, tag the commit, and push:
 
 git commit -m 'Version #{version}'
 git tag -a -m '#{version}' '#{version}'
 git push
 
-INSTRUCTIONS
-
+================================================================================
+    INSTRUCTIONS
   end
 
-  # TODO: Not tested
-  desc 'Display instructions to release on rubyforge'
-  task :rubyforge => [:reversion, :gemspec, :package] do
+  desc 'Release on gemcutter'
+  task :gemcutter => ['release:prepare', :package] do
     name, version = GEMSPEC.name, GEMSPEC.version
 
-    puts <<INSTRUCTIONS
-To publish to rubyforge do following:
-
-rubyforge login
-rubyforge add_release #{name} #{name} '#{version}' pkg/#{name}-#{version}.gem
-
-After you have done these steps, see:
-
-rake release:rubyforge_archives
+    puts <<-INSTRUCTIONS
+================================================================================
 
-INSTRUCTIONS
-  end
-
-  desc 'Display instructions to add archives after release:rubyforge'
-  task :rubyforge_archives do
-    name, version = GEMSPEC.name, GEMSPEC.version
-    puts "Adding archives for distro packagers is:", ""
+To publish to gemcutter do following:
 
-    Dir["pkg/#{name}-#{version}.{tgz,zip}"].each do |file|
-      puts "rubyforge add_file #{name} #{name} '#{version}' '#{file}'"
-    end
+gem push pkg/#{name}-#{version}.gem
 
-    puts
+================================================================================
+    INSTRUCTIONS
   end
 end

metadata

@@ -1,27 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nagoro
-version: !ruby/object:Gem::Version 
-  version: "2009.05"
+version: !ruby/object:Gem::Version
+  version: '2013.03'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michael 'manveru' Fellinger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-05-07 00:00:00 +09:00
-default_executable: 
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies: []
-
 description: An extendible and fast templating engine in pure ruby.
 email: m.fellinger@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- AUTHORS
 - CHANGELOG
 - MANIFEST
 - README.markdown
@@ -63,43 +59,36 @@ files:
 - spec/nagoro/template.rb
 - spec/nagoro/template/full.nag
 - spec/nagoro/template/hello.nag
+- tasks/authors.rake
 - tasks/bacon.rake
 - tasks/changelog.rake
 - tasks/gem.rake
-- tasks/gem_installer.rake
-- tasks/grancher.rake
-- tasks/install_dependencies.rake
 - tasks/manifest.rake
 - tasks/rcov.rake
 - tasks/release.rake
 - tasks/reversion.rake
-has_rdoc: true
 homepage: http://github.com/manveru/nagoro
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: An extendible and fast templating engine in pure ruby.
 test_files: []
-

data/tasks/gem_installer.rake

@@ -1,76 +0,0 @@
-task :gem_installer do
-  class GemInstaller
-    def initialize(options = {}, &block)
-      @gems = []
-      @options = options
-
-      run(&block)
-    end
-
-    def run(&block)
-      instance_eval(&block) if block_given?
-    end
-
-    def gem(name, version = nil, options = {})
-      if version.respond_to?(:merge!)
-        options = version
-      else
-        options[:version] = version
-      end
-
-      @gems << [name, options]
-    end
-
-    def setup_gemspec(gemspec)
-      gemspec.dependencies.each do |dependency|
-        dependency.version_requirements.as_list.each do |version|
-          gem(dependency.name, version)
-        end
-      end
-
-      setup
-    end
-
-    def setup
-      require 'rubygems'
-      require 'rubygems/dependency_installer'
-
-      @gems.each do |name, options|
-        setup_gem(name, options)
-      end
-    end
-
-    def setup_gem(name, options, try_install = true)
-      print "activating #{name} ... "
-      Gem.activate(name, *[options[:version]].compact)
-      require(options[:lib] || name)
-      puts "success."
-    rescue LoadError => error
-      puts error
-      install_gem(name, options) if try_install
-      setup_gem(name, options, try_install = false)
-    end
-
-    def install_gem(name, options)
-      installer = Gem::DependencyInstaller.new(options)
-
-      temp_argv(options[:extconf]) do
-        print "Installing #{name} ... "
-        installer.install(name, options[:version])
-        puts "done."
-      end
-    end
-
-    def temp_argv(extconf)
-      if extconf ||= @options[:extconf]
-        old_argv = ARGV.clone
-        ARGV.replace(extconf.split(' '))
-      end
-
-      yield
-
-    ensure
-      ARGV.replace(old_argv) if extconf
-    end
-  end
-end

data/tasks/grancher.rake

@@ -1,12 +0,0 @@
-begin
-  require 'grancher/task'
-
-  Grancher::Task.new do |g|
-    g.branch = 'gh-pages'
-    g.push_to = 'origin'
-    g.message = 'Updated website'
-    g.directory 'ydoc', 'doc'
-  end
-rescue LoadError
-  # oh well :)
-end