ruby_ext 0.4.11 → 0.4.12

data/Rakefile

@@ -1,13 +1,13 @@
-lib_dir = File.expand_path(File.dirname(__FILE__))
+lib_dir = "#{File.expand_path(File.dirname(__FILE__))}/lib"
 $LOAD_PATH << lib_dir unless $LOAD_PATH.include? lib_dir
 
 require 'rake_ext'
 
 project(
-  :name => "ruby_ext",
-  :version => "0.4.11",
-  :summary => "Ruby language extensions",
+  name: "ruby_ext",
+  version: "0.4.12",
+  summary: "Ruby Extensions",
 
-  :author => "Alexey Petrushin",
-  :homepage => "http://github.com/alexeypetrushin/ruby_ext"
+  author: "Alexey Petrushin",
+  homepage: "http://github.com/alexeypetrushin/ruby_ext"
 )

data/lib/rake_ext.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 # 
 begin
   require 'rspec/core/rake_task'
-  task :default => :spec
+  task default: :spec
 
   RSpec::Core::RakeTask.new('spec') do |t|
     t.pattern = "spec/**/[^_]*_spec.rb"
@@ -16,7 +16,7 @@ begin
     
     desc "Run RSpec code exapmples in isolated mode (every spec file in another Ruby process)"
     task :isolated do
-      Dir.glob("spec/**/[^_]*_spec.rb").each do |spec_file|
+      Dir.glob("spec/[^_]**/[^_]*_spec.rb").each do |spec_file|
         Kernel.system "rspec #{spec_file}"
       end
     end
@@ -32,7 +32,7 @@ end
 # 
 PROJECT_DIR = (
   caller.find{|line| line =~ /\/Rakefile\:/} || 
-  raise("You can include the '' file only in Rakefile!")
+  raise("You can include the 'rake_ext' only in Rakefile!")
 ).sub(/\/Rakefile\:.*/, '')
 def project_dir
   PROJECT_DIR
@@ -40,7 +40,7 @@ end
 
 
 # 
-# before & after task
+# before, after and remove task
 # 
 def before task_name, &block
   @task_counter ||= {}
@@ -57,6 +57,11 @@ def after task_name, &block
   task task_name, &block
 end
 
+def remove_task(task_name)
+  Rake.application.instance_variable_get('@tasks').delete(task_name.to_s)
+end
+alias :delete_task :remove_task
+
 
 # 
 # project
@@ -67,7 +72,7 @@ def project options = nil
     options.each{|k, v| @options[k.to_sym] = v}
     
     @options[:name] || raise("project name not defined")
-    @options[:gem_name] ||= @options[:name]
+    @options[:official_name] ||= @options[:name]
     
     require 'rake_ext/project'
   end

data/lib/rake_ext/project.rb

@@ -2,8 +2,9 @@
 # parse_dependencies_for
 # 
 def parse_project_gemfile
-  required_gems = []    
+  required_gems, required_fake_gems = [], []
   gem_file = "#{project_dir}/lib/#{project[:name]}/gems.rb"
+
   if File.exist? gem_file
     # puts "Parsing gemfile #{gem_file}"
     
@@ -11,10 +12,12 @@ def parse_project_gemfile
     
     stub_class = Class.new
     stub_class.send(:define_method, :gem){|*args| required_gems << args}
-    stub = stub_class.new      
+    stub_class.send(:define_method, :fake_gem){|*args| required_fake_gems << args}
+    stub = stub_class.new
     stub.instance_eval code, __FILE__, __LINE__
   end
-  required_gems
+  
+  return required_gems, required_fake_gems
 end
 
 
@@ -24,15 +27,30 @@ end
 namespace :gem do
   desc "Install gem required by project"
   task :install do
-    gems = parse_project_gemfile    
+    gems, fake_gems = parse_project_gemfile    
     gems.each do |name, version|
