hitimes 1.1.1-x86-mingw32 → 1.2.2-x86-mingw32

data/spec/value_metric_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
-
-require 'hitimes/value_metric'
+require 'spec_helper'
 
 describe Hitimes::ValueMetric do
   before( :each ) do
@@ -9,50 +7,50 @@ describe Hitimes::ValueMetric do
   end
 
   it 'has a name' do
-    @metric.name.should == "testing"
+    @metric.name.must_equal "testing"
   end
 
   it "has associated data from initialization" do
     m = Hitimes::ValueMetric.new( "more-data", 'foo' => 'bar', 'this' => 'that' )
-    m.additional_data['foo'].should == 'bar'
-    m.additional_data['this'].should == 'that'
+    m.additional_data['foo'].must_equal 'bar'
+    m.additional_data['this'].must_equal 'that'
     
     m = Hitimes::ValueMetric.new( "more-data", { 'foo' => 'bar', 'this' => 'that' } )
-    m.additional_data['foo'].should == 'bar'
-    m.additional_data['this'].should == 'that'
+    m.additional_data['foo'].must_equal 'bar'
+    m.additional_data['this'].must_equal 'that'
   end
 
   it "calculates the mean of the measurements" do
-    @metric.mean.should == 4.5
+    @metric.mean.must_equal 4.5
   end
 
   it "calculates the stddev of the measurements" do
-    @metric.stddev.should > 0.0
+    @metric.stddev.must_be :>, 0.0
   end
 
   it "returns 0.0 for stddev if there is no data" do
     m = Hitimes::ValueMetric.new('0-data')
-    m.stddev.should == 0.0
+    m.stddev.must_equal 0.0
   end
 
   it "keeps track of the sum of data" do
-    @metric.sum.should == 45.0
+    @metric.sum.must_equal 45.0
   end
 
   it "keeps track of the sum of squars of data" do
-    @metric.sumsq.should == 285.0
+    @metric.sumsq.must_equal 285.0
   end
 
   it "retuns 0.0 for mean if there is no data" do
-    Hitimes::ValueMetric.new('0-data').mean.should == 0.0
+    Hitimes::ValueMetric.new('0-data').mean.must_equal 0.0
   end
 
   it "keeps track of the min value" do
-    @metric.min.should == 0
+    @metric.min.must_equal 0
   end
 
   it "keeps track of the max value" do
-    @metric.max.should == 9
+    @metric.max.must_equal 9
   end
 
   it "keeps track of the first start time of all the measurements" do
@@ -60,11 +58,11 @@ describe Hitimes::ValueMetric do
     f1 = Time.now.gmtime.to_f * 1_000_000
     10.times{ |x| m.measure( x ); sleep 0.1 }
     f2 = Time.now.gmtime.to_f * 1_000_000
-    m.sampling_start_time.should >= f1
-    m.sampling_start_time.should < f2
+    m.sampling_start_time.must_be :>=, f1
+    m.sampling_start_time.must_be :<, f2
     # distance from now to start time should be greater than the distance from
     # the start to the min start_time
-    (f2 - m.sampling_start_time).should > ( m.sampling_start_time - f1 )
+    (f2 - m.sampling_start_time).must_be :>, ( m.sampling_start_time - f1 )
   end
 
   it "keeps track of the last stop time of all the intervals" do
@@ -72,37 +70,37 @@ describe Hitimes::ValueMetric do
     f1 = Time.now.gmtime.to_f * 1_000_000
     10.times {|x| m.measure( x ); sleep 0.1  }
     f2 = Time.now.gmtime.to_f * 1_000_000
-    m.sampling_stop_time.should > f1
-    m.sampling_stop_time.should <= f2
+    m.sampling_stop_time.must_be :>, f1
+    m.sampling_stop_time.must_be :<=, f2
     # distance from now to max stop time time should be less than the distance
     # from the start to the max stop time
-    (f2 - m.sampling_stop_time).should < ( m.sampling_stop_time - f1 )
+    (f2 - m.sampling_stop_time).must_be :<, ( m.sampling_stop_time - f1 )
   end
 
   describe "#to_hash" do
 
     it "has name value" do
       h = @metric.to_hash
-      h['name'].should == "testing"
+      h['name'].must_equal "testing"
     end
 
     it "has an empty has for additional_data" do
       h = @metric.to_hash
-      h['additional_data'].should == Hash.new
-      h['additional_data'].size.should == 0
+      h['additional_data'].must_equal Hash.new
+      h['additional_data'].size.must_equal 0
     end
 
     it "has the right sum" do
       h = @metric.to_hash
-      h['sum'].should == 45
+      h['sum'].must_equal 45
     end
 
     fields = ::Hitimes::Stats::STATS.dup + %w[ name additional_data sampling_start_time sampling_stop_time ]
     fields = fields - [ 'rate' ]
     fields.each do |f|
-      it "should have a value for #{f}" do
+      it "has a value for #{f}" do
         h = @metric.to_hash
