hitimes 1.1.1-x86-mswin32 → 1.2.0-x86-mswin32

data/tasks/extension.rake

@@ -1,108 +1,38 @@
-require 'tasks/config'
-require 'pathname'
-
-#-----------------------------------------------------------------------
-# Extensions
-#-----------------------------------------------------------------------
-
-if ext_config = Configuration.for_if_exist?('extension') then
-  namespace :ext do  
-    desc "Build the extension(s)"
-    task :build => :clobber do
-      ext_config.configs.each do |extension|
-        path  = Pathname.new(extension)
-        parts = path.split
-        conf  = parts.last
-        Dir.chdir(path.dirname) do |d| 
-          ruby conf.to_s
-          sh "make" 
-
-          # install into requireable location so specs will run
-          subdir = "hitimes/#{RUBY_VERSION.sub(/\.\d$/,'')}"
-          dest_dir = Hitimes::Paths.lib_path( subdir )
-          mkdir_p dest_dir, :verbose => true
-          cp "hitimes_ext.#{Config::CONFIG['DLEXT']}", dest_dir, :verbose => true
-        end
-      end
-    end 
-
-    if RUBY_PLATFORM == "java" then
-      desc "Build the jruby extension"
-      task :build_java => [ :clobber, "lib/hitimes/hitimes.jar" ]
-
-      file "lib/hitimes/hitimes.jar" => FileList["ext/java/src/hitimes/*.java"] do |t|
-        jruby_home = Config::CONFIG['prefix']
-        jruby_jar  = File.join( jruby_home, 'lib', 'jruby.jar' )
-
-        mkdir_p 'pkg/classes'
-        sh "javac -classpath #{jruby_jar} -d pkg/classes #{t.prerequisites.join(' ')}"  
-
-        dest_dir = File.dirname(t.name)
-        sh "jar cf #{t.name} -C pkg/classes ."
-      end
+# To be used if the gem has extensions.
+# If this task set is inclueded then you will need to also have
+#
+#   spec.add_development_dependency( 'rake-compiler', '~> 0.8.1' )
+#
+# in your top level rakefile
+begin
+  require 'rake/extensiontask'
+  require 'rake/javaextensiontask'
+
+  if RUBY_PLATFORM == "java" then
+
+    Rake::JavaExtensionTask.new( This.name) do |ext|
+      ext.ext_dir  = File.join( 'ext', This.name, "java" )
+      ext.lib_dir  = File.join( 'lib', This.name )
+      ext.gem_spec = This.java_gemspec
     end
 
+  else
 
