lolcommits-loltext 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f9348cdaa338b881bf19eca6ad2afaae9c94b761
-  data.tar.gz: 4c90aeb629125bcc2f2eab8bf3f106f779d8ee7f
+SHA256:
+  metadata.gz: 7bb994beb14f6500f65e7daa1627799a8dcebae3e0b878ff555acd189c1a0214
+  data.tar.gz: 5c9f29f4df2846f487c195d94f206f369e2191bda72ac79e0f50e112d766754e
 SHA512:
-  metadata.gz: a104bdf1586ba5a459c47cc5dde0033ff90dea112f4918c02967a695c1b6db087ab1a44c7eadaf3f6c305e466b80a83734c474f8eb0a6b3074dfe20533d83abd
-  data.tar.gz: b813527f9fb04adbd84873687bfef1f6c5c43dc896307a4334f0196b0adfd46b0d3a19dd4b26806d76bd244110600c116888559e893733ddad1e2fa24e90fefb
+  metadata.gz: 55b8edd9835ee27558dfb64a63b5ae54fa651dc7f1b967fbe43e0fcc6e14ad18cc4e72282dbca1a5bc8940403294cb6f774aabb353b531c314fc9f8efab46d48
+  data.tar.gz: be8f188a027eda28a1ee3295a3abe8d32b8ce6be4a4077a1d4c9aa9a08277ced7b58e2ba3ccaf659bd82b281e1d43965083e687f8390932820a48bf0f43300aa

data/.travis.yml

@@ -3,10 +3,10 @@ language: ruby
 cache: bundler
 rvm:
  - 2.0.0
- - 2.1.7
- - 2.2.4
- - 2.3.3
- - 2.4.1
+ - 2.1.10
+ - 2.2.8
+ - 2.3.5
+ - 2.4.2
  - ruby-head
 
 before_install:
@@ -19,6 +19,13 @@ matrix:
   allow_failures:
     - rvm: ruby-head
 
-branches:
-  except:
-    - gh-pages
+env:
+  global:
+    - CC_TEST_REPORTER_ID=8d879fff974ae19930e4c3ae89623aec6a2d86a236a350e5a128360c4142332a
+    - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/README.md

