lambda_convert 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25c44e1fb6fa07cb8e1aaf5654100b73721aa0c6
-  data.tar.gz: ec7ba833db940fa8dea581cdcd37265e1cea6142
+  metadata.gz: ec904ee282cb8ab57051dc9c2add258f690bfb8a
+  data.tar.gz: 0b795afa9b435d58c2f36b8c7b0c86ed68044f6d
 SHA512:
-  metadata.gz: 12347aac344bf05dd0e0ca8add187610d50d5adf81b962f0136a04c989c5a669db5e78f0ecd075ff5087f32c261c764783714c20304297407c6bfff7a1353aaf
-  data.tar.gz: fa4d46a0d15d393f455e20fcd45a2cd68c9ff4585052bb59727550cce5741be24c9be1f02f2f0cadd8abcbc8bbef8387adf46eb6904c59da8074d4a015e0eb5a
+  metadata.gz: fe5a60653a5ad932860fbbb59fd88ecbddfe9ddf7ace5d3ec985a645dc0ae8262c3baa8d75c7492a7ba33fcd6437bffc22ed9fcfae3ab76d45330c7eecf2b5e9
+  data.tar.gz: 9f2f3bc73241b227a786e44ea30e8584593d62198a745badb343d6d6a465cc68fc916de448e9d532fdca92afa5963e4f8f04f791708e7bbd48baa775b98fcfff

data/bin/convert

@@ -1,6 +1,14 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.push File.expand_path('../../lib', __FILE__)
 
-require 'lambda_convert/cli'
+require 'logger'
+require 'lambda_convert'
 
-main
+debug_log = ENV['CONVERT_DEBUG_LOG']
+if debug_log.nil?
+  LambdaConvert::CLI.logger = Logger.new(STDERR)
+else
+  file = File.open(debug_log, File::WRONLY | File::APPEND | File::CREAT)
+  LambdaConvert::CLI.logger = Logger.new(file)
+end
+LambdaConvert::CLI.main

data/lib/lambda_convert.rb

@@ -0,0 +1,2 @@
+require 'lambda_convert/cli'
+require 'lambda_convert/utils'

data/lib/lambda_convert/cli.rb

@@ -1,137 +1,127 @@
-require 'logger'
 require 'rubygems'
+require 'json'
 require 'English'
 
 require 'aws-sdk'
 
-# find command path array matching given `cmd` name in $PATH
-def find_cmd(cmd)
-  (ENV['PATH'].split(File::PATH_SEPARATOR).map do |path|
-    cmd_path = File.join(path, cmd)
-    cmd_path if File.executable?(cmd_path) && !File.directory?(cmd_path)
-  end).compact
-end
-
-def parse_input_path(path)
-  # convert command input path could be attached with selecting syntax, let's
-  # parse it and return them in an array of [filename, selecting syntax]
-  # ref: https://www.imagemagick.org/script/command-line-processing.php
-  match = /([^\[\]]+)(\[(.+)\])?/.match(path)
-  [match[1], match[3]]
-end
+module LambdaConvert
+  # `convert` command line tool implementation
+  module CLI
+    class <<self
+      attr_accessor :logger
+    end
 
-def lambda_convert
-  logger = Logger.new(STDERR)
+    def self.lambda_convert
+      s3_region = ENV['CONVERT_S3_REGION'] || ENV['AWS_REGION']
+      lambda_region = ENV['CONVERT_LAMBDA_REGION'] || ENV['AWS_REGION']
+      aws_credentials = Aws::Credentials.new(
+        ENV['CONVERT_ACCESS_KEY'] || ENV['AWS_ACCESS_KEY_ID'],
+        ENV['CONVERT_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_ACCESS_KEY']
+      )
+      s3_bucket = ENV['CONVERT_S3_BUCKET']
+      s3_key_prefix = ENV['CONVERT_S3_KEY_PREFIX'] || '_convert_tmp/'
+      lambda_function = ENV['CONVERT_LAMBDA_FUNCTION'] || 'image-convert-prod'
 