-    def build_win( version = "1.8.6" )
-      ext_config = Configuration.for("extension")
-      rbconfig = ext_config.cross_rbconfig["rbconfig-#{version}"]
-      raise ArgumentError, "No cross compiler for version #{version}, we have #{ext_config.cross_rbconfig.keys.join(",")}" unless rbconfig
-      Hitimes::GEM_SPEC.extensions.each do |extension|
-        path = Pathname.new(extension)
-        parts = path.split
-        conf = parts.last
-        rvm = File.expand_path( "~/.rvm/bin/rvm" )
-        Dir.chdir(path.dirname) do |d| 
-          if File.exist?( "Makefile" ) then
-            sh "make clean distclean"
-          end
-          cp "#{rbconfig}", "rbconfig.rb"
-          rubylib = ENV['RUBYLIB']
-          ENV['RUBYLIB'] = "."
-          sh %[#{rvm} #{version} -S extconf.rb]
-          ENV['RUBYLIB'] = rubylib
-          sh "make"
-        end
-      end
-    end
-
-    win_builds = []
-    ext_config.cross_rbconfig.keys.each do |v|
-      s = v.split("-").last
-      desc "Build the extension for windows version #{s}"
-      win_bname = "build_win-#{s}"
-      win_builds << win_bname
-      task win_bname => :clean do
-        build_win( s )
-      end
-    end
+    Rake::ExtensionTask.new( This.name ) do |ext|
+      ext.ext_dir   = File.join( 'ext', This.name, "c" )
+      ext.lib_dir   = File.join( 'lib', This.name )
+      ext.gem_spec  = This.ruby_gemspec
 
-    task :clean do
-      ext_config.configs.each do |extension|
-        path  = Pathname.new(extension)
-        parts = path.split
-        conf  = parts.last
-        Dir.chdir(path.dirname) do |d| 
-          if File.exist?( "Makefile" ) then
-            sh "make clean"
-          end
-          rm_f "rbconfig.rb"
-        end 
-      end 
-    end 
-
-    task :clobber do
-      ext_config.configs.each do |extension|
-        path  = Pathname.new(extension)
-        parts = path.split
-        conf  = parts.last
-        Dir.chdir(path.dirname) do |d| 
-          if File.exist?( "Makefile" ) then
-            sh "make distclean"
-          end
-          rm_f "rbconfig.rb"
-        end 
-      end 
+      ext.cross_compile  = true               # enable cross compilation (requires cross compile toolchain)
+      ext.cross_platform = 'i386-mswin32'     # forces the Windows platform instead of the default one
+                                              # configure options only for cross compile
     end
   end
+
+  task :test_requirements => :compile
+rescue LoadError
+  This.task_warning( 'extension' )
 end
+
+CLOBBER << FileList["lib/**/*.{jar,so,bundle}"]
+CLOBBER << FileList["lib/#{This.name}/1.{8,9}/"]

data/tasks/this.rb

@@ -0,0 +1,209 @@
+require 'pathname'
+
+# Public: A Class containing all the metadata and utilities needed to manage a
+# ruby project.
+class ThisProject
+  # The name of this project
+  attr_accessor :name
+
+  # The author's name
+  attr_accessor :author
+
+  # The email address of the author(s)
+  attr_accessor :email
+
+  # The homepage of this project
+  attr_accessor :homepage 
+
+  # The regex of files to exclude from the manifest
+  attr_accessor :exclude_from_manifest
+
+  # The hash of Gem::Specifications keyed' by platform
+  attr_accessor :gemspecs
+
+  # Public: Initialize ThisProject
+  #
+  # Yields self
+  def initialize(&block)
+    @exclude_from_manifest = %r/\.(git|DS_Store)|^(doc|coverage|pkg|tmp)|Gemfile*|\.(gemspec|swp|jar|bundle|so|rvmrc)$|~$/
+    @gemspecs              = Hash.new
+    yield self if block_given?
+  end
+
+  # Public: return the version of ThisProject
+  #
+  # Search the ruby files in the project looking for the one that has the
+  # version string in it. This does not eval any code in the project, it parses
+  # the source code looking for the string.
+  #
+  # Returns a String version
+  def version
+    [ "lib/#{ name }.rb", "lib/#{ name }/version.rb" ].each do |v|
+      path = project_path( v )
+      line = path.read[/^\s*VERSION\s*=\s*.*/]
+      if line then
+        return line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+      end
+    end
+  end
+
+  # Internal: Return a section of an RDoc file with the given section name
+  #
+  # path         - the relative path in the project of the file to parse
+  # section_name - the section out of the file from which to parse data
+  #
+  # Retuns the text of the section as an array of paragrphs.
+  def section_of( file, section_name )
+    re    = /^=+ (.*)$/
+    sectional = project_path( file )
+    parts = sectional.read.split( re )[1..-1]
+    parts.map! { |p| p.strip }
+
+    sections = Hash.new
+    Hash[*parts].each do |k,v|
+      sections[k] = v.split("\n\n")
+    end
+    return sections[section_name]
+  end
+
+  # Internal: print out a warning about the give task
+  def task_warning( task )
+    warn "WARNING: '#{task}' tasks are not defined. Please run 'rake develop'"
+  end
+
+  # Internal: Return the full path to the file that is relative to the project
+  # root.
+  #
+  # path - the relative path of the file from the project root
+  #
+  # Returns the Pathname of the file
+  def project_path( *relative_path )
+    project_root.join( *relative_path )
+  end
+
+  # Internal: The absolute path of this file
+  #
+  # Returns the Pathname of this file.
+  def this_file_path
+    Pathname.new( __FILE__ ).expand_path
+  end
+
+  # Internal: The root directory of this project
+  #
+  # This is defined as being the directory that is in the path of this project
+  # that has the first Rakefile
+  #
+  # Returns the Pathname of the directory
+  def project_root
+    this_file_path.ascend do |p|
+      rakefile = p.join( 'Rakefile' )
+      return p if rakefile.exist?
+    end
+  end
+
+  # Internal: Returns the contents of the Manifest.txt file as an array
+  #
+  # Returns an Array of strings
+  def manifest
+    manifest_file = project_path( "Manifest.txt" )
+    abort "You need a Manifest.txt" unless manifest_file.readable?
+    manifest_file.readlines.map { |l| l.strip }
+  end
+
+  # Internal: Return the files that define the extensions
+  #
+  # Returns an Array
+  def extension_conf_files
+    manifest.grep( /extconf.rb\Z/ )
+  end
+
+  # Internal: Returns the gemspace associated with the current ruby platform
+  def platform_gemspec
+    gemspecs[platform]
+  end
+
+  def core_gemspec
+    Gem::Specification.new do |spec|
+      spec.name        = name
+      spec.version     = version
+      spec.author      = author
+      spec.email       = email
+      spec.homepage    = homepage
+
+      spec.summary     = summary
+      spec.description = description
+
+      spec.files       = manifest
+      spec.executables = spec.files.grep(/^bin/) { |f| File.basename(f) }
+      spec.test_files  = spec.files.grep(/^spec/)
+
+      spec.extra_rdoc_files += spec.files.grep(/(txt|rdoc)$/)
+      spec.rdoc_options = [ "--main"  , 'README.rdoc',
+                            "--markup", "tomdoc" ]
+    end
+  end
+
+  # Internal: Return the gemspec for the ruby platform
+  def ruby_gemspec( core = core_gemspec, &block )
+    yielding_gemspec( 'ruby', core, &block )
+  end
+
+  # Internal: Return the gemspec for the jruby platform
+  def java_gemspec( core = core_gemspec, &block )
+    yielding_gemspec( 'java', core, &block )
+  end
+
+  # Internal: give an initial spec and a key, create a new gemspec based off of
+  # it.
+  #
+  # This will force the new gemspecs 'platform' to be that of the key, since the
+  # only reason you would have multiple gemspecs at this point is to deal with
+  # different platforms.
+  def yielding_gemspec( key, core )
+    spec = gemspecs[key] ||= core.dup
+    spec.platform = key
+    yield spec if block_given?
+    return spec
+  end
+
+  # Internal: Set the recovery gem development dependency
+  #
+  # These are dynamically set since they cannot be hard coded as there is 
+  # no way to ship them correctly in the gemspec
+  #
+  # Returns nothing.
+  def set_coverage_gem
+    if RUBY_VERSION < "1.9.0"
+      platform_gemspec.add_development_dependency( 'rcov', '~> 1.0.0' )
+    else
+      platform_gemspec.add_development_dependency( 'simplecov', '~> 0.7.1' )
+    end
+  end
+
+  # Internal: Return the platform of ThisProject at the current moment in time.
+  def platform
+    (RUBY_PLATFORM == "java") ? 'java' : Gem::Platform::RUBY
+  end
+
+  # Internal: Return the DESCRIPTION section of the README.rdoc file
+  def description_section
+    section_of( 'README.rdoc', 'DESCRIPTION')
+  end
+ 
+ # Internal: Return the summary text from the README 
+  def summary
+    description_section.first
+  end
+
+  # Internal: Return the full description text from the READEM
+  def description
+    description_section.join(" ").tr("\n", ' ').gsub(/[{}]/,'').gsub(/\[[^\]]+\]/,'') # strip rdoc
+  end
+
+  # Internal: The path to the gemspec file
+  def gemspec_file
+    project_path( "#{ name }.gemspec" )
+  end
+end
+
+This = ThisProject.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hitimes
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: x86-mswin32
 authors: 
 - Jeremy Hinegardner
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 -06:00
-default_executable: 
+date: 2013-02-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -26,107 +25,110 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 73
         segments: 
