airbrush 0.0.4 → 0.0.5.pre

data/.gitignore

@@ -0,0 +1,3 @@
+pkg
+doc
+coverage

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2008 Square Circle Triangle
+
+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.

data/Rakefile

@@ -1,4 +1,15 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+Dir['tasks/**/*.rake'].each { |rake| load rake }
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "airbrush"
+    gemspec.summary = "Image Processing Server"
+    gemspec.description = "An Image Processing Server"
+    gemspec.email = "nick@whatevernext.org"
+    gemspec.homepage = "http://github.com/square-circle-triangle/airbush"
+    gemspec.authors = ["Marcus Crafter", "Nick Marfleet"]
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
+end

data/VERSION

@@ -0,0 +1 @@
+0.0.3

data/extras/image_reaper.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'active_support'
+
+class File
+  def self.obsolete?(filename)
+    File.mtime(filename) < 1.day.ago
+  end
+end
+
+Dir['*'].each do |filename|
+  next if filename =~ /^airbrush/ # leave queue files alone
+  File.delete filename if File.obsolete? filename
+end

data/lib/airbrush/core_ext/get_args.rb

@@ -1,16 +1,16 @@
+require 'live_ast'
 require 'ruby2ruby'
-require 'parse_tree'
 
 class ParseTreeArray < Array #:nodoc:
   def self.translate(*args)
-    sexp = ::ParseTree.translate(*args)
-    # ParseTree.translate returns [nil] if called on an inherited method, so walk
-    # up the inheritance chain to find the class that the method was defined in
+    clazz, methd = *args
+    sexp = clazz.instance_method(methd).to_ast
+
     unless sexp.first
       klass = args.first.ancestors.detect do |klass|
         klass.public_instance_methods(false).include?(args.last.to_s)
       end
-      sexp = ::ParseTree.translate(klass, args.last) if klass
+      sexp = klass.instance_method(args.last).to_ast if klass
     end
     self.new(sexp)
   end
@@ -47,7 +47,7 @@ class ParseTreeArray < Array #:nodoc:
 
     lasgns = default_node[1..-1]
     lasgns.each do |asgn|
-      args.assoc(asgn[1]) << eval(RubyToRuby.new.process(asgn[2]))
+      args.assoc(asgn[1]) << eval(Ruby2Ruby.new.process(asgn[2]))
     end
     args
   end

data/lib/airbrush/version.rb

@@ -2,7 +2,7 @@ module Airbrush #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/airbrush/core_ext/timestamped_logger_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe ActiveSupport::BufferedLogger, 'log statements' do
+
+  before do
+    @time = Time.now
+    Time.stub!(:now).and_return(@time)
+    @target = StringIO.new
+    @logger = ActiveSupport::BufferedLogger.new(@target)
+    @statement = 'this is a test'
+  end
+
+  it 'should automatically include the current time' do
+    @logger.debug(@statement)
+    @target.rewind
+    @target.readline.should == "#{@time}: #{@statement}\n"
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,10 +1,2 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
-
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'airbrush'

data/tasks/rspec.rake

@@ -1,11 +1,11 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems'
-  require 'spec'
+  require 'rspec'
 end
 begin
-  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
 rescue LoadError
   puts <<-EOS
 To use rspec for testing you must install rspec gem:
@@ -15,22 +15,22 @@ EOS
 end
 
 desc "Run the specs under spec"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.rspec_opts = ['--options', "spec/spec.opts"]
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 desc "Run the specs under spec with code coverage"
-Spec::Rake::SpecTask.new('rcov') do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new('rcov') do |t|
+  t.rspec_opts = ['--options', "spec/spec.opts"]
+  t.pattern = 'spec/**/*_spec.rb'
   t.rcov = true
   t.rcov_opts = ['--exclude', 'spec']
 end
 
 desc "Generate spec HTML report"
-Spec::Rake::SpecTask.new('spec-report') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["--format", "html:doc/rspec-results.html", "--diff"]
+RSpec::Core::RakeTask.new('spec-report') do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = ["--format", "html:doc/rspec-results.html", "--diff"]
   t.fail_on_error = false
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: airbrush
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  prerelease: 6
+  version: 0.0.5.pre
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -15,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 +11:00
-default_executable: 
+date: 2010-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: starling
@@ -26,10 +21,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
   type: :runtime
   version_requirements: *id001
@@ -41,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 10
         version: 2.3.10
   type: :runtime
   version_requirements: *id002
@@ -56,10 +43,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
         version: 1.2.1
   type: :runtime
   version_requirements: *id003
@@ -71,49 +54,51 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 10
         version: 1.0.10
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: live_ast
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id005
-description: Distributed image processing server.
-email: nickmarfleet@gmail.com
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id006
+description: An Image Processing Server
+email: nick@whatevernext.org
 executables: 
 - airbrush
 - airbrush-example-client
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
+- LICENSE
 - README.txt
-- website/index.txt
 files: 
+- .gitignore
 - History.txt
-- Manifest.txt
+- LICENSE
 - README.txt
 - Rakefile
+- VERSION
 - bin/airbrush
 - bin/airbrush-example-client
-- config/hoe.rb
-- config/requirements.rb
+- extras/image_reaper.rb
 - lib/airbrush.rb
 - lib/airbrush/client.rb
 - lib/airbrush/core_ext/get_args.rb
@@ -140,6 +125,7 @@ files:
 - setup.rb
 - spec/airbrush/client_spec.rb
 - spec/airbrush/core_ext/get_args_spec.rb
