dragonfly 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ffd2bb4d5173409df91ab216ffad595d9d92071
-  data.tar.gz: 20b8fe94c9af91ba77b18d990142c349c5eab9ef
+  metadata.gz: 5a47133559b55bb240e3e977a7a21bf6c20b3bb0
+  data.tar.gz: 2e8427ea7731176f305fa8c9db9021b0fcb993f9
 SHA512:
-  metadata.gz: 9582f0a75464c24764a614a8c70a73a8889864eca6cebe1c47a4c1556b487c73414152c4c9db38c3c3d245c94c6808f7090d4f12d4f2d426fbd1d4d82ba6c6cb
-  data.tar.gz: 16553d6fbf78c3d7d30670c659f3725cdd33061f535b0d96fcd8bb4a733073aebae5df3a453dc434fcc1353a4b97b75db3d264969d9313bdf2d4710e4d7edaa6
+  metadata.gz: 0b913360c4b6b7d3aa3eec21616ecf5f02b3e39b674a30bf31bbe696380b0326e2b2b918b91ac3f8858b62af5ac3a5966dc843de941104e219e28e0afcc2e0d0
+  data.tar.gz: a1e0950d8088f9237df79290bdef52b01e6eae07f42792974eb23e2386134d9f3759c9d05ea8f077eaf5f99f8abe12eb56686a164b867347c6684665f75ba469

data/History.md

@@ -1,3 +1,12 @@
+1.2.0 (2018-11-13)
+===================
+Fixes
+-----
+- Replaced `quote` with `escape` for escaping shell commands - works with paths with apostrophes
+Changes
+-----
+- Replaced Open3.popen3 with now recommended Open3.capture3 (tomasc)
+
 1.1.5 (2018-03-23)
 ===================
 Fixes

data/lib/dragonfly/content.rb

@@ -137,7 +137,7 @@ module Dragonfly
     #   # ===> "beach.jpg: image/jpeg"
     def shell_eval(opts={})
       should_escape = opts[:escape] != false
-      command = yield(should_escape ? shell.quote(path) : path)
+      command = yield(should_escape ? shell.escape(path) : path)
       run command, :escape => should_escape
     end
 
@@ -152,7 +152,7 @@ module Dragonfly
       ext = opts[:ext] || self.ext
       should_escape = opts[:escape] != false
       tempfile = Utils.new_tempfile(ext)
-      new_path = should_escape ? shell.quote(tempfile.path) : tempfile.path
+      new_path = should_escape ? shell.escape(tempfile.path) : tempfile.path
       command = yield(new_path)
       run(command, :escape => should_escape)
       update(tempfile)
@@ -169,8 +169,8 @@ module Dragonfly
       ext = opts[:ext] || self.ext
       should_escape = opts[:escape] != false
       tempfile = Utils.new_tempfile(ext)
-      old_path = should_escape ? shell.quote(path) : path
-      new_path = should_escape ? shell.quote(tempfile.path) : tempfile.path
+      old_path = should_escape ? shell.escape(path) : path
+      new_path = should_escape ? shell.escape(tempfile.path) : tempfile.path
       command = yield(old_path, new_path)
       run(command, :escape => should_escape)
       update(tempfile)

data/lib/dragonfly/shell.rb

@@ -15,14 +15,11 @@ module Dragonfly
     end
 
     def escape_args(args)
-      args.shellsplit.map do |arg|
-        quote arg.gsub(/\\?'/, %q('\\\\''))
-      end.join(' ')
+      args.shellsplit.map{|arg| escape(arg) }.join(' ')
     end
 
-    def quote(string)
-      q = Dragonfly.running_on_windows? ? '"' : "'"
-      q + string + q
+    def escape(string)
+      Shellwords.escape(string)
     end
 
     private
@@ -36,22 +33,31 @@ module Dragonfly
       def run_command(command)
         result = `#{command}`
         status = $?
-        raise CommandFailed, "Command failed (#{command}) with exit status #{status.exitstatus}" unless status.success?
+        raise_command_failed!(command, status.exitstatus) unless status.success?
         result
+      rescue Errno::ENOENT => e
+        raise_command_failed!(command, nil, e.message)
       end
 
     else
 
       def run_command(command)
-        Open3.popen3 command do |stdin, stdout, stderr, wait_thread|
-          stdin.close_write # make sure it doesn't hang
-          status = wait_thread.value
-          raise CommandFailed, "Command failed (#{command}) with exit status #{status.exitstatus} and stderr #{stderr.read}" unless status.success?
-          stdout.read
-        end
+        stdout_str, stderr_str, status = Open3.capture3(command)
+        raise_command_failed!(command, status.exitstatus, stderr_str) unless status.success?
+        stdout_str
+      rescue Errno::ENOENT => e
+        raise_command_failed!(command, nil, e.message)
       end
 
     end
 
