githubchart 1.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5b97eb7ceecad0e89eb0b4656223434f2f0ed4b8
-  data.tar.gz: 7c5d787fa39f84aa3e35d9ca4f41e1b987689fc9
+SHA256:
+  metadata.gz: e48f3f535441ab20fe77836268a92837324868897746d1e1fad41058bf4e6267
+  data.tar.gz: 0b56932b2b156217e3da81a0f99ece4d2dbf0b5802bd456b066562d4fe9ca8ff
 SHA512:
-  metadata.gz: a906582a33f89c0bbcd419d0d5fedb82137e3e917f3a5a0f20a9221756edbf8d88412e730b40ae963cc3a2fbd4d782ed1a4ba600d223e7fe0febe4e38643542c
-  data.tar.gz: f9078318fe62638941647021185aa404495dec8cd43e1c58bf3a742dba99f440d3974c45fc8415bf015eff2b4d05ac5a9d2ea11a18143b135f732b06f2c57c53
+  metadata.gz: fc030737c81d2f3a47f48ce48f470ccf067a7c99bf88f0e427b05ab2544883dba87592d4ba8ca84e61a5e7fa04d94044243d1f33e92d2911faa3aa3e9c35fc75
+  data.tar.gz: 80bc87ebcb7330a88a508b958899ddf981b638ed714f18be9d434a6e6a0aef70c488c8dda403ee1093f12c06779f040de12cffbf2bc909243cae747ff12c9a89

data/.circle-ruby

@@ -0,0 +1,4 @@
+2.6.1
+2.5.3
+2.4.5
+2.3.8

data/.prospectus

@@ -1,11 +1,11 @@
+my_slug = 'akerl/githubchart'
+
+Prospectus.extra_dep('file', 'prospectus_travis')
+Prospectus.extra_dep('file', 'prospectus_gems')
+
 item do
-  expected do
-    static
-    set 'green'
-  end
+  noop
 
-  actual do
-    gemnasium
-    slug 'akerl/githubchart'
-  end
+  extend ProspectusGems::Gemspec.new
+  extend ProspectusTravis::Build.new(my_slug)
 end

data/.rubocop.yml

@@ -1,2 +1,2 @@
-Encoding:
-    Enabled: false
+inherit_gem:
+  goodcop: .rubocop.yml

data/.travis.yml

@@ -1,17 +1,10 @@
-language: ruby
-cache: bundler
-sudo: false
-rvm:
-- 2.2.2
-- 2.2.1
-- 2.2.0
-- 2.1.6
-- 2.0.0-p598
-- 1.9.3-p551
+dist: xenial
+install:
+- for i in $(cat .circle-ruby) ; do rvm install $i || exit 1 ; done
+- for i in $(cat .circle-ruby) ; do rvm-exec $i bundle install || exit 1 ; done
+script:
+- for i in $(cat .circle-ruby) ; do rvm-exec $i bundle exec rake || exit 1 ; done
 notifications:
   email: false
