capa 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '056684bd0e821dfdd60e6e3f8164ff46bea56991e64a9220d124165a2e5ef539'
-  data.tar.gz: afcfed449e5f6ff18782afbca68356513b1015232be02624c38630ef2a10ec62
+  metadata.gz: a5774c2dc81775fcb01070ec5f107ee6d6619c8820a877b0c55dd6509d1266f9
+  data.tar.gz: 70cedf1db2030087a9bc1e2100a1aa0e817fdf3b66c8f5028645441f86cf2515
 SHA512:
-  metadata.gz: 8705c6d0974c4833ee1c0dd88c9cd0afa7c430430e225c97bfa6eb5511c8f53f877f4ea11a8eaf162d45ae43ec7cf0878b7b3c9c20ac81e42f1d1809add19910
-  data.tar.gz: dad80eedc9b2a4863e817afa004a5bcb18fbbdad0c67361738796ded0dfd65cf2dc84ad3338e79421af848c7aee2bcfc82046516972a52a95f2f1c0475ea4553
+  metadata.gz: 5f2f11dee1c55172dc0ac094d97dd1ead53ef5b8185435b9174a984f0b812ef9eb98bb3e40988281d42d5c508ce1de3243af0966df4e01f9b6e1c2888c668fc1
+  data.tar.gz: 909ceb3236834024a08f0e16daddb59df46499e83bdd8a728f0d44fd4ad3b192fcd0c6af64e5b628d1d2e384baddc81422d3b40edc933c8357fbc3926dea3ab2

data/bin/capa

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/capa'

data/lib/capa.rb

@@ -13,15 +13,18 @@ options = {}
 
 # Set up the options you are looking for
 optparse = OptionParser.new do |opts|
-  explanation = "> The command #{"$ capa-ios".bold} will generate a video and a GIF from the iOS Simulator\ 
-> The command #{"$ capa-android".bold} will generate a video and a GIF from the Android Emulator .\n\n"
+  explanation = "> #{"$ capa".bold} will generate a video and a GIF from the iOS Simulator or the Android Emulator. #{"capa".bold} will try to infer the platform. Alternatively you can select which platform you wish to record in.\n\n"
   usage =  "Usage: #{$0} [options]".bold
   opts.banner = "#{explanation} #{usage}"
 
-  opts.on( '-o', '--output NAME', "Output filename. Defaults to 'recording'" ) do  |o|
+  opts.on( '-o', '--output NAME', "Output filename. Defaults to #{"recording".italic}" ) do |o|
     options[:output] = o
   end
 
+  opts.on( '-p', '--platform NAME', "Available platforms: #{"ios".italic} and #{"android".italic}" ) do |o|
+    options[:platform] = o
+  end
+
   opts.on("-v", "--version", "Display version") do
     puts Capa::VERSION
     exit
@@ -36,4 +39,22 @@ 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"
+
+recorder_factory = RecorderFactory.new(filename: video_filename)
+platform = platform = options[:platform] || recorder_factory.infer_platform
+recorder = recorder_factory.create(from_platform: platform)
+
+abort("Please choose a platform. Help: #{$0} -h") if recorder.nil?
+
+generator = GIFGenerator.new(input_video: video_filename, output_gif: "#{video_filename}.gif")
+
+begin
+  recorder.record
+rescue Capa::UserAbort
+  puts 'Exiting...'
+  recorder.cancel
+  exit
+end
+
+generator.generate

data/lib/capa/emulator_recorder.rb

@@ -1,7 +1,8 @@
 require_relative 'string'
 require_relative 'helper'
+require_relative 'recorder_factory'
 
-class EmulatorRecorder
+class EmulatorRecorder < Recorder
   def initialize(filename: '')
     abort('Please provide a name for the video') if filename.blank?
     @filename = filename
@@ -23,25 +24,28 @@ class EmulatorRecorder
         "Tip: Galaxy Nexus works great!") if /err=-38/ =~ message
     end
 
-    puts 'Capturing video... Press ENTER to save'
+    puts 'Capturing video from the Android Emulator... Press ENTER to save'
     p = gets.chomp
     `adb shell killall -SIGINT screenrecord`
     sleep 0.5
     pull_video_from_emulator
   end
 
