mojo_magick 0.5.5 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eac3d5826a0b9a1ec1af5f3e2fc9426fa1ae5e6e
-  data.tar.gz: 4df48720e9ebda2703298deb9fbb06ed7ce9baf7
+SHA256:
+  metadata.gz: 93f3aa9373877c8a0a09828441a83f62a4f633b0779642dd881460295ec117d1
+  data.tar.gz: '0395757ba6b054c84b1d649333d32b6ce085eaad407a3a80e1b23054cc5a6f32'
 SHA512:
-  metadata.gz: a79fbec51705e82b87e0a88b1f230a35bc9b1dad95633f687658e9019223c249e935b74c39e9b489f55f6163b43b940008ff179c5d75489e28ba905fe499a473
-  data.tar.gz: d36c224300d79d6308b02b426e175c9f136777b73e35b61cbb32f9b9619ca1b58274c779e9b74292ebd2b6fc5a5cc9e9b1a274a01b4a95a4511b1e730a9d88c6
+  metadata.gz: 2b417825f921e106e47a2a0387cd8dff673d468b40a95387cfbef1be8d3811067b2ee7d0115117fecaa8a39dfa77e5bec7ac9fb9fa49f8711a93df6d92e172b3
+  data.tar.gz: ef4726ee3b9db797d1eab003d54ebd53dba4af804583a353ae96f0299fd4f0de8dca632beb214df43bb658935166eaa66788cbbb45e102a4698a2262e76a9630

data/.circleci/config.yml

@@ -0,0 +1,25 @@
+version: 2.1
+orbs:
+  ruby: circleci/ruby@1.1.2
+
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.6.6-browsers
+    executor: ruby/default
+    steps:
+      - checkout
+      - run:
+          name: Which bundler?
+          command: bundle -v
+      - ruby/install-deps
+      - run:
+          name: install imagemagick
+          command: sudo apt-get install imagemagick ghostscript
+      - run:
+          name: tests
+          command: bundle exec rake
+      - run:
+          name: audit
+          command: bundle exec bundle-audit update && bundle exec bundle-audit check
+      - ruby/rubocop-check

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.rubocop-common.yml

@@ -0,0 +1,99 @@
+AllCops:
+  NewCops: enable
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  Exclude:
+    - "bin/*"
+    - "db/schema.rb"
+    - "lib/templates/**/*"
+    - "**/node_modules/**/*"
+    - "tmp/**/*"
+    - "vendor/**/*"
+    - "log/**/*"
+
+Layout/CaseIndentation:
+  Enabled: false
+
+Layout/FirstArrayElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/HashAlignment:
+  Enabled: false
+
+Layout/LineLength:
+  Max: 120
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+Lint/ScriptPermission:
+  Exclude:
+    - "Rakefile"
+
+Metrics/AbcSize:
+  Max: 35
+  Exclude:
+    - "spec/**/*"
+
+Metrics/BlockLength:
+  CountComments: false
+  Max: 50
+  Exclude:
+    - "config/**/*"
+    - "spec/**/*"
+
+Metrics/ClassLength:
+  Max: 250
+  Exclude:
+    - "spec/**/*"
+
+Metrics/MethodLength:
+  Max: 25
+  Exclude:
+    - "db/migrate/*"
+    - "spec/**/*"
+
+Naming/PredicateName:
+  Enabled: false
+
+Security/YAMLLoad:
+  Enabled: false
+
+Style/BarePercentLiterals:
+  EnforcedStyle: percent_q
+
+Style/BlockDelimiters:
+  EnforcedStyle: braces_for_chaining
+
+Style/Documentation:
+  Enabled: false
+
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: never
+
+Style/Lambda:
+  EnforcedStyle: literal
+
+Style/ModuleFunction:
+  EnforcedStyle: extend_self
+
+Style/MutableConstant:
+  Enabled: false
+
+Style/PreferredHashMethods:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+Style/TernaryParentheses:
+  EnforcedStyle: require_parentheses_when_complex

data/.rubocop-performance.yml

@@ -0,0 +1,2 @@
+Performance/Casecmp:
+  Enabled: false

data/.rubocop-rspec.yml

