contextr 1.0.2 → 1.0.3

data/.gitignore

@@ -0,0 +1,6 @@
+website/test
+pkg
+doc
+*.rbc
+.DS_Store
+.*.swp

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.3 2009-12-03
+
+* minor changes
+  * updated to jeweler
+  * releasing on gemcutter
+
 == 1.0.2 2008-04-01
 
 * 1 major change

data/Rakefile

@@ -1,136 +1,53 @@
-require 'rubygems'
 require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
 require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
-require 'fileutils'
-require 'hoe'
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts 'To use rspec for testing you must install rspec gem:'
-  puts '$ sudo gem install rspec'
-  exit
-end
 
-include FileUtils
-require File.join(File.dirname(__FILE__), 'lib', 'contextr', 'version')
-
-AUTHOR = 'Gregor Schmidt'  # can also be an array of Authors
-EMAIL = "ruby@schmidtwisser.de"
-DESCRIPTION = "The goal is to equip Ruby with an API to allow context-oriented programming."
-GEM_NAME = 'contextr' # what ppl will type to install your gem
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}"
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "contextr"
+    gemspec.summary = "Context-oriented programming API for Ruby"
+    gemspec.description = "The goal is to equip Ruby with an API to allow " + 
+                          "context-oriented programming."
+    gemspec.email = "ruby@schmidtwisser.de"
+    gemspec.homepage = "http://github.com/schmidt/contextr"
+    gemspec.authors = ["Gregor Schmidt"]
+
+    gemspec.add_development_dependency('rake')
+    gemspec.add_development_dependency('markaby')
+    gemspec.add_development_dependency('literate_maruku')
+    gemspec.add_development_dependency('rspec')
+    gemspec.add_development_dependency('jeweler', '>= 1.4.0')
   end
-  @rubyforge_username ||= @config["username"]
-end
-
-RUBYFORGE_PROJECT = 'contextr' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-NAME = "contextr"
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
-# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
-VERS = ContextR::VERSION::STRING + (REV ? ".#{REV}" : "")
-CLEAN.include ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
-RDOC_OPTS = ['--quiet', '--title', 'contextr documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
 
-class Hoe
-  def extra_deps 
-    @extra_deps.reject { |x| Array(x).first == 'hoe' } 
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= CLEAN  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-end
-
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\n\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-
-desc 'Generate website files'
-task :website_generate do
-  Dir['website/**/*.txt'].each do |txt|
-    sh %{ ruby scripts/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
-  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
-desc 'Upload website files to rubyforge'
-task :website_upload do
-  host = "#{rubyforge_username}@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/#{PATH}/"
-  local_dir = 'website'
-  sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
+desc 'Generate documentation for the literate_maruku gem.'
+Rake::RDocTask.new(:doc) do |doc|
+  doc.rdoc_dir = 'doc'
+  doc.title = 'ContextR'
+  doc.options << '--line-numbers' << '--inline-source'
+  doc.rdoc_files.include('README.rdoc')
+  doc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]
-
-desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release] do
-  puts "Remember to create SVN tag:"
-  puts "svn copy svn+ssh://rubyforge.org/var/svn/#{PATH}/trunk " +
-    "svn+ssh://rubyforge.org/var/svn/#{PATH}/tags/contextr-#{VERS} "
-  puts "Suggested comment:"
-  puts "Tagging release #{CHANGES}"
+desc "Run the tests under test"
+task :test do 
+  require 'rake/runtest'
+  Rake.run_tests 'test/**/test_*.rb'
 end
 
-desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
-task :local_deploy => [:website_generate, :install_gem]
-
-task :check_version do
-  unless ENV['VERSION']
-    puts 'Must pass a VERSION=x.y.z release version'
-    exit
-  end
-  unless ENV['VERSION'] == VERS
-    puts "Please update your version.rb to match the release version, currently #{VERS}"
-    exit
+begin
+  require 'spec/rake/spectask'
+  desc "Run the specs under spec"
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_opts = ['--options', "spec/spec.opts"]
+    t.spec_files = FileList['spec/*_spec.rb']
   end