+        - 10
         - 0
-        - 8
-        - 1
-        version: 0.8.1
+        - 3
+        version: 10.0.3
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: configuration
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 63
         segments: 
+        - 2
+        - 12
         - 0
-        - 0
-        - 5
-        version: 0.0.5
+        version: 2.12.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rdoc
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
-        - 1
-        - 1
         - 3
-        version: 1.1.3
+        - 12
+        version: "3.12"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
+        - 1
+        - 7
+        - 6
+        version: 1.7.6
   type: :development
   version_requirements: *id004
-description: |-
-  Hitimes is a fast, high resolution timer library for recording
-  performance metrics.  It uses the appropriate low method calls for each
-  system to get the highest granularity time increments possible.  
-  
-  It currently supports any of the following systems:
-  
-  * any system with the POSIX call <tt>clock_gettime()</tt>,
-  * Mac OS X
-  * Windows
-  * JRuby
-  
-  Using Hitimes can be faster than using a series of +Time.new+ calls, and
-  it will have a much higher granularity.   It is definitely faster than
-  using +Process.times+.
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
+  type: :development
+  version_requirements: *id005
+description: "Hitimes is a fast, high resolution timer library for recording performance metrics.  It uses the appropriate low method calls for each system to get the highest granularity time increments possible.   It currently supports any of the following systems: * any system with the POSIX call <tt>clock_gettime()</tt>, * Mac OS X * Windows * JRuby Using Hitimes can be faster than using a series of +Time.new+ calls, and it will have a much higher granularity.   It is definitely faster than using +Process.times+."
 email: jeremy@copiousfreetime.org
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
-- HISTORY
-- LICENSE
-- lib/hitimes/metric.rb
-- lib/hitimes/mutexed_stats.rb
-- lib/hitimes/paths.rb
-- lib/hitimes/stats.rb
-- lib/hitimes/timed_metric.rb
-- lib/hitimes/timed_value_metric.rb
-- lib/hitimes/value_metric.rb
-- lib/hitimes/version.rb
-- lib/hitimes.rb
+- HISTORY.rdoc
+- Manifest.txt
+- README.rdoc
 files: 
