pgplot 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b44a1a4ec2013849e2c49505431632f19d4e23de
-  data.tar.gz: 93aa0e6a84a0eb7e5adda60f664156239f4ae26a
+SHA256:
+  metadata.gz: 4fc81664bfcb9e98f2a1d7c1fcbcf64f9b0e4ecaf296f10dc07dcf37b44eeb93
+  data.tar.gz: 0d59f1606548424591b15e80411beddf9e87dbe0b4abe336ce43efca249b15a5
 SHA512:
-  metadata.gz: e1bef91baee3cb87ff596e67c0106ef37e2b95b9f5d56ca15a6633cb165cae5fb66d63d2022099b1e09df9a822d10207586778b6de130598527ede24d99f067b
-  data.tar.gz: a24bbb7c5d86bb29e3874b45f17360e8bbc464e801d0fd94ce12264dddd76f3b9ae7dd08df221fed672156b8a8ec628b483f79498fe6271f3c6757e4ca1043ba
+  metadata.gz: f5a213ab4f4cb5a927423a0c2b988c75f1bf21ed458a1733135d2fc64b67181f98d8d901533fa58d0b848a3c43bd9dbda5356515ef64c36f47a4346c432431c9
+  data.tar.gz: 101cf7efa5bd01166fc5aa230d3c3927ba2ceb3593e7b91d1fffe1d9596ec3847d7eecc165a784d4bfd9495ef5d994b1f5f34ffa1a2348de6a02b2ef153eb548

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/ext/build_lib/Makefile

@@ -12,6 +12,7 @@ $(pkg):
 $(sd)/drivers.list: $(pkg)
 	gunzip -c $(pkg) | tar xf -
 	touch $(sd)/drivers.list
+	ruby patch.rb $(sd)
 
 $(bd)/drivers.list: drivers.conf $(sd)/drivers.list
 	ruby drivers.rb $(sd) $(bd)

data/ext/build_lib/patch.rb

@@ -0,0 +1,16 @@
+require 'fileutils'
+
+$src_dir = ARGV[0] || 'pgplot'
+
+fnw = File.join($src_dir,"drivers/pndriv.c")
+fnr = fnw + ".orig"
+
+FileUtils.mv(fnw,fnr)
+
+open(fnr,"rt") do |r|
+  open(fnw,"wt") do |w|
+    while s = r.gets
+      w.print s.sub(/png_ptr->jmpbuf/,"png_jmpbuf(png_ptr)")
+    end
+  end
+end

data/ext/cogen.rb

@@ -153,6 +153,8 @@ def cogen_pgplot
       fout.print
     end
   end
+  fout.close
+  fin.close
 end
 
 cogen_pgplot if $0 == __FILE__

data/ext/extconf.rb

@@ -1,137 +1,210 @@
-# extconf.rb : Configure script for Ruby/PGPLOT
-#
-#   Copyright (c) 2000,2001 Masahiro TANAKA <masa@ir.isas.ac.jp>
-#
-#   This program is free software.
-#   You can distribute/modify this program
-#   under the same terms as Ruby itself.
-#   NO WARRANTY.
-#
-# usage: ruby extconf.rb [configure options]
-
-# Narray is now Gem based, so require rubygems
-# so that we can use Gem class to find narray.
 require "mkmf"
 
-#$DEBUG = true
+def main
+  extconf_start
+  check_narray
 
-# configure options:
-#  --with-x11-dir=path
-#  --with-x11-include=path
-#  --with-x11-lib=path
-dir_config("x11")
+  $objs = %w(rb_pgplot.o kwarg.o)
+  $enable_autobuild = enable_config('autobuild', false)
+  $found_lib = []
 
-# configure options:
-#  --with-pgplot-dir=path
-#  --with-pgplot-include=path
-#  --with-pgplot-lib=path
-dir_config("pgplot")
-
-# Otherwise you can also specify:
-#  --with-opt-dir=path
-#  --with-opt-include=path
-#  --with-opt-lib=path
+  # Check PGPLOT Header
+  if have_header("cpgplot.h")
+    if have_library("cpgplot","cpgbeg")
+      create_makefile("pgplot")
+      exit
+    end
 
-def find_dir_w_file(d,h)
-  g = Dir.glob(RbConfig.expand(d+"/"+h))
-  File.dirname(g.last) if g and !g.empty?
-end
+    # Check for extra libs then re-check for PGPLOT library
+    puts "First check for PGPLOT library failed."
+    check_extra_libs
+    $libs = append_library($libs, "pgplot")
 
