fattr 2.1.0 → 2.2.0

data/LICENSE

@@ -0,0 +1 @@
+same as Ruby's

data/Rakefile

@@ -1,23 +1,67 @@
+This.rubyforge_project = 'codeforpeople'
 This.author = "Ara T. Howard"
 This.email = "ara.t.howard@gmail.com"
 This.homepage = "http://github.com/ahoward/#{ This.lib }/tree/master"
-This.rubyforge_project = 'codeforpeople'
+
 
 task :default do
-  puts(Rake::Task.tasks.map{|task| task.name} - ['default'])
+  puts((Rake::Task.tasks.map{|task| task.name.gsub(/::/,':')} - ['default']).sort)
+end
+
+task :test do
+  run_tests!
+end
+
+namespace :test do
+  task(:unit){ run_tests!(:unit) }
+  task(:functional){ run_tests!(:functional) }
+  task(:integration){ run_tests!(:integration) }
 end
 
-task :spec do
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new do |t|
-    t.spec_files = FileList['spec/*_spec.rb']
+def run_tests!(which = nil)
+  which ||= '**'
+  test_dir = File.join(This.dir, "test")
+  test_glob ||= File.join(test_dir, "#{ which }/**_test.rb")
+  test_rbs = Dir.glob(test_glob).sort
+        
+  div = ('=' * 119)
+  line = ('-' * 119)
+  helper = "-r ./test/helper.rb" if test(?e, "./test/helper.rb")
+
+  test_rbs.each_with_index do |test_rb, index|
+    testno = index + 1
+    command = "#{ This.ruby } -I ./lib -I ./test/lib #{ helper } #{ test_rb }"
+
+    puts
+    say(div, :color => :cyan, :bold => true)
+    say("@#{ testno } => ", :bold => true, :method => :print)
+    say(command, :color => :cyan, :bold => true)
+    say(line, :color => :cyan, :bold => true)
+
+    system(command)
+
+    say(line, :color => :cyan, :bold => true)
+
+    status = $?.exitstatus
+
+    if status.zero? 
+      say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
+      say("SUCCESS", :color => :green, :bold => true)
+    else
+      say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
+      say("FAILURE", :color => :red, :bold => true)
+    end
+    say(line, :color => :cyan, :bold => true)
+
+    exit(status) unless status.zero?
   end
 end
 
+
 task :gemspec do
   ignore_extensions = 'git', 'svn', 'tmp', /sw./, 'bak', 'gem'
-  ignore_directories = 'pkg'
-  ignore_files = 'test/log'
+  ignore_directories = %w[ pkg ]
+  ignore_files = %w[ test/log ]
 
   shiteless = 
     lambda do |list|
@@ -39,14 +83,18 @@ task :gemspec do
     end
 
   lib         = This.lib
+  object      = This.object
   version     = This.version
   files       = shiteless[Dir::glob("**/**")]
   executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
   has_rdoc    = true #File.exist?('doc')
   test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
+  summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
+  description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
 
-  extensions = This.extensions
-  if extensions.nil?
+  if This.extensions.nil?
+    This.extensions = []
+    extensions = This.extensions
     %w( Makefile configure extconf.rb ).each do |ext|
       extensions << ext if File.exists?(ext)
     end
@@ -64,22 +112,20 @@ task :gemspec do
 
           Gem::Specification::new do |spec|
             spec.name = #{ lib.inspect }
-            spec.description = 'fattr.rb is a "fatter attr" for ruby'  
             spec.version = #{ version.inspect }
             spec.platform = Gem::Platform::RUBY
             spec.summary = #{ lib.inspect }
+            spec.description = #{ description.inspect }
 
             spec.files = #{ files.inspect }
             spec.executables = #{ executables.inspect }
             
-            <% if test(?d, 'lib') %>
             spec.require_path = "lib"
-            <% end %>
 
             spec.has_rdoc = #{ has_rdoc.inspect }
             spec.test_files = #{ test_files.inspect }
-            #spec.add_dependency 'lib', '>= version'
-            #spec.add_dependency 'fattr'
+
+          # spec.add_dependency 'lib', '>= version'
 
             spec.extensions.push(*#{ extensions.inspect })
 
@@ -92,12 +138,13 @@ task :gemspec do
       }
     end
 
-  open("#{ lib }.gemspec", "w"){|fd| fd.puts template}
-  This.gemspec = "#{ lib }.gemspec"
+  Fu.mkdir_p(This.pkgdir)
+  This.gemspec = File.join(This.pkgdir, "gemspec.rb")
+  open("#{ This.gemspec }", "w"){|fd| fd.puts(template)}
 end
 
 task :gem => [:clean, :gemspec] do
-  Fu.mkdir_p This.pkgdir
+  Fu.mkdir_p(This.pkgdir)
   before = Dir['*.gem']
   cmd = "gem build #{ This.gemspec }"
   `#{ cmd }`
@@ -123,7 +170,7 @@ task :readme do
     cmd = "ruby #{ sample }"
     samples << Util.indent(prompt + cmd, 2) << "\n\n"
 
