graphicsmagick 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDJmODRhNWFlNjc3Yzc2NWY5N2U4OGIzNzNhZjBlNTJmZTA0MmY5Nw==
-  data.tar.gz: !binary |-
-    YWRhMDc1MTUyZjcyNWIyNmNhMjQ5MGY0YTBjY2RjMWExZDU4MTYwZg==
+SHA256:
+  metadata.gz: 3ab21c37d819c49def5a8aa98a3ed90a6ab0f1f6717fac438d8250f06f604d99
+  data.tar.gz: 219be75aa7b43b7fdd644418de9b0deff2cc56c276d4439f0333c021b09f6c81
 SHA512:
-  metadata.gz: !binary |-
-    NjEzMDZkNjU0NjBmNjgzNDMwNjdlMTI1YTkxNWJjM2ZjMTY5N2E5ZjA5Njdi
-    NmMxMzRmMmUzNTdhM2Q0NTYwMzI2ZGJiNjU2NTY3YzZjN2FmNmUyMzNkZTdl
-    Mzg5MWI2OTI0MzJlZGYxNmY1M2Y3NDRmZDc3YThlNTlhMjEwYzc=
-  data.tar.gz: !binary |-
-    ZWQzMmNiMGI5MGI2NTI5OTcxYTU5MDdmYzQ0OGZlOTNkZDVjZGE5MTAwYzgw
-    MWMyMWU2MmQ4ZGE1NDFiYjQxMWFmZDgzY2UzZjk0ODkzYWY1YTNjMmRiNGZm
-    OGFkYmYwMDlkNDFiMjE3ZTg5NDU1NGQwZjQxOTNmZGNmMDQ0ZDg=
+  metadata.gz: 8273a3e318dd6fcb3f7f88e659761aac43e26f19e4b63cb3fc51946060d8718de6558e24e8cd38a60bab16dee5e713ef1c8980dc5f576a27355270c8a8ff20ae
+  data.tar.gz: 3197104fe4949341eb052db6ad55712aac15aea7abad7dc6c0046bc596bddcb8c0bf02793e2fc3e6d5bf87cd80f560a2e07cce3c8d91a047b1c6cada0cfa6aa6

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store
+mkmf.log

data/lib/graphicsmagick/image.rb

@@ -2,87 +2,92 @@ require 'tempfile'
 require 'subexec'
 require 'shellwords'
 require 'graphicsmagick/utilities'
-require 'active_support/core_ext/numeric/time'
 
 module GraphicsMagick
+  UnknownOptionError = Class.new(StandardError)
 
-	UnknownOptionError = Class.new(StandardError)
+  class Image
+    attr_reader :file
 
-	class Image
-		attr_reader :file
-
-		include GraphicsMagick::Utilities
+    include GraphicsMagick::Utilities
 
     def initialize(input)
-    	@command_options = []
-    	@utility = nil
+      @command_options = []
+      @utility = nil
 
-    	@file = parse_input(input)
-  	end
+      @file = parse_input(input)
+    end
 
-  	# Returns the path of the associated file
-  	def path
-  		@file.path
-  	end
+    # Returns the path of the associated file
+    def path
+      @file.path
+    end
 
-  	# Writes the changes to the file specified in +output+.
-  	# Set +:timeout => 30.seconds+ to change the timeout value. Default is one minute.
-  	def write output, opts={}
-  		output_path = parse_input(output, false)
+    # Writes the changes to the file specified in +output+.
+    # Set +:timeout => 30.seconds+ to change the timeout value.
+    # Default is one minute.
+    def write(output, opts = {})
+      output_path = parse_input(output, false)
 
-  		FileUtils.copy_file(self.path, output_path) unless requires_output_file?
-  		
-  		command = build_command(output_path)
-  		run(command, opts)
-  		GraphicsMagick::Image.new(output_path)
-  	end
+      FileUtils.copy_file(path, output_path) unless requires_output_file?
 
+      command = build_command(output_path)
+      run(command, opts)
+      GraphicsMagick::Image.new(output_path)
+    end
 
-  	# Writes the changes to the current file.
-  	# Set +:timeout => 30.seconds+ to change the timeout value. Default is one minute.
-  	def write! opts={}
-  		raise NoMethodError, "You cannot use Image#write(output) with the #{current_utility} command" if requires_output_file?
+    # Writes the changes to the current file.
+    # Set +:timeout => 30.seconds+ to change the timeout value.
+    # Default is one minute.
+    def write!(opts = {})
+      if requires_output_file?
+        raise NoMethodError, "You cannot use Image#write(output) with "\
+                             "the #{current_utility} command"
+      end
 
-  		command = build_command(path)
-  		run(command, opts)
-  		self
-  	end
+      command = build_command(path)
+      run(command, opts)
+      self
+    end
 
-  	protected
+    protected
 
-  	def method_missing(method, *args, &block)
-      add_option("-#{method.to_s.gsub(/_/,'-')}", *args)
+    def method_missing(method, *args, &block)
+      add_option("-#{method.to_s.gsub(/_/, '-')}", *args)
     end
 
     private
 
-    def add_option option_name, *args
-    	@command_options << {:name => option_name, :args => args.collect { |a| Shellwords.escape(a.to_s) }.join(" ")}
-    	self
+    def add_option(option_name, *args)
+      @command_options << {
+        name: option_name,
+        args: args.collect { |a| Shellwords.escape(a.to_s) }.join(' ')
+      }
+      self
     end
 
-    def run command, opts={}
-    	opts.reverse_merge!(:timeout => 1.minute)
-    	command = "gm #{command}"
-    	cmd = Subexec.run(command, opts)
+    def run(command, opts = {})
+      opts = { timeout: 60 }.merge(opts)
+      command = "gm #{command}"
+      cmd = Subexec.run(command, opts)
 
       if cmd.exitstatus != 0
-      	raise UnknownOptionError, "#{command} failed: #{cmd.output}"
+        raise UnknownOptionError, "#{command} failed: #{cmd.output}"
       end
     ensure
-    	@command_options = []
-    	@utility = nil
+      @command_options = []
+      @utility = nil
     end
 
-    def parse_input(input, output_as_file=true)
-    	if input.is_a? String
-    		return output_as_file ? File.new(input) : input
-    	elsif input.is_a?(File) || input.is_a?(Tempfile)
-    		return output_as_file ? input : input.path
-    	else
-    		raise TypeError, "You must specify a file as a String, File, or Tempfile object"
-    	end
+    def parse_input(input, output_as_file = true)
+      if input.is_a?(String)
+        output_as_file ? File.new(input) : input
+      elsif input.is_a?(File) || input.is_a?(Tempfile)
+        output_as_file ? input : input.path
+      else
+        raise TypeError,
+              'You must specify a file as a String, File, or Tempfile object'
+      end
     end
-
-	end
-end
+  end
+end

data/lib/graphicsmagick/version.rb

@@ -1,3 +1,3 @@
 module GraphicsMagick
-  VERSION = "1.0.5"
+  VERSION = '1.0.6'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: graphicsmagick
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Chad McGimpsey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subexec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Light ruby wrapper for the GraphicsMagick CLI.
@@ -31,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -39,7 +39,6 @@ files:
 - Rakefile
 - graphicsmagick.gemspec
 - lib/graphicsmagick.rb
-- lib/graphicsmagick/.DS_Store
 - lib/graphicsmagick/image.rb
 - lib/graphicsmagick/utilities.rb
 - lib/graphicsmagick/utilities/composite.rb
@@ -57,17 +56,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.6
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Light ruby wrapper for the GraphicsMagick CLI.