-  irc:
-    template:
-    - "%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}"
-    channels:
-    - irc.oftc.net#akerl
+  slack:
+    secure: XOIlpE54Yq450PGd3VI7atmVplX+WRmz+karIxlC+PEWgEbE3G9lCuIKez8OvJ+bS357KEsyF9k2ZhmaxJvQXKtMgQn6I7zBmjBRPm9xAb/ynFujquGsjW+OMAiP/3elq8DS6yvVYUDWBDgRv6SxHF/rLKliuSh4S8NrnuTyfokoWx4i/dIBQyujU6kmRW+2DIfkSY1wTyyb7Qo9HFH3ekOeJrYg+bK2Sm5HSLK+ATKpJ8nWvLirK8KIsQbCSj+Hkt61yBC+3pst51EUI5CwlHF1qxLy9T/eezY+bnUD/0WwcJX10co6K62+qykvN/4pKqYubfSsnYVmU3sZgk0FfRfBNOaYwai6mbZxxcFn4kIUOYoGTML/NTe7bu9dbtbHAM751x/V/tFM1V4m6xap451WQoommuMIcOuGS/OgzeOkc12VQ0X5nXM0DA20MOZKlMUJR+XlYu6derwIvOEOPlazZq8Ta4LQNrMaqax5IzJVyNsSqXMsEkpXDVSpvkwdXeBMy6X02ozNQOrcefoGGLhAtrnewyJnchDxhIy/aG2TUYx6qMGi/zxGr+yKyev2Op3Qwg8FAhJ2Nk3Noa+Tm9ZErcfKhVykowGFYdBurD0M+9eouz4LRQP+JOfvUjmdduEZ9H+uzTou3OCr3pCj+6PLltQRT7C7hNz1YCzocUc=

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+# 3.1.1 / 2020-08-13
+
+* [ENHANCEMENT] Update GithubStats dep
+
+# 3.1.0 / 2017-10-03
+
+* [ENHANCEMENT] GitHub updated their styling; this updated matches that change
+
+# 3.0.0 / 2017-09-29
+
+* [ENHANCEMENT] Upgrade to latest githubstats with better error messages
+
+# 2.1.0 / 2017-08-25
+
+* [ENHANCEMENT] Upgrade to latest githubstats
+
+# 2.0.1 / 2016-11-08
+
+* [BUGFIX] Actually update changelog in release
+
+# 2.0.0 / 2016-11-07
+
+* [FEATURE] Add support for svg_square as a rendering type, thanks @blerchin
+
 # 1.1.0 / 2016-05-19
 
 * [BUGFIX] Upgrade to newer GithubStats that fixes streak parsing

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-

data/README.md

