simplews 1.9.1 → 1.10.0

data/bin/start_jobs_ws

@@ -28,8 +28,8 @@ OptionParser.new do |opts|
     options[:wsdl] = filename
   end
    
-  opts.on("-d", "--directory PATH", String, "Work directory for the WS") do |filename|
-    options[:wsdl] = filename
+  opts.on("-t", "--path PATH", String, "Work directory for the WS") do |filename|
+    options[:directory] = filename
   end
   
 end.parse!

data/lib/simplews.rb

@@ -71,7 +71,7 @@ class SimpleWS <  SOAP::RPC::StandaloneServer
     tmp = File.open("/tmp/simpleWS.wsdl",'w')
     tmp.write SimpleWS::get_wsdl(url, name)
     tmp.close
-    driver = SOAP::WSDLDriverFactory.new( "/tmp/simpleWS.wsdl"  ).create_rpc_driver
+    driver = SOAP::WSDLDriverFactory.new("/tmp/simpleWS.wsdl").create_rpc_driver
     FileUtils.rm "/tmp/simpleWS.wsdl"
 
     driver
@@ -216,6 +216,8 @@ class SimpleWS <  SOAP::RPC::StandaloneServer
     wsdl.gsub!(/\$\{LOCATION\}/,"http://#{ @host }:#{ @port }")
     
     if filename
+      directory = File.dirname(File.expand_path(filename))
+      FileUtils.mkdir_p directory unless File.exists? directory
       File.open(filename,'w') {|f| f.write wsdl }
       nil
     else
@@ -277,6 +279,8 @@ class SimpleWS <  SOAP::RPC::StandaloneServer
     end
 
     if filename
+      directory = File.dirname(File.expand_path(filename))
+      FileUtils.mkdir_p directory unless File.exists? directory
       File.open(filename,'w') {|f| f.write html_table }
       nil
     else

data/lib/simplews/notifier.rb

@@ -0,0 +1,123 @@
+require 'rmail'
+require 'net/smtp'
+require 'soap/wsdlDriver'
+require 'simplews/jobs'
+
+class SimpleWS::Jobs::Notifier
+
+  def driver
+    case
+    when String === @ws
+      if File.exists? @ws
+        return SOAP::WSDLDriverFactory.new(@ws).create_rpc_driver
+      end
+    when Array === @ws
+      return SimpleWS.get_driver(@ws[0], @ws[1])
+    when SOAP::WSDLDriverFactory === @ws
+      return @ws
+    end
+
+    raise "Do not know how to connect to driver"
+  end
+
+  def initialize(name, host, ws, options = {})
+    @host = host
+    @name   = name
+    @ws     = ws
+    @smtp_host  = options[:smtp_host] || 'localhost'
+    @smtp_port  = options[:smtp_port] || 25
+    @sleep_time = options[:sleep_time] || 2
+    @jobs = {}
+  end
+
+  def add_job(job_id, email)
+    @jobs[job_id] = email
+  end
+
+  def process
+    @jobs.each do |job_id, email|
+      if driver.done job_id
+        if driver.error job_id
+          error(job_id, email, driver.messages(job_id).last)
+        else
+          success(job_id, email)
+        end
+        @jobs.delete(job_id)
+      end
+    end
+  end
+
+  def send_mail(to, subject, body)
+    puts "Sending mail to #{ to }: #{ subject }"
+    message = RMail::Message.new
+
+    from = "noreply@" + @host.sub(/:.*/,'')
+
+    message.header['To'] = to
+    message.header['From'] = from
+    message.header['Subject'] = subject
+    
+    main = RMail::Message.new    
+    main.body = body
+
+    message.add_part(main)
+
+    Net::SMTP.start(@smtp_host.chomp, @smtp_port.to_i) do |smtp|
+      smtp.send_message message.to_s, from, to
+    end
+  end
+
+
+  def error(job_id, email, msg)
+    body =<<-EOF
+Dear #{ @name } user:
+
+You job with id '#{ job_id }' has finished with error message:
+
+#{ msg }
+
+URL: http://#{@host.chomp}/#{ job_id }
+
+Note: Do not reply to this message, it is automatically generated.
+    EOF
+    send_mail(email, "#{@name} [ERROR]: #{ job_id }", body)
+  end
+
+  def success(job_id, email)
+    body =<<-EOF
+Dear #{ @name } user:
+
+You job with id '#{ job_id }' has finished successfully:
+
+URL: http://#{@host.chomp}/#{ job_id }
+
+Note: Do not reply to this message, it is automatically generated.
+    EOF
+    send_mail(email, "#{@name} [SUCCESS]: #{ job_id }", body)
+  end
+
+  def pending?
+    ! @jobs.empty?
+  end
+
+  def start
+    puts "Starting Email notifier."
+    puts "Name: #{ @name }"
+    puts "Host: #{ @host }"
+    puts "SMTP: #{ @smtp_host }"
+    @thread = Thread.new do
+      while true
+        begin
+          process
+          sleep @sleep_time
+        rescue
+          puts $!.message
+        end
+      end
+    end
+  end
+
+  def stop
+    @thread.kill
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simplews
 version: !ruby/object:Gem::Version 
-  version: 1.9.1
+  prerelease: false
+  segments: 
+  - 1
+  - 10
+  - 0
+  version: 1.10.0
 platform: ruby
 authors: 
 - Miguel Vazquez
@@ -9,39 +14,47 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +01:00
+date: 2010-04-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: soap4r
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 8
         version: 1.5.8
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rand
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Generates WSDL automatically. It manages jobs as asynchronous processes
 email: miguel.vazquez@fdi.ucm.es
 executables: 
@@ -56,6 +69,7 @@ files:
 - lib/rake_pipeline.rb
 - lib/simplews.rb
 - lib/simplews/jobs.rb
+- lib/simplews/notifier.rb
 - lib/simplews/rake.rb
 - LICENSE
 - README.rdoc
@@ -72,18 +86,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simplifies creating soap4r web services as stand-alone servers