+      puts "Installing gem #{name} #{version}"
+      %x(gem install #{name}#{" -v #{version}" if version} --ignore-dependencies)
+    end
+  end  
+  
+  desc "List all gems required by project"
+  task :list do
+    puts "Gems required for #{project[:official_name]}:"
+    gems, fake_gems = parse_project_gemfile
+    puts(gems + fake_gems)
+  end
+  
+  desc "Install all gem required by project (including fake gems)"
+  task :install_all do
+    gems, fake_gems = parse_project_gemfile    
+    (gems + fake_gems).each do |name, version|
       puts "Installing gem #{name} #{version}"
       %x(gem install #{name} #{"-v #{version}" if version})
     end
   end
 end
 
-
 # 
 # Gem Spec, for sample look at Rakefile
 # 
@@ -42,17 +60,20 @@ require 'tmpdir'
 
 namespace :gem do
   spec = Gem::Specification.new do |s|
-    gems = parse_project_gemfile
+    gems, fake_gems = parse_project_gemfile
+    gems = gems + fake_gems
+    
     gems.each{|name_version| s.add_dependency *name_version}
 
     options = project.clone
 
     options.delete(:name)
-    s.name = options.delete(:gem_name)
+    s.name = options.delete(:official_name)
     s.platform = options.delete(:platform) || Gem::Platform::RUBY
     s.has_rdoc = options.delete(:has_rdoc) == nil ? false : true
     s.require_path = options.delete(:lib) || "lib"
     s.files = options.delete(:files) || (%w{Rakefile readme.md} + Dir.glob("{lib,spec}/**/*"))
+    s.bindir = options.delete(:bin) if options.include? :bin
 
     # s.name = options[:name)
     # s.author = options[:author)
@@ -61,7 +82,7 @@ namespace :gem do
     options.each{|k, v| s.send "#{k}=", v}    
   end
 
-  package_dir = Dir.tmpdir + "/#{project[:gem_name]}_tmp"
+  package_dir = Dir.tmpdir + "/#{project[:official_name]}_tmp"
   Rake::GemPackageTask.new(spec) do |p|
     p.need_tar = true if RUBY_PLATFORM !~ /mswin/
     p.need_zip = true
@@ -69,7 +90,7 @@ namespace :gem do
   end
 
   task :push do
-    gem_file = Dir.glob("#{package_dir}/#{project[:gem_name]}*.gem").first
+    gem_file = Dir.glob("#{package_dir}/#{project[:official_name]}*.gem").first
     system "gem push #{gem_file}"
   end
 
@@ -77,12 +98,6 @@ namespace :gem do
     system "rm -r #{package_dir}"
   end
   
-  desc "List all gems required by project"
-  task :list do
-    puts "Gems required for #{project[:gem_name]}:"
-    puts parse_project_gemfile
-  end
-    
   desc "Build and publish project as gem"
-  task :release => [:gem, :push, :clean]
+  task release: [:gem, :push, :clean]
 end

data/lib/rspec_ext.rb

@@ -2,42 +2,105 @@ require 'rspec'
 require 'fileutils'
 
 RSpec.configure do |c|
-  c.filter_run :focus => true
+  c.filter_run focus: true
   c.run_all_when_everything_filtered = true
 end
 
-RSpec::Core::ExampleGroup.class_eval do
+def rspec &block
+  RSpec::Core::ExampleGroup.class_eval &block if block
+  return RSpec::Core::ExampleGroup
+end
+
+rspec do
+  def self.define_matcher *args, &block
+    RSpec::Matchers.define *args do |expected|
+      match do |actual|
+        block.call actual, expected if block
+      end
+    end
+  end
+end
+
+rspec do
+  def self.with_load_path *args
+    list = if args.first.is_a? Array
+      args.first
+    else
+      args
+    end
+    
+    before(:all){list.each{|path| $LOAD_PATH << path}}
+    after(:all){list.each{|path| $LOAD_PATH.delete path}}
+  end
+  
+  def self.with_tmp_spec_dir *args
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    dir = args.first || self.spec_dir
+    
+    options[:before] ||= :all
+    tmp_dir = "/tmp/#{dir.split('/').last}"
+    
+    before options do
+      FileUtils.rm_r tmp_dir if File.exist? tmp_dir
+      FileUtils.cp_r dir, tmp_dir
+      @spec_dir = tmp_dir
+    end
+    
+    after options do      
+      FileUtils.rm_r tmp_dir if File.exist? tmp_dir
+      @spec_dir = nil
+    end  
+    
+    tmp_dir
+  end
+  
+  def self.with_spec_dir dir
+    before(:all){@spec_dir = dir}
+    after(:all){@spec_dir = nil}
+  end
+  
+  # def self.with_spec_dir
+    
+  # def self.spec_dir dir = nil
+  #   @spec_dir ||= calculate_spec_dir_for_current_caller
+  # end
+  
+  def self.spec_dir
+    self.calculate_default_spec_dir || raise(":spec_dir not defined!")
+  end
+  
+  def spec_dir
+    @spec_dir || self.class.spec_dir
+  end
+  
+  def self.calculate_default_spec_dir
+    spec_file_name = caller.find{|line| line =~ /_spec\.rb\:/}
+    return nil unless spec_file_name    
+    spec_dir = spec_file_name.sub(/\.rb\:.*/, '')
+    raise "spec dir not exist (#{spec_dir})!" unless File.exist? spec_dir
+    spec_dir
+  end
+  
   def remove_constants *args
     args = args.first if args.size == 1 and args.first.is_a?(Array)
     args.each{|c| Object.send :remove_const, c if Object.const_defined? c}       
   end
   
-  def prepare_spec_data spec_file_name
-    dir = File.expand_path(spec_file_name.sub(/\.rb$/, ''))
-    original_data_dir = dir + "_data"
-
-    FileUtils.rm_r dir if File.exist? dir
-    FileUtils.cp_r original_data_dir, dir
-
-    dir
-  end
-
-  def clean_spec_data spec_file_name
-    dir = spec_file_name.sub(/\.rb$/, '')
-    FileUtils.rm_r dir if File.exist? dir
-  end
+  # def spec_tmp_dir
+  #   $spec_tmp_dir || raise("you should call :with_tmp_spec_dir to be able to use :spec_tmp_dir!")
+  # end
 end
 
 class String
-  # unless "".respond_to? :dirname
+  unless "".respond_to? :dirname
     def dirname
       File.expand_path(File.dirname(self))
     end
-  # end
+  end
 
   unless "".respond_to? :parent_dirname
     def parent_dirname
-      File.expand_path(File.dirname(self) + "/..")
+      File.expand_path(self + "/..")
     end
   end
 end

data/lib/ruby_ext.rb

@@ -1,52 +1 @@
-require 'ruby_ext/gems'
-
-core = [
-  'facets/array/indexable', # Array first!, last!
-  'facets/enumerable/every',
-  'facets/enumerable/group_by',
-  'facets/exception/detail', # pretty print
-  'facets/object/dup', # false.dup(), false.clone() and so on.
-  'facets/kernel/blank',
-  'facets/numeric/round.rb', # round_at, round_to
-  'facets/hash',
-  'facets/string/interpolate',
-  # 'facets/ostruct',
-  # 'facets/openobject' it has broken implementation and is completelly rewritend in ruby-ext
-]
-
-more = [
-  # 'facets/basicobject', causes problem with rspec
-  # 'facets/opencascade', causes problem with redefined OpenObject
-]
-
-(core + more).each{|f| require f}
-
-{
-  :BasicObject => 'basic_object',
-  :OpenObject => 'open_object',
-  :OpenConstructor => 'open_constructor',
-  :Observable2 => 'observable2',
-  :ExtraBlankSlate => 'extra_blank_slate', # do I need it?  
-  :Tuple => 'tuple',
-}.each{|klass, file| Kernel.autoload klass, "ruby_ext/#{file}"}
-
-%w{
-  file
-  array
-  hash
-  kernel 
-  module
-  not_defined
-  object
-  class
-  string
-  symbol
-  
-  deep_clone  
-  declarative_cache
-  must
-  prepare_arguments  
-  synchronize
-  micelaneous
-  multiple_inheritance
-}.each{|f| require "ruby_ext/#{f}"}
+require "ruby_ext/more"

data/lib/ruby_ext/core.rb

@@ -0,0 +1,24 @@
+raise 'ruby 1.9.2 or higher required!' if RUBY_VERSION < '1.9.2'
+
+require 'ruby_ext/gems'
+require 'ruby_ext/fixes'
+
+%w(
+  basic_object
+  file
+  enumerable
+  array
+  hash
+  kernel
+  object    
+  module
+  not_defined  
+  class
+  string
+  symbol  
+  must
+  open_object
+  deep_clone
+  multiple_inheritance
+  micelaneous
+).each{|f| require "ruby_ext/core/#{f}"} 

data/lib/ruby_ext/{array.rb → core/array.rb}

@@ -1,4 +1,4 @@
-class Array
+class Array    
   def sfilter *filters
     filters = filters.first if filters.size == 1 and filters.first.is_a?(Array)
     filters.collect!{|o| o.is_a?(Regexp) ? o : /#{Regexp.escape o}/}
@@ -9,5 +9,7 @@ class Array
   
   def self.wrap value
     Array(value)
-  end
+  end    
+  
+  alias_method :filter, :select
 end

data/lib/ruby_ext/core/basic_object.rb

@@ -0,0 +1,8 @@
+class BasicObject
+  protected :==, :equal?, :!, :!=
+  
+  protected
+    def raise *args
+      ::Object.send :raise, *args
+    end
+end

data/lib/ruby_ext/{deep_clone.rb → core/deep_clone.rb}

@@ -45,11 +45,10 @@ Array.class_eval do
   end
 end
 
-[Class, Proc].each do |klass|
+[Class, Proc, Regexp].each do |klass|
   klass.class_eval do
-    def deep_clone
-      self
-    end
+    def clone; self end
+    alias_method :deep_clone, :clone
   end
 end
 

data/lib/ruby_ext/core/enumerable.rb

@@ -0,0 +1,17 @@
+module Enumerable
+  class EveryProxy < BasicObject
+    def initialize enumerable
+      @enumerable = enumerable
+    end
+
+    protected
+      def method_missing m, *a, &b
+        @enumerable.each{|o| o.send m, *a, &b}
+        self
+      end
+  end
+  
+  def every
+    EveryProxy.new(self)
+  end
+end