heywatch 1.2.8 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c17fc5449cb72029b803d8a8fa3ddd92bea21735
-  data.tar.gz: 0acf4d7ed1e1cff75939cf0ed79c8b9e8ace35bc
+  metadata.gz: f508e3eb28941bd33d8492abaee36ffe43c4c6ae
+  data.tar.gz: 01c33f25ce83aef17f50911fe08b77cdb7155d79
 SHA512:
-  metadata.gz: f6a044e0ba5ff5c0bed2b0a55058b6a1e8b52a7efa8227c72e055eff204f5972f0dc2c0fb08326dfedb9f6cf4b36a0f5d207349463b99f7fa97e91357c1abc80
-  data.tar.gz: 330dd4a59b356e4d8326fc77770868d3e350771d48d76e756ee7c3fb9544fd35a65e7d7002582aed2fd99834a0bf3e1598185263456064274298c10a18b3eb8f
+  metadata.gz: 6c69118f29dc4780c3439b385a4e459bbcf0303f7b5f6ee898a38868402dce12b474f6372cdaa42cea26fd9159a1cacd610c1bc97b7181bef2eee425490257b7
+  data.tar.gz: f6a6a87e0287c154a2228c8a57c6205a7b0fef8a5949784ebf9c5383c57698adc5528a7556e9dd54a5d589c76b4f7c5e3cbd648ac0a87bed84c8c16786959d8c

data/lib/heywatch.rb

@@ -1,193 +1,36 @@
-require "rest-client"
+require "net/http"
 require "multi_json"
 require "uri"
 
-class HeyWatch
-  class InvalidResource < ArgumentError; end
-  class BadRequest < RuntimeError; end
+module HeyWatch
+  class Error < RuntimeError; end
 
-  URL = ENV["HEYWATCH_URL"] || "https://heywatch.com"
-  VERSION = "1.2.8"
+  HEYWATCH_URL = ENV["HEYWATCH_URL"] || "https://heywatch.com"
+  USER_AGENT = "HeyWatch/2.0.0 (Ruby)"
 
-  attr_reader :credits_left
+  def self.submit(config_content, api_key=nil)
+    api_key ||= ENV["HEYWATCH_API_KEY"]
 
-  # Authenticate with your HeyWatch credentials
-  #
-  # hw = HeyWatch.new(user, passwd)
-  def initialize(user=nil, password=nil)
-    uri = URI.parse(URL)
-    user = uri.user if !uri.user.nil?
-    password = uri.password if !uri.password.nil?
-    @cli = RestClient::Resource.new(URL, {:user => user, :password => password, :headers =>
-      {:user_agent => "HeyWatch Ruby/#{VERSION}", :accept => "application/json"}})
+    uri = URI("#{HEYWATCH_URL}/api/v1/job")
+    headers = {"User-Agent" => USER_AGENT, "Content-Type" => "text/plain", "Accept" => "application/json"}
 
-    if !user.nil? && !password.nil?
-      self.account
-    end
-    self
-  end
-
-  def self.register(data={})
-    HeyWatch.new(nil, nil).req("/account", :post, data)
-  end
-
-  # Get a specific field from account
-  #
-  # hw["env"] => "sandbox"
-  # hw["login"] => "bruno"
-  def [](field)
-    @me[field]
-  end
-
-  def inspect # :nodoc:
-    "#<HeyWatch: " + @me.inspect + ">"
-  end
-
-  # Get account information
-  #
-  # hw.account
-  def account
-    @me = req("/account")
-  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
-    results = req("/#{resource}")
-    return results if filters.nil? || filters.empty?
-    return filter_all(results, filters)
-  end
-
-  # Get info about a given resource and id
-  #
-  # hw.info :format, 31
-  def info(resource, id)
-    req("/#{resource}/#{id}")
-  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)
-    RestClient.get(url(resource, id), :raw_response => true, &block)
-  end
-
-  # Get the real location of the video / encoded_video
-  #
-  # hw.url :encoded_video, 12345
-  def url(resource, id)
-    unless [:encoded_video, :video].include?(resource.to_sym)
-      raise InvalidResource, "Can't retrieve '#{resource}'"
-    end
-
-    info(resource, id)["url"]
-  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) || params.delete("async")
-      return req("/encoded_video/#{id}/thumbnails", :post, params)
-    end
+    req = Net::HTTP::Post.new(uri.path, headers)
+    req.basic_auth api_key, ''
+    req.body = config_content
 
-    unless params.empty?
-      params = "?" + params.map{|k,v| "#{k}=#{v}"}.join("&")
+    response = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme.include?("https")) do |http|
+      http.request(req)
     end
-    req("/encoded_video/#{id}.jpg#{params}")
-  end
-
-  # Create a resource with the give data
-  #
-  # hw.create :download, :url => "http://site.com/video.mp4", :title => "testing"
-  def create(resource, data={})
-    req("/#{resource}", :post, data)
-  end
-
-  # Update an object by giving its resource and ID (except account)
-  #
-  # hw.update :format, 9877, :video_bitrate => 890
-  def update(resource, *params)
-    if resource.to_sym == :account
-      return req("/#{resource}", :put, params[0])
-    end
-
-    id, data = params
-    req("/#{resource}/#{id}", :put, data)
-  end
-
-  # Delete a resource
-  #
-  # hw.delete :format, 9807
-  def delete(resource, id)
-    req("/#{resource}/#{id}", :delete)
-  end
-
-  # Upload a video from the disk
-  #
-  # hw.upload "/path/to/video.mp4"
-  def upload(path, params={})
-    req("/upload", :post, params.merge({:data => File.new(path, "rb")}))
-  end
-
-  def req(path, method=:get, params={}, &block) # :nodoc:
-    res = @cli[singularize_resource_in_path(path)].send(method, params, &block)
-    retrieve_credits_or_gb_left(res.headers)
 
