sge 0.0.3 → 0.0.4

data/Guardfile

@@ -3,7 +3,7 @@
 
 guard 'rspec', :version => 2 do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/sge/(.+)\.rb$}) { |m| puts m[1] ;"spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/sge/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 
   watch(%r{^spec/support/(.+)\.rb$}){ "spec" }

data/lib/sge/job_helpers.rb

@@ -5,36 +5,46 @@ module SGE
       base.extend ClassMethods
       base.class_eval do
         @attributes = []
+        @special_attributes = {}
       end
     end
 
     module ClassMethods
 
       def define_attributes(opts)
-        @attributes ||= []
         opts.each do |k,v|
           @attributes.push(k)
           attr_accessor(v)
-          alias_method k, v
+          alias_method k, v 
           alias_method "#{k}=", "#{v}="
         end
         # If attributes changed reload attributes_path
         @attributes_path = nil
         @attributes
       end
+      
+      def special_attribute(a, path)
+        attr_accessor a
+        @special_attributes[a] = path
+      end
 
       def attributes_path
         @attributes_path ||= @attributes.join('|')
       end
+          
 
       def from_document(doc)
         instance = new
-        doc.xpath('.//' + self::attributes_path ).each do |node|
+        doc.xpath('.//' + self.attributes_path ).each do |node|
           instance.send("#{node.name}=", node.text)
         end
+        @special_attributes.each do |k,v|
+          doc.xpath('.//' + v.to_s)
+          instance.send("#{k}=", doc.xpath('.//' + v.to_s).map{ |n| n.text})
+        end
         instance
       end
     end
 
   end
-end
+end

data/lib/sge/qstat/job.rb

@@ -8,9 +8,9 @@ module SGE
         :JB_owner => :owner,
         :JAT_start_time => :start_time,
         :queue_name => :queue_name,
-        :JB_submission_time => :submission_time,
-        :state => :state
+        :JB_submission_time => :submission_time
       )
+      special_attribute :state, "@state|state"
 
       def self.load_documents(opts,&block)
         documents = []

data/lib/sge/version.rb

@@ -1,3 +1,3 @@
 module SGE
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/qstat/job_spec.rb

@@ -31,7 +31,7 @@ describe SGE::QStat::Job do
     lambda{ @job = SGE::QStat::Job.from_document(doc) }.should_not raise_error
     @job.job_number.should == '2337'
     @job.name.should == 's20100220_11;init_jour'
-    @job.state.should == 'r'
+    @job.state.should == ['r','running']
     @job.owner.should == 'prodsoft'
     @job.start_time.should == '2010-02-24T21:55:13'
     @job.queue_name.should == 'calcul-x@wousdat-dev.in.weborama.fr'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sge
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &21065340 !ruby/object:Gem::Requirement
+  requirement: &70233676098620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21065340
+  version_requirements: *70233676098620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21064720 !ruby/object:Gem::Requirement
+  requirement: &70233676097260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21064720
+  version_requirements: *70233676097260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21064180 !ruby/object:Gem::Requirement
+  requirement: &70233676095100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21064180
+  version_requirements: *70233676095100
 description: Sun Grid Engine ruby library
 email:
 - hery@rails-royce.org
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3303954016914168628
+      hash: -1457147814193271419
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,10 +108,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3303954016914168628
+      hash: -1457147814193271419
 requirements: []
 rubyforge_project: sge
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Sun Grid Engine ruby library