+- CONTRIBUTING.md
+- HISTORY.rdoc
+- LICENSE
+- Manifest.txt
+- README.rdoc
+- Rakefile
 - examples/benchmarks.rb
 - examples/stats.rb
-- ext/hitimes/hitimes_ext.c
-- ext/hitimes/hitimes_instant_clock_gettime.c
-- ext/hitimes/hitimes_instant_osx.c
-- ext/hitimes/hitimes_instant_windows.c
-- ext/hitimes/hitimes_interval.c
-- ext/hitimes/hitimes_stats.c
-- ext/hitimes/hitimes_interval.h
-- ext/hitimes/hitimes_stats.h
-- ext/hitimes/extconf.rb
+- ext/hitimes/c/extconf.rb
+- ext/hitimes/c/hitimes.c
+- ext/hitimes/c/hitimes_instant_clock_gettime.c
+- ext/hitimes/c/hitimes_instant_osx.c
+- ext/hitimes/c/hitimes_instant_windows.c
+- ext/hitimes/c/hitimes_interval.c
+- ext/hitimes/c/hitimes_interval.h
+- ext/hitimes/c/hitimes_stats.c
+- ext/hitimes/c/hitimes_stats.h
+- ext/hitimes/java/src/hitimes/Hitimes.java
+- ext/hitimes/java/src/hitimes/HitimesInterval.java
+- ext/hitimes/java/src/hitimes/HitimesService.java
+- ext/hitimes/java/src/hitimes/HitimesStats.java
+- lib/hitimes.rb
 - lib/hitimes/metric.rb
 - lib/hitimes/mutexed_stats.rb
 - lib/hitimes/paths.rb
@@ -135,7 +137,7 @@ files:
 - lib/hitimes/timed_value_metric.rb
 - lib/hitimes/value_metric.rb
 - lib/hitimes/version.rb
-- lib/hitimes.rb
+- spec/hitimes_spec.rb
 - spec/interval_spec.rb
 - spec/metric_spec.rb
 - spec/mutex_stats_spec.rb
@@ -146,33 +148,22 @@ files:
 - spec/timed_value_metric_spec.rb
 - spec/value_metric_spec.rb
 - spec/version_spec.rb
-- README
-- HISTORY
-- LICENSE
-- tasks/announce.rake
-- tasks/distribution.rake
-- tasks/documentation.rake
+- tasks/default.rake
 - tasks/extension.rake
-- tasks/rspec.rake
-- tasks/rubyforge.rake
-- tasks/config.rb
-- tasks/utils.rb
-- Rakefile
-- gemspec.rb
-- lib/hitimes/1.8/hitimes_ext.so
-- lib/hitimes/1.9/hitimes_ext.so
-has_rdoc: true
-homepage: http://copiousfreetime.rubyforge.org/hitimes/
+- tasks/this.rb
+- lib/hitimes/1.8/hitimes.so
+- lib/hitimes/1.9/hitimes.so
+homepage: http://github.com/copiousfreetime/hitimes
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
 - --main
-- README
+- README.rdoc
+- --markup
+- tomdoc
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -193,10 +184,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: copiousfreetime
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Hitimes is a fast, high resolution timer library for recording performance metrics
-test_files: []
-
+summary: Hitimes is a fast, high resolution timer library for recording performance metrics.  It uses the appropriate low method calls for each system to get the highest granularity time increments possible.
+test_files: 
+- spec/hitimes_spec.rb
+- spec/interval_spec.rb
+- spec/metric_spec.rb
+- spec/mutex_stats_spec.rb
+- spec/paths_spec.rb
+- spec/spec_helper.rb
+- spec/stats_spec.rb
+- spec/timed_metric_spec.rb
+- spec/timed_value_metric_spec.rb
+- spec/value_metric_spec.rb
+- spec/version_spec.rb