-        h[f].should_not be_nil
+        h[f].wont_be_nil
       end
     end
   end

data/spec/version_spec.rb

@@ -1,33 +1,7 @@
-require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper" ) )
+require "spec_helper"
 
 describe "Hitimes::Version" do
-    it "should have a major numbers that is >= 0" do
-        Hitimes::Version::MAJOR.should >= 0
-    end 
-
-    it "should have a minor number that is >= 0" do
-        Hitimes::Version::MINOR.should >= 0
-    end 
-
-    it "should have a tiny number that is >= 0" do
-        Hitimes::Version::BUILD.should >= 0
-    end 
-
-    it "should have an array representation" do
-        Hitimes::Version.to_a.should have(3).items
-    end 
-
-    it "should have a string representation" do
-        Hitimes::Version.to_s.should match(/\d+\.\d+\.\d+/)
-    end 
-
-    it "should have a hash representation" do
-      [ :major, :minor, :build ].each do |k|
-        Hitimes::Version.to_hash[k].should_not be_nil
-      end
-    end
-
-    it "should be accessable as a constant" do
-        Hitimes::VERSION.should match(/\d+\.\d+\.\d+/)
-    end 
+  it "should be accessable as a constant" do
+    Hitimes::VERSION.must_match(/\d+\.\d+\.\d+/)
+  end
 end

data/tasks/default.rake