-    if res.headers[:status] == "204" || res.empty?
-      return true
-    end
-
-    if(res.headers[:content_type] =~ /json/ && !res.to_s.strip.empty?)
-      return MultiJson.decode(res)
-    end
-
-    return res.to_s.strip
-  rescue RestClient::BadRequest=> e
-    raise BadRequest, e.http_body
-  end
-
-  private
-
-  def filter_all(results, filters)
-    filters = filters.map{ |f| f.split("=") } if filters.is_a?(Array)
-    filters = Hash[filters.map{ |k, v| [k.to_s, Regexp.new(v.to_s)] }]
-
-    results.select do |result|
-      filters.all?{ |key, matcher| result[key].to_s =~ matcher }
-    end
-  end
-
-  def singularize_resource_in_path(path)
-    s_path = path.split("/")
-    if s_path[1] != "hls" && s_path[1][-1..-1] == "s"
-      s_path[1] = s_path[1].slice(0..-2)
-    end
-    return s_path.join("/")
+    return MultiJson.decode(response.body)
   end
 
-  def retrieve_credits_or_gb_left(headers)
-    if credits = headers[:x_hw_credits_left]
-      @credits_left = credits.to_i
-    elsif gb = headers[:x_hw_gb_left]
-      @credits_left = gb.to_f
+  def self.submit!(config_content, opts={})
+    result = submit(config_content, opts)
+    if result["status"] == "error"
+      raise Error, "#{result["message"]} (#{result["error_code"]})"
+    else
+      return result
     end
   end
-end
+end

metadata

@@ -1,55 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: heywatch
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Bruno Celeste
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: Client Library for encoding Videos with HeyWatch, a Video Encoding Web
-  Service.
-email: bruno@particle-s.com
-executables:
-- heywatch
+description: Official client library to transcode videos with heywatch cloud service
+email: bruno@heywatch.com
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/heywatch.rb
-- bin/heywatch
 homepage: http://www.heywatchencoding.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -57,18 +41,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Client library and CLI to encode videos with HeyWatch
+summary: Client library to transcode videos with heywatch
 test_files: []

data/bin/heywatch

@@ -1,196 +0,0 @@
-#!/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
-  print "Do you want to create an HeyWatch account? (Y/n) "
-  if $stdin.gets.chomp.downcase == "y"
-    data = {}
-    [:firstname, :lastname, :email, :login].each do |f|
-      print "#{f}: ".capitalize
-      data[f] = $stdin.gets.chomp
-    end
-
-    [:password, :password_confirmation].each do |f|
-      print "#{f}: ".capitalize.gsub("_", " ")
-      system "stty -echo"
-      data[f] = $stdin.gets.chomp
-      system "stty echo"
-      puts
-    end
-
-    print "Is the information correct? (Y/n) "
-    exit if $stdin.gets.chomp.downcase != "y"
-
-    begin
-      HeyWatch.register(data)
-      user, passwd = data[:login], data[:password]
-    rescue => e
-      puts e
-      exit
-    end
-  else
-    print "HeyWatch username: "
-    user = $stdin.gets.chomp
-    print "HeyWatch password: "
-    system "stty -echo"
-    passwd = $stdin.gets.chomp
-    system "stty echo"
-    puts
-  end
-
-  # 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)\n-----\n"
-  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       # manage account       | create, update
-      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
-      upload        # upload a video
-
-    Usage:
-
-      heywatch account
-      heywatch account:update env=sandbox
-      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
-      heywatch upload path/to/video.mp4 "title=my title"
-    )
-    exit
-  end
-
-  if ARGV.size == 1 and ARGV[0] == "account"
-    puts MultiJson.dump(hw.account, :pretty => true)
-    exit
-  end
-
-  resource, method = ARGV[0].split(":")
-  params = ARGV[1..-1]
-  if method.nil?
-    if params.size == 1 && params[0].to_i > 0
-      method = "info"
-    else
-      method = "all"
-    end
-  end
-
-  $stderr.puts [resource, method, params].inspect if ENV["DEBUG"]
-
-  if resource == "upload"
-    path = ARGV[1]
-    params = Hash[*ARGV[2..-1].map{|p| k,v = p.split("=") }.flatten]
-    puts MultiJson.dump(hw.upload(path, params), :pretty => true)
-    exit
-  end
-
-  if method == "create"
-    params = Hash[*ARGV[1..-1].map{|p| k,v = p.split("=") }.flatten]
-
-    if resource == "account"
-      puts MultiJson.dump(HeyWatch.register(params), :pretty => true)
-    else
-      if resource == "robot/job" # read from STDIN
-        params = $stdin.read
-      end
-
-      res = hw.send(method, *[resource, params])
-      if res.empty?
-        puts "ok"
-      else
-        puts MultiJson.dump(res, :pretty => true)
-      end
-    end
-    exit
-  end
-
-  if method == "update"
-    params = Hash[*ARGV[2..-1].map{|p| k,v = p.split("=") }.flatten]
-
-    hw.send(method, *[resource, ARGV[1], params])
-    puts "ok"
-    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 MultiJson.dump(res, :pretty => true)
-    exit
-  end
-
-  if params.last =~ /\[([0-9\.-]+)\]/
-    offset = eval($1)
-    params = params[0..-2]
-  end
-
-  res = hw.send(method, *[resource, params[0]])
-  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 MultiJson.dump(res, :pretty => true)
-  exit
-
-rescue => e
-  puts e
-  puts e.backtrace.join("\n") if ENV["DEBUG"]
-end