-end
-
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/*_spec.rb']
+rescue LoadError
+  puts "RSpec not available. Install it with: sudo gem install rspec"
 end
 
 desc "Run specs and tests by default"

data/TODO.taskpaper

@@ -0,0 +1,2 @@
+Future Release X:
+- deactivate layers before entering ContextR code and activate them on leave

data/VERSION.yml

@@ -0,0 +1,4 @@
+---
+:major: 1
+:minor: 0
+:patch: 3

data/autotest/discover.rb

@@ -0,0 +1,3 @@
+Autotest.add_discovery do
+  ["rspec", "test"]
+end

data/autotest/rspec_test.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'autotest/rspec'
+
+class Autotest
+  class RspecTest
+    def self.run
+      Thread.new do
+        Autotest::Rspec.run
+      end
+      Autotest.run
+    end
+  end
+end

data/benchmark/contextr/bench.rb

@@ -0,0 +1,91 @@
+require 'benchmark'
+require File.dirname( __FILE__ ) + '/../../lib/contextr'
+
+class Foo
+  def ordinary
+    true
+  end
+
+  def once
+    true
+  end
+
+  def twice
+    true
+  end
+
+  def wrapped
+    true
+  end
+
+  def full
+    true
+  end
+
+  def claimed
+    true
+  end
+
+  in_layer :once do
+    def once
+      true
+    end
+    def twice 
+      true
+    end
+  end
+
+  in_layer :two do
+    def twice
+      true
+    end
+  end
+end
+
+f = Foo.new
+
+n = 100_000
+Benchmark.bmbm(20) do |x|
+  x.report("Ordinary:") {
+    n.times { f.ordinary }
+  }
+
+  x.report("Once (w/o):") {
+    n.times { f.once }
+  }
+
+  x.report("Once (ctx):") {
+    ContextR.with_layers :one do
+      n.times { f.once }
+    end
+  }
+
+  x.report("Twice (w/o):") {
+    n.times { f.twice }
+  }
+
+  x.report("Twice (ctx):") {
+    ContextR.with_layers :one, :two do
+      n.times { f.twice }
+    end
+  }
+end
+
+__END__
+n = 100_000 (bmbm to warm up the jvm)
+
+ruby 1.8.6
+                          user     system      total        real
+Ordinary:             0.040000   0.000000   0.040000 (  0.041294)
+Once (w/o):           1.030000   0.010000   1.040000 (  1.043971)
+Once (ctx):           1.540000   0.000000   1.540000 (  1.598743)
+Twice (w/o):          1.030000   0.010000   1.040000 (  1.055684)
+Twice (ctx):          2.780000   0.010000   2.790000 (  2.839568)
+
+jruby -O -J-server 1.0.2
+                          user     system      total        real
+Ordinary:             0.108000   0.000000   0.108000 (  0.108000)
+Once (w/o):           2.336000   0.000000   2.336000 (  2.335000)
+Once (ctx):           3.390000   0.000000   3.390000 (  3.390000)
+Twice (w/o):          2.439000   0.000000   2.439000 (  2.439000)
+Twice (ctx):          5.191000   0.000000   5.191000 (  5.190000)

data/benchmark/contextr/results_for_different_hashes.txt

@@ -0,0 +1,31 @@
+Hash - memory leak
+Ordinary:             0.040000   0.000000   0.040000 (  0.042914)
+Once (w/o):           0.610000   0.000000   0.610000 (  0.609222)
+Once (ctx):           1.640000   0.000000   1.640000 (  1.647269)
+Twice (w/o):          0.610000   0.000000   0.610000 (  0.605728)
+Twice (ctx):          1.850000   0.000000   1.850000 (  1.861542)
+Wrapped (w/o):        0.600000   0.010000   0.610000 (  0.604295)
+Wrapped (ctx):        2.980000   0.000000   2.980000 (  2.988616)
+All wrappers (ctx):   3.890000   0.010000   3.900000 (  3.915734)
+
+Without cache
+Ordinary:             0.040000   0.000000   0.040000 (  0.040913)
+Once (w/o):           1.410000   0.010000   1.420000 (  1.426041)
+Once (ctx):           2.530000   0.010000   2.540000 (  2.534582)
+Twice (w/o):          1.400000   0.000000   1.400000 (  1.403935)
+Twice (ctx):          2.730000   0.000000   2.730000 (  2.749183)
+Wrapped (w/o):        1.400000   0.000000   1.400000 (  1.397227)
+Wrapped (ctx):        4.000000   0.010000   4.010000 (  4.019783)
+All wrappers (ctx):   4.770000   0.010000   4.780000 (  4.790803)
+
+SimpleWeakHash
+Ordinary:             0.040000   0.000000   0.040000 (  0.040132)
+Once (w/o):           0.940000   0.000000   0.940000 (  0.947428)
+Once (ctx):           2.010000   0.010000   2.020000 (  2.021883)
+Twice (w/o):          0.950000   0.000000   0.950000 (  0.952142)
+Twice (ctx):          2.220000   0.000000   2.220000 (  2.231346)
+Wrapped (w/o):        0.950000   0.000000   0.950000 (  0.948439)
+Wrapped (ctx):        3.380000   0.010000   3.390000 (  3.400573)
+All wrappers (ctx):   4.360000   0.010000   4.370000 (  4.390844)
+
+WeakHash is either to slow or produces an infinte loop

data/contextr.gemspec

@@ -0,0 +1,119 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{contextr}
+  s.version = "1.0.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Gregor Schmidt"]
+  s.date = %q{2009-12-03}
+  s.description = %q{The goal is to equip Ruby with an API to allow context-oriented programming.}
+  s.email = %q{ruby@schmidtwisser.de}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "GPL.txt",
+     "History.txt",
+     "LICENSE.txt",
+     "MIT.txt",
+     "README.rdoc",
+     "RUBY.txt",
+     "Rakefile",
+     "TODO.taskpaper",
+     "VERSION.yml",
+     "autotest/discover.rb",
+     "autotest/rspec_test.rb",
+     "benchmark/contextr/bench.rb",
+     "benchmark/contextr/results_for_different_hashes.txt",
+     "contextr.gemspec",
+     "examples/README",
+     "examples/employer.rb",
+     "examples/node.rb",
+     "lib/contextr.rb",
+     "lib/contextr/class_methods.rb",
+     "lib/contextr/core_ext.rb",
+     "lib/contextr/core_ext/module.rb",
+     "lib/contextr/core_ext/object.rb",
+     "lib/contextr/event_machine.rb",
+     "lib/contextr/inner_class.rb",
+     "lib/contextr/layer.rb",
+     "lib/contextr/modules/mutex_code.rb",
+     "lib/contextr/modules/unique_id.rb",
+     "lib/contextr/public_api.rb",
+     "lib/ext/active_support_subset.rb",
+     "lib/ext/dynamic.rb",
+     "setup.rb",
+     "spec/contextr_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "test/class_side.mkd",
+     "test/dynamic_scope.mkd",
+     "test/dynamics.mkd",
+     "test/hello_world.mkd",
+     "test/introduction.mkd",
+     "test/layer_state.mkd",
+     "test/lib/example_test.rb",
+     "test/lib/literate_maruku_test.rb",
+     "test/meta_api.mkd",
+     "test/method_missing.mkd",
+     "test/ordering.mkd",
+     "test/restrictions.mkd",
+     "test/test_contextr.rb",
+     "test/test_helper.rb",
+     "test/test_plain.rb",
+     "website/ContextR_euruko_2008.pdf",
+     "website/index.html",
+     "website/index.txt",
+     "website/javascripts/rounded_corners_lite.inc.js",
+     "website/stylesheets/screen.css",
+     "website/template.rhtml"
+  ]
+  s.homepage = %q{http://github.com/schmidt/contextr}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Context-oriented programming API for Ruby}
+  s.test_files = [
+    "spec/contextr_spec.rb",
+     "spec/spec_helper.rb",
+     "test/lib/example_test.rb",
+     "test/lib/literate_maruku_test.rb",
+     "test/test_contextr.rb",
+     "test/test_helper.rb",
+     "test/test_plain.rb",
+     "examples/employer.rb",
+     "examples/node.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<markaby>, [">= 0"])
+      s.add_development_dependency(%q<literate_maruku>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
+    else
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<markaby>, [">= 0"])
+      s.add_dependency(%q<literate_maruku>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+    end
+  else
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<markaby>, [">= 0"])
+    s.add_dependency(%q<literate_maruku>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+  end
+end
+