capa 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d579a95dcc1d51a4600ddf28c836abf623f962f2cc4ed98cd1f7b5398cedae5a
-  data.tar.gz: 45ed656b945f4ef785cbf09f8b02301d4145e4d83f7662f38f1244bf440c018a
+  metadata.gz: dcbb3e889cb78cbd969f3ee5408f766f9f07b438fbc78d8b2558107b48ef8be2
+  data.tar.gz: 36a96e12f227e53f62154a6af9bbbc2a55dd5c7fd706e9c9ae2202ea129092e8
 SHA512:
-  metadata.gz: 9db48acb31ecad6888422b6b50095da330d99bcc6df98b13522f18f3a1c75a541c90aec72fda48ac8cded7896d2f66d3cdcfee2d0dee92bece0c3f3515c019ec
-  data.tar.gz: ed5de9f0717b8d75262fc9bd231342f4851d4ef9a03f7d0d5bfd01b181143c3281b7aca2d80eb1b946f303719a5c08cba4a3e0e72d77adbe9a75a3bc2044cd99
+  metadata.gz: 767b605ea8a0f401cf713ff78a4740f26a9aa87b1b1df48b22e8f1457c7d1ac0d925a72109b191cadf54bffee2198571112cf486c1546c0df6c23d4d98e557c0
+  data.tar.gz: 302cb2dac22680d9abfee0c7dacb32b2d35a3252613ba91ba08527739a2654ae1e92edf2804436be998b51da15280e439b07a751d0358f266a7966f466362377

data/bin/capa-android

@@ -2,17 +2,18 @@
 
 require_relative '../lib/capa'
 
-abort('Please install adb') unless command?('adb')
+abort('Please install adb https://developer.android.com/studio/') unless command?('adb')
 abort('Please install gifify: https://github.com/vvo/gifify') unless command?('gifify')
 
 recorder = EmulatorRecorder.new(filename: @video_filename)
 generator = GIFGenerator.new(input_video: @video_filename, output_gif: "#{@video_filename}.gif")
 
-Signal.trap("SIGINT") do
-  recorder.stop
-  recorder.pull_video_from_emulator
-  generator.generate
-  exit 0
+begin
+  recorder.record
+rescue Capa::UserAbort
+  puts 'Exiting...'
+  `adb shell killall screenrecord`
+  exit
 end
 
-video = recorder.record
+generator.generate

data/bin/capa-ios

@@ -2,18 +2,19 @@
 
 require_relative '../lib/capa'
 
-def command?(command)
-  system("which #{command} > /dev/null 2>&1")
-end
-
 abort('Please install gifify: https://github.com/vvo/gifify') unless command?('gifify')
 
 recorder = SimulatorRecorder.new(filename: @video_filename)
+generator = GIFGenerator.new(input_video: @video_filename, output_gif: "#{@video_filename}.gif")
 
-Signal.trap("SIGINT") do
-  generator = GIFGenerator.new(input_video: @video_filename, output_gif: "#{@video_filename}.gif")
-  generator.generate
+begin
+  recorder.record
+rescue Capa::UserAbort
+  puts 'Exiting...'
+  if system('pgrep simctl > /dev/null')
+    `killall simctl`
+  end
+  exit
 end
 
-
-recorder.record
+generator.generate

data/lib/capa.rb

@@ -18,7 +18,7 @@ optparse = OptionParser.new do |opts|
   usage =  "Usage: #{$0} [options]".bold
   opts.banner = "#{explanation} #{usage}"
 
-  opts.on( '-o', '--output NAME', "Output filename. GIF file will get '.gif' added as suffix. Defaults to recording.mp4 and recording.mp4.gif" ) do  |o|
+  opts.on( '-o', '--output NAME', "Output filename. Defaults to 'recording'" ) do  |o|
     options[:output] = o
   end
 
@@ -36,4 +36,4 @@ end
 # The parse! method also removes any options it finds from ARGV.
 optparse.parse!
 
-@video_filename = options[:output] || 'recording.mp4'
+@video_filename = "#{options[:output] || 'recording'}.mp4"

data/lib/capa/emulator_recorder.rb

@@ -1,4 +1,5 @@
 require_relative 'string'
+require_relative 'helper'
 
 class EmulatorRecorder
   def initialize(filename: '')
@@ -8,18 +9,25 @@ class EmulatorRecorder
 
   def record
     abort("You need exactly one emulator or device connected") unless can_record?
-    puts 'Capturing video... Use CTRL+C to save'
-    # Might want to add '--size 720x1280' flag. That's the maximum permitted size for video recordings
-    # We can specify the device, in case there is more than one connected: -s emulator-5554
-    message = `adb shell screenrecord --verbose #{emulator_video_path}`
     
-    abort("Maximum permitted resolution is 720x1280. Minimum Android version is Marshmallow.\n"\
-      "Please choose a different device.\n"\
-      "Tip: Galaxy Nexus works great!") if /err=-38/ =~ message
-  end
+    Signal.trap("SIGINT") { raise Capa::UserAbort }
+    Signal.trap("SIGTSTP") { raise Capa::UserAbort }
+
+    Thread.new do
+      # Might want to add '--size 720x1280' flag. That's the maximum permitted size for video recordings
+      # We can specify the device, in case there is more than one connected: -s emulator-5554
+      message = `adb shell screenrecord --verbose #{emulator_video_path}`
+      
+      abort("Maximum permitted resolution is 720x1280. Minimum Android version is Marshmallow.\n"\
+        "Please choose a different device.\n"\
+        "Tip: Galaxy Nexus works great!") if /err=-38/ =~ message
+    end
 
-  def stop
-    `killall -SIGINT adb`
+    puts 'Capturing video... Press ENTER to save'
+    p = gets.chomp
+    `adb shell killall -SIGINT screenrecord`
+    sleep 0.5
+    pull_video_from_emulator
   end
 
   def pull_video_from_emulator

data/lib/capa/helper.rb

@@ -1,3 +1,7 @@
+module Capa
+  class UserAbort < StandardError; end
+end
+
 
 def command?(command)
   system("which #{command} > /dev/null 2>&1")

data/lib/capa/simulator_recorder.rb

@@ -8,14 +8,17 @@ class SimulatorRecorder
 
   def record
     abort unless can_record?
-    puts 'Capturing video... Use CTRL+C to save'
 
-    job = fork do
-      exec("xcrun simctl io booted recordVideo #{@filename}")
+    Signal.trap("SIGINT") { raise Capa::UserAbort }
+    Signal.trap("SIGTSTP") { raise Capa::UserAbort }
+
+    Thread.new do
+      `xcrun simctl io booted recordVideo #{@filename}`
     end
 
-    Process.detach(job)
-    Process.waitall
+    puts 'Capturing video... Press ENTER to save'
+    p = gets.chomp
+    `killall -SIGINT simctl`
   end
 
   private

data/lib/capa/version.rb

@@ -1,3 +1,3 @@
 module Capa
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alex Salom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies: []
 description: capa can record animated GIFs (and videos) from the iOS Simulator and
   the Android Emulator because a GIF is worth a thousand lines of code.