timestamp_maker 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed37875d238df5bcc9566649a2767aff49522b6baab2f2c5bb07f4a788e38f5b
-  data.tar.gz: 14647536fd8c17f34a02e9b7d4542e8c154561fcea3c569a18613fa174338ecf
+  metadata.gz: 42381622c6bc152ee1ca0d7b69e37de3694e2bc656f2364523eee7e0f61b8027
+  data.tar.gz: 38649f363088143afdb178ddacfac05ed617b53af2c1d685ecb24f75e416212d
 SHA512:
-  metadata.gz: e8289f87c08d1f3b81f7f8835cf02a68e197cba768425f962a3d16e8b2fcb8567cb6cb675aa1e4e5ed762dfe077509cb74fb18b3394bf32952d2ed7e1c0e5c32
-  data.tar.gz: 063ccdfd4dbe3a585238b44e20a6728aff9faef849499efeb303b47154488f347644e934bb78eb1b177fd53ea43372c27bc6780ab29de4fe4e34dff0b08aceab
+  metadata.gz: 3822ff2a0ef886a63b61d075f88899fcb5636be686323212c6636afc817e4ccc66f4c0436e424fe06d8a73e1da7bcc983ef0a44f76be75cf8ccdcb81b15b69aa
+  data.tar.gz: 7b8de123fc936bb49c10fcd4f6cad59ba954d6ad7e6f6272109b71249447284fd9d44f9f58899a0cce7d8d5ee0f03cafead1c89672cc32ecb88b38cff03578f6

data/lib/timestamp_maker/image_timestamper.rb

@@ -2,6 +2,7 @@
 
 require 'open3'
 require 'time'
+require 'English'
 
 module TimestampMaker
   module ImageTimestamper
@@ -28,7 +29,7 @@ module TimestampMaker
     )
       time_string = time.strftime(format)
       command = %W[
-        magick convert #{input_path}
+        convert #{input_path}
         (
         -background #{background_color}
         -fill #{font_color}
@@ -44,18 +45,18 @@ module TimestampMaker
         -geometry +#{x}+#{y}
         -composite #{output_path}
       ]
-      system(*command, exception: true)
+      raise "Command failed with exit #{$CHILD_STATUS.exitstatus}: #{command.first}" unless system(*command)
     end
 
     def self.creation_time(input_path)
       command = %W[
-        magick identify -format %[exif:DateTime*]%[exif:OffsetTime*] #{input_path}
+        identify -format %[exif:DateTime*]%[exif:OffsetTime*] #{input_path}
       ]
 
       stdout_string, status = Open3.capture2(*command)
       raise unless status.success?
 
-      parsed = Hash[stdout_string.split("\n").map!{ _1[5..].split('=') }]
+      parsed = Hash[stdout_string.split("\n").map! { |i| i[5..-1].split('=') }]
 
       time_string = parsed['DateTimeOriginal'] || parsed['DateTimeDigitized'] || parsed['DateTime']
       raise 'Cannot find creation time' if time_string.nil?

data/lib/timestamp_maker/video_timestamper.rb

@@ -3,6 +3,7 @@
 require 'json'
 require 'time'
 require 'open3'
+require 'English'
 
 module TimestampMaker
   module VideoTimestamper
@@ -23,7 +24,7 @@ module TimestampMaker
       )
         creation_timestamp = time.to_i
         text = "%{pts:localtime:#{creation_timestamp}:#{escape_text_expansion_argument(format)}}"
-        drawtext = "#{coord_map(coordinate_origin, x, y)}:" << %W[
+        drawtext = +"#{coord_map(coordinate_origin, x, y)}:" << %W[
           font=#{escape_filter_description_value(font_family)}
           fontsize=#{font_size}
           fontcolor=#{font_color}
@@ -56,12 +57,12 @@ module TimestampMaker
                   when '-' then '+'
                   else raise "Cannot parse time zone: #{string}"
                   end
-                "#{sign}#{string[1..]}"
+                "#{sign}#{string[1..-1]}"
               end
             end
           else raise TypeError
           end
-        system({ 'TZ' => tz }, *command, exception: true)
+        raise "Command failed with exit #{$CHILD_STATUS.exitstatus}: #{command.first}" unless system({ 'TZ' => tz }, *command)
       end
 
       def creation_time(input_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timestamp_maker
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Weihang Jian
@@ -92,7 +92,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="