simplews 1.5.3 → 1.6.0

data/bin/start_ws

@@ -0,0 +1,50 @@
+#!/usr/bin/ruby
+require 'rubygems'
+require 'simplews'
+require "optparse"
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{ $_ } [options] <config_file>"
+
+  opts.on("-h", "--host HOST", String, "Select host interface, localhost by default") do |host|
+    options[:host] = host
+  end
+
+  opts.on("-p", "--port PORT", Integer, "Select interface port, 1984 by default") do |port|
+    options[:port] = port
+  end
+
+  opts.on("-n", "--name NAME", String, "Select the name of the web server interface, SimpleWS by default") do |name|
+    options[:name] = name
+  end
+
+  opts.on("-d", "--description DESCRIPTION", String, "Description of the service") do |description|
+    options[:description] = description
+  end
+
+  opts.on("-w", "--wsdl FILENAME", String, "Save the WSDL file") do |filename|
+    options[:wsdl] = filename
+  end
+  
+end.parse!
+
+filename = ARGV[0]
+
+server = SimpleWS.new(options[:name], options[:description], options[:host], options[:port]) do
+  actions = File.open(filename)do |f| f.read end
+  eval actions
+end
+
+if options[:wsdl]
+  File.open(options[:wsdl], 'w') do |f| f.write server.wsdl end
+end
+
+trap('INT'){
+  puts "Stopping server"
+  server.shutdown
+}
+
+server.start
+
+

data/lib/rake_pipeline.rb