@@ -0,0 +1,242 @@
+# vim: syntax=ruby
+require 'rake/clean'
+require 'digest'
+#------------------------------------------------------------------------------
+# If you want to Develop on this project just run 'rake develop' and you'll
+# have all you need to get going. If you want to use bundler for development,
+# then run 'rake develop:using_bundler'
+#------------------------------------------------------------------------------
+namespace :develop do
+
+  # Install all the development and runtime dependencies of this gem using the
+  # gemspec.
+  task :default => 'Gemfile' do
+    require 'rubygems/dependency_installer'
+    installer = ::Gem::DependencyInstaller.new
+    puts "Installing bundler..."
+    installer.install 'bundler'
+    sh 'bundle install'
+    puts "\n\nNow run 'rake test'"
+  end
+
+  # Create a Gemfile that just references the gemspec
+  file 'Gemfile' => :gemspec do
+    File.open( "Gemfile", "w+" ) do |f|
+      f.puts "# DO NOT EDIT - This file is automatically generated"
+      f.puts "# Make changes to Manifest.txt and/or Rakefile and regenerate"
+      f.puts 'source "https://rubygems.org/"'
+      f.puts 'gemspec'
+    end
+  end
+end
+desc "Boostrap development"
+task :develop => "develop:default"
+
+#------------------------------------------------------------------------------
+# Minitest - standard TestTask
+#------------------------------------------------------------------------------
+begin
+  require 'rake/testtask'
+  Rake::TestTask.new( :test ) do |t|
+    t.ruby_opts    = %w[ -w -rubygems ]
+    t.libs         = %w[ lib spec test ]
+    t.pattern      = "{test,spec}/**/{test_*,*_spec}.rb"
+  end
+
+  task :test_requirements
+  task :test => :test_requirements
+  task :default => :test
+rescue LoadError
+  This.task_warning( 'test' )
+end
+
+#------------------------------------------------------------------------------
+# RDoc - standard rdoc rake task, although we must make sure to use a more
+#        recent version of rdoc since it is the one that has 'tomdoc' markup
+#------------------------------------------------------------------------------
+begin
+  gem 'rdoc' # otherwise we get the wrong task from stdlib
+  require 'rdoc/task'
+  RDoc::Task.new do |t|
+    t.markup   = 'tomdoc'
+    t.rdoc_dir = 'doc'
+    t.main     = 'README.md'
+    t.title    = "#{This.name} #{This.version}"
+    t.rdoc_files.include( FileList['*.{rdoc,md,txt}'], FileList['ext/**/*.c'],
+                          FileList['lib/**/*.rb'] )
+  end
+rescue StandardError, LoadError
+  This.task_warning( 'rdoc' )
+end
+
+#------------------------------------------------------------------------------
+# Coverage - optional code coverage, rcov for 1.8 and simplecov for 1.9, so
+#            for the moment only rcov is listed.
+#------------------------------------------------------------------------------
+begin
+  require 'simplecov'
+  desc 'Run tests with code coverage'
+  task :coverage do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task[:test].execute
+  end
+  CLOBBER << 'coverage' if File.directory?('coverage')
+rescue LoadError
+  This.task_warning( 'simplecov' )
+end
+
+#------------------------------------------------------------------------------
+# Manifest - We want an explicit list of thos files that are to be packaged in
+#            the gem. Most of this is from Hoe.
+#------------------------------------------------------------------------------
+namespace 'manifest' do
+  desc "Check the manifest"
+  task :check => :clean do
+    files = FileList["**/*", ".*"].exclude( This.exclude_from_manifest ).to_a.sort
+    files = files.select{ |f| File.file?( f ) }
+
+    tmp = "Manifest.tmp"
+    File.open( tmp, 'w' ) do |f|
+      f.puts files.join("\n")
+    end
+
+    begin
+      sh "diff -du Manifest.txt #{tmp}"
+    ensure
+      rm tmp
+    end
+    puts "Manifest looks good"
+  end
+
+  desc "Generate the manifest"
+  task :generate => :clean do
+    files = %x[ git ls-files ].split("\n").sort
+    files.reject! { |f| f =~ This.exclude_from_manifest }
+    File.open( "Manifest.txt", "w" ) do |f|
+      f.puts files.join("\n")
+    end
+  end
+end
+
+#------------------------------------------------------------------------------
+# Fixme - look for fixmes and report them
+#------------------------------------------------------------------------------
+namespace :fixme do
+  task :default => 'manifest:check' do
+    This.manifest.each do |file|
+      next if file == __FILE__
+      next unless file =~ %r/(txt|rb|md|rdoc|css|html|xml|css)\Z/
+      puts "FIXME: Rename #{file}" if file =~ /fixme/i
+      IO.readlines( file ).each_with_index do |line, idx|
+        prefix = "FIXME: #{file}:#{idx+1}".ljust(42)
+        puts "#{prefix} => #{line.strip}" if line =~ /fixme/i
+      end
+    end
+  end
+
+  def fixme_project_root
+    This.project_path( '../fixme' )
+  end
+
+  def fixme_project_path( subtree )
+    fixme_project_root.join( subtree )
+  end
+
+  def local_fixme_files
+    This.manifest.select { |p| p =~ %r|^tasks/| }
+  end
+
+  def outdated_fixme_files
+    local_fixme_files.select do |local|
+      upstream     = fixme_project_path( local )
+      upstream.exist? &&
+        ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
+    end
+  end
+
+  def fixme_up_to_date?
+    outdated_fixme_files.empty?
+  end
+
+  desc "See if the fixme tools are outdated"
+  task :outdated => :release_check do
+    if fixme_up_to_date? then
+      puts "Fixme files are up to date."
+    else
+      outdated_fixme_files.each do |f|
+        puts "#{f} is outdated"
+      end
+    end
+  end
+
+  desc "Update outdated fixme files"
+  task :update => :release_check do
+    if fixme_up_to_date? then
+      puts "Fixme files are already up to date."
+    else
+      puts "Updating fixme files:"
+      outdated_fixme_files.each do |local|
+        upstream = fixme_project_path( local )
+        puts "  * #{local}"
+        FileUtils.cp( upstream, local )
+      end
+      puts "Use your git commands as appropriate."
+    end
+  end
+end
+desc "Look for fixmes and report them"
+task :fixme => "fixme:default"
+
+#------------------------------------------------------------------------------
+# Gem Specification
+#------------------------------------------------------------------------------
+# Really this is only here to support those who use bundler
+desc "Build the #{This.name}.gemspec file"
+task :gemspec do
+  File.open( This.gemspec_file, "wb+" ) do |f|
+    f.puts "# DO NOT EDIT - This file is automatically generated"
+    f.puts "# Make changes to Manifest.txt and/or Rakefile and regenerate"
+    f.write This.platform_gemspec.to_ruby
+  end
+end
+
+# .rbc files from ruby 2.0
+CLOBBER << FileList["**/*.rbc"]
+
+# The standard gem packaging task, everyone has it.
+require 'rubygems/package_task'
+::Gem::PackageTask.new( This.platform_gemspec ) do
+  # nothing
+end
+
+#------------------------------------------------------------------------------
+# Release - the steps we go through to do a final release, this is pulled from
+#           a compbination of mojombo's rakegem, hoe and hoe-git
+#
+# 1) make sure we are on the master branch
+# 2) make sure there are no uncommitted items
+# 3) check the manifest and make sure all looks good
+# 4) build the gem
+# 5) do an empty commit to have the commit message of the version
+# 6) tag that commit as the version
+# 7) push master
+# 8) push the tag
+# 7) pus the gem
+#------------------------------------------------------------------------------
+task :release_check do
+  unless `git branch` =~ /^\* master$/
+    abort "You must be on the master branch to release!"
+  end
+  unless `git status` =~ /^nothing to commit/m
+    abort "Nope, sorry, you have unfinished business"
+  end
+end
+
+desc "Create tag v#{This.version}, build and push #{This.platform_gemspec.full_name} to rubygems.org"
+task :release => [ :release_check, 'manifest:check', :gem ] do
+  sh "git commit --allow-empty -a -m 'Release #{This.version}'"
+  sh "git tag -a -m 'v#{This.version}' v#{This.version}"
+  sh "git push origin master"
+  sh "git push origin v#{This.version}"
+  sh "gem push pkg/#{This.platform_gemspec.full_name}.gem"
+end

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-mingw32'     # 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,1.9,2.0,2.1,2.2}/"]