githubchart 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b97eb7ceecad0e89eb0b4656223434f2f0ed4b8
-  data.tar.gz: 7c5d787fa39f84aa3e35d9ca4f41e1b987689fc9
+  metadata.gz: 10dfa80d371c52dba32328690e164a7a9a08d9dc
+  data.tar.gz: 57831c4b0694a31f41e8ad24fc58d2519885465f
 SHA512:
-  metadata.gz: a906582a33f89c0bbcd419d0d5fedb82137e3e917f3a5a0f20a9221756edbf8d88412e730b40ae963cc3a2fbd4d782ed1a4ba600d223e7fe0febe4e38643542c
-  data.tar.gz: f9078318fe62638941647021185aa404495dec8cd43e1c58bf3a742dba99f440d3974c45fc8415bf015eff2b4d05ac5a9d2ea11a18143b135f732b06f2c57c53
+  metadata.gz: 88d6755bf2df598c47e2369f1cece14616ee7b4e7b12aa7e9ed3f1bf1823ee821b0820312daa92d6f8ac3898af89b4a6b3a61ee913ac6d1875009b30b8fbccfa
+  data.tar.gz: 9f893ad3059e55ca31497af62926fa0c27e3b03c78d4bd4c97f5da45e7a3fc6a591f29ca92cd784ca5e841219694b612b64770cb7d8e3f9ff2487d56fb43b6d0

data/.circle-ruby

@@ -0,0 +1,3 @@
+2.3.1
+2.2.5
+2.1.10

data/Gemfile

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

data/README.md

@@ -3,7 +3,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/circleci/project/akerl/githubchart/master.svg)](https://circleci.com/gh/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"
@@ -36,11 +39,9 @@ OptionParser.new do |opts|
     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,6 +50,12 @@ 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
@@ -57,7 +64,7 @@ end.parse!
 
 SVG_Path = ARGV.shift
 
-Chart = GithubChart.new(options).svg
+Chart = GithubChart.new(options).render(render_type)
 
 if SVG_Path.nil?
   puts Chart

data/circle.yml

@@ -1,12 +1,6 @@
 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'
+  - 'for i in $(cat .circle-ruby) ; do rvm-exec $i bundle install || exit 1 ; done'
 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'
+  - 'for i in $(cat .circle-ruby) ; do rvm-exec $i bundle exec rake || exit 1 ; done'

data/githubchart.gemspec

@@ -16,13 +16,13 @@ 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', '~> 1.3.0'
   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.45.0'
+  s.add_development_dependency 'rake', '~> 11.3.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.5.0'
+  s.add_development_dependency 'fuubar', '~> 2.2.0'
 end
 

data/lib/githubchart.rb

@@ -62,6 +62,13 @@ module GithubChart
       @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
 
     ##

data/lib/githubchart/svg.rb

@@ -7,11 +7,14 @@ module GithubChart
   # Declare SVG support
 
   add_support(:svg)
+  add_support(:svg_square)
 
   ##
   # Convert stats into SVG
   class Chart
-    def svg
+    private
+
+    def render_svg
       grid = matrix
       chart = SVGPlot.new(width: 13 * grid.column_size + 13,
                           height: 13 * grid.row_size + 13)
@@ -21,7 +24,13 @@ module GithubChart
       chart.to_s
     end
 
-    private
+    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.to_s
+    end
 
     # rubocop:disable Style/HashSyntax, Lint/UnneededDisable
 
@@ -57,11 +66,11 @@ module GithubChart
 
     # rubocop:enable Style/HashSyntax, Lint/UnneededDisable
 
-    def svg_add_points(grid, chart)
+    def svg_add_points(grid, chart, padding = 14)
       grid.each_with_index do |point, y, x|
         next if point.score == -1
         chart.rectangle(
-          (x * 13) + 14, (y * 13) + 14, 11, 11,
+          (x * 13) + padding, (y * 13) + padding, 11, 11,
           data: { score: point.score, date: point.date },
           style: svg_point_style(point)
         )

data/lib/githubchart/version.rb

@@ -1,5 +1,5 @@
 ##
 # Define the version
 module GithubChart
-  VERSION = '1.1.0'.freeze
+  VERSION = '2.0.0'.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

@@ -37,6 +37,13 @@ describe GithubChart do
       ).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: 2.0.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-11-07 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: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: svgplot
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.45.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.45.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.0
+        version: 11.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.0
+        version: 11.3.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
 description: Uses GithubStats to grab Github contributions scores and converts that
   into an SVG
 email: me@lesaker.org
@@ -116,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circle-ruby"
 - ".gitignore"
 - ".prospectus"
 - ".rspec"