fire_and_forget 0.2.0 → 0.3.0

data/Gemfile

@@ -1,6 +1,5 @@
 source "http://rubygems.org"
 
-gem "json", "~>1.4.6"
 gem "daemons", "~>1.1.0"
 
 group :development do

data/Gemfile.lock

@@ -8,7 +8,6 @@ GEM
       git (>= 1.2.5)
       rake
     jnunemaker-matchy (0.4.0)
-    json (1.4.6)
     rake (0.8.7)
     rr (1.0.2)
     shoulda (2.11.3)
@@ -21,6 +20,5 @@ DEPENDENCIES
   daemons (~> 1.1.0)
   jeweler (~> 1.5.1)
   jnunemaker-matchy (~> 0.4)
-  json (~> 1.4.6)
   rr (~> 1.0.2)
   shoulda

data/README.rdoc

@@ -88,8 +88,12 @@ will issue the following command in the background
 
 as well as setting it's nice value to 12 and updating ENV with the extra parameter "ENVIRONMENT_SETTING".
 
-Parameter values are JSON encoded so you can pass arrays or hashes. Again, it is
-up to the script to decode these values.
+Parameter values are encoded in a format compatible with Thor:
+
+Arrays are encoded as --array=1 2 3
+Hashes as --hash=key1:value1 key2:value2
+
+Again, it is up to the script to decode these values.
 
 Interprocess communication is relatively easy. Take the following as the source of the script "/path/to/script"
 
@@ -148,6 +152,7 @@ single non-shared server (potentially running many sites).
 
 - Improve security restrictions (perhaps by limiting the tasks that each user can launch)
 - Improve the tests so they are closer to testing the full stack
+- Add in scheduled/delayed execution of tasks
 
 == Contributing to fire_and_forget
 

data/bin/fire_forget

@@ -7,13 +7,10 @@ faf_lib_path = File.expand_path(File.dirname(__FILE__) + "/../lib")
 $:.unshift(faf_lib_path) unless $:.include?(faf_lib_path)
 
 # include dependencies without using rubygems (to save memory)
-$:.unshift('vendor/json-1.5.0/lib')
 $:.unshift('vendor/daemons-1.1.0/lib')
 
-require 'vendor/json-1.5.0/lib/json/pure'
 require 'vendor/daemons-1.1.0/lib/daemons'
 
-
 require 'ostruct'
 require 'optparse'
 require 'socket'

data/fire_and_forget.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fire_and_forget}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Garry Hill"]
-  s.date = %q{2011-01-19}
+  s.date = %q{2011-01-20}
   s.default_executable = %q{fire_forget}
   s.email = %q{garry@magnetised.info}
   s.executables = ["fire_forget"]
@@ -64,23 +64,7 @@ Gem::Specification.new do |s|
     "vendor/daemons-1.1.0/lib/daemons/pid.rb",
     "vendor/daemons-1.1.0/lib/daemons/pidfile.rb",
     "vendor/daemons-1.1.0/lib/daemons/pidmem.rb",
