gruff 0.3.7 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f87f85fa28083c6c5de44ae3ff41f6ec46c23b87
+  data.tar.gz: a53548ce9aad15d9790b783e89c430e9152c46a6
+SHA512:
+  metadata.gz: 0c29244b01317a82ca81b1090d1b24d956e8c7437cca469847aba06f9c48128ea2d47c76b9fd8db76fb02c08671e47e18b98a677fc149154140af413aed8e190
+  data.tar.gz: 5f30539089e2b77e077e95df0117316771b901c6415f7710cbfb0bd5875e74607889433b8f8df8cadc4f918bae91207e074809c48b8ac8d586ddd02f306f3f1c

data/.gitignore

@@ -1,6 +1,7 @@
+*~
 /.idea/
 /pkg/
 .DS_Store
-/test/output
 .bundle
 .yardoc
+Gemfile.lock

data/.travis.yml

@@ -1,8 +1,14 @@
 language: ruby
+notifications:
+  email:
+    - uwe@kubosch.no
 rvm:
   - "1.8.7"
   - "1.9.3"
+  - "2.0.0"
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
+  - jruby-20mode # JRuby in 2.0 mode
   - rbx-18mode
   - rbx-19mode
+  - rbx-20mode

data/Gemfile

@@ -4,13 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'rake'
-
-  platform :ruby do
-    gem 'rmagick'
-  end
-
-  platform :jruby do
-    gem 'rmagick4j'
+  if RUBY_VERSION =~ /^1\.9\./ || RUBY_VERSION =~ /^2\.0\./
+    gem 'minitest-reporters'
   end
 end

data/History.txt

@@ -1,3 +1,79 @@
+== 0.4.0
+
+All old branches and pull requests have been merged or deleted.  Over 40
+issues have been resolved!  Ruby 2.0 compatibility has been confirmed.
+Several new features.
+
+Features:
+
+* Issue #38 Separate themes into Gruff::Themes module
+* Issue #39 Add staggered labels
+* Issue #40 Added spacing factor to bar graphs
+* Issue #41 Add rotation to spider chart
+* Issue #65 Add RMagick and RMagick4J respectively as dependencies to the
+  Gruff gem
+* Issue #81 Ensure Ruby 2.0 compatibility
+
+Bugfixes:
+
+* Issue #17 Baseline drawn at incorrect position
+* Issue #21 Division By Zero Error on Documented Example
+* Issue #36 When writing the same chart multiple times, it should not be
+  rendered again.
+* Issue #44 XY Datasets are inconvenient to use. (documentation and/or
+  code is wrong)
+* Issue #46 issue with markers that are floats
+* Issue #51 line with nil in dataset
+* Issue #52 Wrong direction in y_axis_label
+* Issue #54 Explicitly specify overlapping for lines (Gruff::Line)
+* Issue #58 Clean up data sorting
+* Issue #59 Escape '%' in labels
+* Issue #60 Correct DOT graph drawing
+* Issue #63 Some charts are drawn with transparent text when running with
+  JRuby/RMagick4J
+* Issue #66 Marker line for 54.0 is missing on bar_set_marker.png example
+* Issue #68 Y-axis label for bar_x_y_labels.png should be rotated when
+  drawn with JRuby
+
+Support:
+
+* Issue #4 Scaling a graph leads to fuzzy pictures
+* Issue #8 zero-width bar entries drawn
+* Issue #11 Feature: Data value markers
+* Issue #18 Set encoding to uft-8
+* Issue #24 Gruff::SideStackedBar
+* Issue #35 Add option for line height in legend.
+* Issue #49 font directive is not setting font in charts
+* Issue #53 Is this project still alive?
+
+Documentation:
+
+* Issue #57 Build failing on Travis and no Build Status image in Readme
+
+Pull requests:
+
+* Issue #9 Add gradient background direction
+* Issue #12 Bar updates
+* Issue #14 Make use of the TEXT_OFFSET_PERCENTAGE const variable
+* Issue #16 Fix exception when y_axis_increment is used in line bars
+* Issue #26 Fix bug with additional point included on area charts
+* Issue #27 Added marker_shadow_color to allow to draw shadows below
+  marker lines
+* Issue #37 Update lib/gruff/base.rb: set legend under the graph
+* Issue #42 Update lib/gruff/base.rb: set legend under the graph
+* Issue #43 Fixed issue #25
+* Issue #48 add license information to the gemspec
+* Issue #56 Fixed gem file generation problem
+
+Internal:
+
+* Issue #80 Remove the .rmvrc file from the project
+
+
+== 0.3.7
+
+* ???
+
 == 0.3.6
 
 * Fixed manifest to list dot graph [theirishpenguin]