-    cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -Ilib #{ sample })'"
+    cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -I ./lib #{ sample })'"
     samples << Util.indent(`#{ cmd } 2>&1`, 4) << "\n"
   end
 
@@ -170,44 +217,62 @@ end
 
 
 BEGIN {
+# support for this rakefile
+#
   $VERBOSE = nil
 
   require 'ostruct'
   require 'erb'
   require 'fileutils'
+  require 'rbconfig'
 
+# fu shortcut
+#
   Fu = FileUtils
 
+# cache a bunch of stuff about this rakefile/environment
+#
   This = OpenStruct.new
 
   This.file = File.expand_path(__FILE__)
   This.dir = File.dirname(This.file)
   This.pkgdir = File.join(This.dir, 'pkg')
 
+# grok lib
+#
   lib = ENV['LIB']
   unless lib
-    lib = File.basename(Dir.pwd)
+    lib = File.basename(Dir.pwd).sub(/[-].*$/, '')
   end
   This.lib = lib
 
+# grok version
+#
   version = ENV['VERSION']
   unless version
-    name = lib.capitalize
-    library = "./lib/#{ lib }.rb"
-    program = "./bin/#{ lib }"
-    if test(?e, library)
-      require library
-      version = eval(name).send(:version)
-    elsif test(?e, program)
-      version = `#{ program } --version`.strip
-    end
-    abort('no version') if(version.nil? or version.empty?)
+    require "./lib/#{ This.lib }"
+    This.name = lib.capitalize
+    This.object = eval(This.name)
+    version = This.object.send(:version)
   end
   This.version = version
 
+# we need to know the name of the lib an it's version
+#
   abort('no lib') unless This.lib
   abort('no version') unless This.version
 
+# discover full path to this ruby executable
+#
+  c = Config::CONFIG
+  bindir = c["bindir"] || c['BINDIR']
+  ruby_install_name = c['ruby_install_name'] || c['RUBY_INSTALL_NAME'] || 'ruby'
+  ruby_ext = c['EXEEXT'] || ''
+  ruby = File.join(bindir, (ruby_install_name + ruby_ext))
+  This.ruby = ruby
+
+# some utils
+#
   module Util
     def indent(s, n = 2)
       s = unindent(s)
@@ -217,18 +282,20 @@ BEGIN {
 
     def unindent(s)
       indent = nil
-      s.each do |line|
-      next if line =~ %r/^\s*$/
-      indent = line[%r/^\s*/] and break
+      s.each_line do |line|
+        next if line =~ %r/^\s*$/
+        indent = line[%r/^\s*/] and break
+      end
+      indent ? s.gsub(%r/^#{ indent }/, "") : s
     end
-    indent ? s.gsub(%r/^#{ indent }/, "") : s
-  end
     extend self
   end
 
+# template support
+#
   class Template
     def initialize(&block)
-      @block = block
+      @block = block.binding
       @template = block.call.to_s
     end
     def expand(b=nil)
@@ -238,5 +305,57 @@ BEGIN {
   end
   def Template(*args, &block) Template.new(*args, &block) end
 
+# colored console output support
+#
+  This.ansi = {
+    :clear      => "\e[0m",
+    :reset      => "\e[0m",
+    :erase_line => "\e[K",
+    :erase_char => "\e[P",
+    :bold       => "\e[1m",
+    :dark       => "\e[2m",
+    :underline  => "\e[4m",
+    :underscore => "\e[4m",
+    :blink      => "\e[5m",
+    :reverse    => "\e[7m",
+    :concealed  => "\e[8m",
+    :black      => "\e[30m",
+    :red        => "\e[31m",
+    :green      => "\e[32m",
+    :yellow     => "\e[33m",
+    :blue       => "\e[34m",
+    :magenta    => "\e[35m",
+    :cyan       => "\e[36m",
+    :white      => "\e[37m",
+    :on_black   => "\e[40m",
+    :on_red     => "\e[41m",
+    :on_green   => "\e[42m",
+    :on_yellow  => "\e[43m",
+    :on_blue    => "\e[44m",
+    :on_magenta => "\e[45m",
+    :on_cyan    => "\e[46m",
+    :on_white   => "\e[47m"
+  }
+  def say(phrase, *args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    options[:color] = args.shift.to_s.to_sym unless args.empty?
+    keys = options.keys
+    keys.each{|key| options[key.to_s.to_sym] = options.delete(key)}
+
+    color = options[:color]
+    bold = options.has_key?(:bold)
+
+    parts = [phrase]
+    parts.unshift(This.ansi[color]) if color
+    parts.unshift(This.ansi[:bold]) if bold
+    parts.push(This.ansi[:clear]) if parts.size > 1
+
+    method = options[:method] || :puts
+
+    Kernel.send(method, parts.join)
+  end
+
+# always run out of the project dir
+#
   Dir.chdir(This.dir)
 }

data/lib/fattr.rb

@@ -1,5 +1,5 @@
 module Fattr
-  Fattr::Version = '2.1.0' unless Fattr.const_defined?(:Version)
+  Fattr::Version = '2.2.0' unless Fattr.const_defined?(:Version)
   def self.version() Fattr::Version end
 
   class List < ::Array
@@ -72,7 +72,7 @@ module Fattr
 
         initialize = (
           if inheritable
-            lambda do
+            lambda do |*ignored|
               parents = ancestors[1..-1]
               catch(:value) do
                 parents.each do |parent|
@@ -82,7 +82,7 @@ module Fattr
               end
             end
           else
-            block || lambda{ default }
+            block || lambda{|*ignored| default }
           end
         )
 
@@ -123,6 +123,7 @@ module Fattr
         compile[code]
 
       # bang method re-calls any initializer given at declaration time
+=begin
         code = <<-code
           def #{ name }!
             initializer = ObjectSpace._id2ref #{ initializer_id }
@@ -131,6 +132,14 @@ module Fattr
           end
         code
         compile[code]
+=end
+
+        module_eval do
+          define_method :"#{ name }!" do
+            self.send :"#{ name }=", initializer.call(self)
+            self.instance_variable_get :"@#{name}"
+          end
+        end
 
       # query simply defers to getter - cast to bool
         code = <<-code

data/test/{fattr.rb → fattr_test.rb}

@@ -10,6 +10,7 @@ Testing Fattr do
 
   testing 'that the basic usage works' do
     o = Class.new{ fattr :a }.new
+    p o.a
     assert{ o.a==nil }
     assert{ o.a=42 }
     assert{ o.a(42.0) }
@@ -123,10 +124,16 @@ BEGIN {
         words.join('-').downcase
       end
 
-      @@testing_subclass_count = 0 unless defined?(@@testing_subclass_count) 
-      @@testing_subclass_count += 1
+      def self.testing_subclass_count
+        @testing_subclass_count ||= 0
+      end
+      def self.testing_subclass_count=(value)
+        @testing_subclass_count = value
+      end
+
+      self.testing_subclass_count += 1
       slug = slug_for(*args).gsub(%r/-/,'_')
-      name = ['TESTING', '%03d' % @@testing_subclass_count, slug].delete_if{|part| part.empty?}.join('_')
+      name = ['TESTING', '%03d' % self.testing_subclass_count, slug].delete_if{|part| part.empty?}.join('_')
       name = name.upcase!
       const_set(:Name, name)
       def self.name() const_get(:Name) end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fattr
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  prerelease: false
+  segments: 
+  - 2
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -06:00
+date: 2010-11-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: fattr.rb is a "fatter attr" for ruby
+description: "description: fattr kicks the ass"
 email: ara.t.howard@gmail.com
 executables: []
 
@@ -22,9 +27,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- a.rb
-- fattr.gemspec
 - lib/fattr.rb
+- LICENSE
 - Rakefile
 - README
 - README.erb
@@ -36,7 +40,7 @@ files:
 - samples/f.rb
 - samples/g.rb
 - samples/h.rb
-- test/fattr.rb
+- test/fattr_test.rb
 has_rdoc: true
 homepage: http://github.com/ahoward/fattr/tree/master
 licenses: []
@@ -47,23 +51,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: fattr
-test_files: 
-- test/fattr.rb
+test_files: []
+

data/a.rb

@@ -1,42 +0,0 @@
-require 'rubygems'
-require 'fattr'
-
-class A
-  class << A
-    fattr(:x, :inheritable => true){ 42 }
-  end
-end
-
-class B < A; end
-
-class C < B; end
-
-
-p C.x
-p B.x
-p A.x
-puts
-
-B.x = 42.0
-
-p C.x
-p B.x
-p A.x
-puts
-
-C.x! # force re-initialization from parent(s)
-
-p C.x
-p B.x
-p A.x
-puts
-
-
-class K
-end
-module M
-  fattr(:x, :inheritable => true){ 42 }
-end
-K.extend(M)
-
-p K.x

data/fattr.gemspec

@@ -1,29 +0,0 @@
-## fattr.gemspec
-#
-
-Gem::Specification::new do |spec|
-  spec.name = "fattr"
-  spec.description = 'fattr.rb is a "fatter attr" for ruby'  
-  spec.version = "2.1.0"
-  spec.platform = Gem::Platform::RUBY
-  spec.summary = "fattr"
-
-  spec.files = ["a.rb", "fattr.gemspec", "lib", "lib/fattr.rb", "Rakefile", "README", "README.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb", "samples/f.rb", "samples/g.rb", "samples/h.rb", "test", "test/fattr.rb"]
-  spec.executables = []
-  
-  
-  spec.require_path = "lib"
-  
-
-  spec.has_rdoc = true
-  spec.test_files = "test/fattr.rb"
-  #spec.add_dependency 'lib', '>= version'
-  #spec.add_dependency 'fattr'
-
-  spec.extensions.push(*[])
-
-  spec.rubyforge_project = "codeforpeople"
-  spec.author = "Ara T. Howard"
-  spec.email = "ara.t.howard@gmail.com"
-  spec.homepage = "http://github.com/ahoward/fattr/tree/master"
-end