-def find_dir_in_gemspec
-  begin
-    require 'rubygems'
-    if gemspec=Gem::Specification.find_by_path('narray')
-      return File.join(gemspec.full_gem_path, gemspec.require_path)
+    if have_library("cpgplot","cpgbeg")
+      create_makefile("pgplot")
+      exit
     end
-  rescue
+  elsif $enable_autobuild
+    check_extra_libs
   end
-  nil
-end
 
-# Check NArray
-gems_dir="$(rubylibprefix)/gems/$(ruby_version)/gems/"
-narray_d="narray-0.[56].*"
-narray_h="narray.h"
-if narray_h_dir =
-    find_dir_in_gemspec ||
-    find_dir_w_file("../"+narray_d,narray_h) ||
-    find_dir_w_file(gems_dir+narray_d,narray_h) ||
-    find_dir_w_file(CONFIG['sitearchdir'],narray_h) ||
-    find_dir_w_file(CONFIG['archdir'],narray_h)
-  $CPPFLAGS = " -I#{narray_h_dir} " + $CPPFLAGS
+  if $enable_autobuild
+    autobuild_pgplot
+  else
+    puts "
+The PGPLOT library was not found.  To auto-build PGPLOT library
+as part of installing Ruby/PGPLOT, pass the --enable-autobuild option.
+
+Examples:
+       Gem install:  gem install pgplot -- --enable-autobuild
+    Manual install:  ruby extconf.rb --enable-autobuild
+
+"
+  end
 end
-exit unless have_header("narray.h")
 
-if RUBY_PLATFORM =~ /cygwin|mingw/
-  $LDFLAGS = " -L#{CONFIG['sitearchdir']} "+$LDFLAGS
-  exit unless have_library("narray","na_make_object")
+
+def extconf_start
+  # configure options:
+  #  --with-pgplot-dir=path
+  #  --with-pgplot-include=path
+  #  --with-pgplot-lib=path
+  dir_config("pgplot")
+
+  # configure options:
+  #  --with-x11-dir=path
+  #  --with-x11-include=path
+  #  --with-x11-lib=path
+  dir_config("x11")
+
+  # Otherwise you can also specify:
+  #  --with-opt-dir=path
+  #  --with-opt-include=path
+  #  --with-opt-lib=path
 end
 
-# Check FORTRAN Libraries
-#
-# SUN WorkShop FORTRAN 77 compiler ver5.0
-# configure options: --with-sunws
-if with_config("sunws")
-  $libs = "-lM77 -lsunmath "+$libs
-  exit unless find_library("F77", "f77_init", "/opt/SUNWspro/lib")
-  $defs.push "-DSPARC_FORTRAN"
-#
-# GNU FORTRAN v4
-elsif have_library("gfortran")
-  $CFLAGS = "-Wall "+$CFLAGS
-  $defs.push "-DGNU_FORTRAN"
-#
-# GNU FORTRAN v3
-elsif have_library("g77")
-  $CFLAGS = "-Wall "+$CFLAGS
-  $defs.push "-DGNU_FORTRAN"
-else
-  puts "failed"
-  exit
+def find_narray_h
+  $LOAD_PATH.each do |x|
+    p x
+    if File.exist? File.join(x,'narray.h')
+      $INCFLAGS = "-I#{x} " + $INCFLAGS
+      break
+    end
+  end
 end
 
-# Check GrWin Library (for cygwin (and mingw32?))
-#  configure options: --with-grwin
-if with_config("grwin")
-  #$LDFLAGS = "-Wl,--subsystem,console "+$LDFLAGS
-  if RUBY_PLATFORM =~ /cygwin|mingw/
-    $libs += " -mwindows"
+def find_libnarray_a
+  $LOAD_PATH.each do |x|
+    if File.exist? File.join(x,'libnarray.a')
+      $LDFLAGS = "-L#{x} " + $LDFLAGS
+      break
+    end
   end
-  exit unless have_library("GrWin", "GWinit")
 end
 
-$found_lib = []
+def check_narray
+  require "narray"
+  find_narray_h
+  if !have_header("narray.h")
+    puts "
+  Header numo/narray.h was not found. Give pathname as follows:
+  % ruby extconf.rb --with-narray-include=narray_h_dir"
+    exit(1)
+  end
 
-# Check X11 Library
-if have_library("X11", "XOpenDisplay")
-  $found_lib << 'X11'
+  if RUBY_PLATFORM =~ /mswin|cygwin|mingw/
+    find_libnarray_a
+    unless have_library("narray","na_make_object")
+      puts "libnarray.a not found"
+      exit(1)
+    end
+  end
 end
 
