elliottcable-jello 3 → 4

data/.manifest

@@ -4,6 +4,7 @@ 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

data/Rakefile.rb

@@ -18,8 +18,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 = ['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
   
@@ -72,7 +74,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

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,6 +43,15 @@ 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_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|

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 = "4"
 
---- !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-10-13}
+  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_fixer.rb
-- moulds/say.rb
-- moulds/shortener.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<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<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<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 = 4
   
   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/shortener.rb

@@ -31,7 +31,7 @@ Jello::Mould.new do |paste, board|
       end
       
       unless base and (base = base[1])
-        base = uri.host.match( /(?:[\w\d\.]+\.)?([\w\d]+)\.[\w]{2,4}/ )[1]
+        base = uri.host.match( /(?:[\w\d\-\.]+\.)?([\w\d\-]+)\.[\w]{2,4}/ )[1]
       end
       
       base = URI::unescape(base).gsub(/\s/, '_')
@@ -49,8 +49,13 @@ Jello::Mould.new do |paste, board|
       
       shortener.query = params.to_a.map {|a| a.join '=' }.join('&')
       
-      reply = open(shortener).read
-      short = JSON.parse reply
+      begin
+        puts " --@ [#{shortener}]" if $DEBUG
+        reply = open(shortener).read
+        short = JSON.parse reply
+      rescue OpenURI::HTTPError => e
+        short = {'url' => paste}
+      end
       [short['url'], base].join('?')
     end
   end

metadata

@@ -1,29 +1,31 @@
 --- !ruby/object:Gem::Specification 
 name: elliottcable-jello
 version: !ruby/object:Gem::Version 
-  version: "3"
+  version: "4"
 platform: ruby
 authors: 
 - elliottcable
 autorequire: 
 bindir: bin
-cert_chain: 
-date: 2008-10-09 01:00:00 -07:00
-default_executable: 
+cert_chain: []
+
+date: 2008-10-13 00:00:00 -07:00
+default_executable: jello
 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: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.0.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -33,7 +35,6 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rcov
-  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -43,7 +44,6 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -53,7 +53,6 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: stringray
-  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -83,6 +82,7 @@ files:
 - lib/jello/mould.rb
 - lib/jello/pasteboard.rb
 - lib/jello.rb
+- moulds/fail.rb
 - moulds/grabup_fixer.rb
 - moulds/say.rb
 - moulds/shortener.rb