Pistos-ramaze 2009.04.08 → 2009.06.12

data/spec/snippets/array/put_within.rb

@@ -1,33 +1,38 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
 
-describe 'Array#put_within' do
-  it 'should put a given object at a well-described position' do
-    array = [:foo, :bar, :baz]
-    array.put_within(:foobar, :after => :bar, :before => :baz)
-    array.should == [:foo, :bar, :foobar, :baz]
-  end
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
+
+describe 'Array' do
+  describe '#put_within' do
+    it 'puts a given object at a well-described position' do
+      array = [:foo, :bar, :baz]
+      array.put_within(:foobar, :after => :bar, :before => :baz)
+      array.should == [:foo, :bar, :foobar, :baz]
+    end
 
-  it 'should raise on uncertainity' do
-    array = [:foo, :bar, :baz]
-    lambda{
-      array.put_within(:foobar, :after => :foo, :before => :baz)
-    }.should.raise(ArgumentError).
-      message.should == "Too many elements within constrain"
+    it 'raises on uncertainity' do
+      array = [:foo, :bar, :baz]
+      lambda{
+        array.put_within(:foobar, :after => :foo, :before => :baz)
+      }.should.raise(ArgumentError).
+        message.should == "Too many elements within constrain"
+    end
   end
-end
 
-describe 'Array#put_after' do
-  it 'should put a given object at a well-described position' do
-    array = [:foo, :bar, :baz]
-    array.put_after(:bar, :foobar)
-    array.should == [:foo, :bar, :foobar, :baz]
+  describe '#put_after' do
+    it 'puts a given object at a well-described position' do
+      array = [:foo, :bar, :baz]
+      array.put_after(:bar, :foobar)
+      array.should == [:foo, :bar, :foobar, :baz]
+    end
   end
-end
 
-describe 'Array#put_within' do
-  it 'should put a given object at a well-described position' do
-    array = [:foo, :bar, :baz]
-    array.put_before(:bar, :foobar)
-    array.should == [:foo, :foobar, :bar, :baz]
+  describe '#put_within' do
+    it 'puts a given object at a well-described position' do
+      array = [:foo, :bar, :baz]
+      array.put_before(:bar, :foobar)
+      array.should == [:foo, :foobar, :bar, :baz]
+    end
   end
 end

data/spec/snippets/binding/locals.rb

@@ -1,4 +1,7 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe 'locals' do
   should 'find locals' do

data/spec/snippets/numeric/filesize_format.rb

@@ -1,4 +1,7 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe "Numeric#filesize_format" do
   it 'it should convert filesizes to human readable format' do

data/spec/snippets/numeric/time.rb

@@ -1,4 +1,7 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe "Numeric time extensions" do
   it 'should provide times in the past' do
@@ -9,4 +12,4 @@ describe "Numeric time extensions" do
   it 'should provide times in the future' do
     2.weeks.from_now.to_i.should == (Time.now + 2*7*24*60*60).to_i
   end
-end
+end

data/spec/snippets/object/__dir__.rb

@@ -1,4 +1,7 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe '__DIR__' do
   # this is hardly exhaustive, but better than nothing

data/spec/snippets/ordered_set.rb

@@ -1,4 +1,7 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe 'OrderedSet' do
   os = OrderedSet.new(1,2,3,1)

data/spec/snippets/ramaze/acquire.rb

@@ -1,4 +1,7 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 require 'fileutils'
 
 

data/spec/snippets/ramaze/dictionary.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe Ramaze::Dictionary do
   Dictionary = Ramaze::Dictionary

data/spec/snippets/ramaze/struct.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe Ramaze::Struct do
   should 'provide #values_at' do

data/spec/snippets/string/camel_case.rb

@@ -1,4 +1,7 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe "String#camel_case" do
 

data/spec/snippets/string/color.rb

@@ -1,4 +1,7 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe 'String#color' do
   it 'should define methods to return ANSI strings' do

data/spec/snippets/string/snake_case.rb

@@ -1,4 +1,7 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe "String#snake_case" do
 

data/spec/snippets/string/unindent.rb

@@ -1,4 +1,7 @@
-require 'lib/ramaze/spec/helper/snippets'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe "String#unindent" do
   it "should remove indentation" do

