heywatch 0.0.1 → 1.0.2

data/bin/heywatch

@@ -0,0 +1,135 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.dirname(__FILE__) + "/../lib"
+require "rubygems"
+require "heywatch"
+
+RestClient.log = "stderr" if ENV["DEBUG"]
+config_file = "#{ENV["HOME"]}/.heywatch"
+
+if File.exists?(config_file)
+  user, passwd = File.read(config_file).split("\n")
+else
+  puts "HeyWatch username:"
+  user = $stdin.gets.chomp
+  puts "HeyWatch password:"
+  system "stty -echo"
+  passwd = $stdin.gets.chomp
+  system "stty echo"
+  
+  # testing credentials
+  begin
+    HeyWatch.new(user, passwd)  
+    File.open(config_file, "w") {|f| f.write("#{user}\n#{passwd}") }
+    File.chmod(0600, config_file)
+    puts "Your credentials have been saved in this file #{config_file} (0600)"
+    exit
+  rescue => e
+    puts "Wrong login or password."
+    exit
+  end
+end
+
+hw = HeyWatch.new(user, passwd)
+
+begin
+  if ARGV.empty?
+    puts %(Usage: heywatch RESOURCE:METHOD [ID] [parameter1=value1 parameter2=value2 ...]
+
+    Resources:
+
+      account       # account information
+      video         # manage video         | all, info, delete, count, bin            
+      encoded_video # manage encoded video | all, info, delete, count, bin, jpg       
+      download      # manage download      | all, info, delete, count, create         
+      job           # manage job           | all, info, delete, count, create         
+      format        # manage format        | all, info, delete, count, create, update 
+    
+    Usage:
+    
+      heywatch account
+      heywatch video:info 123456
+      heywatch job:all
+      heywatch download:create url=http://site.com/video.mp4 title=mytitle
+      heywatch encoded_video:jpg 9882322 start=4 > thumb.jpg
+      heywatch format:all owner=true video_codec=h264
+      heywatch video:all "[0]"
+      heywatch job:all "[0..10]"
+      heywatch format:count owner=true
+    )
+    exit
+  end
+  
+  if ARGV[0] == "account"
+    puts JSON.pretty_generate(hw.account)
+    exit
+  end
+  
+  resource, method = ARGV[0].split(":")
+  params = ARGV[1..-1]
+
+  $stderr.puts [resource, method, params].inspect if ENV["DEBUG"]
+  
+  if method == "create"
+    params = Hash[*ARGV[1..-1].map{|p| k,v = p.split("=") }.flatten]
+    puts JSON.pretty_generate(hw.send(method, *[resource, params]))
+    exit
+  end
+  
+  if method == "update"
+    params = Hash[*ARGV[2..-1].map{|p| k,v = p.split("=") }.flatten]
+    puts JSON.pretty_generate(hw.send(method, *[resource, ARGV[1], params]))
+    exit
+  end
+  
+  if method == "jpg"
+    params = Hash[*ARGV[2..-1].map{|p| k,v = p.split("=") }.flatten]
+    puts hw.send(method, *[ARGV[1], params])
+    exit
+  end
+
+  if method == "bin"
+    puts hw.send(method, *[resource, ARGV[1]])
+    exit
+  end
+  
+  if params.empty?
+    res = hw.send(method, resource)
+    if method == "count"
+      puts res
+      exit
+    end
+    
+    puts JSON.pretty_generate(res)
+    exit
+  end
+  
+  if params.last =~ /\[([0-9\.-]+)\]/
+    offset = eval($1)
+    params = params[0..-2]
+  end
+
+  res = hw.send(method, *[resource, params])
+  if res == true
+    puts "ok"
+    exit
+  end
+  
+  if res.is_a?(Fixnum)
+    puts res
+    exit
+  end
+  
+  if res.empty?
+    exit
+  end
+  
+  res = res[offset] if offset
+  
+  puts JSON.pretty_generate(res)
+  exit
+  
+rescue => e
+  puts e
+  puts e.backtrace.join("\n") if ENV["DEBUG"]
+end

data/lib/heywatch.rb

@@ -1,88 +1,140 @@
-#--
-# Copyright (c) 2007 Bruno Celeste
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
+require "rest-client"
+require "json"
 