@@ -0,0 +1,33 @@
+# Request and system specs by definition do not test specific classes/modules,
+# so they are excluded from following the `describe ClassOrModule` rule.
+RSpec/DescribeClass:
+  Exclude:
+    - "spec/features/**/*"
+    - "spec/requests/**/*"
+    - "spec/system/**/*"
+
+# Prefer short examples but allow some flexibility (up to 12 lines). System
+# specs are excluded from this cop because they often involve many sequential
+# steps, and forcing these to be shorter can make them harder to follow.
+RSpec/ExampleLength:
+  Max: 12 # Default is 5
+  Exclude:
+    - "spec/features/**/*"
+    - "spec/system/**/*"
+
+# If an `it` block does not have a description (i.e. the example relies on
+# RSpec magic to infer the description), then prefer it use the `is_expected`
+# syntax instead of `expect(subject)`, like this:
+# it { is_expected.to be_truthy }
+RSpec/ImplicitSubject:
+  EnforcedStyle: single_statement_only
+
+# Ideal BDD is to have one `expect` per example (so that each specification can
+# have corresponding documentation in the form of an `it` block), but we allow
+# some flexibility (up to 3). System specs are often long capybara flows with
+# many expectations, so we exclude them from this cop.
+RSpec/MultipleExpectations:
+  Max: 3 # Default is 1
+  Exclude:
+    - "spec/features/**/*"
+    - "spec/system/**/*"

data/.rubocop.yml

@@ -0,0 +1,11 @@
+require:
+  - rubocop-performance
+
+inherit_from:
+  - ./.rubocop-common.yml
+  - ./.rubocop-performance.yml
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+Metrics/PerceivedComplexity:
+  Max: 10

data/.ruby-version

@@ -1 +1 @@
-2.1.5
+2.6.6

data/Gemfile

@@ -1,3 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+
+group :test, :development do
+  gem "irb", require: false
+  gem "simplecov", require: false
+end
 
 gemspec

data/Gemfile.lock

@@ -1,26 +1,74 @@
 PATH
   remote: .
   specs:
