simplews 1.3.2 → 1.3.4

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Miguel Vazquez
+
+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/README.rdoc

@@ -1,92 +1,18 @@
-= simpleWS
+= simplews
 
-== DESCRIPTION:
+Description goes here.
 
-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.
+== Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but
+   bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
 
-== FEATURES/PROBLEMS:
+== Copyright
 
-
-== SYNOPSIS:
-
-Each Web Service provided is described using the method 'serve', which takes
-as arguments the name of the service, the name of its arguments, the type of
-its arguments and an optional block of code. If a block of code is provided,
-it will be the one executed when the service is called, if not, a function
-with the same name will be used. The types for the arguments are listed here,
-along with the WSDL type that it is translated to:
-
-:string  => 'xsd:string',
-:integer => 'xsd:integer',
-:array   => 'tns:ArrayOfString',
-:hash    => 'tns:Map',
-:binary  => 'xsd:base64Binary',
-
-The type of the result value may also be specified using the name :return,
-this means no argument may be called :return. If it is not specified there
-will be no return value.
-
-Following is an example of use:
-
-class TestWS < SimpleWS
-    def hi(name)
-        "Hi #{name}, how are you?"
-    end
-
-    def initialize(*args)
-        super(*args)
-        serve :hi, %(name), :name => :string, :return => :string
-
-        serve :bye, %(name), :name => :string, :return => :string do |name
-            "Bye bye #{name}. See you soon."
-        end
-    end
-end
-
-The constructor accepts a number of parameters. The name of the server, a
-description, the host and the port, along with any other arguments one wishes
-to pass to the SOAP::RPC::StandaloneServer constructor
-
-This is an example of instantiating the above server:
-
-server = TestWS.new("TestWS", "Greeting Services", 'localhost', '1984')
-server.wsdl("TestWS.wsdl")
-
-The function 'wsdl' saves the WSDL describing the services and the location
-provided as an argument.
-
-
-== REQUIREMENTS:
-
-Requires soap4r gem to be installed.
-
-== INSTALL:
-
-sudo gem install simpleWS
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2008 Miguel Vazquez (miguel.vazquez@fdi.ucm.es)
-
-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.
+Copyright (c) 2009 Miguel Vazquez. See LICENSE for details.

data/lib/simplews/jobs.rb

@@ -1,7 +1,6 @@
 require File.join(File.dirname(File.dirname(__FILE__)) + '/simplews')
 
 require 'yaml'
-require 'drb'
 require 'singleton'
 require 'rand'
 require 'zlib'
@@ -14,8 +13,13 @@ class SimpleWS::Jobs < SimpleWS
   class Aborted < Exception; end
 
 
-  #{{{ Scheduler
+  SLEEP_TIMES = {
+    :job_info => 1,
+    :monitor => 2,
+  }
+
   
+  #{{{ Scheduler
   module Scheduler
     include Process
 
@@ -26,7 +30,8 @@ class SimpleWS::Jobs < SimpleWS
     
     @@queue = []
     @@max_jobs = 3
