jello 3 → 5

data/.manifest

@@ -4,9 +4,10 @@ lib/jello/logger.rb
 lib/jello/mould.rb
 lib/jello/pasteboard.rb
 lib/jello.rb
-moulds/grabup.rb
+moulds/fail.rb
+moulds/grabup_fixer.rb
 moulds/say.rb
-moulds/shorten.rb
+moulds/shortener.rb
 Rakefile.rb
 README.markdown
 spec/jello_spec.rb

data/README.markdown

@@ -23,7 +23,7 @@ the long URL with the shortened one, write a short mould like the following:
     
     Jello::Mould.new do |paste|
     
-      if paste =~ %r{}^http://.*}
+      if paste =~ %r{^http://.*}
         uri = $&
         uri.gsub! /#/, '%23'
         unless uri =~ %r{^http://bit.ly}

data/Rakefile.rb

@@ -9,7 +9,8 @@ require 'fileutils'
 begin
   require 'echoe'
   
-  task :package => :'package:install'
+  task :package => :'package:package'
+  task :install => :'package:install'
   task :manifest => :'package:manifest'
   namespace :package do
     Echoe.new('jello', Jello::Version) do |g|
@@ -18,8 +19,10 @@ begin
       g.email = ['Jello@elliottcable.com']
       g.summary = 'A library to watch the OS X pasteboard, and process/modify incoming pastes.'
       g.url = 'http://github.com/elliottcable/jello'
-      g.development_dependencies = ['echoe >=3.0.1', 'rspec', 'rcov', 'yard', 'stringray']
+      g.development_dependencies = ['elliottcable-echoe >= 3.0.2', 'rspec', 'rcov', 'yard', 'stringray']
       g.manifest_name = '.manifest'
+      g.retain_gemspec = true
+      g.rakefile_name = 'Rakefile.rb'
       g.ignore_pattern = /^\.git\/|^meta\/|\.gemspec/
     end
   
@@ -30,18 +33,10 @@ begin
         puts "\nThe library files are present"
       end
     end
-
-    task :copy_gemspec => [:package] do
-      pkg = Dir['pkg/*'].select {|dir| File.directory? dir}.last
-      mv File.join(pkg, pkg.gsub(/^pkg\//,'').gsub(/\-\d+$/,'.gemspec')), './'
-    end
-
-    desc 'builds a gemspec as GitHub wants it'
-    task :gemspec => [:package, :copy_gemspec, :clobber_package]
   end
   
 rescue LoadError
-  desc 'You need the `echoe` gem to package Jello'
+  desc 'You need the `elliottcable-echoe` gem to package Jello'
   task :package
 end
 
@@ -72,7 +67,7 @@ begin
       # release the fix as it's own gem at some point in the near future.
       require 'stringray/core_ext/spec/rake/verify_rcov'
       RCov::VerifyTask.new(:verify) do |t|
-        t.threshold = 65.0
+        t.threshold = 50.0
         t.index_html = File.join('meta', 'coverage', 'index.html')
         t.require_exact_threshold = false
       end
@@ -132,7 +127,7 @@ end
 
 desc 'Check everything over before commiting'
 task :aok => [:'documentation:generate', :'documentation:open',
-              :'package:manifest', :'package:gemspec',
+              :'package:manifest', :'package:package',
               :'coverage:run', :'coverage:verify', :'coverage:open']
 
 task :ci => [:'documentation:generate', :'coverage:run', :'coverage:verify']

data/bin/jello

@@ -21,8 +21,8 @@ utilized.
 
 The follow moulds are included for your enjoyment:
  - jello say
- - jello grabup
- - jello shorten
+ - jello grabup_fixer
+ - jello shortener
 
 == Usage ==
 `jello [options] <mould> (<mould> <mould> …)`
@@ -32,6 +32,10 @@ The follow moulds are included for your enjoyment:
     options[:verbose] = v
   end
   
+  opts.on("-d", "--[no-]debug", "Run extremely verbosely") do |d|
+    $-d = d
+  end
+  
   opts.on("-f", "--[no-]feedback", "Feedback on successful process") do |f|
     options[:feedback] = f
   end
@@ -39,10 +43,41 @@ The follow moulds are included for your enjoyment:
   opts.on("-p", "--period PERIOD", "Period over which to cycle watcher process") do |p|
     options[:period] = p
   end
+  
+  opts.on("-D", "--[no-]daemonize", "Fork the process") do |D|
+    options[:daemonize] = D
+  end
+  
+  opts.on_tail("--help", "Show this help") do
+    puts opts
+    exit
+  end
+  opts.on_tail("--version", "Show version") do
+    puts "I'm Jello #{Jello::Version}!"
+    exit
+  end
 end.parse!
 
 ARGV.each do |mould|
   require Jello::Mould.find(mould)
 end
 
+# http://github.com/chneukirchen/rack/tree/ed86dfd676dcb46e276b6906f017df514e5632f9/bin/rackup#L153-164
+if options[:daemonize]
+  if RUBY_VERSION < "1.9"
+    exit if fork
+    Process.setsid
+    exit if fork
+    Dir.chdir "/"
+    File.umask 0000
+    STDIN.reopen "/dev/null"
+    STDOUT.reopen "/dev/null", "a"
+    STDERR.reopen "/dev/null", "a"
+  else
+    Process.daemon
+  end
+end
+
+$0 = "jello: #{ARGV.join ', '}"
+
 Jello.start! options

data/jello.gemspec

@@ -1,128 +1,48 @@
+# -*- encoding: utf-8 -*-
 
-# Gem::Specification for Jello-3
-# Originally generated by Echoe
+Gem::Specification.new do |s|
+  s.name = %q{jello}
+  s.version = "5"
 
---- !ruby/object:Gem::Specification 
-name: jello
-version: !ruby/object:Gem::Version 
-  version: "3"
-platform: ruby
-authors: 
-- elliottcable
-autorequire: 
-bindir: bin
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["elliottcable"]
+  s.date = %q{2008-11-01}
+  s.default_executable = %q{jello}
+  s.description = %q{A library to watch the OS X pasteboard, and process/modify incoming pastes.}
+  s.email = ["Jello@elliottcable.com"]
+  s.executables = ["jello"]
+  s.extra_rdoc_files = ["bin/jello", "lib/jello/core_ext/kernel.rb", "lib/jello/logger.rb", "lib/jello/mould.rb", "lib/jello/pasteboard.rb", "lib/jello.rb", "README.markdown"]
+  s.files = ["bin/jello", "lib/jello/core_ext/kernel.rb", "lib/jello/logger.rb", "lib/jello/mould.rb", "lib/jello/pasteboard.rb", "lib/jello.rb", "moulds/fail.rb", "moulds/grabup_fixer.rb", "moulds/say.rb", "moulds/shortener.rb", "Rakefile.rb", "README.markdown", "spec/jello_spec.rb", ".manifest", "jello.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/elliottcable/jello}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jello", "--main", "README.markdown"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{jello}
+  s.rubygems_version = %q{1.3.0}
+  s.summary = %q{A library to watch the OS X pasteboard, and process/modify incoming pastes.}
 
-date: 2008-10-09 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: stringray
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: A library to watch the OS X pasteboard, and process/modify incoming pastes.
-email: 
-- Jello@elliottcable.com
-executables: 
-- jello
-extensions: []
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-extra_rdoc_files: 
-- bin/jello
-- lib/jello/core_ext/kernel.rb
-- lib/jello/logger.rb
-- lib/jello/mould.rb
-- lib/jello/pasteboard.rb
-- lib/jello.rb
-- README.markdown
-files: 
-- bin/jello
-- lib/jello/core_ext/kernel.rb
-- lib/jello/logger.rb
-- lib/jello/mould.rb
-- lib/jello/pasteboard.rb
-- lib/jello.rb
-- moulds/grabup.rb
-- moulds/say.rb
-- moulds/shorten.rb
-- Rakefile.rb
-- README.markdown
-- spec/jello_spec.rb
-- .manifest
-- jello.gemspec
-has_rdoc: true
-homepage: http://github.com/elliottcable/jello
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Jello
-- --main
-- README.markdown
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
-requirements: []
-
-rubyforge_project: jello
-rubygems_version: 1.3.0
-specification_version: 2
-summary: A library to watch the OS X pasteboard, and process/modify incoming pastes.
-test_files: []
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<elliottcable-echoe>, [">= 0", "= 3.0.2"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<stringray>, [">= 0"])
+    else
+      s.add_dependency(%q<elliottcable-echoe>, [">= 0", "= 3.0.2"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<stringray>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<elliottcable-echoe>, [">= 0", "= 3.0.2"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<stringray>, [">= 0"])
+  end
+end

data/lib/jello.rb

@@ -3,7 +3,7 @@ require 'jello/pasteboard'
 require 'jello/mould'
 
 module Jello
-  Version = 3
+  Version = 5
   
   def self.start! options = {}
     options = {:verbose => false, :period => 0.5}.merge(options)
@@ -19,7 +19,12 @@ module Jello
           
           puts "#{pasteboard.board} received: [#{initial_paste}]" if options[:verbose]
           moulds.each do |mould|
-            modified = mould.on_paste[paste]
+            modified = begin
+              mould.on_paste[paste]
+            rescue => error
+              puts " !!> #{error}"
+              nil
+            end
             paste = modified if modified.is_a?(String)
           end
           

data/moulds/fail.rb

@@ -0,0 +1,3 @@
+Jello::Mould.new do |paste|
+  raise 'FAIL'
+end

data/moulds/grabup_fixer.rb

@@ -0,0 +1,13 @@
+require 'uri'
+
+Jello::Mould.new do |paste|
+  if paste =~ %r{^http://.*}
+    uri = URI.parse paste
+    
+    if uri.host =~ /grabup/
+      uri.host = 'grabup.com'
+      uri.query = 'direct'
+      uri.to_s
+    else; nil; end
+  end
+end

data/moulds/shortener.rb

@@ -0,0 +1,64 @@
+require 'cgi'
+require 'rubygems'
+require 'open-uri'
+require 'JSON'
+
+Paths = {
+  'google' => :search,
+  /my-site\.name/ => %r{^http://my-site\.name/(.+)\.xhtml$}
+}
+
+Jello::Mould.new do |paste, board|
+  
+  if paste =~ %r{^http://.*}
+    uri = URI.parse $&
+    unless paste =~ %r{^http://tr.im}
+      # We're going to add the main part of the domain to the end of the URI
+      # as a bullshit parameter, to give visitors some indication of what
+      # their destination is. If you're in a character-limited location, such
+      # as twitter or a text message, feel free to simply delete this section
+      # of the URL by hand after pasting. (⌥⌫ is helpful!)
+      # 
+      # We also check if the URI matches a key of the Paths constant, and
+      # process the URI based on the value matched to that key if it matches.
+      # Keys can be stringish or regexish, in the latter case, it will run it
+      # matches. Values can be stringish or regexish, in the latter case,
+      # the last matching group will be used as the parameter.
+      base = nil
+      matcher = Paths.select {|matcher,baser| uri.to_s =~ (matcher.is_a?(Regexp) ? matcher : /#{matcher}/) } .first
+      if matcher
+        base = uri.to_s.match( matcher[1] )
+      end
+      
+      unless base and (base = base[1])
+        base = uri.host.match( /(?:[\w\d\-\.]+\.)?([\w\d\-]+)\.[\w]{2,4}/ )[1]
+      end
+      
+      base = URI::unescape(base).gsub(/\s/, '_')
+      uri = CGI::escape uri.to_s
+      
+      shortener = URI.parse 'http://tr.im/api/trim_url.json'
+      
+      # Feel free to copy this Mould to your ~/.jello directory and hardcode
+      # in your username and password, if you don't feel like having your
+      # username and password in your shell history.
+      params = {}
+      params[:username] = ENV['TRIM_USERNAME'] if ENV['TRIM_USERNAME']
+      params[:password] = ENV['TRIM_PASSWORD'] if ENV['TRIM_PASSWORD']
+      params[:url] = uri
+      
+      shortener.query = params.to_a.map {|a| a.join '=' }.join('&')
+      
+      begin
+        puts " --@ [#{shortener}]" if $DEBUG
+        reply = open(shortener).read
+        short = JSON.parse reply
+      rescue OpenURI::HTTPError => e
+        short = {'url' => paste}
+      end
+      shortened = [short['url'], base].join('?')
+      shortened.length < paste.length ? shortened : paste
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jello
 version: !ruby/object:Gem::Version 
-  version: "3"
+  version: "5"
 platform: ruby
 authors: 
 - elliottcable
@@ -9,18 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-09 00:00:00 -08:00
+date: 2008-11-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: echoe
+  name: elliottcable-echoe
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.1
+        version: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.0.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -84,9 +87,10 @@ files:
 - lib/jello/mould.rb
 - lib/jello/pasteboard.rb
 - lib/jello.rb
-- moulds/grabup.rb
+- moulds/fail.rb
+- moulds/grabup_fixer.rb
 - moulds/say.rb
-- moulds/shorten.rb
+- moulds/shortener.rb
 - Rakefile.rb
 - README.markdown
 - spec/jello_spec.rb

data/moulds/grabup.rb

@@ -1,6 +0,0 @@
-Jello::Mould.new do |paste|
-  if paste =~ %r{^http://www\.grabup\.com/uploads/[0-9a-z]{32}\.png$}
-    paste.gsub!(%r{^http://www\.}, 'http://')
-    paste += '?direct'
-  end
-end

data/moulds/shorten.rb

@@ -1,37 +0,0 @@
-require 'cgi'
-require 'rubygems'
-require 'open-uri'
-require 'JSON'
-
-Jello::Mould.new do |paste, board|
-  
-  if paste =~ %r{^http://.*}
-    uri = $&
-    unless paste =~ %r{^http://tr.im}
-      # We're going to add the main part of the domain to the end of the URI
-      # as a bullshit parameter, to give visitors some indication of what
-      # their destination is. If you're in a character-limited location, such
-      # as twitter or a text message, feel free to simply delete this section
-      # of the URL by hand after pasting. (⌥⌫ is helpful!)
-      base = uri.match(%r{^http://([\w\d\.]+\.)?([\w\d]+)\.[\w]{2,4}/})[2]
-      
-      uri = CGI::escape uri
-      
-      # Feel free to copy this Mould to your ~/.jello directory and hardcode
-      # in your username and password, if you don't feel like having your
-      # username and password in your shell history.
-      params = {}
-      params[:username] = ENV['TRIM_USERNAME'] if ENV['TRIM_USERNAME']
-      params[:password] = ENV['TRIM_PASSWORD'] if ENV['TRIM_PASSWORD']
-      params[:url] = uri
-      
-      shortener = 'http://tr.im/api/trim_url.json?' +
-        params.to_a.map {|a| a.join '=' }.join('&')
-      
-      reply = open(shortener).read
-      short = JSON.parse reply
-      [short['url'], base].join('?')
-    end
-  end
-  
-end