zencoder-fetcher 0.1.7 → 0.2

data/README.rdoc

@@ -10,22 +10,12 @@ Run with the
 
 Options:
 * --url, -u:                  URL to post the Zencoder notification (default: http://localhost:3000)
-* --loop, -l:                 Run the notifier in a loop, as a daemon.
-* --seconds, -s <i>:          Check every x seconds. (Default: 60)
+* --loop, -l:                 Run the notifier in a loop.
+* --interval, -n <i>:         Check every n seconds. (Default: 60)
 * --count, -c <i>:            Number of notifications to retrieve per page. (Default: 50)
 * --page, -p <i>:             The page to load. (Default: 1)
-* --since_job_id, -p <i>:     Load notifications since the given job_id. (Default gets all jobs)
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+* --since, -m <i>:            Load notifications starting since n minutes ago.
 
 == Copyright
 
-Copyright (c) 2010 Zencoder. See LICENSE for details.
+Copyright (c) 2010 Zencoder Inc. See LICENSE for details.

data/bin/zencoder_fetcher

@@ -18,13 +18,14 @@ where [options] are:
 EOS
   opt :url, "URL to post the Zencoder notification", :short => 'u', :type => String, :default => "http://localhost:3000"
   opt :loop, "Run the notifier in a loop.", :short => 'l', :default => false
-  opt :seconds, "Check every x seconds.", :short => 's', :type => Integer, :default => 60
+  opt :interval, "Check every x seconds.", :short => 'n', :type => Integer, :default => 60
   opt :count, "Number of notifications to retrieve per page.", :short => 'c', :type => Integer, :default => 50
   opt :page, "The page to load.", :short => 'p', :type => Integer, :default => 1
-  opt :since_job_id, "Load notifications since the given job_id.", :short => 'j', :type => Integer, :default => nil
-  opt :all, "Get all records on each request, rather than only new ones.", :short => 'a', :default => false
+  opt :since, "Load notifications starting since _n_ minutes ago.", :short => 'm', :type => Integer, :default => nil
+  opt :endpoint, "Zencoder endpoint to use. Defaults to https://app.zencoder.com/.", :short => 'e', :type => String
 end
 
+
 #
 # Validate input
 #
@@ -38,43 +39,42 @@ Usage:
       zencoder_fetcher [options] <api_key>
 
 EOS
-  exit -1
+  exit 1
 end
 
+
 #
 # Run Zencoder Notifier
 #
 
-options = {}
-options[:api_key] = ARGV[0]
-options[:url] = opts[:url]
-options[:count] = opts[:count]
-options[:page] = opts[:page]
-options[:all] = opts[:all]
-options[:since_job_id] = opts[:since_job_id]
+options            = {}
+options[:api_key]  = ARGV[0]
+options[:url]      = opts[:url]
+options[:count]    = opts[:count]
+options[:page]     = opts[:page]
+options[:since]    = (opts[:since] && (Time.now.utc - (opts[:since].to_i * 60))) || nil
+options[:endpoint] = opts[:endpoint]
 
 begin
   if opts[:loop]
-    @since_job_id = 0
+    @since = options[:since]
     loop do
-      begin
-        puts "Checking Zencoder for Notifications at #{Time.now}"
-        options.merge!({:since_job_id => @since_job_id})
-        last_job = ZencoderFetcher.request(options)
-        @since_job_id = last_job if last_job > @since_job_id
-        sleep [10,opts[:seconds]].max
-      rescue Exception => e
-        raise e
-      end
+      puts "Checking Zencoder for Notifications" << (@since ? " since #{@since.utc.strftime('%b %e, %Y @ %H:%M:%S %Z')}" : "")
+      options.merge!(:since => @since)
+      @since = ZencoderFetcher.request(options)
+      sleep [10, opts[:interval]].max
     end
   else
     ZencoderFetcher.request(options)
   end
 rescue SystemExit, Interrupt
-  raise "Quitting..."
+  puts "Quitting..."
+  exit 0
+rescue FetcherError
+  exit 1
 rescue Exception => e
   puts e.class
   puts e.message
   puts e.backtrace
-  raise
+  exit 1
 end

data/lib/zencoder_fetcher.rb

@@ -1,48 +1,53 @@
 require 'rubygems'
 require 'httparty'
 require 'json'
+require 'time'
 
 module ZencoderFetcher
-  FETCHER_VERSION = [0,1] unless defined?(FETCHER_VERSION)
-  
+  FETCHER_VERSION = [0,2] unless defined?(FETCHER_VERSION)
+
   def self.version
     FETCHER_VERSION.join(".")
   end
-  
+
   def self.request(options={})
-    api_key = options[:api_key]
-    post_uri = options[:url] ? options[:url] : "http://localhost:3000/"
-    per_page = options[:count] ? options[:count] : 50
-    page = options[:page] ? options[:page] : 1
-    since_job_id = (options[:all] || options[:since_job_id].to_s == "") ? 0 : options[:since_job_id]
-    
-    begin
-      response = HTTParty.get("http://app.zencoder.com/api/notifications.json?api_key=#{api_key}&per_page=#{per_page}&page=#{page}&since_id=#{since_job_id}")
-      
-      if response.body.is_a?(String)
-        if response.body =~ /\{"errors"/
-          puts JSON.parse(response.body)["errors"]
-        else
-          i = 0
-          latest_job_id = 0
-          JSON.parse(response.body).each do |job|
-            options = {:headers => {"Content-type" => "application/json"}, :body => job.to_json}
-            begin
-              HTTParty.post(post_uri, options)
-              latest_job_id = job["job"]["id"].to_i if job["job"]["id"].to_i > latest_job_id
-              i += 1
-            rescue Errno::ECONNREFUSED => e
-              raise Exception, "Unable to connect to your local server at #{post_uri}. Is it running?"
-            end
-          end
-          puts "#{i} notifications retrieved and posted to #{post_uri}"
-          return latest_job_id
+    query = {
+      "api_key"  => options[:api_key],
+      "per_page" => options[:count] || 50,
+      "page"     => options[:page] || 1
+    }
+    query["since"] = options[:since].iso8601 if options[:since]
+    query = query.map{|k,v| "#{k}=#{v}" }.join("&")
+
+    local_url = options[:url] || "http://localhost:3000/"
+
+    response = HTTParty.get("https://#{options[:endpoint] || 'app'}.zencoder.com/api/notifications.json?#{query}",
+                            :headers => { "HTTP_X_FETCHER_VERSION" => version })
+
+    if response["errors"]
+      puts "There was an error fetching notifications:"
+      puts response.body.to_s
+      raise
+    else
+      response["notifications"].each do |notification|
+        begin
+          HTTParty.post(local_url,
+                        :body => notification.to_json,
+                        :headers => { "Content-type" => "application/json" })
+        rescue Errno::ECONNREFUSED => e
+          puts "Unable to connect to your local server at #{local_url}. Is it running?"
+          raise FetcherLocalConnectionError
         end
-      else
-        puts "No notifications found."
       end
-    rescue Exception => e
-      raise e
+      puts "Notifications retrieved: #{response["notifications"].size}"
+      puts "Posted to: #{local_url}" if response["notifications"].size > 0
+      puts
+
+      Time.parse(response["sent_at"])
     end
   end
-end
+end
+
+
+class FetcherError < StandardError; end
+class FetcherLocalConnectionError < FetcherError; end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: zencoder-fetcher
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 7
-  version: 0.1.7
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
-- chriswarren
+- Chris Warren
+- Brandon Arbini
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 -05:00
-default_executable: zencoder_fetcher
+date: 2011-07-14 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: trollop
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,7 +30,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -60,48 +60,28 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: trollop
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
 description: Fetches notifications from Zencoder for local development where Zencoder is unable to communicate to the server, usually because it's localhost.
-email: chris@zencoder.com
+email: 
+- chris@zencoder.com
+- b@zencoder.com
 executables: 
 - zencoder_fetcher
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
 - bin/zencoder_fetcher
 - lib/zencoder_fetcher.rb
-- test/helper.rb
-- test/test_zencoder-fetcher.rb
-- zencoder-fetcher.gemspec
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/zencoder/zencoder-fetcher
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -125,10 +105,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Fetches notifications from Zencoder for local development.
-test_files: 
-- test/helper.rb
-- test/test_zencoder-fetcher.rb
+test_files: []
+

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/Rakefile

@@ -1,57 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "zencoder-fetcher"
-    gem.summary = %Q{Fetches notifications from Zencoder for local development.}
-    gem.description = %Q{Fetches notifications from Zencoder for local development where Zencoder is unable to communicate to the server, usually because it's localhost.}
-    gem.email = "chris@zencoder.com"
-    gem.homepage = "http://github.com/zencoder/zencoder-fetcher"
-    gem.authors = ["chriswarren"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_dependency 'httparty'
-    gem.add_dependency 'json'
-    gem.add_dependency 'trollop'
-    gem.executables = %w( zencoder_fetcher)
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "zencoder-notifier #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +0,0 @@
-0.1.7

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'zencoder-notifier'
-
-class Test::Unit::TestCase
-end

data/test/test_zencoder-fetcher.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestZencoderNotifier < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end

data/zencoder-fetcher.gemspec

@@ -1,66 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{zencoder-fetcher}
-  s.version = "0.1.7"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["chriswarren"]
-  s.date = %q{2010-06-28}
-  s.default_executable = %q{zencoder_fetcher}
-  s.description = %q{Fetches notifications from Zencoder for local development where Zencoder is unable to communicate to the server, usually because it's localhost.}
-  s.email = %q{chris@zencoder.com}
-  s.executables = ["zencoder_fetcher"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/zencoder_fetcher",
-     "lib/zencoder_fetcher.rb",
-     "test/helper.rb",
-     "test/test_zencoder-fetcher.rb",
-     "zencoder-fetcher.gemspec"
-  ]
-  s.homepage = %q{http://github.com/zencoder/zencoder-fetcher}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Fetches notifications from Zencoder for local development.}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_zencoder-fetcher.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<trollop>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<trollop>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<trollop>, [">= 0"])
-  end
-end
-