-    
+
+   
     def self.random_name(s="", num=20)
       num.times{
         r = rand
@@ -44,17 +49,18 @@ class SimpleWS::Jobs < SimpleWS
     def self.make_name(name = "")
       name = Scheduler::random_name("job-") unless name =~ /\w/
 
-      taken = @@names.select{|n| n =~ /^#{ name }(-\d+)?$/}
+      taken = @@names.select{|n| n =~ /^#{ Regexp.quote name }(?:-\d+)?$/}
       taken += Job.taken(name)
       taken = taken.sort.uniq
       if taken.any?
         if taken.length == 1
-          return name + '-1'
+          return name + '-2'
         else
           last = taken.collect{|s| 
             if s.match(/-(\d+)$/)
               $1.to_i 
-            else 0 
+            else 
+              1 
             end
           }.sort.last
           return name + '-' + (last + 1).to_s
@@ -78,10 +84,11 @@ class SimpleWS::Jobs < SimpleWS
     end
 
     def self.dequeue
-      if @@pids.length < @@max_jobs && @@queue.any?
+      if @@pids.length <= @@max_jobs && @@queue.any?
         job_info = @@queue.pop
 
         pid = Job.new.run(job_info[:task], job_info[:name], @@task_results[job_info[:task]], *job_info[:args])
+        
         @@pids[job_info[:name]] = pid
         pid
       else
@@ -89,6 +96,10 @@ class SimpleWS::Jobs < SimpleWS
       end
     end
 
+    def self.queue
+      @@queue
+    end
+
     def self.run(task, *args)
       suggested_name = *args.pop
       name = make_name(suggested_name)
@@ -107,7 +118,9 @@ class SimpleWS::Jobs < SimpleWS
     end
 
     def self.clean_job(pid)
-      name = @@pids.select{|name, p| p == pid}.first[0]
+      name = @@pids.select{|name, p| p == pid}.first
+      return if name.nil?
+      name = name.first
       puts "Process #{ name } with pid #{ pid } finished with exitstatus #{$?.exitstatus}"
       state = Job.job_info(name)
       if ![:error, :done, :aborted].include?(state[:status])
@@ -121,18 +134,27 @@ class SimpleWS::Jobs < SimpleWS
     def self.job_monitor
       Thread.new{
         while true
-          pid = dequeue
-          if pid
-            Thread.new(pid){|pid|
-              begin
-                pid = Process.wait(-1,Process::WUNTRACED) if @@pids.any?
-                clean_job(pid) if @@pids.values.include? pid
-              rescue Exception
-                puts $!.message
+          begin
+            pid = dequeue
+            if pid.nil?
+              if @@pids.any?
+                pid_exit = Process.wait(-1, Process::WNOHANG)
+                if pid_exit
+                  clean_job(pid_exit)
+                else
+                  sleep SimpleWS::Jobs::SLEEP_TIMES[:monitor]
+                end
+              else
+                sleep SimpleWS::Jobs::SLEEP_TIMES[:monitor]
               end
-            }
+            else
+              sleep SimpleWS::Jobs::SLEEP_TIMES[:monitor]
+            end
+          rescue
+            puts $!.message
+            puts $!.backtrace.join("\n")
+            sleep 2
           end
-          sleep 2
         end
       }
     end
@@ -170,7 +192,8 @@ class SimpleWS::Jobs < SimpleWS
       end
 
       def self.taken(name = "")
-        Dir.glob(@@savedir + "/#{ name }*.marshal").collect{|n| n.match(/(#{ name }.*).marshal/)[1]}
+        Dir.glob(@@savedir + "/#{ name }*.marshal").
+          collect{|n| n.match(/\/(#{ Regexp.quote name }(?:-\d+)?).marshal/); $1}.compact
       end
       def self.path(file, name)
         if file =~ /^\/|#{@@workdir}/
@@ -196,7 +219,7 @@ class SimpleWS::Jobs < SimpleWS
         rescue Exception
           if retries > 0
             retries -= 1
-            sleep 1
+            sleep SimpleWS::Jobs::SLEEP_TIMES[:job_info]
             retry
           end
           info = nil
@@ -204,6 +227,11 @@ class SimpleWS::Jobs < SimpleWS
 
         raise JobNotFound, "Job with name '#{ name }' was not found" if info.nil?
 
+        if info[:queued] && !@@queue.collect{|info| info[:name]}.include?(name)
+          FileUtils.rm(File.join(@@savedir, name + '.marshal'))
+          raise Aborted, "Job #{ name } has been removed from the queue"
+        end
+
         info
       end
 
@@ -304,6 +332,8 @@ class SimpleWS::Jobs < SimpleWS
               puts $!.message
               puts $!.backtrace
               exit(-1)
+            else
+              exit($!.status)
             end
           end
         end
@@ -364,6 +394,10 @@ class SimpleWS::Jobs < SimpleWS
       end
     }
 
+    serve :queue, [], :return => :array do 
+      Scheduler.queue.collect{|info| info[:name]}
+    end
+
     serve :status, ['job'], :job => :string, :return => :string do |job|
       Scheduler.job_info(job)[:status].to_s
     end

data/lib/simplews.rb

@@ -44,7 +44,7 @@ require 'builder'
 
 
 class SimpleWS <  SOAP::RPC::StandaloneServer
-  VERSION = "1.3.2"
+  VERSION = "1.3.6"
 
 
   # This is a helper function for clients. Given the +url+ where the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simplews
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors: 
 - Miguel Vazquez
@@ -9,75 +9,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 +02:00
+date: 2009-10-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
+  name: rand
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
+  name: builder
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: "0"
     version: 
-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: 
-- mikisvaz@yahoo.com
+description: Generates WSDL automatically. It manages jobs as asynchronous processes
+email: miguel.vazquez@fdi.ucm.es
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
+- LICENSE
 - README.rdoc
-- website/index.txt
 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
+- LICENSE
+- README.rdoc
 has_rdoc: true
-homepage: 
-post_install_message: PostInstall.txt
+homepage: http://github.com/mikisvaz/simplews
+licenses: []
+
+post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -94,12 +69,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: simplews
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: This defines a class that can simplifies creating Web Services
-test_files: 
-- test/test_simplews.rb
-- test/test_helper.rb
-- test/simplews/test_jobs.rb
+specification_version: 3
+summary: Simplifies creating soap4r web services as stand-alone servers
+test_files: []
+

data/History.txt

@@ -1,57 +0,0 @@
-== 1.3.2 2009-03-21
-
-== 1.3.1 2008-12-20
-
-* 1 minor enhancement:
-  * Use Marshal instead of YAML, it seems faster...
-
-* 1 mayor enhancement:
-  * Removed old versions of job based servers
-
-== 1.3.0 2008-12-20
-
-* 1 minor enhancement:
-  * New version for asynchronous job. In this case it uses fork to spawn new
-    processes.
-
-
-
-== 1.1.7 2008-11-27
-
-* 2 minor enhancement:
-  * Inline methods are prepended '_inline_' to avoid polluting namespace
-  * Asynchronous jobs have a hash where they can save information, it is
-    accessible through the 'info' WS method in YAML format
-
-== 1.1.6 2008-11-24
-
-* 1 minor enhancement:
-  * Added documentation
-
-
-== 1.1.5 2008-10-28
-
-* 1 major enhancement:
-  * Jobs save their states across reboots of the server
-
-== 1.1.4 2008-10-28
-
-* 1 major enhancement:
-  * Web Service with asynchronous jobs
-
-== 1.0.2 2008-10-28
-
-* 1 bug fix:
-  * In using the easy client driver creation
-
-== 1.0.1 2008-10-27
-
-* 1 major enhancement:
-  * Easy creation of client driver. Connects to a url and retrieves the WSDL
-    and uses it to generate driver
-
-
-== 1.0.0 2008-10-10
-
-* 1 major enhancement:
-  * Initial release

data/Manifest.txt

@@ -1,26 +0,0 @@
-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

data/PostInstall.txt

@@ -1,7 +0,0 @@
-
-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.
-
-

data/Rakefile

@@ -1,28 +0,0 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/simplews'
-
-# 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/config/hoe.rb

@@ -1,73 +0,0 @@
-require 'simplews/version'
-
-AUTHOR = 'Miguel Vazquez'  # can also be an array of Authors
-EMAIL = "miguel.vazquez@fdi.ucm.es"
-DESCRIPTION = "Simplifies the development of Web Services, producing WSDL automatically for example. Wraps soap4r."
-GEM_NAME = 'simplews' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'simplews' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-EXTRA_DEPENDENCIES = [
-#  ['activesupport', '>= 1.3.1']
-]    # An array of rubygem dependencies [name, version]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-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 = YAML.load(`svn info`)['Revision']
-VERS = Simplews::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'simplews 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.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  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 = EXTRA_DEPENDENCIES
-
-    #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'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""

data/config/requirements.rb

@@ -1,15 +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]))

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/simplews.rb'}"
-puts "Loading simplews gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)