-    "vendor/daemons-1.1.0/setup.rb",
-    "vendor/json-1.5.0/COPYING",
-    "vendor/json-1.5.0/GPL",
-    "vendor/json-1.5.0/README",
-    "vendor/json-1.5.0/README-json-jruby.markdown",
-    "vendor/json-1.5.0/Rakefile",
-    "vendor/json-1.5.0/TODO",
-    "vendor/json-1.5.0/VERSION",
-    "vendor/json-1.5.0/lib/json.rb",
-    "vendor/json-1.5.0/lib/json/add/core.rb",
-    "vendor/json-1.5.0/lib/json/add/rails.rb",
-    "vendor/json-1.5.0/lib/json/common.rb",
-    "vendor/json-1.5.0/lib/json/editor.rb",
-    "vendor/json-1.5.0/lib/json/pure.rb",
-    "vendor/json-1.5.0/lib/json/pure/generator.rb",
-    "vendor/json-1.5.0/lib/json/pure/parser.rb",
-    "vendor/json-1.5.0/lib/json/version.rb"
+    "vendor/daemons-1.1.0/setup.rb"
   ]
   s.homepage = %q{http://github.com/magnetised/fire_and_forget}
   s.licenses = ["MIT"]
@@ -97,7 +81,6 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, ["~> 1.4.6"])
       s.add_runtime_dependency(%q<daemons>, ["~> 1.1.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
@@ -105,7 +88,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rr>, ["~> 1.0.2"])
     else
-      s.add_dependency(%q<json>, ["~> 1.4.6"])
       s.add_dependency(%q<daemons>, ["~> 1.1.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])
@@ -114,7 +96,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rr>, ["~> 1.0.2"])
     end
   else
-    s.add_dependency(%q<json>, ["~> 1.4.6"])
     s.add_dependency(%q<daemons>, ["~> 1.1.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<jnunemaker-matchy>, ["~> 0.4"])

data/lib/fire_and_forget/command/fire.rb

@@ -1,5 +1,5 @@
 
-require 'daemons'
+require 'daemons' unless defined?(Daemons)
 
 module FireAndForget
   module Command

data/lib/fire_and_forget/utilities.rb

@@ -1,4 +1,3 @@
-require "json"
 
 module FireAndForget
   module Utilities
@@ -8,12 +7,23 @@ module FireAndForget
       end.join(" ")
     end
 
+    # Maps objects to command line parameters suitable for parsing by Thor
+    # @see https://github.com/wycats/thor
     def to_parameter(obj)
-      if obj.is_a?(String)
+      case obj
+      when String
+        obj.inspect
+      when Array
+        obj.map { |o| to_parameter(o) }.join(' ')
+      when Hash
+        obj.map do |k, v|
+          "#{k}:#{to_parameter(obj[k])}"
+        end.join(' ')
+      when Numeric
         obj
       else
-        JSON.generate(obj)
-      end.inspect
+        to_parameter(obj.to_s)
+      end
     end
   end
 end

data/lib/fire_and_forget/version.rb

@@ -1,4 +1,4 @@
 
 module FireAndForget
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/test_fire_and_forget.rb

@@ -6,8 +6,9 @@ class TestFireAndForget < Test::Unit::TestCase
       FAF.to_arguments({
         :param1 => "value1",
         :param2 => "value2",
-        :array => [1, 2, "3"]
-      }).should == %(--array="[1,2,\\"3\\"]" --param1="value1" --param2="value2")
+        :array => [1, 2, "3 of 4"],
+        :hash  => {:name => "Fred", :age => 23}
+      }).should == %(--array=1 2 "3 of 4" --hash=age:23 name:"Fred" --param1="value1" --param2="value2")
     end
   end
   context "configuration" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Garry Hill
@@ -14,25 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 +00:00
+date: 2011-01-20 00:00:00 +00:00
 default_executable: fire_forget
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
-  name: json
-  requirement: *id001
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -42,11 +28,11 @@ dependencies:
         - 0
         version: 1.1.0
   name: daemons
-  requirement: *id002
+  requirement: *id001
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -54,11 +40,11 @@ dependencies:
         - 0
         version: "0"
   name: shoulda
-  requirement: *id003
+  requirement: *id002
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -67,11 +53,11 @@ dependencies:
         - 4
         version: "0.4"
   name: jnunemaker-matchy
-  requirement: *id004
+  requirement: *id003
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -81,11 +67,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  requirement: *id005
+  requirement: *id004
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -95,11 +81,11 @@ dependencies:
         - 1
         version: 1.5.1
   name: jeweler
-  requirement: *id006
+  requirement: *id005
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -109,7 +95,7 @@ dependencies:
         - 2
         version: 1.0.2
   name: rr
-  requirement: *id007
+  requirement: *id006
   prerelease: false
   type: :development
 description: 
@@ -169,22 +155,6 @@ files:
 - vendor/daemons-1.1.0/lib/daemons/pidfile.rb
 - vendor/daemons-1.1.0/lib/daemons/pidmem.rb
 - vendor/daemons-1.1.0/setup.rb
-- vendor/json-1.5.0/COPYING
-- vendor/json-1.5.0/GPL
-- vendor/json-1.5.0/README
-- vendor/json-1.5.0/README-json-jruby.markdown
-- vendor/json-1.5.0/Rakefile
-- vendor/json-1.5.0/TODO
-- vendor/json-1.5.0/VERSION
-- vendor/json-1.5.0/lib/json.rb
-- vendor/json-1.5.0/lib/json/add/core.rb
-- vendor/json-1.5.0/lib/json/add/rails.rb
-- vendor/json-1.5.0/lib/json/common.rb
-- vendor/json-1.5.0/lib/json/editor.rb
-- vendor/json-1.5.0/lib/json/pure.rb
-- vendor/json-1.5.0/lib/json/pure/generator.rb
-- vendor/json-1.5.0/lib/json/pure/parser.rb
-- vendor/json-1.5.0/lib/json/version.rb
 has_rdoc: true
 homepage: http://github.com/magnetised/fire_and_forget
 licenses: 

data/vendor/json-1.5.0/COPYING

@@ -1,58 +0,0 @@
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see GPL file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
-