-# Check PNG Library
-libs_save = $libs
-$libs = append_library($libs, "z")
-if have_library("png","png_create_write_struct")
-  $found_lib << 'png'
-else
-  $libs = libs_save
-end
 
-$libs = append_library($libs, "pgplot")
-$have_pgplot = false
+def check_extra_libs
+  # Check FORTRAN Libraries
+  #
+  # SUN WorkShop FORTRAN 77 compiler ver5.0
+  # configure options: --with-sunws
+  if with_config("sunws")
+    $libs = "-lM77 -lsunmath "+$libs
+    exit unless find_library("F77", "f77_init", "/opt/SUNWspro/lib")
+    $defs.push "-DSPARC_FORTRAN"
+  #
+  # GNU FORTRAN v4
+  elsif have_library("gfortran")
+    $CFLAGS = "-Wall "+$CFLAGS
+    $defs.push "-DGNU_FORTRAN"
+  #
+  # GNU FORTRAN v3
+  elsif have_library("g77")
+    $CFLAGS = "-Wall "+$CFLAGS
+    $defs.push "-DGNU_FORTRAN"
+  else
+    puts "failed"
+    exit
+  end
+
+  # Check GrWin Library (for cygwin (and mingw32?))
+  #  configure options: --with-grwin
+  if with_config("grwin")
+    #$LDFLAGS = "-Wl,--subsystem,console "+$LDFLAGS
+    if RUBY_PLATFORM =~ /cygwin|mingw/
+      $libs += " -mwindows"
+    end
+    exit unless have_library("GrWin", "GWinit")
+  end
 
-# Check PGPLOT Header
-if have_header("cpgplot.h")
+  # Check X11 Library
+  if have_library("X11", "XOpenDisplay")
+    $found_lib << 'X11'
+  end
 
-  # Check PGPLOT Library
-  if find_library("cpgplot","cpgbeg", "/usr/lib",
-		  "/usr/local/lib", "/usr/local/pgplot" )
-    $have_pgplot = true
+  # Check PNG Library
+  libs_save = $libs
+  $libs = append_library($libs, "z")
+  if have_library("png","png_create_write_struct")
+    $found_lib << 'png'
+  else
+    $libs = libs_save
   end
 end
 
-$objs = %w(rb_pgplot.o kwarg.o)
 
-if $have_pgplot
+def autobuild_pgplot
+  # Exit unless a fortran compiler was found
+  exit unless %w[gfortran g77].any?{|cmd| system("which #{cmd}")}
+  puts "enabling auto-build PGPLOT Library..."
+
+  $subdir = 'build_lib'
+  $CFLAGS = "-I#{$subdir}/build "+$CFLAGS
+  $LDFLAGS = "-L#{$subdir}/build "+$LDFLAGS
+  $libs = append_library($libs, "cpgplot")
+  $defs.push '-DPGPLOT_DIR=\\"$(PGPLOT_DIR)\\"'
+
   # Generate Makefile
   create_makefile("pgplot")