-require "rubygems"
-require "xmlsimple"
-require "cgi"
-
-module HeyWatch
-	Host = "heywatch.com" unless const_defined? :Host
-	OutFormat = "xml" unless const_defined? :OutFormat
-  Resources = %w{job format download discover encoded_video video account log} unless const_defined? :Resources
-
-  # These are error codes you receive if you use ping options
-  ErrorCode = {
-                100 => "Unknown error",
-                101 => "Unsupported audio codec",
-                102 => "Unsupported video codec",
-                103 => "This video cannot be encoded in this format",
-                104 => "Wrong settings for audio",
-                105 => "Wrong settings for video",
-                106 => "Cannot retrieve info from this video",
-                107 => "Not a video file",
-                108 => "Video too long",
-                109 => "The container of this video is not supported yet",
-                110 => "The audio can't be resampled",
-                201 => "404 Not Found",
-                202 => "Bad address",
-                300 => "No more credit available"
-              } unless const_defined? :ErrorCode
-              
-  class NotAuthorized < RuntimeError; end
-  class RequestError < RuntimeError; end
-  class ResourceNotFound < RuntimeError; end
-  class ServerError < RuntimeError; end
-  class SessionNotFound < RuntimeError; end
+class HeyWatch
+  class InvalidResource < ArgumentError; end
+  class BadRequest < RuntimeError; end
+  
+  URL = "https://heywatch.com"
+  VERSION = "1.0.2"
+  
+  attr_reader :cli
   
-  # Convert the XML response into Hash
-  def self.response(xml)
-    XmlSimple.xml_in(xml, {'ForceArray' => false})
+  # Authenticate with your HeyWatch credentials
+  #
+  # hw = HeyWatch.new(user, passwd)
+  def initialize(user, password)
+    @cli = RestClient::Resource.new(URL, {:user => user, :password => password, :headers =>
+      {:user_agent => "HeyWatch Ruby/#{VERSION}", :accept => "application/json"}})
+      
+    self
   end
   
-  # sanitize url
-  def self.sanitize_url(url)
-    return url.gsub(/[^a-zA-Z0-9:\/\.\-\+_\?\=&]/) {|s| CGI::escape(s)}.gsub("+", "%20")
+  def inspect # :nodoc:
+    "#<HeyWatch: " + account.inspect + ">"
+  end
+  
+  # Get account information
+  #
+  # hw.account
+  def account
+    JSON.parse(@cli["/account"].get)
   end
-end
-
-$: << File.dirname(File.expand_path(__FILE__))
-
-require "heywatch/ext"
-require "heywatch/version"
-require "heywatch/browser"
-require "heywatch/auth"
-require "heywatch/base"
-require "heywatch/encoded_video"
-require "heywatch/video"
-require "heywatch/account"
-require "heywatch/download"
-require "heywatch/discover"
-require "heywatch/job"
 
-class Hash
-  include HeyWatch::CoreExtension::HashExtension
-end
+  # Get all from a given resource.
+  # Filters are optional
+  #
+  # hw.all :video
+  # hw.all :format, :owner => true
+  def all(*resource_and_filters)
+    resource, filters = resource_and_filters
+  
+    result = JSON.parse(@cli["/#{resource}"].get)
+    return result if filters.nil? or filters.empty?
 
