threadify 1.3.0 → 1.4.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDM2ZGI2N2E2ZWFjMGUwOGE5Mzg5ZGEzNTA0ZTFiY2JlMjU5Yjg0Ng==
+  data.tar.gz: !binary |-
+    Y2RlNjMyYWI2MGVhODExNDdiM2VhOTViOTUyOWViMmRlZGFjOWU2YQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MTdlZWZhNGZlMmEyZDA5N2JhMjQ5MTA0MWRmNzZhZDMyMmM5YTE4MmJmZmI5
+    MmIxZWUzMjcyOGU4NjRhNzUzNDQ2MTlhZTM5NDQzN2M4ZjFmNzc1YTQxOWI5
+    Zjk4MGQ5N2YwMWEwMzY0YzY3NjllMDhiZjlkYTQyZDI5NDIzYjc=
+  data.tar.gz: !binary |-
+    ZGI5N2VmNWY2MGFkMzVlNGI2MGZmNTEyZDZhODYxODg1OWIzMzNjZjBkODc2
+    M2U1NjFhMDQ3MWZkNzIyNzVkMzIzMjI3ODc3MTFiMDkzZjI2MWQzZGZjNDAz
+    NWYwN2YyNjRiYzAzYzQwYmQwODlhODc3MDExYzQyNzFjOTJlYzE=

data/README

@@ -64,9 +64,9 @@ SAMPLES
   ~ > ruby sample/a.rb
 
     --- 
-    without threadify: 10.1121168136597
+    without threadify: 8.49043202400208
     --- 
-    with threadify: 8.11967301368713
+    with threadify: 2.45102596282959
 
 
   <========< sample/b.rb >========>
@@ -118,9 +118,9 @@ SAMPLES
   ~ > ruby sample/b.rb
 
     --- 
-    without threadify: 20.6975500583649
+    without threadify: 19.2692859172821
     --- 
-    with threadify: 0.923933982849121
+    with threadify: 0.851074934005737
     --- 
     :needle: 42
     :a: 42
@@ -130,6 +130,9 @@ SAMPLES
 
 
 HISTORY
+  1.4.2
+    - fix name collision running under jruby's native threads.  thanks charles nutter!
+
   1.3.0
     - added Threadify(*args, &block) method to execute arbitrary code in parallel
 

data/README.erb

@@ -22,6 +22,9 @@ SAMPLES
 
 
 HISTORY
+  1.4.2
+    - fix name collision running under jruby's native threads.  thanks charles nutter!
+
   1.3.0
     - added Threadify(*args, &block) method to execute arbitrary code in parallel
 

data/lib/threadify.rb

@@ -1,7 +1,11 @@
 module Threadify
-  Threadify::VERSION = '1.3.0' unless defined?(Threadify::VERSION)
+  Threadify::VERSION = '1.4.3' unless defined?(Threadify::VERSION)
   def Threadify.version() Threadify::VERSION end
 
+  def Threadify.description
+    'https://github.com/ahoward/threadify.git'
+  end
+
   require 'thread'
   require 'enumerator'
 
@@ -90,8 +94,8 @@ module Enumerable
               break if caught
               job = jobsi.shift
               break if job == done
-              args = job.first
-              jobsi << (job << block.call(*args))
+              argv = job.first
+              jobsi << (job << block.call(*argv))
             }
             nothing
           end
@@ -99,7 +103,7 @@ module Enumerable
 
         unless nothing == thrown
           thrownq.push [i, thrown]
-          args, i = job
+          argv, i = job
         end
       end
     end

data/rakefile

@@ -1,18 +1,69 @@
-
 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.homepage = "https://github.com/ahoward/#{ This.lib }"
 
+task :license do
+  open('LICENSE', 'w'){|fd| fd.puts "same as ruby's"}
+end
 
 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
+
+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)
+
+  test_rbs.each_with_index do |test_rb, index|
+    testno = index + 1
+    command = "#{ This.ruby } -w -I ./lib -I ./test/lib #{ 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_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
+  ignore_directories = ['pkg']
+  ignore_files = ['test/log']
 
   shiteless = 
     lambda do |list|
@@ -26,17 +77,27 @@ task :gemspec do
         dirname = File.expand_path(entry)
         ignore_directories.any?{|dir| File.expand_path(dir) == dirname}
       end
+      list.delete_if do |entry|
+        next unless test(?f, entry)
+        filename = File.expand_path(entry)
+        ignore_files.any?{|file| File.expand_path(file) == filename}
+      end
     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')
+  #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"
+  license     = object.respond_to?(:license) ? object.license : "same as ruby's"
 
-  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
@@ -57,16 +118,18 @@ task :gemspec do
             spec.version = #{ version.inspect }
             spec.platform = Gem::Platform::RUBY
             spec.summary = #{ lib.inspect }
+            spec.description = #{ description.inspect }
+            spec.license = #{ license.inspect }
 
-            spec.files = #{ files.inspect }
+            spec.files =\n#{ files.sort.pretty_inspect }
             spec.executables = #{ executables.inspect }
             
             spec.require_path = "lib"
 
-            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.add_dependency 'map'
 
             spec.extensions.push(*#{ extensions.inspect })
 
@@ -79,19 +142,21 @@ task :gemspec do
       }
     end
 
