cutcut 1.3.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ae337b09ec1288623bbf294f99b29fb62aeffdf
-  data.tar.gz: fce49362ed35c9db79429989c20f7a0baab19004
+  metadata.gz: f32227fb2714e7a4f063ad906ddbae63e8114af9
+  data.tar.gz: 13d6426b18247c31dc1eb66ca5515071700661d3
 SHA512:
-  metadata.gz: b3362d0c71ca3730ae848760230385163444facc53bd8d630fc09d4305eda176e8f410cdccd0518cbc18bbe765f025b6d3f89df85c488b16d4c349552022ac09
-  data.tar.gz: beee37468252d1e12ec4b402c75a3ea75d328a724fa1e8940e2883f4a1de3983ee6fc26b51d35c2263a5c08b7578db16e7a52e28d057ec941e788c2694063a11
+  metadata.gz: b0f40c26b9c1bf20bfe3a60b75035c111b41e0f2b535fa1ef064a1c805afa60c88c5df329e9b4f9f7e9658dc9cb6f56915ddbdee069890b8f48ef8c7bd185d7e
+  data.tar.gz: afb46a68b83c4b14790f04c46be3d3a60b921a46acf8350200aca1056397eb183ab3be1c2ed410a04017dfeb274c26e313ec1cdb37dd429ff8a10af2a6d6708d

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 Changelog
 =========
 
+Version 1.4.2 (June 25, 2016)
+-----------------------------
+
+* Fix error when converting files with blank space characters
+* Escape all input
+* Rollback to rspec 3.4
+
+Version 1.4.1 (June 17, 2016)
+-----------------------------
+
+* Update dependencies
+
+Version 1.4.0 (June 5, 2016)
+-----------------------------
+
+* Add --raw option
+
 Version 1.3.0 (May 11, 2016)
 -----------------------------
 

data/README.md

@@ -32,6 +32,7 @@ Usage: cutcut [options]
         --extract-screenshots NUMBER Screenshots per second
         --input INPUT                Input
         --quality CRF                CRF between 0 and 51, 0 lossless. Default to 20
+        --raw                        Raw options
         --remove-audio               Video speed
         --scale SCALE_RESOLUTION     Resolution to scale eg: 1280:720
         --speed NUMBER               Video speed

data/bin/cutcut

@@ -11,6 +11,7 @@ OptionParser.new do |opt|
   opt.on('--extract-screenshots NUMBER', 'Screenshots per second') { |e| options[:extract_screenshots] = e }
   opt.on('--input INPUT', 'Input') { |e| options[:input] = e }
   opt.on('--quality CRF', 'CRF between 0 and 51, 0 lossless. Default to 20') { |e| options[:quality] = e }
+  opt.on('--raw', 'Raw options') { |e| options[:raw] = e }
   opt.on('--remove-audio', 'Video speed') { options[:remove_audio] = true }
   opt.on('--scale SCALE_RESOLUTION', 'Resolution to scale eg: 1280:720') { |e| options[:scale] = e }
   opt.on('--speed NUMBER', 'Video speed') { |e| options[:speed] = e }