-  s3_region = ENV['CONVERT_S3_REGION'] || ENV['AWS_REGION']
-  lambda_region = ENV['CONVERT_LAMBDA_REGION'] || ENV['AWS_REGION']
-  aws_credentials = Aws::Credentials.new(
-    ENV['CONVERT_ACCESS_KEY'] || ENV['AWS_ACCESS_KEY_ID'],
-    ENV['CONVERT_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_ACCESS_KEY']
-  )
-  s3_bucket = ENV['CONVERT_S3_BUCKET']
-  s3_key_prefix = ENV['CONVERT_S3_KEY_PREFIX'] || '_convert_tmp/'
-  lambda_function = ENV['CONVERT_LAMBDA_FUNCTION'] || 'image-convert-prod'
+      s3 = Aws::S3::Client.new(
+        region: s3_region,
+        credentials: aws_credentials
+      )
+      aws_lambda = Aws::Lambda::Client.new(
+        region: lambda_region,
+        credentials: aws_credentials
+      )
 
-  s3 = Aws::S3::Client.new(
-    region: s3_region,
-    credentials: aws_credentials
-  )
-  aws_lambda = Aws::Lambda::Client.new(
-    region: lambda_region,
-    credentials: aws_credentials
-  )
+      input_file, input_selecting = LambdaConvert::Utils.parse_input_path(
+        ARGV[0]
+      )
+      # Notice: there is also special output file syntax for convert command,
+      # but we are not supporting them now, as we probably won't use it
+      output_file = ARGV[-1]
 
-  input_file, input_selecting = parse_input_path(ARGV[0])
-  # Notice: there is also special output file syntax for convert command, but
-  # we are not supporting them now, as we probably won't use it
-  output_file = ARGV[-1]
+      input_key = "#{s3_key_prefix}#{SecureRandom.uuid}"
+      output_key = "#{s3_key_prefix}#{SecureRandom.uuid}"
 
-  input_key = "#{s3_key_prefix}#{SecureRandom.uuid}"
-  output_key = "#{s3_key_prefix}#{SecureRandom.uuid}"
-
-  logger.info("Uploading file to s3://#{s3_bucket}/#{input_key}")
-  File.open(input_file, 'rb') do |file|
-    s3.put_object(bucket: s3_bucket, key: input_key, body: file)
-  end
-  source = '{source}'
-  source += "[#{input_selecting}]" unless input_selecting.nil?
-  instruction = {
-    schema: 'envoy-convert-instruction',
-    original: input_key,
-    bucket: s3_bucket,
-    write_options: {
-      acl: 'private'
-    },
-    key: output_key,
-    args: [source] + ARGV[1..-2] + ['{dest}']
-  }
-  logger.info("Invoking lambda with instruction #{instruction}")
+      logger.info("Uploading file to s3://#{s3_bucket}/#{input_key}")
+      File.open(input_file, 'rb') do |file|
+        s3.put_object(bucket: s3_bucket, key: input_key, body: file)
+      end
+      source = '{source}'
+      source += "[#{input_selecting}]" unless input_selecting.nil?
+      instruction = {
+        schema: 'envoy-convert-instruction',
+        original: input_key,
+        bucket: s3_bucket,
+        write_options: {
+          acl: 'private'
+        },
+        key: output_key,
+        args: [source] + ARGV[1..-2] + ['{dest}']
+      }
+      logger.info("Invoking lambda with instruction #{instruction}")
 
-  resp = aws_lambda.invoke(
-    function_name: lambda_function,
-    invocation_type: 'RequestResponse',
-    payload: JSON.dump(instruction)
-  )
-  logger.info("Get response of invoke #{resp}")
-  raise 'Failed to run convert on Lambda' if resp.status_code != 200
+      resp = aws_lambda.invoke(
+        function_name: lambda_function,
+        invocation_type: 'RequestResponse',
+        payload: JSON.dump(instruction)
+      )
+      logger.info("Get response of invoke #{resp}")
+      raise 'Failed to run convert on Lambda' if resp.status_code != 200
 