-  open("#{ lib }.gemspec", "w"){|fd| fd.puts template}
-  This.gemspec = "#{ lib }.gemspec"
+  Fu.mkdir_p(This.pkgdir)
+  gemspec = "#{ lib }.gemspec"
+  open(gemspec, "w"){|fd| fd.puts(template)}
+  This.gemspec = gemspec
 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 }`
   after = Dir['*.gem']
   gem = ((after - before).first || after.first) or abort('no gem!')
-  Fu.mv gem, This.pkgdir
-  This.gem = File.basename(gem)
+  Fu.mv(gem, This.pkgdir)
+  This.gem = File.join(This.pkgdir, File.basename(gem))
 end
 
 task :readme do
@@ -110,13 +175,13 @@ 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
 
   template = 
-    if test(?e, 'readme.erb')
-      Template{ IO.read('readme.erb') }
+    if test(?e, 'README.erb')
+      Template{ IO.read('README.erb') }
     else
       Template {
         <<-__
@@ -147,9 +212,18 @@ task :release => [:clean, :gemspec, :gem] do
   gems = Dir[File.join(This.pkgdir, '*.gem')].flatten
   raise "which one? : #{ gems.inspect }" if gems.size > 1
   raise "no gems?" if gems.size < 1
-  cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.pkgdir }/#{ This.gem }"
+
+  cmd = "gem push #{ This.gem }"
+  puts cmd
+  puts
+  system(cmd)
+  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
+
+  cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.gem }"
   puts cmd
-  system cmd
+  puts
+  system(cmd)
+  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
 end
 
 
@@ -157,37 +231,63 @@ end
 
 
 BEGIN {
+# support for this rakefile
+#
   $VERBOSE = nil
 
   require 'ostruct'
   require 'erb'
   require 'fileutils'
+  require 'rbconfig'
+  require 'pp'
 
+# 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
-    require "./lib/#{ lib }"
-    version = eval(name).send(:version)
+    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)
@@ -197,7 +297,7 @@ BEGIN {
 
     def unindent(s)
       indent = nil
-      s.each do |line|
+      s.each_line do |line|
       next if line =~ %r/^\s*$/
       indent = line[%r/^\s*/] and break
     end
@@ -206,17 +306,71 @@ BEGIN {
     extend self
   end
 
+# template support
+#
   class Template
     def initialize(&block)
       @block = block
       @template = block.call.to_s
     end
     def expand(b=nil)
-      ERB.new(Util.unindent(@template)).result(b||@block)
+      ERB.new(Util.unindent(@template)).result((b||@block).binding)
     end
     alias_method 'to_s', 'expand'
   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/sample/a.rb

@@ -32,6 +32,6 @@ BEGIN {
     yield
   ensure
     b = Time.now.to_f
-    y label => (b - a)
+    puts({label => (b - a)}.to_yaml)
   end
 }

data/sample/b.rb

@@ -28,7 +28,7 @@ end
 
 raise if a != b
 
-y :a => a, :b => b, :needle => needle
+y({:a => a, :b => b, :needle => needle}.to_yaml)
 
 BEGIN {
   def time label
@@ -36,6 +36,6 @@ BEGIN {
     yield
   ensure
     b = Time.now.to_f
-    y label => (b - a)
+    y({label => (b - a)})
   end
 }

data/threadify.gemspec

@@ -3,24 +3,36 @@
 
 Gem::Specification::new do |spec|
   spec.name = "threadify"
-  spec.version = "1.3.0"
+  spec.version = "1.4.3"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "threadify"
+  spec.description = "https://github.com/ahoward/threadify.git"
+  spec.license = "same as ruby's"
+
+  spec.files =
+["README",
+ "README.erb",
+ "lib",
+ "lib/threadify.rb",
+ "rakefile",
+ "sample",
+ "sample/a.rb",
+ "sample/b.rb",
+ "threadify.gemspec"]
 
-  spec.files = ["lib", "lib/threadify.rb", "rakefile", "README", "README.erb", "sample", "sample/a.rb", "sample/b.rb", "threadify.gemspec"]
   spec.executables = []
   
   spec.require_path = "lib"
 
-  spec.has_rdoc = true
   spec.test_files = nil
-  #spec.add_dependency 'lib', '>= version'
-  #spec.add_dependency 'fattr'
+
+### spec.add_dependency 'lib', '>= version'
+#### spec.add_dependency 'map'
 
   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/threadify/tree/master"
+  spec.homepage = "https://github.com/ahoward/threadify"
 end

metadata

@@ -1,61 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: threadify
-version: !ruby/object:Gem::Version 
-  version: 1.3.0
+version: !ruby/object:Gem::Version
+  version: 1.4.3
 platform: ruby
-authors: 
+authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-09-10 00:00:00 -06:00
-default_executable: 
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies: []
-
-description: 
+description: https://github.com/ahoward/threadify.git
 email: ara.t.howard@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib
-- lib/threadify.rb
-- rakefile
+files:
 - README
 - README.erb
-- sample
+- lib/threadify.rb
+- rakefile
 - sample/a.rb
 - sample/b.rb
 - threadify.gemspec
-has_rdoc: true
-homepage: http://github.com/ahoward/threadify/tree/master
+homepage: https://github.com/ahoward/threadify
+licenses:
+- same as ruby's
+metadata: {}
 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
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: codeforpeople
-rubygems_version: 1.3.1
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: threadify
 test_files: []
-