@@ -28,12 +29,14 @@ progressbar = ProgressBar.create(title: 'Converting', starting_at: 0, total: fil
 puts "#{files.count + folders.count} files found"
 
 files.each do |file|
-  media = CutCut::Media.new(input: file)
+  media = CutCut::Media.new(input: Regexp.escape(file))
   scale = options[:scale] || '1920:1080'
   speed = options[:speed]
   remove_audio = options[:remove_audio]
+  remove_audio = true if speed.to_i != 1
+
   crf = options[:quality]
-  media.convert(copy_metadata: options[:copy_metadata], scale: scale, speed: speed, remove_audio: remove_audio, crf: crf)
+  media.convert(copy_metadata: options[:copy_metadata], scale: scale, speed: speed, remove_audio: remove_audio, crf: crf, raw: options[:raw])
   media.extract_screenshots(fps: options[:extract_screenshots], copy_metadata: true) if options[:extract_screenshots]
   progressbar.increment
 end
@@ -41,7 +44,8 @@ end
 folders.each do |folder|
   timelapse = CutCut::Timelapse.new(input: Regexp.escape(folder), output: Regexp.escape(File.join(options[:input_dir], File.basename(folder).gsub(/\s+/, '_') + '.mp4')))
   scale = options[:scale] || '1920:1080'
-  timelapse.convert(fps: options[:timelapse_fps] || 30, scale: scale, remove_audio: true)
+  crf = options[:quality]
+  timelapse.convert(fps: options[:timelapse_fps] || 30, scale: scale, remove_audio: true, crf: crf)
   progressbar.increment
 end
 

data/cutcut.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.email       = ['stjhimy@gmail.com']
   s.homepage    = 'http://github.com/stjhimy/cutcut'
   s.license     = 'MIT'
-  s.summary     = 'Trim/Cut/Screenshot videos'
+  s.summary     = 'Easily Trim/Cut/Screenshot videos'
   s.description = 'CLI for working with videos'
-  s.version     = '1.3.0'
+  s.version     = '1.4.2'
 
   s.executables   = ['cutcut']
   s.files         = `git ls-files`.split("\n")
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'guard',           '~> 2.13'
   s.add_development_dependency 'guard-rspec',     '~> 4.6'
+  s.add_development_dependency 'rubocop',         '~> 0.4'
   s.add_development_dependency 'guard-rubocop',   '~> 1.2'
   s.add_development_dependency 'rspec',           '~> 3.4'
 end

data/lib/cutcut/helpers.rb

@@ -14,7 +14,7 @@ module CutCut
 
     def self.copy_metadata(origin, target)
       exif = MiniExiftool.new(target.delete('\\'))
-      exif.copy_tags_from(origin, '*')
+      exif.copy_tags_from(origin.delete('\\'), '*')
     end
   end
 end

data/lib/cutcut/media.rb

@@ -24,7 +24,7 @@ module CutCut
       speed = "-filter:v \"setpts=#{options[:speed]}*PTS\"" if options[:speed]
       remove_audio = options[:remove_audio] == true ? '-an' : nil
       crf = options[:crf] || 20
-      "-movflags +faststart -vf scale=#{scale} -c:v libx264 -crf #{crf} -preset ultrafast  #{speed} #{remove_audio}"
+      "-movflags +faststart -vf scale=#{scale} -c:v libx264 -crf #{crf} -preset ultrafast  #{speed} #{remove_audio} #{options[:raw]}"
     end
 
     def extract_screenshots(options = {})

data/lib/cutcut/timelapse.rb

@@ -28,12 +28,13 @@ module CutCut
 
     def convert(options = {})
       fps = options[:fps] || 30
-      execute_ffmpeg_command(input: File.join(@input, input_basename), output: @output,
-                             raw_options: {
-                               input: "-f image2  -start_number #{start_number} -framerate #{fps}",
-                               output: '-c:v libx264 -r 30 -vf scale=-1:1080 -crf 23 -preset ultrafast -pix_fmt yuv420p'
-                             }
-                            )
+      execute_ffmpeg_command(
+        input: File.join(@input, input_basename), output: @output,
+        raw_options: {
+          input: "-f image2  -start_number #{start_number} -framerate #{fps}",
+          output: '-c:v libx264 -r 30 -vf scale=-1:1080 -crf 23 -preset ultrafast -pix_fmt yuv420p'
+        }
+      )
 
       Helpers.copy_metadata(files.first, @output)
       @output

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cutcut
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Jhimy Fernandes Villar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +175,7 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: Trim/Cut/Screenshot videos
+summary: Easily Trim/Cut/Screenshot videos
 test_files:
 - spec/cutcut/base_spec.rb
 - spec/cutcut/helpers_spec.rb