@@ -0,0 +1,220 @@
+require 'rake'
+
+# Include the step_dependencies and step_def methods to simplify Pipelines. Steps depend on
+# the step strictly above by default. The output of the step is save marshaled,
+# except for Strings which are save as text. The input of the step, the output
+# of the previous step if availabe is accessed with the input method
+#
+# Example::
+#
+#     step_def :text do 
+#       "Text to revert"
+#     end
+#
+#     step_def :revert do
+#       text = input
+#       text.reverse
+#     end
+#
+module Rake::Pipeline
+
+  module Rake::Pipeline::Step
+
+    class << self
+
+      @@step_descriptions = {}
+      def step_descriptions
+        @@step_descriptions
+      end
+
+      def add_description(re, step, message)
+        @@step_descriptions[re] = "#{ step }: #{ message }"                       
+      end
+
+      @@last_step = nil
+      def step_dependencies(name, dependencies = nil)
+
+        re = Regexp.new(/(?:^|\/)#{name}\/.*$/)
+
+        # Take the last_description and associate it with the name
+        if Rake.application.last_description
+          add_description(re, name, Rake.application.last_description)
+        end
+
+        if dependencies.nil? && ! @@last_step.nil?
+          dependencies = @@last_step
+        end
+        @@last_step = name
+
+        # Generate the Hash definition
+        case 
+        when dependencies.nil?
+          re
+        when String === dependencies || Symbol === dependencies
+          {re => lambda{|filename| filename.sub(name.to_s,dependencies.to_s) }}
+        when Array === dependencies
+          {re => lambda{|filename| dependencies.collect{|dep| filename.sub(name.to_s, dep.to_s) } }}
+        when Proc === dependencies
+          {re => dependencies}
+        end
+
+      end
+
+      def parse_filename(filename)
+        filename.match(/^(.*?)([^\/]*)\/([^\/]*)$/)
+        {
+          :prefix => $1,
+          :step => $2,
+          :job => $3,
+        }
+      end
+    end
+  end
+
+  module Rake::Pipeline::Info
+
+    def self.info_file(filename)
+      info = Rake::Pipeline::Step.parse_filename(filename)
+      "#{info[:prefix]}/.info/#{info[:job]}.yaml"
+    end
+
+    def self.load_info(t)
+      filename = t.name
+      info_filename = info_file(filename)
+
+      if File.exists? info_filename
+        YAML.load(File.open(info_filename))
+      else
+        {}
+      end
+    end
+
+    def self.save_info(t, info = {})
+      filename = t.name
+      info_filename = info_file(filename)
+
+      FileUtils.mkdir_p File.dirname(info_filename) unless File.exists? File.dirname(info_filename)
+      File.open(info_filename,'w'){|file|
+        file.write YAML.dump info
+      }
+    end
+  end
+
+  @@steps = []
+
+  def steps
+    @@steps
+  end
+
+
+  NON_ASCII_PRINTABLE = /[^\x20-\x7e\s]/
+  def is_binary?(file)
+    binary = file.read(1024) =~ NON_ASCII_PRINTABLE
+    file.rewind
+    binary
+  end
+
+  def step_descriptions
+    Rake::Pipeline::Step.step_descriptions
+  end
+
+
+  def step_dependencies(*args)
+    Rake::Pipeline::Step.step_dependencies(*args)
+  end
+
+  def infile(t, &block)
+    File.open(t.prerequisites.first) do |f|
+      block.call(f)
+    end
+  end
+
+  def outfile(t, &block)
+    File.open(t.name, 'w') do |f|
+      block.call(f)
+    end
+  end
+
+  def load_input(t, step = nil)
+    if step
+      info = Rake::Pipeline::Step.parse_filename(t.name)
+      filename = "#{info[:prefix]}/#{step}/#{info[:job]}"
+      File.open(filename){|f| 
+        if is_binary?(f)
+          Marshal.load(f) 
+        else
+          f.read
+        end
+      }
+    else
+      return nil if t.prerequisites.first.nil?
+      infile(t){|f| 
+        if is_binary?(f)
+          Marshal.load(f) 
+        else
+          f.read
+        end
+      }
+    end
+  end
+
+  def save_output(t, output)
+    case 
+    when output.nil?
+      nil
+    when String === output
+      outfile(t){|f| f.write output } 
+    else
+      outfile(t){|f| f.write Marshal.dump(output) } 
+    end
+
+  end
+
+  # We cannot load the input variable before the block.call, so we need another method
+
+  # Load the input data from the previous step
+  def input(step = nil)
+    load_input(@@current_task, step) if @@current_task
+  end
+
+  if defined? SimpleWS::Jobs
+    def method_missing(symbol, *args)
+      $_current_job.send(symbol, *args)
+    end
+  else
+    # Add values to the info file
+    def info(values = {})
+      puts "Using rake info"
+      
+      info = Rake::Pipeline::Info.load_info(@@current_task)
+      info = info.merge values
+      Rake::Pipeline::Info.save_info(@@current_task, info)
+      info
+    end
+  end
+
+  
+  
+  
+  # Define a new step, it depends on the previously defined by default. It
+  # saves the output of the block so it can be loaded by the input method of
+  # the next step
+  def step_def(name, dependencies = nil, &block)
+    @@steps << name
+    rule step_dependencies(name, dependencies) do |t| 
+
+      # Save the task object to be able to load the input
+      @@current_task = t
+      
+      output = block.call(t)
+      
+      save_output(t, output)
+    end
+
+  end
+end
+
+if __FILE__ == $0
+
+  p Rake::Pipeline::Info.info_file('work/diseases/t')
+end

data/lib/simplews/jobs.rb

@@ -386,7 +386,7 @@ class SimpleWS::Jobs < SimpleWS
     @workdir
   end
 
-  def initialize(name, description, host = 'localhost' , port = '8081', workdir = nil, *args)
+  def initialize(name = nil, description = nil, host = nil, port = nil, workdir = nil, *args)
     super(name, description, host, port, *args)
 
     @workdir = workdir || "/tmp/#{ name }"

data/lib/simplews/rake.rb

@@ -2,6 +2,7 @@
 
 require 'simplews/jobs'
 require 'rake'
+require 'fileutils'
 
 class SimpleWS::Jobs::Scheduler::Job
 
@@ -45,6 +46,11 @@ class SimpleWS::Jobs::Scheduler::Job
     EOC
 
     load rakefile
+    @@steps.each{|step|
+      step_dirname = File.join(workdir, step.to_s)
+      FileUtils.mkdir_p step_dirname unless File.exists? step_dirname
+    }
+
     if defined? Rake::Pipeline
       Rake::Pipeline::step_descriptions.each{|re, description|
         if description.match(/(.*): (.*)/)

data/lib/simplews.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+gem 'soap4r'
 require 'soap/rpc/standaloneServer'
 require 'builder'
 
@@ -77,14 +79,22 @@ class SimpleWS <  SOAP::RPC::StandaloneServer
     driver
   end
 
+  attr_accessor :description
+
   # Creates an instance of a Server. The parameter +name+ specifies the
   # +namespace+ used in the +WSDL+, +description+ is the description
   # also included in the +WSDL+. The parameters +host+ and +port+,
   # specify where the server will be listening, they are parameters of
   # the +super+ class SOAP::RPC::StandaloneServer, they are made
   # explicit here because they are included in the +WSDL+ as well.
-  def initialize(name="WS", description="", host="localhost", port="1984", *args)
+  def initialize(name=nil, description=nil, host=nil, port=nil, *args, &block)
+    name ||= self.class.to_s
+    description ||= "Web Server for #{ name }"
+    host ||= "localhost"
+    port ||= "1984"
+
     super(description, "urn:#{ name }", host, port, *args)
+
     @host        = host
     @port        = port
     @name        = name
@@ -93,12 +103,26 @@ class SimpleWS <  SOAP::RPC::StandaloneServer
     @operations  = []
     @bindings    = []
 
+    if block_given?
+      instance_eval &block
+    end
+
+    puts "Server #{ name } at #{ host }:#{ port }"
+
     serve :wsdl, %w(),  :return => :string
     METHODS.each{|name, info|
       serve name, info[:args], info[:types], &info[:block]
     }
   end
 
+  def name=(name)
+    @name = name
+    appname = name
+    default_namespace = "urn:#{name}"
+  end
+
+  
+
 
   # This method tells the server to provide a method named by the +name+
   # parameter, with arguments listed in the +args+ parameter. The
@@ -174,7 +198,7 @@ class SimpleWS <  SOAP::RPC::StandaloneServer
     end
     @messages << message
     message =  Builder::XmlMarkup.new(:indent => 2).message :name => "#{ name }Response" do |xml|
-      type = types[:return] || types["return"]
+      type = types[:return] || types["return"] || :string
       if type
         type = type.to_sym
         xml.part :name => 'return', :type => TYPES2WSDL[type]
@@ -231,7 +255,7 @@ targetNamespace="${NAME}-NS">
                </restriction>
             </complexContent>
          </complexType>
-     </schema>
+       </schema>
    </types>
 
 ${MESSAGES}
@@ -260,7 +284,6 @@ EOT
     :integer => 'xsd:integer',
     :float   => 'xsd:float',
     :array   => 'tns:ArrayOfString',
-    :hash    => 'tns:Map',
     :binary  => 'xsd:base64Binary',
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simplews
 version: !ruby/object:Gem::Version 
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors: 
 - Miguel Vazquez
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 +01:00
-default_executable: 
+date: 2009-12-30 00:00:00 +01:00
+default_executable: start_ws
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: soap4r
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.8
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rand
   type: :runtime
@@ -34,14 +44,15 @@ dependencies:
     version: 
 description: Generates WSDL automatically. It manages jobs as asynchronous processes
 email: miguel.vazquez@fdi.ucm.es
-executables: []
-
+executables: 
+- start_ws
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
 files: 
+- lib/rake_pipeline.rb
 - lib/simplews.rb
 - lib/simplews/jobs.rb
 - lib/simplews/rake.rb