simplews 1.3.1 → 1.3.2

data/History.txt

@@ -1,3 +1,5 @@
+== 1.3.2 2009-03-21
+
 == 1.3.1 2008-12-20
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -1,18 +1,18 @@
 History.txt
 Manifest.txt
 PostInstall.txt
-README.txt
+README.rdoc
 Rakefile
 config/hoe.rb
 config/requirements.rb
 lib/simplews.rb
 lib/simplews/jobs.rb
-lib/simplews/version.rb
 script/console
 script/destroy
 script/generate
 script/txt2html
 setup.rb
+simplews.gemspec
 tasks/deployment.rake
 tasks/environment.rake
 tasks/website.rake

data/Rakefile

@@ -1,4 +1,28 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+require File.dirname(__FILE__) + '/lib/simplews'
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+$hoe = Hoe.new('simplews', SimpleWS::VERSION) do |p|
+  p.developer('Miguel Vazquez', 'mikisvaz@yahoo.com')
+  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
+  p.rubyforge_name       = p.name # TODO this is default value
+  # p.extra_deps         = [
+  #   ['activesupport','>= 2.0.2'],
+  # ]
+  p.extra_dev_deps = [
+    ['newgem', ">= #{::Newgem::VERSION}"]
+  ]
+  
+  p.clean_globs |= %w[**/.DS_Store tmp *.log]
+  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
+  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
+  p.rsync_args = '-av --delete --ignore-errors'
+end
+
+require 'newgem/tasks' # load /tasks/*.rake
+Dir['tasks/**/*.rake'].each { |t| load t }
+
+# TODO - want other tests/tasks run by default? Add them to the list
+# task :default => [:spec, :features]

data/lib/simplews/jobs.rb

@@ -4,6 +4,8 @@ require 'yaml'
 require 'drb'
 require 'singleton'
 require 'rand'
+require 'zlib'
+
 
 
 class SimpleWS::Jobs < SimpleWS
