lambda_convert 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57f70ce184afbeb3debbef49fa829a7d518b7fb6
-  data.tar.gz: 8c4ea13a8f7b2e512233a5c701d993710ea89154
+  metadata.gz: ab417e94470f8f933b2d90b7010d3050cbdf608d
+  data.tar.gz: c2748ee3e263683c0b7aadf00d4a2da2e5b5883d
 SHA512:
-  metadata.gz: 4c38ab5f589bfe0284bea6add6458f8f87471bad41617a15285ea094ca160df9e0a5fded154496c3a95c5a91970b21197876e15b02778f74e6996b940c9c20ba
-  data.tar.gz: 96286dd77ccf7b90014ae6f706800380ecdc2f5bd0ea1e54a4fc2b99f834a991c9910f32f91fe359bfe7402b63faed891d312af039e1efb5d3a9e1a5b671c2d4
+  metadata.gz: 30120d3f06649b62c0bdf9b3bcf44ca68fbf4a4d6efcc7a14b198187f054ff86d2a101a7eb1fec24a4ec84726812ca26b2425649344a6a587681ec3ffda0b6b3
+  data.tar.gz: 68052dd61c6afdc2da6d303105169eb302376b0d871d2ffcda3bdf2fdd8ccec4ad872578cb85fbcfb2651893b8b595c4a5047bf90e8ab53b145eaf77bfc5c403

data/bin/convert

@@ -4,6 +4,14 @@ $LOAD_PATH.push File.expand_path('../../lib', __FILE__)
 require 'logger'
 require 'lambda_convert'
 
+# we want to print 'yes' if CONVERT_CHECK_SCRIPT is set to 1, in this way
+# LambdaConvert::Utils.original_convert can determine whether is given
+# executable file ours
+if ENV['CONVERT_CHECK_SCRIPT'] == '1'
+  puts('yes')
+  exit
+end
+
 debug_log = ENV['CONVERT_DEBUG_LOG']
 if debug_log.nil?
   LambdaConvert::CLI.logger = Logger.new(STDERR)

data/lib/lambda_convert/cli.rb

@@ -31,6 +31,8 @@ module LambdaConvert
         credentials: aws_credentials
       )
 
+      abort('Invalid arguments') if ARGV.count < 2
+
       input_file, input_selecting = LambdaConvert::Utils.parse_input_path(
         ARGV[0]
       )
@@ -103,6 +105,7 @@ module LambdaConvert
       env = ENV.to_h
       # find the original convert bin path
       original_convert = LambdaConvert::Utils.original_convert
+      abort('No local convert found') if original_convert.nil?
       # we also put a CONVERT_RECURSIVE_FLAG to avoid somehow calling ourself
       # again by mistake
       env['CONVERT_RECURSIVE_FLAG'] = '1'

data/lib/lambda_convert/utils.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module LambdaConvert
   # Utils functions
   module Utils
@@ -11,9 +13,8 @@ module LambdaConvert
 
     def self.original_convert
       find_cmd('convert').find do |path|
-        # TODO: maybe we need a more robust way to determine whether is given
-        # convert path from us or someone else
-        File.dirname(path) != Gem.bindir && !path.include?('.rbenv/shims')
+        output, = Open3.capture3({ 'CONVERT_CHECK_SCRIPT' => '1' }, path)
+        output.strip != 'yes'
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lambda_convert
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Fang-Pen Lin