data/spec/snippets/thread/into.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__)
 
 describe 'Thread.into' do
   it 'should provide access to thread vars' do

data/tasks/bacon.rake

@@ -1,5 +1,5 @@
 desc 'Run all bacon specs with pretty output'
-task :bacon => :install_dependencies do
+task :bacon => :setup do
   require 'open3'
   require 'scanf'
   require 'matrix'
@@ -16,14 +16,16 @@ task :bacon => :install_dependencies do
   left_format = "%4d/%d: %-#{len + 11}s"
   spec_format = "%d specifications (%d requirements), %d failures, %d errors"
 
+  load_path = File.expand_path('../../', __FILE__)
+
   specs.each_with_index do |spec, idx|
     print(left_format % [idx + 1, specs_size, spec])
 
-    Open3.popen3(RUBY, spec) do |sin, sout, serr|
+    Open3.popen3(RUBY, '-I', load_path, spec) do |sin, sout, serr|
       out = sout.read.strip
       err = serr.read.strip
 
-      # this is conventional, see spec/innate/state/fiber.rb for usage
+      # this is conventional
       if out =~ /^Bacon::Error: (needed .*)/
         puts(yellow % ("%6s %s" % ['', $1]))
       else

data/tasks/changelog.rake

@@ -1,12 +1,14 @@
 desc 'update changelog'
 task :changelog do
-  File.open('CHANGELOG', 'w+') do |changelog|
+  File.open('doc/CHANGELOG', 'w+') do |changelog|
     `git log -z --abbrev-commit`.split("\0").each do |commit|
       next if commit =~ /^Merge: \d*/
       ref, author, time, _, title, _, message = commit.split("\n", 7)
       ref    = ref[/commit ([0-9a-f]+)/, 1]
       author = author[/Author: (.*)/, 1].strip
       time   = Time.parse(time[/Date: (.*)/, 1]).utc
+      time   = time.strftime('%a %b %d %H:%M:%S %Z %Y')
+
       title.strip!
 
       changelog.puts "[#{ref} | #{time}] #{author}"

data/tasks/{gem_installer.rake → gem_setup.rake}

@@ -1,14 +1,17 @@
-task :gem_installer do
-  class GemInstaller
+task :gem_setup do
+  class GemSetup
     def initialize(options = {}, &block)
       @gems = []
-      @options = options
+      @options = options.dup
+      @verbose = @options.delete(:verbose)
 
       run(&block)
     end
 
     def run(&block)
-      instance_eval(&block) if block_given?
+      return unless block_given?
+      instance_eval(&block)
+      setup
     end
 
     def gem(name, version = nil, options = {})
@@ -21,6 +24,16 @@ task :gem_installer do
       @gems << [name, options]
     end
 
+    # all gems defined, let's try to load/install them
+    def setup
+      require 'rubygems'
+      require 'rubygems/dependency_installer'
+
+      @gems.each do |name, options|
+        setup_gem(name, options)
+      end
+    end
+
     def setup_gemspec(gemspec)
       gemspec.dependencies.each do |dependency|
         dependency.version_requirements.as_list.each do |version|
@@ -31,36 +44,31 @@ task :gem_installer do
       setup
     end
 
-    def setup
-      require 'rubygems'
-      require 'rubygems/dependency_installer'
+    # first try to activate, install and try to activate again if activation
+    # fails the first time
+    def setup_gem(name, options)
+      version = [options[:version]].compact
+      lib_name = options[:lib] || name
 
-      @gems.each do |name, options|
-        setup_gem(name, options)
-      end
-    end
+      log "activating #{name}"
 
-    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)
+      Gem.activate(name, *version)
+    rescue LoadError
+      install_gem(name, options)
+      Gem.activate(name, *version)
     end
 
+    # tell rubygems to install a gem
     def install_gem(name, options)
       installer = Gem::DependencyInstaller.new(options)
 
       temp_argv(options[:extconf]) do
-        print "Installing #{name} ... "
+        log "Installing #{name}"
         installer.install(name, options[:version])
-        puts "done."
       end
     end
 
+    # prepare ARGV for rubygems installer
     def temp_argv(extconf)
       if extconf ||= @options[:extconf]
         old_argv = ARGV.clone