-class Array
-  include HeyWatch::CoreExtension::ArrayExtension
-end
+    return filter_all(result, filters)
+  end
+  
+  # Get info about a given resource and id
+  #
+  # hw.info :format, 31
+  def info(resource, id)
+    JSON.parse(@cli["/#{resource}/#{id}"].get)
+  end
+  
+  # Count objects from a given resources.
+  # Filters are optional
+  #
+  # hw.count :job
+  # hw.count :job, :status => "error"
+  def count(*resource_and_filters)
+    all(*resource_and_filters).size
+  end
+  
+  # Get the binary data of a video / encoded_video
+  #
+  # hw.bin :encoded_video, 12345
+  def bin(resource, id, &block)
+    unless [:encoded_video, :video].include?(resource.to_sym)
+      raise InvalidResource, "Can't retrieve '#{resource}'"
+    end
+    
+    @cli["/#{resource}/#{id}.bin"].head do |res, req|
+      return RestClient.get(res.headers[:location], :raw_response => true, &block)
+    end
+  end
+  
+  # Generate thumbnails in the foreground or background via :async => true
+  #
+  # hw.jpg 12345, :start => 2
+  # => thumbnail data
+  #
+  # hw.jpg 12345, :async => true, :number => 6, :s3_directive => "s3://accesskey:secretkey@bucket"
+  # => true
+  def jpg(id, params={})
+    if params.delete(:async) or params.delete("async")
+      @cli["/encoded_video/#{id}/thumbnails"].post(params)
+      return true
+    end
+    
+    unless params.empty?
+      params = "?" + params.map{|k,v| "#{k}=#{v}"}.join("&")
+    end
+    @cli["/encoded_video/#{id}.jpg#{params}"].get
+  rescue RestClient::BadRequest=> e
+    raise BadRequest, e.http_body
+  end
+  
+  # Create a resource with the give data
+  #
+  # hw.create :download, :url => "http://site.com/video.mp4", :title => "testing"
+  def create(resource, data={}) 
+    JSON.parse(@cli["/#{resource}"].post(data))
+  rescue RestClient::BadRequest=> e
+    raise BadRequest, e.http_body
+  end
+  
+  # Update an object by giving its resource and ID
+  #
+  # hw.update :format, 9877, :video_bitrate => 890
+  def update(resource, id, data={})
+    @cli["/#{resource}/#{id}"].put(data)
+    info(resource, id)
+  rescue RestClient::BadRequest=> e
+    raise BadRequest, e.http_body
+  end
+  
+  # Delete a resource
+  #
+  # hw.delete :format, 9807
+  def delete(resource, id)
+    @cli["/#{resource}/#{id}"].delete
+    true
+  end
+  
+  private
+  
+  def filter_all(result, filters) # :nodoc:
+    if filters.is_a?(Array)
+      filters = Hash[*filters.map{|f| f.split("=") }.flatten]
+    end
+    
+    filtered = []
+    result.each do |r|
+      if eval("true if " + filters.map{|k,v| "'#{r[k.to_s]}' =~ /#{v}/"}.join(" and "))
+        filtered << r
+      end
+    end
+    filtered
+  end
+end

metadata

@@ -1,80 +1,95 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: heywatch
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-04-19 00:00:00 +02:00
-summary: Ruby Library for HeyWatch service (http://heywatch.com).
-require_paths: 
-- lib
-email: bruno.celeste@heywatch.com
-homepage: http://heywatch.rubyforge.org
-rubyforge_project: heywatch
-description: Ruby Library for HeyWatch service (http://heywatch.com).
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  hash: 19
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Bruno Celeste
-files: 
-- Manifest.txt
-- README.txt
-- Rakefile
-- lib/heywatch.rb
-- lib/heywatch/video.rb
-- lib/heywatch/version.rb
-- lib/heywatch/job.rb
-- lib/heywatch/ext.rb
-- lib/heywatch/encoded_video.rb
-- lib/heywatch/download.rb
-- lib/heywatch/discover.rb
-- lib/heywatch/browser.rb
-- lib/heywatch/base.rb
-- lib/heywatch/auth.rb
-- lib/heywatch/account.rb
-- setup.rb
-- test/test_helper.rb
-- test/test_heywatch.rb
-test_files: 
-- test/test_helper.rb
-- test/test_heywatch.rb
-rdoc_options: 
-- --quiet
-- --title
-- heywatch documentation
-- --opname
-- index.html
-- --line-numbers
-- --main
-- README.txt
-- --inline-source
-extra_rdoc_files: 
-- README.txt
-executables: []
-
-extensions: []
-
-requirements: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2011-06-18 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  name: rest-client
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+description: Client Library for encoding Videos with HeyWatch, a Video Encoding Web Service.
+email: bruno@particle-s.com
+executables: 
+- heywatch
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- lib/heywatch.rb
+- bin/heywatch
+has_rdoc: true
+homepage: http://heywatch.com
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.5.0
+signing_key: 
+specification_version: 3
+summary: Client library and CLI to encode videos with HeyWatch
+test_files: []
+