githubchart 2.1.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a256147befb46b1059f9e6b9d5be479c61de11f
-  data.tar.gz: 2097baa5f511c7e4d6eed17f86ae5f266a0a33e9
+  metadata.gz: 12ecb34761bd3f4f318e52195201320f239421a3
+  data.tar.gz: 83f0fd65e8f03d458faca75f4147c0de74065775
 SHA512:
-  metadata.gz: 13287b1c631bd6a1ff3855ae836406a83eb005e645d90c9c44ae7a7f2db44d80723467f85e539d20c08b8a0cb9e9b022c209a9c678df73b9fa302cf9a2f445cd
-  data.tar.gz: 1e5f586ec76d5b34cc6d2f9428c73e4da13e7ed2a37de74323434798d00c7f1529a5c769621f794494b7ea82316a6794f1025b26908039e22f7ffa2ebbe0a0ef
+  metadata.gz: af152bb8f0f252f9cb20a9ab5bdb9c33dd1eb13931216fc069b6f1fa6fd1b7754ff6b8ce4e114a5ee95ac5f8641f1e8aba45684ef057ac16f547018305b5f51c
+  data.tar.gz: cadae5c1945e63b6bc31d49f4fa07b0a8e9b04871992c334213f772ad4c7b90c30a07770de2204dab119a6d18cad45f98387e2219db8686ed8984f5973fa435b

data/.circle-ruby

@@ -1,3 +1,3 @@
-2.4.1
-2.3.4
-2.2.7
+2.4.2
+2.3.5
+2.2.8

data/.rubocop.yml

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

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 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

data/bin/githubchart

@@ -32,7 +32,7 @@ OptionParser.new do |opts|
 
     begin
       parsed = JSON.parse(contents)
-    rescue => e
+    rescue StandardError => e
       raise "Unable to parse JSON data provided: #{e}"
     end
 

data/githubchart.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files spec/*`.split
   s.executables = ['githubchart']
 
-  s.add_runtime_dependency 'githubstats', '~> 1.4.0'
+  s.add_runtime_dependency 'githubstats', '~> 2.0.0'
   s.add_runtime_dependency 'svgplot', '~> 1.0.0'
 
-  s.add_development_dependency 'rubocop', '~> 0.49.0'
-  s.add_development_dependency 'rake', '~> 12.0.0'
+  s.add_development_dependency 'rubocop', '~> 0.50.0'
+  s.add_development_dependency 'goodcop', '~> 0.1.0'
+  s.add_development_dependency 'rake', '~> 12.1.0'
   s.add_development_dependency 'codecov', '~> 0.1.1'
   s.add_development_dependency 'rspec', '~> 3.6.0'
   s.add_development_dependency 'fuubar', '~> 2.2.0'

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,7 +58,7 @@ 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
@@ -71,6 +72,17 @@ module GithubChart
 
     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

@@ -14,10 +14,14 @@ module GithubChart
   class Chart
     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
@@ -26,36 +30,34 @@ module GithubChart
 
     def render_svg_square
       grid = matrix.minor(0, 7, -7, 7)
-      chart = SVGPlot.new(width: 13 * grid.column_size - 2,
-                          height: 13 * grid.row_size - 2)
-      svg_add_points grid, chart, 0
+      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 style for weekday labels
+    # Define shared label style
 
-    SVG_WEEKDAY_STYLE = {
-      :fill => '#ccc',
-      :'text-anchor' => 'middle',
+    SVG_SHARED_STYLE = {
+      :fill => '#767676',
+      :'text-anchor' => 'start',
       :'text-align' => 'center',
-      :font => '9px Helvetica, arial, freesans, clean, sans-serif',
-      :'white-space' => 'nowrap',
-      :display => 'display'
+      :'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 = 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)
       {
@@ -64,13 +66,11 @@ module GithubChart
       }
     end
 
-    # rubocop:enable Style/HashSyntax, Lint/UnneededDisable
-
-    def svg_add_points(grid, chart, padding = 14)
+    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) + padding, (y * 13) + padding, 11, 11,
+          (x * CUBE_SIZE) + xpadding, (y * CUBE_SIZE) + ypadding, 10, 10,
           data: { score: point.score, date: point.date },
           style: svg_point_style(point)
         )
@@ -79,10 +79,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)
@@ -105,7 +106,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 = '2.1.0'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/spec/githubchart_spec.rb

@@ -1,11 +1,9 @@
 require 'spec_helper'
 
-# rubocop:disable Metrics/BlockLength
-
 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
 
@@ -24,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'))
@@ -35,7 +34,7 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githubchart
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: githubstats
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: svgplot
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.50.0
+- !ruby/object:Gem::Dependency
+  name: goodcop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 12.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 12.1.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Generate an SVG of Github contributions data