airplay-cli 0.1.0.beta4 → 0.1.0

data/bin/air

@@ -2,26 +2,36 @@
 
 require "clap"
 require "airplay/cli"
+require "airplay/cli/version"
 
-Clap.run ARGV,
-  "--device"      => lambda { |device_name| @device = Airplay[device_name] },
-  "--wait"        => lambda { |sec| @wait = sec.to_i },
-  "--interactive" => lambda { @interactive = true },
+begin
+  Clap.run ARGV,
+    "--device"      => lambda { |device_name| @device = Airplay[device_name] },
+    "--wait"        => lambda { |sec| @wait = sec.to_i },
+    "--interactive" => lambda { @interactive = true },
 
-  "list" => Airplay::CLI.method(:list),
+    "list" => Airplay::CLI.method(:list),
 
-  "play" => lambda { |video|
-    options = { device: @device || Airplay.devices.first }
-    Airplay::CLI.play(video, options)
-  },
+    "version" => lambda { puts Airplay::CLI::VERSION },
 
-  "view" => lambda { |file|
-    options = {
-      device: @device || Airplay.devices.first,
-      interactive: @interactive || false,
-      wait: @wait || 3
+    "play" => lambda { |video|
+      options = { device: @device || Airplay.devices.first }
+      Airplay::CLI.play(video, options)
+    },
+
+    "view" => lambda { |file|
+      options = {
+        device: @device || Airplay.devices.first,
+        interactive: @interactive || false,
+        wait: @wait || 3
+      }
+      Airplay::CLI.view(file, options)
     }
-    Airplay::CLI.view(file, options)
-  }
+
+rescue Airplay::Browser::NoDevicesFound
+  puts "No devices found."
+rescue Interrupt
+  puts "Bye!"
+end
 
 # vim: ft=ruby

data/lib/airplay/cli.rb

@@ -1,9 +1,18 @@
-require "airplay"
 require "ruby-progressbar"
+require "airplay"
+require "airplay/cli/image_viewer"
 
+# Public: Airplay core module
+#
 module Airplay
+  # Public: Airplay CLI module
+  #
   module CLI
     class << self
+      # Public: Lists all the devices to STDOUT
+      #
+      # Returns nothing.
+      #
       def list
         Airplay.devices.each do |device|
           puts <<-EOS.gsub(/^\s{12}/,'')
@@ -15,6 +24,14 @@ module Airplay
         end
       end
 
+      # Public: Plays a video given a device
+      #
+      # video   - The url or file path to the video
+      # options - Options that include the device
+      #           * device: The device in which it should run
+      #
+      # Returns nothing.
+      #
       def play(video, options)
         device = options[:device]
         player = device.play(video)
@@ -31,74 +48,34 @@ module Airplay
         player.wait
       end
 
+      # Public: Show an image given a device
+      #
+      # file_or_dir - The url, file path or folder path to the image/s
+      # options     - Options that include the device
+      #               * device: The device in which it should run
+      #               * interactive: Boolean flag to control playback with the
+      #                              arrow keys
+      #
+      # Returns nothing.
+      #
       def view(file_or_dir, options)
         device = options[:device]
-        wait = options[:wait]
+        viewer = ImageViewer.new(device, options)
 
         if File.directory?(file_or_dir)
           files = Dir.glob("#{file_or_dir}/*")
 
           if options[:interactive]
-            view_interactive(files)
+            viewer.interactive(files)
           else
-            view_slideshow(files)
+            viewer.slideshow(files)
           end
         else
-          view_image(device, file_or_dir)
+          viewer.view(file_or_dir)
           sleep
         end
       end
 
-      private
-
-      def view_interactive(files)
-        numbers = Array(0...files.count)
-        transition = "None"
-
-        i = 0
-        loop do
-          view_image(device, files[i], transition)
-
-          case read_char
-            # Right Arrow
-          when "\e[C"
-            i = i + 1 > numbers.count - 1 ? 0 : i + 1
-            transition = "SlideLeft"
-          when "\e[D"
-            i = i - 1 < 0 ? numbers.count - 1 : i - 1
-            transition = "SlideRight"
-          else
-            break
-          end
-        end
-      end
-
-      def view_slideshow(files)
-        files.each do |file|
-          view_image(device, file)
-          sleep wait
-        end
-      end
-
-      def read_char
-        STDIN.echo = false
-        STDIN.raw!
-
-        input = STDIN.getc.chr
-        if input == "\e" then
-          input << STDIN.read_nonblock(3) rescue nil
-          input << STDIN.read_nonblock(2) rescue nil
-        end
-      ensure
-        STDIN.echo = true
-        STDIN.cooked!
-
-        return input
-      end
-
-      def view_image(device, image, transition = "SlideLeft")
-        device.view(image, transition: transition)
-      end
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: airplay-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta4
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - elcuervo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airplay
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: clap
   requirement: !ruby/object:Gem::Requirement
@@ -86,9 +86,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23