+  def cancel
+    `adb shell killall screenrecord`
+  end
+
   def pull_video_from_emulator
     # We can specify the device, in case there is more than one connected: -s emulator-5554
     puts `adb pull #{emulator_video_path}`
   end
 
-  private
-
   def emulator_video_path
     "/sdcard/#{@filename}"
   end
 
   def can_record?
+    return false if command?('adb') == false
     # Example response
     #
     # "List of devices attached\n

data/lib/capa/helper.rb

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

data/lib/capa/recorder_factory.rb

@@ -0,0 +1,34 @@
+class RecorderFactory
+  def initialize(filename: '')
+    @recorders = {
+      'ios' => SimulatorRecorder.new(filename: filename),
+      'android' => EmulatorRecorder.new(filename: filename)
+    }
+  end
+
+  def infer_platform
+    available_platforms = @recorders
+      .select { |key, recorder| recorder.can_record? }
+      .map { |key, recorder| key }
+    
+    return available_platforms.first if available_platforms.count == 1
+  end
+
+  def create(from_platform: '')
+    @recorders[from_platform] unless from_platform.nil?
+  end
+end
+
+class Recorder
+  def record
+    raise 'not implemented'
+  end
+
+  def cancel
+    raise 'not implemented'
+  end
+
+  def can_record?
+    raise 'not implemented'
+  end
+end

data/lib/capa/simulator_recorder.rb

@@ -1,13 +1,14 @@
 require_relative 'string'
+require_relative 'recorder_factory'
 
-class SimulatorRecorder
+class SimulatorRecorder < Recorder
   def initialize(filename: '')
     abort('Please provide a name for the video') if filename.blank?
     @filename = filename
   end
 
   def record
-    abort unless can_record?
+    abort("You need to open the iOS Simulator") unless can_record?
 
     Signal.trap("SIGINT") { raise Capa::UserAbort }
     Signal.trap("SIGTSTP") { raise Capa::UserAbort }
@@ -16,16 +17,21 @@ class SimulatorRecorder
       `xcrun simctl io booted recordVideo #{@filename}`
     end
 
-    puts 'Capturing video... Press ENTER to save'
+    puts 'Capturing video from the iOS Simulator... Press ENTER to save'
     p = gets.chomp
     `killall -SIGINT simctl`
   end
 
-  private
+  def cancel
+    if system('pgrep simctl > /dev/null')
+      `killall simctl`
+    end
+  end
 
   def can_record?
+    return false if command?('xcrun') == false
     # Will output 'No devices are booted.' if Simulator.app is closed
-    `xcrun simctl io booted enumerate`
+    `xcrun simctl io booted enumerate > /dev/null 2>&1`
     $?.exitstatus == 0
   end
 end

data/lib/capa/version.rb

@@ -1,3 +1,3 @@
 module Capa
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capa
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Salom
@@ -14,17 +14,16 @@ description: capa can record animated GIFs (and videos) from the iOS Simulator a
   the Android Emulator because a GIF is worth a thousand lines of code.
 email: alex.salom@gmail.com
 executables:
-- capa-ios
-- capa-android
+- capa
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/capa-android
-- bin/capa-ios
+- bin/capa
 - lib/capa.rb
 - lib/capa/emulator_recorder.rb
 - lib/capa/gif_generator.rb
 - lib/capa/helper.rb
+- lib/capa/recorder_factory.rb
 - lib/capa/simulator_recorder.rb
 - lib/capa/string.rb
 - lib/capa/version.rb

data/bin/capa-android

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/capa'
-
-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")
-
-begin
-  recorder.record
-rescue Capa::UserAbort
-  puts 'Exiting...'
-  `adb shell killall screenrecord`
-  exit
-end
-
-generator.generate

data/bin/capa-ios

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/capa'
-
-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")
-
-begin
-  recorder.record
-rescue Capa::UserAbort
-  puts 'Exiting...'
-  if system('pgrep simctl > /dev/null')
-    `killall simctl`
-  end
-  exit
-end
-
-generator.generate