+
+  # Append PGPLOT install task to Makefile
+  exit unless $makefile_created
+  puts "appending extra install tasks to Makefile"
+  File.open("Makefile","a") do |w|
+    w.print "
+PGPLOT_DIR = $(RUBYARCHDIR)/pgplot
+PGPLOT_BUILD = #{$subdir}/build
+
+$(PGPLOT_BUILD)/libcpgplot.a:
+	(cd #{$subdir}; make build/libcpgplot.a)
+$(PGPLOT_BUILD)/cpgplot.h: $(PGPLOT_BUILD)/libcpgplot.a
+rb_pgplot.o: $(PGPLOT_BUILD)/cpgplot.h
+$(DLLIB): $(PGPLOT_BUILD)/libcpgplot.a
+
+install: install-pgplot
+install-pgplot:
+	$(MAKEDIRS) $(PGPLOT_DIR)
+	$(INSTALL_DATA) $(PGPLOT_BUILD)/grfont.dat $(PGPLOT_DIR)
+	$(INSTALL_DATA) $(PGPLOT_BUILD)/rgb.txt $(PGPLOT_DIR)
+"
+    if $found_lib.include? "X11"
+      w.print \
+"	$(INSTALL_PROG) $(PGPLOT_BUILD)/pgxwin_server $(PGPLOT_DIR)
+
+$(PGPLOT_BUILD)/pgxwin_server: $(PGPLOT_BUILD)/cpgplot.h
+	(cd #{$subdir}; make build/pgxwin_server)
+$(DLLIB): $(PGPLOT_BUILD)/pgxwin_server
+"
+    end
+  end
+
+  puts "creating #{$subdir}/drivers.conf"
+  File.open("#{$subdir}/drivers.conf","w") do |w|
+    w.puts "GIDRIV PPDRIV PSDRIV"
+    w.puts "PNDRIV" if $found_lib.include? "png"
+    w.puts "WDDRIV XWDRIV" if $found_lib.include? "X11"
+  end
+
+  puts "Ready to download and auto-build PGPLOT !!"
 end
+
+main

data/ext/version.h

@@ -1 +1 @@
-#define RUBY_PGPLOT_VERSION "0.1.9"
+#define RUBY_PGPLOT_VERSION "0.2.0"

data/pgplot.gemspec

@@ -0,0 +1,61 @@
+open("ext/version.h") do |f|
+  f.each_line do |l|
+    if /RUBY_PGPLOT_VERSION "([\d.]+)"/ =~ l
+      PKG_VERSION=$1
+      break
+    end
+  end
+end
+
+PGPLOT_GEMSPEC = Gem::Specification.new do |s|
+  s.name = "pgplot"
+  s.version = PKG_VERSION
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Masahiro Tanaka"]
+  s.date = Time.now.strftime("%F")
+  s.description = "PGPLOT wrapper for Ruby"
+  s.email = "masa16.tanaka@gmail.com"
+  s.extensions = ["ext/extconf.rb"]
+  s.homepage = "http://masa16.github.io/ruby-pgplot/"
+  s.require_paths = ["."]
+  s.rubyforge_project = "pgplot"
+  s.rubygems_version = "2.0.0"
+  s.summary = "PGPLOT wrapper for Ruby. The PGPLOT library needs to be " \
+              "installed in advance using GNU FORTRAN compiler"
+  s.files = `git ls-files FuncUsage README README.ja Rakefile demo ext pgplot.gemspec test`.split($/)
+
+  s.add_dependency('narray', '< 0.7.0')
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+
+  # Documentation TODO
+  s.rdoc_options = %w[
+    --title Ruby/PGPLOT
+    --main README
+    --exclude demo/
+    --exclude test/
+    --exclude pgplot/
+    --exclude ext/build_lib/
+    --exclude ext/Makefile
+    --exclude ext/build-pgplot.rb
+    --exclude ext/cogen.rb
+    --exclude ext/cpgplot.h
+    --exclude ext/depend
+    --exclude ext/extconf.rb
+    --exclude ext/kwarg.c
+    --exclude ext/rb_pgplot.c.in
+    --exclude ext/version.h
+    --exclude .*\.o
+    --exclude pgplot\.so
+  ]
+  s.has_rdoc = true
+  s.extra_rdoc_files = %w[README README.ja FuncUsage ext/rb_pgplot.c]
+end

metadata

@@ -1,59 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: pgplot
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Masahiro Tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 description: PGPLOT wrapper for Ruby
 email: masa16.tanaka@gmail.com
 executables: []
 extensions:
-- ext/extconf-auto.rb
+- ext/extconf.rb
 extra_rdoc_files:
 - README
 - README.ja
 - FuncUsage
 - ext/rb_pgplot.c
 files:
+- FuncUsage
 - README
 - README.ja
-- FuncUsage
+- Rakefile
 - demo/pgdemo1.rb
 - demo/pgdemo15.rb
 - demo/pgdemo3.rb
 - demo/pgdemo4.rb
 - demo/pgdemo9.rb
+- ext/build_lib/Makefile
+- ext/build_lib/download.rb
+- ext/build_lib/drivers.rb
+- ext/build_lib/makefile.rb
+- ext/build_lib/patch.rb
 - ext/cogen.rb
 - ext/depend
 - ext/extconf.rb
-- ext/extconf-auto.rb
 - ext/kwarg.c
+- ext/rb_pgplot.c
 - ext/rb_pgplot.c.in
 - ext/version.h
-- ext/build_lib/Makefile
-- ext/build_lib/download.rb
-- ext/build_lib/drivers.rb
-- ext/build_lib/makefile.rb
+- pgplot.gemspec
 - test/pgband.rb
 - test/pgcurs.rb
 - test/pggray.rb
@@ -62,63 +65,60 @@ files:
 - test/pgncur.rb
 - test/pgolin.rb
 - test/pgtick.rb
-- ext/rb_pgplot.c
-homepage: http://pgplot.rubyforge.org/
+homepage: http://masa16.github.io/ruby-pgplot/
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - Ruby/PGPLOT
-- --main
+- "--main"
 - README
-- --exclude
+- "--exclude"
 - demo/
-- --exclude
+- "--exclude"
 - test/
-- --exclude
+- "--exclude"
 - pgplot/
-- --exclude
+- "--exclude"
 - ext/build_lib/
-- --exclude
+- "--exclude"
 - ext/Makefile
-- --exclude
+- "--exclude"
 - ext/build-pgplot.rb
-- --exclude
+- "--exclude"
 - ext/cogen.rb
-- --exclude
+- "--exclude"
 - ext/cpgplot.h
-- --exclude
+- "--exclude"
 - ext/depend
-- --exclude
+- "--exclude"
 - ext/extconf.rb
-- --exclude
-- ext/extconf-auto.rb
-- --exclude
+- "--exclude"
 - ext/kwarg.c
-- --exclude
+- "--exclude"
 - ext/rb_pgplot.c.in
-- --exclude
+- "--exclude"
 - ext/version.h
-- --exclude
-- .*\.o
-- --exclude
+- "--exclude"
+- ".*\\.o"
+- "--exclude"
 - pgplot\.so
 require_paths:
-- .
+- "."
 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: pgplot
-rubygems_version: 2.0.0
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 2
 summary: PGPLOT wrapper for Ruby. The PGPLOT library needs to be installed in advance

data/ext/extconf-auto.rb

@@ -1,72 +0,0 @@
-# extconf.rb : Configure script for Ruby/PGPLOT
-#
-#   Copyright (c) 2000,2001 Masahiro TANAKA <masa@ir.isas.ac.jp>
-#
-#   This program is free software.
-#   You can distribute/modify this program
-#   under the same terms as Ruby itself.
-#   NO WARRANTY.
-#
-# usage: ruby extconf.rb [configure options]
-
-# Narray is now Gem based, so require rubygems
-# so that we can use Gem class to find narray.
-
-load "./extconf.rb"
-
-exit if $have_pgplot
-exit unless %w[gfortran g77].any?{|cmd| system("which #{cmd}")}
-
-puts "enabling auto-build PGPLOT Library..."
-
-$subdir = 'build_lib'
-
-$CFLAGS = "-I#{$subdir}/build "+$CFLAGS
-$LDFLAGS = "-L#{$subdir}/build "+$LDFLAGS
-
-$libs = append_library($libs, "pgplot")
-$libs = append_library($libs, "cpgplot")
-$defs.push '-DPGPLOT_DIR=\\"$(PGPLOT_DIR)\\"'
-
-# Generate Makefile
-create_makefile("pgplot")
-
-# Append PGPLOT install task to Makefile
-if $makefile_created
-  puts "appending extra install tasks to Makefile"
-  File.open("Makefile","a") do |w|
-    w.print <<EOL
-
-PGPLOT_DIR = $(RUBYARCHDIR)/pgplot
-PGPLOT_BUILD = #{$subdir}/build
-
-$(PGPLOT_BUILD)/libcpgplot.a:
-	(cd #{$subdir}; make build/libcpgplot.a)
-$(PGPLOT_BUILD)/cpgplot.h: $(PGPLOT_BUILD)/libcpgplot.a
-rb_pgplot.o: $(PGPLOT_BUILD)/cpgplot.h
-$(DLLIB): $(PGPLOT_BUILD)/libcpgplot.a
-
-install: install-pgplot
-install-pgplot:
-	$(MAKEDIRS) $(PGPLOT_DIR)
-	$(INSTALL_DATA) $(PGPLOT_BUILD)/grfont.dat $(PGPLOT_DIR)
-	$(INSTALL_DATA) $(PGPLOT_BUILD)/rgb.txt $(PGPLOT_DIR)
-EOL
-    if $found_lib.include? "X11"
-      w.print <<EOL
-	$(INSTALL_PROG) $(PGPLOT_BUILD)/pgxwin_server $(PGPLOT_DIR)
-
-$(PGPLOT_BUILD)/pgxwin_server: $(PGPLOT_BUILD)/cpgplot.h
-	(cd #{$subdir}; make build/pgxwin_server)
-$(DLLIB): $(PGPLOT_BUILD)/pgxwin_server
-EOL
-    end
-  end
-
-  puts "creating #{$subdir}/drivers.conf"
-  File.open("#{$subdir}/drivers.conf","w") do |w|
-    w.puts "GIDRIV PPDRIV PSDRIV"
-    w.puts "PNDRIV" if $found_lib.include? "png"
-    w.puts "WDDRIV XWDRIV" if $found_lib.include? "X11"
-  end
-end