@@ -2,8 +2,7 @@ GithubChart
 ============
 
 [![Gem Version](https://img.shields.io/gem/v/githubchart.svg)](https://rubygems.org/gems/githubchart)
-[![Dependency Status](https://img.shields.io/gemnasium/akerl/githubchart.svg)](https://gemnasium.com/akerl/githubchart)
-[![Build Status](https://img.shields.io/circleci/project/akerl/githubchart.svg)](https://circleci.com/gh/akerl/githubchart)
+[![Build Status](https://img.shields.io/travis/com/akerl/githubchart.svg)](https://travis-ci.com/akerl/githubchart)
 [![Coverage Status](https://img.shields.io/codecov/c/github/akerl/githubchart.svg)](https://codecov.io/github/akerl/githubchart)
 [![Code Quality](https://img.shields.io/codacy/e8ee7e2aba4c4a01b93d5c0493bef68b.svg)](https://www.codacy.com/app/akerl/githubchart)
 [![MIT Licensed](https://img.shields.io/badge/license-MIT-green.svg)](https://tldrlegal.com/license/mit-license)

data/bin/githubchart

@@ -3,7 +3,10 @@
 require 'githubchart'
 require 'optparse'
 
+# rubocop:disable Metrics/BlockLength
 options = {}
+render_type = 'svg'.freeze
+
 OptionParser.new do |opts|
   opts.banner =
     "Usage: githubchart (-u username) (-t type) path/for/new/image\n"
@@ -18,7 +21,6 @@ OptionParser.new do |opts|
     if options.include? :user
       raise 'The --user and --input flags are incompatible with each other.'
     end
-
     if input.eql? '-'
       raise 'No data provided on stdin' if STDIN.tty?
       contents = STDIN.read
@@ -26,21 +28,17 @@ OptionParser.new do |opts|
       raise 'File does not exist' unless File.exist? input
       contents = File.read input
     end
-
     begin
       parsed = JSON.parse(contents)
-    rescue => e
+    rescue StandardError => e
       raise "Unable to parse JSON data provided: #{e}"
     end
-
     options[:data] = GithubStats::Data.new(parsed)
   end
   opts.on('-cSCHEME', '--colors SCHEME', 'Pick a color scheme') do |scheme|
-    if GithubChart::COLOR_SCHEMES.include? scheme.to_sym
-      options[:colors] = scheme.to_sym
-    else
-      raise 'Unknown color scheme provided'
-    end
+    is_good_scheme = GithubChart::COLOR_SCHEMES.include? scheme.to_sym
+    raise('Unknown color scheme provided') unless is_good_scheme
+    options[:colors] = scheme.to_sym
   end
   opts.on('-s', '--schemes', 'List known color schemes') do
     puts 'Color schemes:'
@@ -49,15 +47,22 @@ OptionParser.new do |opts|
     end
     exit
   end
+  opts.on('-t TYPE', '--type TYPE', 'What type to render') do |type|
+    raise('Unsupported render type') unless GithubChart.supported.include?(
+      type.to_sym
+    )
+    render_type = type
+  end
   opts.on_tail('-v', '--version', 'Show version') do
     puts GithubChart::VERSION
     exit
   end
 end.parse!
+# rubocop:enable Metrics/BlockLength
 
 SVG_Path = ARGV.shift
 
-Chart = GithubChart.new(options).svg
+Chart = GithubChart.new(options).render(render_type)
 
 if SVG_Path.nil?
   puts Chart

data/githubchart.gemspec

@@ -1,4 +1,5 @@
-$:.unshift File.expand_path('../lib/', __FILE__)
+require 'English'
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'githubchart/version'
 
 Gem::Specification.new do |s|
@@ -16,13 +17,14 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files spec/*`.split
   s.executables = ['githubchart']
 
-  s.add_runtime_dependency 'githubstats', '~> 1.2.0'
+  s.add_runtime_dependency 'githubstats', '~> 3.0.2'
   s.add_runtime_dependency 'svgplot', '~> 1.0.0'
 
-  s.add_development_dependency 'rubocop', '~> 0.40.0'
-  s.add_development_dependency 'rake', '~> 11.1.0'
+  s.add_development_dependency 'rubocop', '~> 0.76.0'
+  s.add_development_dependency 'goodcop', '~> 0.8.0'
+  s.add_development_dependency 'rake', '~> 13.0.0'
   s.add_development_dependency 'codecov', '~> 0.1.1'
-  s.add_development_dependency 'rspec', '~> 3.4.0'
-  s.add_development_dependency 'fuubar', '~> 2.0.0'
+  s.add_development_dependency 'rspec', '~> 3.9.0'
+  s.add_development_dependency 'fuubar', '~> 2.5.0'
 end
 

data/lib/githubchart.rb

@@ -40,7 +40,8 @@ module GithubChart
   ##
   # Color schemes for gradient
   COLOR_SCHEMES = {
-    default: ['#eeeeee', '#d6e685', '#8cc665', '#44a340', '#1e6823'],
+    default: ['#eeeeee', '#c6e48b', '#7bc96f', '#239a3b', '#196127'],
+    old: ['#eeeeee', '#d6e685', '#8cc665', '#44a340', '#1e6823'],
     halloween: ['#EEEEEE', '#FFEE4A', '#FFC501', '#FE9600', '#03001C']
   }.freeze
 
@@ -57,13 +58,31 @@ module GithubChart
 
     def initialize(params = {})
       params = { user: params } unless params.is_a? Hash
-      @stats = params.fetch(:data) { GithubStats.new(params[:user]).data }
+      @stats = load_stats(params[:data], params[:user])
       @colors = params[:colors] || :default
       @colors = COLOR_SCHEMES[@colors] unless @colors.is_a? Array
     end
 
+    def render(type)
+      unless GithubChart.supports? type
+        raise NameError, "Format #{type} is unsupported."
+      end
+      send("render_#{type}".to_sym)
+    end
+
     private
 
+    ##
+    # Load stats from provided arg or github
+
+    def load_stats(data, user)
+      return data if data
+      raise('No data or user provided') unless user
+      stats = GithubStats.new(user).data
+      raise("Failed to find data for #{user} on GitHub") unless stats
+      stats
+    end
+
     ##
     # Convert the data into a matrix of weeks
     # The fill value is used to pad the front and backdd

data/lib/githubchart/svg.rb

@@ -7,61 +7,68 @@ module GithubChart
   # Declare SVG support
 
   add_support(:svg)
+  add_support(:svg_square)
 
   ##
   # Convert stats into SVG
   class Chart
-    def svg
+    private
+
+    CUBE_SIZE = 12
+    X_PAD = 27
+    Y_PAD = 20
+
+    def render_svg
       grid = matrix
-      chart = SVGPlot.new(width: 13 * grid.column_size + 13,
-                          height: 13 * grid.row_size + 13)
+      chart = SVGPlot.new(width: CUBE_SIZE * grid.column_size + X_PAD,
+                          height: CUBE_SIZE * grid.row_size + Y_PAD)
       svg_add_points grid, chart
       svg_add_weekdays chart
       svg_add_months chart
       chart.to_s
     end
 
-    private
+    def render_svg_square
+      grid = matrix.minor(0, 7, -7, 7)
+      chart = SVGPlot.new(width: CUBE_SIZE * grid.column_size - 2,
+                          height: CUBE_SIZE * grid.row_size - 2)
+      svg_add_points grid, chart, 0, 0
+      chart.to_s
+    end
 
-    # rubocop:disable Style/HashSyntax, Lint/UnneededDisable
+    ##
+    # Define shared label style
+
+    SVG_SHARED_STYLE = {
+      fill: '#767676',
+      'text-anchor': 'start',
+      'text-align': 'center',
+      'font-family': '-apple-system, BlinkMacSystemFont, \'Segoe UI\', Helvetica, Arial, sans-serif, \'Apple Color Emoji\', \'Segoe UI Emoji\', \'Segoe UI Symbol\'', # rubocop:disable Metrics/LineLength
+      'white-space': 'nowrap'
+    }.freeze
 
     ##
     # Define style for weekday labels
 
-    SVG_WEEKDAY_STYLE = {
-      :fill => '#ccc',
-      :'text-anchor' => 'middle',
-      :'text-align' => 'center',
-      :font => '9px Helvetica, arial, freesans, clean, sans-serif',
-      :'white-space' => 'nowrap',
-      :display => 'display'
-    }.freeze
+    SVG_WEEKDAY_STYLE = SVG_SHARED_STYLE.dup.merge('font-size': '9px').freeze
 
     ##
     # Define Style for month labels
 
-    SVG_MONTH_STYLE = {
-      :fill => '#aaa',
-      :'text-align' => 'center',
-      :font => '10px Helvetica, arial, freesans, clean, sans-serif',
-      :'white-space' => 'nowrap',
-      :display => 'block'
-    }.freeze
+    SVG_MONTH_STYLE = SVG_SHARED_STYLE.dup.merge('font-size': '10px').freeze
 
     def svg_point_style(point)
       {
         fill: @colors[@stats.quartile(point.score)],
-        :'shape-rendering' => 'crispedges'
+        'shape-rendering': 'crispedges'
       }
     end
 
-    # rubocop:enable Style/HashSyntax, Lint/UnneededDisable
-
-    def svg_add_points(grid, chart)
+    def svg_add_points(grid, chart, xpadding = X_PAD, ypadding = Y_PAD)
       grid.each_with_index do |point, y, x|
         next if point.score == -1
         chart.rectangle(
-          (x * 13) + 14, (y * 13) + 14, 11, 11,
+          (x * CUBE_SIZE) + xpadding, (y * CUBE_SIZE) + ypadding, 10, 10,
           data: { score: point.score, date: point.date },
           style: svg_point_style(point)
         )
@@ -70,10 +77,11 @@ module GithubChart
 
     def svg_add_weekday(chart, point)
       index = point.date.wday
-      letter = point.date.strftime('%a')[0]
+      letter = point.date.strftime('%a')
       style = SVG_WEEKDAY_STYLE.dup
       style[:display] = 'none' unless [1, 3, 5].include? index
-      chart.text(4, 13 * index + 23, style: style) { raw letter }
+      shift = index > 3 ? 29 : 28
+      chart.text(0, CUBE_SIZE * index + shift, style: style) { raw letter }
     end
 
     def svg_add_weekdays(chart)
@@ -96,7 +104,8 @@ module GithubChart
       offsets.shift if [1, 2].include? offsets[1].last
       offsets.each do |month, offset|
         next if offset > 50
-        chart.text(13 * offset + 14, 9, style: SVG_MONTH_STYLE) { raw month }
+        x = CUBE_SIZE * offset + X_PAD
+        chart.text(x, 10, style: SVG_MONTH_STYLE) { raw month }
       end
     end
   end

data/lib/githubchart/version.rb

@@ -1,5 +1,5 @@
 ##
 # Define the version
 module GithubChart
-  VERSION = '1.1.0'.freeze
+  VERSION = '3.1.1'.freeze
 end

data/spec/githubchart/svg_spec.rb

@@ -1,21 +1,26 @@
 require 'spec_helper'
 require 'tempfile'
 
-describe GithubChart::Chart do
-  let(:svg) { GithubChart.new.svg }
+def test_svg(type)
+  file = Tempfile.new('svg')
+  file.write(GithubChart.new(user: 'akerl').render(type))
+  path = file.path
+  file.close
+  res = `file #{path}`
+  file.unlink
+  res
+end
 
-  before(:all) do
-    @file = Tempfile.new('svg')
-    @file.write(GithubChart.new.svg)
-    @path = @file.path
-    @file.close
+describe GithubChart::Chart do
+  describe '#render_svg' do
+    it 'makes an SVG' do
+      expect(test_svg(:svg)).to include('Scalable Vector Graphic')
+    end
   end
 
-  after(:all) { @file.unlink }
-
-  describe '#svg' do
+  describe '#render_svg_square' do
     it 'makes an SVG' do
-      expect(`file #{@path}`).to include('Scalable Vector Graphic')
+      expect(test_svg(:svg_square)).to include('Scalable Vector Graphic')
     end
   end
 end

data/spec/githubchart_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe GithubChart do
   describe '#new' do
     it 'creates a new Chart object' do
-      expect(GithubChart.new).to be_an_instance_of GithubChart::Chart
+      expect(GithubChart.new(data: [])).to be_an_instance_of GithubChart::Chart
     end
   end
 
@@ -22,10 +22,11 @@ describe GithubChart do
 
   describe GithubChart::Chart do
     it 'has default colors' do
-      expect(GithubChart.new.colors.last).to eql '#1e6823'
+      expect(GithubChart.new(data: []).colors.last).to eql '#196127'
     end
     it 'lets you override the colors' do
-      expect(GithubChart.new(colors: [1, 2, 3, 4, 5]).colors.last).to eql 5
+      colors = [1, 2, 3, 4, 5]
+      expect(GithubChart.new(data: [], colors: colors).colors.last).to eql 5
     end
     it 'lets you pass external data' do
       data = JSON.parse(File.read('spec/examples/input.json'))
@@ -33,10 +34,17 @@ describe GithubChart do
     end
     it 'creates a data object when not provided' do
       expect(
-        GithubChart.new(username: 'fly').stats
+        GithubChart.new(user: 'akerl').stats
       ).to be_an_instance_of GithubStats::Data
     end
   end
+
+  describe '#render' do
+    it 'raises error if render type is unsupported' do
+      expect { GithubChart.new(user: 'akerl').render(:dog) }
+        .to raise_error(NameError)
+    end
+  end
 end
 
 describe ::Integer do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githubchart
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Les Aker
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: githubstats
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: svgplot
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.76.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.76.0
+- !ruby/object:Gem::Dependency
+  name: goodcop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.0
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.0
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.5.0
 description: Uses GithubStats to grab Github contributions scores and converts that
   into an SVG
 email: me@lesaker.org
@@ -116,6 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circle-ruby"
 - ".gitignore"
 - ".prospectus"
 - ".rspec"
@@ -127,7 +142,6 @@ files:
 - README.md
 - Rakefile
 - bin/githubchart
-- circle.yml
 - examples/chart.svg
 - examples/other_user.svg
 - githubchart.gemspec
@@ -142,7 +156,7 @@ homepage: https://github.com/akerl/githubchart
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,9 +171,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Generate an SVG of Github contributions data
 test_files:

data/circle.yml

@@ -1,12 +0,0 @@
-dependencies:
-  override:
-    - 'rvm-exec 1.9.3-p551 bundle install'
-    - 'rvm-exec 2.0.0-p645 bundle install'
-    - 'rvm-exec 2.1.6 bundle install'
-    - 'rvm-exec 2.2.2 bundle install'
-test:
-  override:
-    - 'rvm-exec 1.9.3-p551 bundle exec rake'
-    - 'rvm-exec 2.0.0-p645 bundle exec rake'
-    - 'rvm-exec 2.1.6 bundle exec rake'
-    - 'rvm-exec 2.2.2 bundle exec rake'