-    mojo_magick (0.5.5)
+    mojo_magick (0.6.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.4)
-    multi_json (1.8.2)
-    rake (0.9.2.2)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    ast (2.4.1)
+    bundle-audit (0.1.0)
+      bundler-audit
+    bundler-audit (0.7.0.1)
+      bundler (>= 1.2.0, < 3)
+      thor (>= 0.18, < 2)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
+    io-console (0.5.7)
+    irb (1.3.2)
+      reline (>= 0.1.5)
+    minitest (5.14.2)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.8.2)
+    reline (0.2.2)
+      io-console (~> 0.5)
+    rexml (3.2.4)
+    rspec-expectations (3.10.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (1.1.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 1.0.1)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.1.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.10.1)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    thor (1.0.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundle-audit
+  bundler
+  irb
+  minitest
   mojo_magick!
   rake
   rspec-expectations
+  rubocop
+  rubocop-performance
   simplecov
+
+BUNDLED WITH
+   1.17.2

data/README.md

@@ -10,6 +10,7 @@ This tool came about because I wanted a fast, simple, lightweight, nothing-goes-
 because-it's-too-simple-to-break image tool.
 
 [![Gem Version](https://badge.fury.io/rb/mojo_magick.png)](http://badge.fury.io/rb/mojo_magick)
+[![Build Status](https://circleci.com/gh/rcode5/mojo_magick/tree/master.svg?style=shield&circle-token=8d2252bd460bf1a7cdaad5c2e169698605afb981)]()
 
 Using it
 ========
@@ -17,11 +18,11 @@ Using it
 Add to your Gemfile
 
     gem 'mojo_magick'
-    
+
 Require it in your ruby code
 
     require 'mojo_magick'
-    
+
 Go to town! Check out a couple of simple [examples, here](examples/)
 
 Examples
@@ -138,7 +139,7 @@ complex commands.
 
 ### Get a list of available fonts
 
-    fonts = MojoMagick::get_fonts
+    fonts = MojoMagick::available_fonts
 
     fonts.first
     => #<MojoMagick::Font:0x000001015a8b90 @name="AvantGarde-Book", @family="AvantGarde", @style="Normal", @stretch="Normal", @weight="400", @glyphs="/usr/local/share/ghostscript/fonts/a010013l.pfb">
@@ -196,7 +197,7 @@ Availablility
 Contributions
 =============
 
-Got a fix?  Got a feature?  
+Got a fix?  Got a feature?
 
 * fork it
 * make a branch (named appropriately)
@@ -210,6 +211,36 @@ in the new code
 
 Recent Changes
 ==============
+#### Version 0.6.3
+
+* Major cleanup and refactor (https://github.com/rcode5/mojo_magick/pull/33)
+* Deprecated `MojoMagick.get_fonts` in favor of `MojoMagick.available_fonts`
+* Moved `raw_command` and `execute` and `execute!` methods into their own module (and added deprecation warnings)
+* Renamed `Util::Parser` to `Util::FontParser` because that's what it does 
+* Overall rubocop and ruby clean up
+
+#### Version 0.6.2
+
+* fix `annotate` option.  Now it takes keyword arguments for geometry.
+
+#### Version 0.6.1
+
+* pushed and yanked - defunct version
+
+#### Version 0.6.0
+
+* general cleanup and update gems - ready for ImageMagick 7
+* dumped resource limit handling
+* PR #29, #30
+
+#### Version 0.5.6
+
+*  add `get_format` method to help with quoted source file
+
+#### Version 0.5.5
+
+*  Refactor raw_command into execute! and execute methods so that for cases where we don't care about exit status, it can be easily ignored
+
 #### Version 0.5.4
 
 * Include image magick commandline failure from raw_command (on failure)

data/Rakefile

@@ -1,20 +1,22 @@
-require 'rubygems'
+require "rubygems"
+require "simplecov"
+require "rake/testtask"
 
-task 'default' => :test
+task default: [:test]
 
-desc "Default: run tests"
-task :test do
-  require 'simplecov'
-  SimpleCov.start
-  require 'rake/runtest'
-  files = Dir.glob(File.join(File.dirname(__FILE__), 'test/*_test.rb'))
-  files.each do |f|
-    Rake.run_tests f
-  end
+Rake::TestTask.new do |t|
+  t.libs = ["minitest"]
+  t.test_files = Dir.glob(File.join(File.dirname(__FILE__), "test/*_test.rb"))
+  t.verbose = true
 end
 
 desc "Build gem"
 task :build do
   `rm mojo_magick-*.gem`
-  puts `gem build mojo_magick.gemspec`  
+  puts `gem build mojo_magick.gemspec`
+end
+
+desc "Release"
+task release: :build do
+  puts `gem push mojo_magick-*.gem`
 end

data/examples/animated_gif.rb

@@ -1,22 +1,19 @@
 #!/usr/bin/env ruby
-#
+require "mojo_magick"
 
-require 'mojo_magick'
-
-MojoMagick::convert(nil, 'animated.gif') do |c|
-  c.size '200x200'
+MojoMagick.convert(nil, "animated.gif") do |c|
+  c.size "200x200"
   c.delay 100
   c.image_block do # first layer
-    c.background 'blue'
-    c.fill 'white'
-    c.gravity 'northwest'
-    c.label 'NW'
+    c.background "blue"
+    c.fill "white"
+    c.gravity "northwest"
+    c.label "NW"
   end
   c.image_block do # second layer
-    c.background 'transparent'
-    c.fill 'red'
-    c.gravity 'southeast'
-    c.label 'SE'
+    c.background "transparent"
+    c.fill "red"
+    c.gravity "southeast"
+    c.label "SE"
   end
 end
-

data/examples/composite.rb

@@ -1,23 +1,20 @@
 #!/usr/bin/env ruby
-#
+require "mojo_magick"
 
-require 'mojo_magick'
-
-MojoMagick::convert(nil, 'composite_out.png') do |c|
-  c.size '200x200'
+MojoMagick.convert(nil, "composite_out.png") do |c|
+  c.size "200x200"
   c.delay 100
   c.image_block do # first layer
-    c.background 'blue'
-    c.fill 'white'
-    c.gravity 'northwest'
-    c.label 'NW'
+    c.background "blue"
+    c.fill "white"
+    c.gravity "northwest"
+    c.label "NW"
   end
   c.image_block do # second layer
-    c.background 'transparent'
-    c.fill 'red'
-    c.gravity 'southeast'
-    c.label 'SE'
+    c.background "transparent"
+    c.fill "red"
+    c.gravity "southeast"
+    c.label "SE"
   end
   c.composite
 end
-