@@ -2,8 +2,8 @@
 
 [![Gem Version](https://img.shields.io/gem/v/lolcommits-loltext.svg?style=flat)](http://rubygems.org/gems/lolcommits-loltext)
 [![Travis Build Status](https://travis-ci.org/lolcommits/lolcommits-loltext.svg?branch=master)](https://travis-ci.org/lolcommits/lolcommits-loltext)
-[![Coverage Status](https://coveralls.io/repos/github/lolcommits/lolcommits-loltext/badge.svg?branch=master)](https://coveralls.io/github/lolcommits/lolcommits-loltext)
-[![Code Climate](https://codeclimate.com/github/lolcommits/lolcommits-loltext/badges/gpa.svg)](https://codeclimate.com/github/lolcommits/lolcommits-loltext)
+[![Maintainability](https://img.shields.io/codeclimate/maintainability/lolcommits/lolcommits-loltext.svg)](https://codeclimate.com/github/lolcommits/lolcommits-loltext/maintainability)
+[![Test Coverage](https://img.shields.io/codeclimate/c/lolcommits/lolcommits-loltext.svg)](https://codeclimate.com/github/lolcommits/lolcommits-loltext/test_coverage)
 [![Gem Dependency Status](https://gemnasium.com/badges/github.com/lolcommits/lolcommits-loltext.svg)](https://gemnasium.com/github.com/lolcommits/lolcommits-loltext)
 
 [lolcommits](https://lolcommits.github.io/) takes a snapshot with your webcam
@@ -83,7 +83,7 @@ try the following:
 
 ```
 loltext:
-  enabled: true
+  :enabled: true
   :message:
     :color: white
     :font: "/Users/matt/Library/Fonts/Raleway-Light.ttf"
@@ -159,7 +159,7 @@ The gem is available as open source under the terms of
 ## Links
 
 * [Travis CI](https://travis-ci.org/lolcommits/lolcommits-loltext)
-* [Test Coverage](https://coveralls.io/github/lolcommits/lolcommits-loltext)
+* [Test Coverage](https://codeclimate.com/github/lolcommits/lolcommits-loltext/test_coverage)
 * [Code Climate](https://codeclimate.com/github/lolcommits/lolcommits-loltext)
 * [RDoc](http://rdoc.info/projects/lolcommits/lolcommits-loltext)
 * [Issues](http://github.com/lolcommits/lolcommits-loltext/issues)

data/lib/lolcommits/loltext/version.rb

@@ -1,5 +1,5 @@
 module Lolcommits
   module Loltext
-    VERSION = "0.0.5".freeze
+    VERSION = "0.0.6".freeze
   end
 end

data/lib/lolcommits/plugin/loltext.rb

@@ -8,15 +8,6 @@ module Lolcommits
         File.dirname(__FILE__), "../../../vendor/fonts/Impact.ttf"
       ).freeze
 
-      ##
-      # Returns the name of the plugin. Identifies the plugin to lolcommits.
-      #
-      # @return [String] the plugin name
-      #
-      def self.name
-        'loltext'
-      end
-
       # Returns position(s) of when this plugin should run during the capture
       # process. We want to add text to the image after capturing, but before
       # capture is ready for sharing.
@@ -34,7 +25,7 @@ module Lolcommits
       # @return [Boolean] true/false indicating if plugin is enabled
       #
       def enabled?
-        !configured? || super
+        configuration.empty? || super
       end
 
       ##
@@ -46,7 +37,7 @@ module Lolcommits
       # @return [Boolean] true/false indicating if plugin is correct configured
       #
       def valid_configuration?
-        !configured? || super
+        configuration.empty? || super
       end
 
       ##
@@ -55,27 +46,20 @@ module Lolcommits
       # @return [Hash] a hash of configured plugin options
       #
       def configure_options!
-        options = super
-        if options['enabled']
-          puts '---------------------------------------------------------------'
-          puts '  LolText options '
-          puts ''
-          puts '  * any blank options will use the (default)'
-          puts '  * always use the full absolute path to fonts'
-          puts '  * valid text positions are NE, NW, SE, SW, S, C (centered)'
-          puts '  * colors can be hex #FC0 value or a string \'white\''
-          puts '      - use `none` for no stroke color'
-          puts '  * overlay fills your image with a random color'
-          puts '      - set one or more overlay_colors with a comma seperator'
-          puts '      - overlay_percent (0-100) sets the fill colorize strength'
-          puts '---------------------------------------------------------------'
-
-          options[:message] = configure_sub_options(:message)
-          options[:sha]     = configure_sub_options(:sha)
-          options[:overlay] = configure_sub_options(:overlay)
-          options[:border]  = configure_sub_options(:border)
-        end
-        options
+        puts '---------------------------------------------------------------'
+        puts '  LolText options '
+        puts ''
+        puts '  * any blank options will use the (default)'
+        puts '  * always use the full absolute path to fonts'
+        puts '  * valid text positions are NE, NW, SE, SW, S, C (centered)'
+        puts '  * colors can be hex #FC0 value or a string \'white\''
+        puts '      - use `none` for no stroke color'
+        puts '  * overlay fills your image with a random color'
+        puts '      - set one or more overlay_colors with a comma seperator'
+        puts '      - overlay_percent (0-100) sets the fill colorize strength'
+        puts '---------------------------------------------------------------'
+
+        super
       end
 
       ##
@@ -89,7 +73,7 @@ module Lolcommits
         image = MiniMagick::Image.open(runner.main_image)
         if config_option(:overlay, :enabled)
           image.combine_options do |c|
-            c.fill config_option(:overlay, :overlay_colors).sample
+            c.fill config_option(:overlay, :overlay_colors).split(',').map(&:strip).sample
             c.colorize config_option(:overlay, :overlay_percent)
           end
         end
@@ -143,31 +127,8 @@ module Lolcommits
         end
       end
 
-      # TODO: consider this type of configuration prompting in Plugin::Base
-      # i.e. allow sub option and working with hash of defaults
-      def configure_sub_options(type)
-        print "#{type}:\n"
-        defaults = config_defaults[type]
-
-        # sort option keys since different `Hash#keys` varys across Ruby versions
-        defaults.keys.sort_by(&:to_s).reduce({}) do |acc, opt|
-          # if we have an enabled key set to false, abort asking for any more options
-          if acc.key?(:enabled) && acc[:enabled] != true
-            acc
-          else
-            print "  #{opt.to_s.tr('_', ' ')} (#{defaults[opt]}): "
-            val = parse_user_input(gets.chomp.strip)
-            # handle array options (comma seperated string)
-            if defaults[opt].is_a?(Array) && !val.nil?
-              val = val.split(',').map(&:strip).delete_if(&:empty?)
-            end
-            acc.merge(opt => val)
-          end
-        end
-      end
-
       # default text styling and positions
-      def config_defaults
+      def default_options
         {
           message: {
             color: 'white',
@@ -191,27 +152,17 @@ module Lolcommits
               '#2e4970', '#674685', '#ca242f', '#1e7882', '#2884ae', '#4ba000',
               '#187296', '#7e231f', '#017d9f', '#e52d7b', '#0f5eaa', '#e40087',
               '#5566ac', '#ed8833', '#f8991c', '#408c93', '#ba9109'
-            ],
+            ].join(','),
             overlay_percent: 50
           },
           border: {
-            color: 'white',
             enabled: false,
+            color: 'white',
             size: 10,
           }
         }
       end
 
-      # return the config option, defaults apply if not set
-      def config_option(type, option)
-        default_option = config_defaults[type][option]
-        if configuration[type]
-          configuration[type][option] || default_option
-        else
-          default_option
-        end
-      end
-
       # explode psuedo-names for text positioning
       def position_transform(position)
         case position

data/lolcommits-loltext.gemspec

@@ -35,10 +35,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.0.0"
 
-  spec.add_development_dependency "lolcommits", ">= 0.9.5"
+  spec.add_development_dependency "lolcommits", ">= 0.10.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "coveralls"
 end

data/test/lolcommits/plugin/loltext_test.rb

@@ -2,17 +2,12 @@ require 'test_helper'
 
 describe Lolcommits::Plugin::Loltext do
 
-  include Lolcommits::TestHelpers::GitRepo
   include Lolcommits::TestHelpers::FakeIO
 
   def plugin_name
     'loltext'
   end
 
-  it 'should have a name' do
-    ::Lolcommits::Plugin::Loltext.name.must_equal plugin_name
-  end
-
   it 'should run on post capturing' do
     ::Lolcommits::Plugin::Loltext.runner_order.must_equal [:post_capture]
   end
@@ -28,9 +23,7 @@ describe Lolcommits::Plugin::Loltext do
   describe 'with a runner' do
     def runner
       # a simple lolcommits runner with an empty configuration Hash
-      @runner ||= Lolcommits::Runner.new(
-        config: OpenStruct.new(read_configuration: {})
-      )
+      @runner ||= Lolcommits::Runner.new
     end
 
     def plugin
@@ -38,17 +31,13 @@ describe Lolcommits::Plugin::Loltext do
     end
 
     def valid_enabled_config
-      @config ||= OpenStruct.new(
-        read_configuration: {
-          'loltext'=> { 'enabled' => true }
-        }
-      )
+      { enabled: true }
     end
 
     describe 'initalizing' do
       it 'should assign runner and an enabled option' do
         plugin.runner.must_equal runner
-        plugin.options.must_equal ['enabled']
+        plugin.options.must_equal [:enabled]
       end
     end
 
@@ -58,16 +47,12 @@ describe Lolcommits::Plugin::Loltext do
       end
 
       it 'should true when configured' do
-        plugin.config = valid_enabled_config
+        plugin.configuration = valid_enabled_config
         plugin.enabled?.must_equal true
       end
     end
 
     describe 'configuration' do
-      it 'should not be configured by default' do
-        plugin.configured?.must_equal false
-      end
-
       it 'should allow plugin options to be configured' do
         # enabled
         inputs = ['true']
@@ -83,18 +68,18 @@ describe Lolcommits::Plugin::Loltext do
         ) * 2
 
         # styling overlay
-        inputs += %w(true  #2884ae,#7e231f 40)
+        inputs += %w(true #2884ae,#7e231f 40)
 
         # border options
-        inputs += %w(#e96d46 true 23)
+        inputs += %w(true #e96d46 23)
 
         configured_plugin_options = {}
-        output = fake_io_capture(inputs: inputs) do
+        fake_io_capture(inputs: inputs) do
           configured_plugin_options = plugin.configure_options!
         end
 
         configured_plugin_options.must_equal( {
-          "enabled" => true,
+          enabled: true,
           message: {
             color: 'red',
             font: 'myfont.ttf',
@@ -113,29 +98,24 @@ describe Lolcommits::Plugin::Loltext do
           },
           overlay: {
             enabled: true,
-            overlay_colors: ['#2884ae', '#7e231f'],
+            overlay_colors: "#2884ae,#7e231f",
             overlay_percent: 40
           },
           border: {
-            color: '#e96d46',
             enabled: true,
+            color: '#e96d46',
             size: 23,
           }
         })
       end
 
-      it 'should indicate when configured' do
-        plugin.config = valid_enabled_config
-        plugin.configured?.must_equal true
-      end
-
       describe '#valid_configuration?' do
         it 'should be trye even if config is not set' do
           plugin.valid_configuration?.must_equal(true)
         end
 
         it 'should be true for a valid configuration' do
-          plugin.config = valid_enabled_config
+          plugin.configuration = valid_enabled_config
           plugin.valid_configuration?.must_equal true
         end
       end

data/test/test_helper.rb

@@ -11,12 +11,7 @@ require 'lolcommits/test_helpers/git_repo'
 require 'lolcommits/test_helpers/fake_io'
 
 if ENV['COVERAGE']
-  if ENV['TRAVIS']
-    require 'coveralls'
-    Coveralls.wear!
-  else
-    require 'simplecov'
-  end
+  require 'simplecov'
 end
 
 # plugin gem test libs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits-loltext
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Matthew Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolcommits
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |2
     Overlay the commit message and sha on your lolcommit. Configure text style,
     positioning and an optional transparent overlay.
@@ -142,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: lolcommits commit message annotation plugin