@@ -43,6 +45,8 @@ class SimpleWS::Jobs < SimpleWS
       name = Scheduler::random_name("job-") unless name =~ /\w/
 
       taken = @@names.select{|n| n =~ /^#{ name }(-\d+)?$/}
+      taken += Job.taken(name)
+      taken = taken.sort.uniq
       if taken.any?
         if taken.length == 1
           return name + '-1'
@@ -134,7 +138,7 @@ class SimpleWS::Jobs < SimpleWS
     end
 
     def self.abort(name)
-      Process.kill "INT", @@pids[name]
+      Process.kill("INT", @@pids[name]) if @@pids[name]
     end
 
     def self.abort_jobs
@@ -165,9 +169,12 @@ class SimpleWS::Jobs < SimpleWS
         FileUtils.mkdir_p @@savedir unless File.exist? @@savedir
       end
 
+      def self.taken(name = "")
+        Dir.glob(@@savedir + "/#{ name }*.marshal").collect{|n| n.match(/(#{ name }.*).marshal/)[1]}
+      end
       def self.path(file, name)
-        if file =~ /^\//
-          file.gsub(/\{JOB\}/)
+        if file =~ /^\/|#{@@workdir}/
+          file.gsub(/\{JOB\}/, name)
         else
           File.join(@@workdir, file.gsub(/\{JOB\}/,name))
         end
@@ -181,14 +188,22 @@ class SimpleWS::Jobs < SimpleWS
 
       def self.job_info(name)
         info = nil
+
+        retries = 2
         begin
-          sleep 1
           info = Marshal::load(File.open(File.join(@@savedir,name + '.marshal')))
-          raise Exception unless info.is_a? Hash
+          raise Exception unless info.is_a?(Hash) && info[:info]
         rescue Exception
-          raise JobNotFound, "Job with name #{ name } was not found"
+          if retries > 0
+            retries -= 1
+            sleep 1
+            retry
+          end
+          info = nil
         end
 
+        raise JobNotFound, "Job with name '#{ name }' was not found" if info.nil?
+
         info
       end
 
@@ -227,6 +242,10 @@ class SimpleWS::Jobs < SimpleWS
         fout.close
       end
 
+      def message(message)
+        @state[:messages] << message 
+        save
+      end
       def step(status, message = nil)
         @state[:status] = status
         @state[:messages] << message if message && message != ""
@@ -269,12 +288,14 @@ class SimpleWS::Jobs < SimpleWS
         save
         @pid = Process.fork do
           begin
+            puts "Job #{@name} starting with pid #{Process.pid}"
+
             trap(:INT) { raise SimpleWS::Jobs::Aborted }
             self.send task, *args
             step :done
             exit(0)
           rescue  SimpleWS::Jobs::Aborted
-            step(:aborted)
+            step(:aborted, "Job Aborted")
             exit(-1)
           rescue Exception
             if !$!.kind_of? SystemExit
@@ -360,7 +381,7 @@ class SimpleWS::Jobs < SimpleWS
     end
 
     serve :done, %w(job), :job => :string, :return => :boolean do |job|
-      [:done, :error, :aborted].include? Scheduler.job_info(job)[:status]
+      [:done, :error, :aborted].include? Scheduler.job_info(job)[:status].to_sym
     end
 
     serve :error, %w(job), :job => :string, :return => :boolean do |job|

data/lib/simplews.rb

@@ -44,6 +44,8 @@ require 'builder'
 
 
 class SimpleWS <  SOAP::RPC::StandaloneServer
+  VERSION = "1.3.2"
+
 
   # This is a helper function for clients. Given the +url+ where the
   # server is listening, as well as the name of the server, it can
@@ -169,8 +171,8 @@ class SimpleWS <  SOAP::RPC::StandaloneServer
     @messages << message
 
     operation = Builder::XmlMarkup.new(:indent => 2).operation :name => "#{ name }" do |xml|
-      xml.input :message => "#{ name }Request"
-      xml.output :message => "#{ name }Response"
+      xml.input :message => "tns:#{ name }Request"
+      xml.output :message => "tns:#{ name }Response"
     end
 
     @operations << operation
@@ -244,6 +246,7 @@ EOT
     :boolean => 'xsd:boolean',
     :string => 'xsd:string',
     :integer => 'xsd:integer',
+    :float => 'xsd:float',
     :array  => 'tns:ArrayOfString',
     :hash  => 'tns:Map',
     :binary => 'xsd:base64Binary',

data/simplews.gemspec

@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{simplews}
+  s.version = "1.3.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Miguel Vazquez"]
+  s.date = %q{2009-06-17}
+  s.description = %q{This defines a class that can simplifies creating Web Services. It inherits from soap2r's  SOAP::RPC::StandaloneServer and provides a few enhancements, the most important the fact that it is able to produce the WSDL automatically.}
+  s.email = ["mikisvaz@yahoo.com"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "website/index.txt"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "config/hoe.rb", "config/requirements.rb", "lib/simplews.rb", "lib/simplews/jobs.rb", "script/console", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "simplews.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "test/simplews/test_jobs.rb", "test/test_helper.rb", "test/test_simplews.rb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.html.erb"]
+  s.has_rdoc = true
+  s.post_install_message = %q{PostInstall.txt}
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{simplews}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{This defines a class that can simplifies creating Web Services}
+  s.test_files = ["test/test_simplews.rb", "test/test_helper.rb", "test/simplews/test_jobs.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+    else
+      s.add_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_dependency(%q<hoe>, [">= 1.8.0"])
+    end
+  else
+    s.add_dependency(%q<newgem>, [">= 1.2.3"])
+    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+  end
+end

data/test/simplews/test_jobs.rb

@@ -66,7 +66,7 @@ class TestJobs < Test::Unit::TestCase
     puts driver.messages(name)
     assert(driver.aborted(name))
 
-    FileUtils.cp "tmp-TestJWS/.save/test-abort.yaml", "tmp-TestJWS/.save/copy.yaml"
+    FileUtils.cp "tmp-TestJWS/.save/test-abort.marshal", "tmp-TestJWS/.save/copy.marshal"
     assert(driver.aborted("copy"))
     
     # Test queue

data/test/test_helper.rb

@@ -1,5 +1,3 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/simplews'
-require File.dirname(__FILE__) + '/../lib/simplews/asynchronous'
-require File.dirname(__FILE__) + '/../lib/simplews/forked'
 require File.dirname(__FILE__) + '/../lib/simplews/jobs'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simplews
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Miguel Vazquez
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-14 00:00:00 +01:00
+date: 2009-06-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: newgem
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.3
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -22,9 +32,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     version: 
-description: Simplifies the development of Web Services, producing WSDL automatically for example. Wraps soap4r.
+description: This defines a class that can simplifies creating Web Services. It inherits from soap2r's  SOAP::RPC::StandaloneServer and provides a few enhancements, the most important the fact that it is able to produce the WSDL automatically.
 email: 
-- miguel.vazquez@fdi.ucm.es
+- mikisvaz@yahoo.com
 executables: []
 
 extensions: []
@@ -33,24 +43,24 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.txt
+- README.rdoc
 - website/index.txt
 files: 
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - config/hoe.rb
 - config/requirements.rb
 - lib/simplews.rb
 - lib/simplews/jobs.rb
-- lib/simplews/version.rb
 - script/console
 - script/destroy
 - script/generate
 - script/txt2html
 - setup.rb
+- simplews.gemspec
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/website.rake
@@ -63,18 +73,11 @@ files:
 - website/stylesheets/screen.css
 - website/template.html.erb
 has_rdoc: true
-homepage: http://simplews.rubyforge.org
-post_install_message: |+
-  
-  For more information on simplews, see http://simplews.rubyforge.org
-  
-  NOTE: Change this information in PostInstall.txt 
-  You can also delete it if you don't want it.
-  
-  
+homepage: 
+post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -95,7 +98,7 @@ rubyforge_project: simplews
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Simplifies the development of Web Services, producing WSDL automatically for example. Wraps soap4r.
+summary: This defines a class that can simplifies creating Web Services
 test_files: 
 - test/test_simplews.rb
 - test/test_helper.rb

data/lib/simplews/version.rb

@@ -1,10 +0,0 @@
-module Simplews
-  module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 3
-    TINY  = 1
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-    self
-  end
-end