data/MIT-LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2005-2008 Topfunky Corporation boss@topfunky.com
+Copyright (c) 2005-2012 Topfunky Corporation boss@topfunky.com
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -18,4 +20,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/README.md

@@ -1,5 +1,8 @@
 # Gruff Graphs
 
+[![Build Status](https://travis-ci.org/topfunky/gruff.png?branch=master)](https://travis-ci.org/topfunky/gruff)
+[![Gem Version](https://badge.fury.io/rb/gruff.png)](http://badge.fury.io/rb/gruff)
+
 A library for making beautiful graphs.
 
 ## WARNING
@@ -24,23 +27,110 @@ Or install it yourself as:
 
 ## Usage
 
-See the test suite in test/line_test.rb for examples.
+```Ruby
+require 'gruff'
+g = Gruff::Line.new
+g.title = 'Wow!  Look at this!'
+g.labels = { 0 => '5/6', 1 => '5/15', 2 => '5/24', 3 => '5/30', 4 => '6/4',
+             5 => '6/12', 6 => '6/21', 7 => '6/28' }
+g.data :Jimmy, [25, 36, 86, 39, 25, 31, 79, 88]
+g.data :Charles, [80, 54, 67, 54, 68, 70, 90, 95]
+g.data :Julie, [22, 29, 35, 38, 36, 40, 46, 57]
+g.data :Jane, [95, 95, 95, 90, 85, 80, 88, 100]
+g.data :Philip, [90, 34, 23, 12, 78, 89, 98, 88]
+g.data :Arthur, [5, 10, 13, 11, 6, 16, 22, 32]
+g.write('exciting.png')
+```
+
+## Examples
+
+You can find many examples in the [test](https://github.com/topfunky/gruff/tree/master/test)
+directory along with their resulting charts in the
+[output](https://github.com/topfunky/gruff/tree/master/test/output) directory.
+
+You can find older examples here:  http://nubyonrails.com/pages/gruff
+
+### Accumulator bar chart
+
+![Accumulator bar chart](https://raw.github.com/topfunky/gruff/master/test/output/accum_bar.png)
+
+### Area chart
+
+![Area chart](https://raw.github.com/topfunky/gruff/master/test/output/area_keynote.png)
+
+### Bar chart
+
+![Bar chart](https://raw.github.com/topfunky/gruff/master/test/output/bar_rails_keynote.png)
+
+### Bezier chart
+
+In progress!
+
+![Bezier chart](https://raw.github.com/topfunky/gruff/master/test/output/bezier_3.png)
+
+### Bullet chart
+
+In progress!
+
+![Bullet chart](https://raw.github.com/topfunky/gruff/master/test/output/bullet_greyscale.png)
+
+### Dot chart
+
+![Dot chart](https://raw.github.com/topfunky/gruff/master/test/output/dot.png)
+
+### Line chart
 
-## Samples
+![Line chart](https://raw.github.com/topfunky/gruff/master/test/output/line_theme_rails_keynote_.png)
+
+### LineXY chart
+
+![LineXY chart](https://raw.github.com/topfunky/gruff/master/test/output/line_xy.png)
+
+### Net chart
+
+![Net chart](https://raw.github.com/topfunky/gruff/master/test/output/net_wide_graph.png)
+
+### Pie chart
+
+![Pie chart](https://raw.github.com/topfunky/gruff/master/test/output/pie_pastel.png)
+
+### Scatter chart
+
+![Scatter chart](https://raw.github.com/topfunky/gruff/master/test/output/scatter_basic.png)
+
+### Side bar chart
+
+![Side bar chart](https://raw.github.com/topfunky/gruff/master/test/output/side_bar.png)
+
+### Side stacked bar chart
+
+![Side stacked bar chart](https://raw.github.com/topfunky/gruff/master/test/output/side_stacked_bar_keynote.png)
+
+### Spider chart
+
+![Spider chart](https://raw.github.com/topfunky/gruff/master/test/output/spider_37signals.png)
+
+### Stacked area chart
+
+![Stacked area chart](https://raw.github.com/topfunky/gruff/master/test/output/stacked_area_keynote.png)
+
+### Stacked bar chart
+
+![Stacked bar chart](https://raw.github.com/topfunky/gruff/master/test/output/stacked_bar_keynote.png)
 
-http://nubyonrails.com/pages/gruff
 
 ## Documentation
 
-http://gruff.rubyforge.org
+http://www.rubydoc.info/github/topfunky/gruff/frames
+
 
 ## Contributing
 
-== Source
+### Source
 
 The source for this project is now kept at GitHub:
 
-http://github.com/topfunky/gruff/tree/master
+http://github.com/topfunky/gruff
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/RELEASE.md

@@ -0,0 +1,92 @@
+Subject: [ANN] Gruff 0.4.0 released!
+
+The Gruff team is pleased to announce the release of Gruff 0.4.0.
+
+New in version 0.4.0:
+
+All old branches and pull requests have been merged or deleted.  Over 40
+issues have been resolved!  Ruby 2.0 compatibility has been confirmed.
+Several new features.
+
+Features:
+
+* Issue #38 Separate themes into Gruff::Themes module
+* Issue #39 Add staggered labels
+* Issue #40 Added spacing factor to bar graphs
+* Issue #41 Add rotation to spider chart
+* Issue #65 Add RMagick and RMagick4J respectively as dependencies to the
+  Gruff gem
+* Issue #81 Ensure Ruby 2.0 compatibility
+    
+Bugfixes:
+
+* Issue #17 Baseline drawn at incorrect position
+* Issue #21 Division By Zero Error on Documented Example
+* Issue #36 When writing the same chart multiple times, it should not be
+  rendered again.
+* Issue #44 XY Datasets are inconvenient to use. (documentation and/or
+  code is wrong)
+* Issue #46 issue with markers that are floats
+* Issue #51 line with nil in dataset
+* Issue #52 Wrong direction in y_axis_label
+* Issue #54 Explicitly specify overlapping for lines (Gruff::Line)
+* Issue #58 Clean up data sorting
+* Issue #59 Escape '%' in labels
+* Issue #60 Correct DOT graph drawing
+* Issue #63 Some charts are drawn with transparent text when running with
+  JRuby/RMagick4J
+* Issue #66 Marker line for 54.0 is missing on bar_set_marker.png example
+* Issue #68 Y-axis label for bar_x_y_labels.png should be rotated when
+  drawn with JRuby
+    
+Support:
+
+* Issue #4 Scaling a graph leads to fuzzy pictures
+* Issue #8 zero-width bar entries drawn
+* Issue #11 Feature: Data value markers
+* Issue #18 Set encoding to uft-8
+* Issue #24 Gruff::SideStackedBar
+* Issue #35 Add option for line height in legend.
+* Issue #49 font directive is not setting font in charts
+* Issue #53 Is this project still alive?
+    
+Documentation:
+
+* Issue #57 Build failing on Travis and no Build Status image in Readme
+    
+Pull requests:
+
+* Issue #9 Add gradient background direction
+* Issue #12 Bar updates
+* Issue #14 Make use of the TEXT_OFFSET_PERCENTAGE const variable
+* Issue #16 Fix exception when y_axis_increment is used in line bars
+* Issue #26 Fix bug with additional point included on area charts
+* Issue #27 Added marker_shadow_color to allow to draw shadows below
+  marker lines
+* Issue #37 Update lib/gruff/base.rb: set legend under the graph
+* Issue #42 Update lib/gruff/base.rb: set legend under the graph
+* Issue #43 Fixed issue #25
+* Issue #48 add license information to the gemspec
+* Issue #56 Fixed gem file generation problem
+    
+Internal:
+
+* Issue #80 Remove the .rmvrc file from the project
+    
+You can find a complete list of issues here:
+
+* https://github.com/topfunky/gruff/issues?state=closed&milestone=2
+
+
+Installation:
+
+    gem install gruff
+
+You can find an introductory tutorial at
+https://github.com/topfunky/gruff
+
+Enjoy!
+
+
+--
+The Gruff Team

data/Rakefile

@@ -1,21 +1,19 @@
-require "rubygems"
-require "bundler/gem_tasks"
+require 'rubygems'
+require 'bundler/gem_tasks'
 require 'rake/testtask'
-
 require 'rake/clean'
-$:.unshift(File.dirname(__FILE__) + "/lib")
 
-CLEAN << ['pkg', 'test/output/*']
+CLEAN << %w(pkg test/output/*)
 
-desc "Run tests"
+desc 'Run tests'
 task :default => :test
 
-Rake::TestTask.new do |t|
- t.libs << 'test'
-end
+task :gem => :build
+
+Rake::TestTask.new
 
 namespace :test do
-  desc "Run mini tests"
+  desc 'Run mini tests'
   task :mini => :clean do
     Dir['test/test_mini*'].each do |file|
       system "ruby #{file}"
@@ -23,16 +21,198 @@ namespace :test do
   end
 end
 
-##
-# Catch unmatched tasks and run them as a unit test.
-# Makes it possible to do
-#
-#  rake pie
-#
-# To run the +test/test_pie+ and +test/test_mini_pie+ files.
-#rule '' do |t|
-#  # Rake::Task["clean"].invoke
-#  Dir["test/test_*#{t.name}*.rb"].each do |filename|
-#    system "ruby #{filename}"
-#  end
-#end
+desc 'Generate release docs for a given milestone'
+task :release_docs do
+  raise "\n    This task requires Ruby 1.9 or newer to parse JSON as YAML.\n\n" if RUBY_VERSION == '1.8.7'
+  categories, grouped_issues, milestone, milestone_description, milestone_name = get_github_issues
+
+  puts '=' * 80
+  puts
+  release_doc = <<EOF
+Subject: [ANN] Gruff #{milestone_name} released!
+
+The Gruff team is pleased to announce the release of Gruff #{milestone_name}.
+
+New in version #{milestone_name}:
+
+#{milestone_description}
+
+#{(categories.keys & grouped_issues.keys).map do |cat|
+    "#{cat}:\n
+#{grouped_issues[cat].map { |i| wrap(%Q{* Issue ##{i['number']} #{i['title']}},2) }.join("\n")}
+    "
+  end.join("\n")}
+You can find a complete list of issues here:
+
+* https://github.com/topfunky/gruff/issues?state=closed&milestone=#{milestone}
+
+
+Installation:
+
+    gem install gruff
+
+You can find an introductory tutorial at
+https://github.com/topfunky/gruff
+
+Enjoy!
+
+
+--
+The Gruff Team
+EOF
+
+  puts release_doc
+  puts
+  puts '=' * 80
+
+  unless Gem::Version.new(Gruff::VERSION).prerelease?
+    File.write('RELEASE.md', release_doc)
+  end
+end
+
+desc 'Fetch download stats form rubygems.org'
+task :stats do
+  require 'time'
+  require 'date'
+  require 'rubygems'
+  require 'uri'
+  require 'net/http'
+  require 'net/https'
+  require 'openssl'
+  require 'yaml'
+  host = 'rubygems.org'
+  base_uri = "https://#{host}/api/v1"
+  https = Net::HTTP.new(host, 443)
+  https.use_ssl = true
+  https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+  counts_per_month = Hash.new { |h, k| h[k] = Hash.new { |mh, mk| mh[mk] = 0 } }
+  total = 0
+
+  %w{gruff}.each do |gem|
+    versions_uri = URI("#{base_uri}/versions/#{gem}.yaml")
+    req = Net::HTTP::Get.new(versions_uri.request_uri)
+    res = https.start { |http| http.request(req) }
+    versions = YAML.load(res.body).sort_by { |v| Gem::Version.new(v['number']) }
+    puts "\n#{gem}:\n#{versions.map { |v| "#{Time.parse(v['built_at']).strftime('%Y-%m-%d')} #{'%10s' % v['number']} #{v['downloads_count']}" }.join("\n")}"
+
+    versions.each do |v|
+      downloads_uri = URI("#{base_uri}/versions/#{gem}-#{v['number']}/downloads/search.yaml?from=#{Time.parse(v['built_at']).strftime('%Y-%m-%d')}&to=#{Date.today}")
+      req = Net::HTTP::Get.new(downloads_uri.request_uri)
+      res = https.start { |http| http.request(req) }
+      counts = YAML.load(res.body)
+      counts.delete_if { |date_str, count| count == 0 }
+      counts.each do |date_str, count|
+        date = Date.parse(date_str)
+        counts_per_month[date.year][date.month] += count
+        total += count
+      end
+      print '.'; STDOUT.flush
+    end
+    puts
+  end
+
+  puts "\nDownloads statistics per month:"
+  years = counts_per_month.keys
+  puts "\n    #{years.map { |year| '%6s:' % year }.join(' ')}"
+  (1..12).each do |month|
+    print "#{'%2d' % month}:"
+    years.each do |year|
+      count = counts_per_month[year][month]
+      print count > 0 ? '%8d' % count : ' ' * 8
+    end
+    puts
+  end
+
+  puts "\nTotal: #{total}\n\n"
+
+  puts "\nRubyGems download statistics per month:"
+  years = counts_per_month.keys
+  puts '    ' + years.map { |year| '%-12s' % year }.join
+  (0..20).each do |l|
+    print (l % 10 == 0) ? '%4d' % ((20-l) * 100) : '    '
+    years.each do |year|
+      (1..12).each do |month|
+        count = counts_per_month[year][month]
+        if [year, month] == [Date.today.year, Date.today.month]
+          count *= (Date.new(Date.today.year, Date.today.month, -1).day.to_f / Date.today.day).to_i
+        end
+        print count > ((20-l) * 100) ? '*' : ' '
+      end
+    end
+    puts
+  end
+  puts '    ' + years.map { |year| '%-12s' % year }.join
+
+  puts "\nTotal: #{total}\n\n"
+end
+
+
+def get_github_issues
+  puts 'GitHub login:'
+  begin
+    require 'rubygems'
+    require 'highline/import'
+    user = ask('login   : ') { |q| q.echo = true }
+    pass = ask('password: ') { |q| q.echo = '*' }
+  rescue Exception
+    print 'user name: '; user = STDIN.gets.chomp
+    print ' password: '; pass = STDIN.gets.chomp
+  end
+  require 'uri'
+  require 'net/http'
+  require 'net/https'
+  require 'openssl'
+  require 'yaml'
+  host = 'api.github.com'
+  base_uri = "https://#{host}/repos/topfunky/gruff"
+  https = Net::HTTP.new(host, 443)
+  https.use_ssl = true
+  https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+  milestone_uri = URI("#{base_uri}/milestones")
+  req = Net::HTTP::Get.new(milestone_uri.request_uri)
+  req.basic_auth(user, pass)
+  res = https.start { |http| http.request(req) }
+  milestones = YAML.load(res.body).sort_by { |i| Date.parse(i['due_on']) }
+  puts milestones.map { |m| "#{'%2d' % m['number']} #{m['title']}" }.join("\n")
+
+  if defined? ask
+    milestone = ask('milestone: ', Integer) { |q| q.echo = true }
+  else
+    print 'milestone: '; milestone = STDIN.gets.chomp
+  end
+
+  uri = URI("#{base_uri}/issues?milestone=#{milestone}&state=closed&per_page=1000")
+  req = Net::HTTP::Get.new(uri.request_uri)
+  req.basic_auth(user, pass)
+  res = https.start { |http| http.request(req) }
+  issues = YAML.load(res.body).sort_by { |i| i['number'] }
+  milestone_name = issues[0] ? issues[0]['milestone']['title'] : "No issues for milestone #{milestone}"
+  milestone_description = issues[0] ? issues[0]['milestone']['description'] : "No issues for milestone #{milestone}"
+  milestone_description = milestone_description.split("\r\n").map{|l|wrap l}.join("\r\n")
+  categories = {
+      'Features' => 'feature', 'Bugfixes' => 'bug', 'Support' => 'support',
+      'Documentation' => 'documentation', 'Pull requests' => nil,
+      'Internal' => 'internal', 'Rejected' => 'rejected', 'Other' => nil
+  }
+  grouped_issues = issues.group_by do |i|
+    labels = i['labels'].map { |l| l['name'] }
+    cat = nil
+    categories.each do |k, v|
+      if labels.include? v
+        cat = k
+        break
+      end
+    end
+    cat ||= i['pull_request'] && i['pull_request']['html_url'] && 'Pull requests'
+    cat ||= 'Other'
+    cat
+  end
+  return categories, grouped_issues, milestone, milestone_description, milestone_name
+end
+
+def wrap(string, indent = 0)
+  string.scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n" + ' ' * indent)
+end
+