-  logger.info(
-    "Downloading file from s3://#{s3_bucket}/#{output_key} to #{output_file}"
-  )
-  s3.get_object(
-    response_target: output_file,
-    bucket: s3_bucket,
-    key: output_key
-  )
-  logger.info('Done')
-ensure
-  logger.info("Delete files #{input_key} and #{output_key} from #{s3_bucket}")
-  s3.delete_objects(
-    bucket: s3_bucket,
-    delete: {
-      objects: [
-        {
-          key: input_key
-        },
-        {
-          key: output_key
+      logger.info(
+        "Downloading file from s3://#{s3_bucket}/#{output_key} to " \
+        "#{output_file}"
+      )
+      s3.get_object(
+        response_target: output_file,
+        bucket: s3_bucket,
+        key: output_key
+      )
+      logger.info('Done')
+    ensure
+      logger.info(
+        "Delete files #{input_key} and #{output_key} from #{s3_bucket}"
+      )
+      s3.delete_objects(
+        bucket: s3_bucket,
+        delete: {
+          objects: [
+            {
+              key: input_key
+            },
+            {
+              key: output_key
+            }
+          ],
+          quiet: true
         }
-      ],
-      quiet: true
-    }
-  )
-end
+      )
+    end
 
-def local_convert
-  logger = Logger.new(STDERR)
+    def self.local_convert
+      env = ENV.to_h
+      # find the original convert bin path
+      original_convert = LambdaConvert::Utils.original_convert
+      # we also put a CONVERT_RECURSIVE_FLAG to avoid somehow calling ourself
+      # again by mistake
+      env['CONVERT_RECURSIVE_FLAG'] = '1'
+      logger.info("Running local convert #{original_convert} with args #{ARGV}")
+      system(env, *([original_convert] + ARGV))
+      abort('Failed to run local convert') unless $CHILD_STATUS.success?
+      logger.info('Done')
+    end
 
-  env = ENV.to_h
-  # find the original convert bin path
-  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')
-  end
-  # we also put a CONVERT_RECURSIVE_FLAG to avoid somehow calling ourself again
-  # by mistake
-  env['CONVERT_RECURSIVE_FLAG'] = '1'
-  logger.info("Running local convert #{original_convert} with args #{ARGV}")
-  system(env, *([original_convert] + ARGV))
-  abort('Failed to run local convert') unless $CHILD_STATUS.success?
-  logger.info('Done')
-end
+    def self.main
+      abort('Recursive call') if ENV['CONVERT_RECURSIVE_FLAG'] == '1'
+      lambda_convert
+    rescue StandardError => e
 
-def main
-  abort('Recursive call') if ENV['CONVERT_RECURSIVE_FLAG'] == '1'
-  lambda_convert
-rescue StandardError => e
-  logger = Logger.new(STDERR)
-  logger.warn("Failed to convert via lambda, error=#{e}")
-  fallback_disabled = (ENV['CONVERT_DISABLE_FALLBACK'].to_i != 0) || false
-  if fallback_disabled
-    abort("Failed to convert via lambda, no fallback, error=#{e}")
+      logger.warn("Failed to convert via lambda, error=#{e}")
+      fallback_disabled = (ENV['CONVERT_DISABLE_FALLBACK'].to_i != 0) || false
+      if fallback_disabled
+        abort("Failed to convert via lambda, no fallback, error=#{e}")
+      end
+      logger.info('Fallback to local convert command')
+      local_convert
+    end
   end
-  logger.info('Fallback to local convert command')
-  local_convert
 end

data/lib/lambda_convert/utils.rb

@@ -0,0 +1,31 @@
+module LambdaConvert
+  # Utils functions
+  module Utils
+    # find command path array matching given `cmd` name in $PATH
+    def self.find_cmd(cmd)
+      (ENV['PATH'].split(File::PATH_SEPARATOR).map do |path|
+        cmd_path = File.join(path, cmd)
+        cmd_path if File.executable?(cmd_path) && !File.directory?(cmd_path)
+      end).compact
+    end
+
+    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')
+      end
+    end
+
+    def self.parse_input_path(path)
+      # convert command input path could be attached with selecting syntax,
+      # let's parse it and return them in an array of
+      #
+      #     [filename, selecting syntax]
+      #
+      # ref: https://www.imagemagick.org/script/command-line-processing.php
+      match = /([^\[\]]+)(\[(.+)\])?/.match(path)
+      [match[1], match[3]]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lambda_convert
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Fang-Pen Lin
@@ -32,7 +32,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - "./lib/.DS_Store"
+- "./lib/lambda_convert.rb"
 - "./lib/lambda_convert/cli.rb"
+- "./lib/lambda_convert/utils.rb"
 - LICENSE
 - README.md
 - bin/convert