+    def raise_command_failed!(command, status=nil, error=nil)
+      raise CommandFailed, [
+        "Command failed: #{command}",
+        ("exit status: #{status}" if status),
+        ("error: #{error}" if error),
+      ].join(', ')
+    end
+
   end
 end

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.1.5'
+  VERSION = '1.2.0'
 end

data/spec/dragonfly/content_spec.rb

@@ -232,7 +232,7 @@ describe Dragonfly::Content do
         path = p
         "cat #{path}"
       end.should == "big\nstuff"
-      path.should == app.shell.quote(content.path)
+      path.should == app.shell.escape(content.path)
     end
 
     it "allows evaluating without escaping" do
@@ -253,8 +253,8 @@ describe Dragonfly::Content do
         new_path = n
         "cp #{o} #{n}"
       end.should == content
-      old_path.should == app.shell.quote(original_path)
-      new_path.should == app.shell.quote(content.path)
+      old_path.should == app.shell.escape(original_path)
+      new_path.should == app.shell.escape(content.path)
       content.data.should == "big\nstuff"
     end
 

data/spec/dragonfly/image_magick/processors/convert_spec.rb

@@ -29,8 +29,8 @@ describe Dragonfly::ImageMagick::Processors::Convert do
     image.should have_width(280)
   end
 
-  it "should work for files with spaces in the name" do
-    image = Dragonfly::Content.new(app, SAMPLES_DIR.join('white pixel.png'))
+  it "should work for files with spaces/apostrophes in the name" do
+    image = Dragonfly::Content.new(app, SAMPLES_DIR.join("mevs' white pixel.png"))
     processor.call(image, "-resize 2x2!")
     image.should have_width(2)
   end
@@ -65,7 +65,7 @@ describe Dragonfly::ImageMagick::Processors::Convert do
   it "allows converting using specific delegates" do
     expect {
       processor.call(image, '', 'format' => 'jpg', 'delegate' => 'png')
-    }.to call_command(app.shell, %r{'convert' 'png:/[^']+?/beach\.png' '/[^']+?\.jpg'})
+    }.to call_command(app.shell, %r{convert png:/[^']+?/beach\.png /[^']+?\.jpg})
   end
 
   it "maintains the mime_type meta if it exists already" do

data/spec/dragonfly/shell_spec.rb

@@ -22,19 +22,21 @@ describe Dragonfly::Shell do
 
   unless Dragonfly.running_on_windows?
 
+    # NOTE: every \\ translates to a single \ on the command line
     describe "escaping args" do
       {
-        %q(hello) => %q('hello'),
-        %q("hello") => %q('hello'),
-        %q('hello') => %q('hello'),
-        %q(he\'llo) => %q('he'\''llo'),
-        %q('he'\''llo') => %q('he'\''llo'),
-        %q("he'llo") => %q('he'\''llo'),
-        %q(hel$(lo)) => %q('hel$(lo)'),
-        %q(hel\$(lo)) => %q('hel$(lo)'),
-        %q('hel\$(lo)') => %q('hel\$(lo)')
+        %q(hello there) => %q(hello there),
+        %q('hello' 'there') => %q(hello there),
+        %q(he\\'llo there) => %q(he\\'llo there),
+        %q(he\\ llo there) => %q(he\\ llo there),
+        %q("he'llo" there) => %q(he\\'llo there),
+        %q('he'\\''llo' there) => %q(he\\'llo there),
+        %q(hel$(lo) there) => %q(hel\\$\\(lo\\) there),
+        %q(hel\\$(lo) > there) => %q(hel\\$\\(lo\\) \\> there),
+        %q('hel$(lo) > there') => %q(hel\\$\\(lo\\)\\ \\>\\ there),
+        %q(hello -there) => %q(hello -there),
       }.each do |args, escaped_args|
-        it "should escape #{args.inspect} -> #{escaped_args.inspect}" do
+        it "should escape #{args} -> #{escaped_args}" do
           shell.escape_args(args).should == escaped_args
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -178,10 +178,10 @@ files:
 - samples/beach.png
 - samples/egg.png
 - samples/gif.gif
+- samples/mevs' white pixel.png
 - samples/round.gif
 - samples/sample.docx
 - samples/taj.jpg
-- samples/white pixel.png
 - spec/dragonfly/app_spec.rb
 - spec/dragonfly/configurable_spec.rb
 - spec/dragonfly/content_spec.rb