+- spec/airbrush/core_ext/timestamped_logger_spec.rb
 - spec/airbrush/handler_spec.rb
 - spec/airbrush/listeners/listener_spec.rb
 - spec/airbrush/listeners/memcache_spec.rb
@@ -152,23 +138,19 @@ files:
 - spec/airbrush_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/deployment.rake
 - tasks/environment.rake
 - tasks/rspec.rake
-- tasks/website.rake
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.rhtml
-has_rdoc: true
-homepage: http://airbrush.rubyforge.org
+homepage: http://github.com/square-circle-triangle/airbush
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -176,23 +158,32 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
-rubyforge_project: airbrush
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Distributed image processing server.
-test_files: []
-
+summary: Image Processing Server
+test_files: 
+- spec/airbrush/client_spec.rb
+- spec/airbrush/core_ext/get_args_spec.rb
+- spec/airbrush/core_ext/timestamped_logger_spec.rb
+- spec/airbrush/handler_spec.rb
+- spec/airbrush/listeners/listener_spec.rb
+- spec/airbrush/listeners/memcache_spec.rb
+- spec/airbrush/processors/image/image_processor_spec.rb
+- spec/airbrush/processors/image/rmagick_spec.rb
+- spec/airbrush/processors/processor_spec.rb
+- spec/airbrush/publishers/memcache_spec.rb
+- spec/airbrush/publishers/publisher_spec.rb
+- spec/airbrush/server_spec.rb
+- spec/airbrush_spec.rb
+- spec/spec_helper.rb

data/Manifest.txt

@@ -1,55 +0,0 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-bin/airbrush
-bin/airbrush-example-client
-config/hoe.rb
-config/requirements.rb
-lib/airbrush.rb
-lib/airbrush/client.rb
-lib/airbrush/core_ext/get_args.rb
-lib/airbrush/core_ext/timestamped_logger.rb
-lib/airbrush/handler.rb
-lib/airbrush/listeners/listener.rb
-lib/airbrush/listeners/memcache.rb
-lib/airbrush/listeners/socket.rb
-lib/airbrush/listeners/webservice.rb
-lib/airbrush/processors/image/image_processor.rb
-lib/airbrush/processors/image/profiles/cmyk-profile.icc
-lib/airbrush/processors/image/profiles/srgb-profile.icc
-lib/airbrush/processors/image/rmagick.rb
-lib/airbrush/processors/processor.rb
-lib/airbrush/publishers/http.rb
-lib/airbrush/publishers/memcache.rb
-lib/airbrush/publishers/publisher.rb
-lib/airbrush/server.rb
-lib/airbrush/version.rb
-log/debug.log
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-spec/airbrush/client_spec.rb
-spec/airbrush/core_ext/get_args_spec.rb
-spec/airbrush/handler_spec.rb
-spec/airbrush/listeners/listener_spec.rb
-spec/airbrush/listeners/memcache_spec.rb
-spec/airbrush/processors/image/image_processor_spec.rb
-spec/airbrush/processors/image/rmagick_spec.rb
-spec/airbrush/processors/processor_spec.rb
-spec/airbrush/publishers/memcache_spec.rb
-spec/airbrush/publishers/publisher_spec.rb
-spec/airbrush/server_spec.rb
-spec/airbrush_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/rspec.rake
-tasks/website.rake
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml

data/config/hoe.rb

@@ -1,71 +0,0 @@
-require 'airbrush/version'
-
-AUTHOR = ['Marcus Crafter', 'Nick Marfleet']  # can also be an array of Authors
-EMAIL = "nickmarfleet@gmail.com"
-DESCRIPTION = "Distributed image processing server."
-GEM_NAME = 'airbrush' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'airbrush' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "nickm"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
-# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
-VERS = Airbrush::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'airbrush documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
-    @extra_deps
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [ [ 'starling', '= 0.9.8' ], [ 'activesupport', '~> 2.3.10' ], [ 'ruby2ruby', '= 1.2.1' ], [ 'daemons', '= 1.0.10' ] ]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  
-end
-
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-hoe.rsync_args = '-av --delete --ignore-errors'

data/config/requirements.rb

@@ -1,17 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
-
-require 'airbrush'

data/tasks/deployment.rake

@@ -1,34 +0,0 @@
-desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release] do
-  puts "Remember to create SVN tag:"
-  puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " +
-    "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
-  puts "Suggested comment:"
-  puts "Tagging release #{CHANGES}"
-end
-
-desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
-task :local_deploy => [:website_generate, :install_gem]
-
-task :check_version do
-  unless ENV['VERSION']
-    puts 'Must pass a VERSION=x.y.z release version'
-    exit
-  end
-  unless ENV['VERSION'] == VERS
-    puts "Please update your version.rb to match the release version, currently #{VERS}"
-    exit
-  end
-end
-
-desc 'Install the package as a gem, without generating documentation(ri/rdoc)'
-task :install_gem_no_doc => [:clean, :package] do
-  sh "#{'sudo ' unless Hoe::WINDOZE }gem install pkg/*.gem --no-rdoc --no-ri"
-end
-
-namespace :manifest do
-  desc 'Recreate Manifest.txt to include ALL files'
-  task :refresh do
-    `rake check_manifest | patch -p0 > Manifest.txt`
-  end
-end

data/tasks/website.rake

@@ -1,17 +0,0 @@
-desc 'Generate website files'
-task :website_generate => :ruby_env do
-  (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt|
-    sh %{ #{RUBY_APP} script/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
-  end
-end
-
-desc 'Upload website files to rubyforge'
-task :website_upload do
-  host = "#{rubyforge_username}@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/#{PATH}/"
-  local_dir = 'website'
-  sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
-end
-
-desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]