@@ -72,5 +80,20 @@ task :gem_installer do
     ensure
       ARGV.replace(old_argv) if extconf
     end
+
+    private
+
+    def log(msg)
+      return unless @verbose
+
+      if defined?(Log)
+        Log.info(msg)
+      else
+        puts(msg)
+      end
+    end
+
+    def rubyforge; 'http://gems.rubyforge.org/' end
+    def github; 'http://gems.github.com/' end
   end
 end

data/tasks/release.rake

@@ -2,15 +2,17 @@ namespace :release do
   task :all => [:release_github, :release_rubyforge]
 
   desc 'Display instructions to release on github'
-  task :github => [:reversion, :gemspec] do
+  task :github => [:jquery, :reversion, :authors, :gemspec] do
     name, version = GEMSPEC.name, GEMSPEC.version
 
-    puts <<INSTRUCTIONS
-First add the relevant files:
+    sh('git', 'add',
+       'MANIFEST', 'doc/CHANGELOG', 'doc/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}'
@@ -22,14 +24,14 @@ INSTRUCTIONS
 
   # TODO: Not tested
   desc 'Display instructions to release on rubyforge'
-  task :rubyforge => [:reversion, :gemspec, :package] do
+  task :rubyforge => [:jquery, :reversion, :authors, :gemspec, :package] do
     name, version = GEMSPEC.name, GEMSPEC.version
 
     puts <<INSTRUCTIONS
 To publish to rubyforge do following:
 
 rubyforge login
-rubyforge add_release #{name} #{version} pkg/#{name}-#{version}.gem
+rubyforge add_release #{name} #{name} '#{version}' pkg/#{name}-#{version}.gem
 
 After you have done these steps, see:
 
@@ -40,30 +42,13 @@ INSTRUCTIONS
 
   desc 'Display instructions to add archives after release:rubyforge'
   task :rubyforge_archives do
-    release_id = latest_release_id
-
+    name, version = GEMSPEC.name, GEMSPEC.version
     puts "Adding archives for distro packagers is:", ""
 
-    Dir["pkg/#{name}-#{version}.{gz,zip}"].each do |file|
-      puts "rubyforge add_file #{name} #{name} #{release_id} '#{file}'"
+    Dir["pkg/#{name}-#{version}.{tgz,zip}"].each do |file|
+      puts "rubyforge add_file #{name} #{name} '#{version}' '#{file}'"
     end
 
     puts
   end
 end
-
-# Use URI and proper XPATH, something along these lines:
-#
-# a = doc.at('a[@href=~"release_id"]')[:href]
-# release_id = URI(a).query[/release_id=(\w+)/, 1]
-def latest_release_id
-  require 'open-uri'
-  require 'hpricot'
-
-  url = "http://rubyforge.org/frs/?group_id=#{PROJECT_RUBYFORGE_GROUP_ID}"
-  doc = Hpricot(open(url))
-  a = (doc/:a).find{|a| a[:href] =~ /release_id/}
-
-  version = a.inner_html
-  release_id = Hash[*a[:href].split('?').last.split('=').flatten]['release_id']
-end

data/tasks/setup.rake

@@ -0,0 +1,6 @@
+desc 'install all possible dependencies'
+task :setup => [:gem_setup] do
+  GemSetup.new :verbose => true do
+    setup_gemspec GEMSPEC
+  end
+end

data/tasks/todo.rake

@@ -1,8 +1,6 @@
 desc "show a todolist from all the TODO tags in the source"
 task :todo do
-  files = Dir[File.join(BASEDIR, '{lib,spec}', '**/*.rb')]
-
-  files.each do |file|
+  Dir.glob('{lib,spec}/**/*.rb') do |file|
     lastline = todo = comment = long_comment = false
 
     File.readlines(file).each_with_index do |line, lineno|
@@ -10,7 +8,7 @@ task :todo do
       comment = line =~ /^\s*?#.*?$/
       long_comment = line =~ /^=begin/
       long_comment = line =~ /^=end/
-      todo = true if line =~ /TODO/ and (long_comment or comment)
+      todo = true if line =~ /TODO|FIXME|THINK/ and (long_comment or comment)
       todo = false if line.gsub('#', '').strip.empty?
       todo = false unless comment or long_comment
       if todo