comana 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/comana.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "comana"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
@@ -27,8 +27,18 @@ Gem::Specification.new do |s|
     "comana.gemspec",
     "lib/comana.rb",
     "spec/comana_spec.rb",
-    "spec/dummy/input_a",
-    "spec/dummy/input_b",
+    "spec/locked/input_a",
+    "spec/locked/input_b",
+    "spec/locked/lock",
+    "spec/locked_outputted/input_a",
+    "spec/locked_outputted/input_b",
+    "spec/locked_outputted/lock",
+    "spec/locked_outputted/output",
+    "spec/not_calculated/input_a",
+    "spec/not_calculated/input_b",
+    "spec/outputted/input_a",
+    "spec/outputted/input_b",
+    "spec/outputted/output",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/ippei94da/comana"

data/lib/comana.rb

@@ -23,11 +23,9 @@ class Comana
   #   :yet           not started
   #   :started       started, but not ended, including short time from last output
   #   :terminated    started, but long time no output
-  #   :next          started, normal ended and need next calculation
   #   :finished      started, normal ended and not need next calculation
   def state
     return :finished   if finished?
-    return :next       if normal_ended?
     return :yet        unless started?
     return :terminated if (Time.now - latest_modified_time > @alive_time)
     return :started    
@@ -38,25 +36,10 @@ class Comana
   # because the calculation has been done by other process already.
   def calculate
     raise AlreadyStartedError if started?
-    File.open(@log, "w")
+    File.open(@lockfile, "w")
     send_command
   end
 
-  # Generate next calculation and return the computation object.
-  def prepare_next
-    raise NotImplementedError, "#{self.class}::prepare_next need to be redefined"
-  end
-
-  # Return initial state.
-  def initial_state
-    raise NotImplementedError, "#{self.class}::initial_state need to be redefined"
-  end
-
-  # Return latest state.
-  def latest_state
-    raise NotImplementedError, "#{self.class}::latest_state need to be redefined"
-  end
-
   private
 
   def send_command
@@ -67,13 +50,14 @@ class Comana
     raise NotImplementedError, "#{self.class}::set_parameters need to be redefined"
 
     # e.g.,
-    #@logfile    = "comana.log"
+    #@lockfile    = "comana.lock"
     #@alive_time = 3600
     #@outfiles   = ["output_a", "ouput_b"] # Files only to output should be indicated.
   end
 
   # Return latest modified time of files in calc dir recursively.
-  #require "find"
+  # require "find"
+  # Not only @outfiles, to catch an irregular state at the beginning before output.
   def latest_modified_time
     tmp = Dir.glob("#{@dir}/**/*").max_by do |file|
       File.mtime(file)
@@ -82,7 +66,7 @@ class Comana
   end
 
   def started?
-    return true if File.exist?( "#{@dir}/#{@logfile}" )
+    return true if File.exist?( "#{@dir}/#{@lockfile}" )
     @outfiles.each do |file|
       return true if File.exist?( "#{@dir}/#{file}" )
     end
@@ -91,12 +75,6 @@ class Comana
 
   # Return true if the condition is satisfied.
   # E.g., when calculation output contains orthodox ending sequences.
-  def normal_ended?
-    raise NotImplementedError, "#{self.class}::normal_ended? need to be redefined"
-  end
-
-  # Return true if the condition is satisfied.
-  # E.g., calculation achieve convergence.
   def finished?
     raise NotImplementedError, "#{self.class}::finished? need to be redefined"
   end

data/spec/comana_spec.rb

@@ -2,40 +2,31 @@ require "fileutils"
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 NOW = Time.now
-CALC_DIR = "spec/dummy"
-LOCKFILE = "#{CALC_DIR}/log"
-OUTFILES = ["#{CALC_DIR}/output_a", "#{CALC_DIR}/output_b"]
+#CALC_DIR = "spec/dummy"
+#LOCKFILE = "#{CALC_DIR}/lock"
+#OUTFILES = ["#{CALC_DIR}/output_a", "#{CALC_DIR}/output_b"]
 
 class Comana
   public :latest_modified_time, :started?
 end
 
-class CalcFinished    < Comana
-  def normal_ended?     ; true      ; end
-  def finished?         ; true      ; end
-  def set_parameters
-    @logfile    = "log"
-    @alive_time =  500
-    @outfiles   =  []
-  end
-end
-
-describe Comana, "with not calculated" do
+describe Comana, "not calculated" do
   class CalcYet < Comana
-    def normal_ended?     ; false     ; end
     def finished?         ; false     ; end
     def set_parameters
-      @logfile    = "log"
+      @lockfile   = "lock"
       @alive_time = 3600
-      @outfiles   =  []
+      @outfiles   = ["output"]
     end
   end
   before do
-    @calc = CalcYet .new(CALC_DIR)
+    calc_dir = "spec/not_calculated"
+    @calc = CalcYet.new(calc_dir)
 
-    File.utime(NOW - 1000 ,NOW - 1000, "#{CALC_DIR}/input_a")
-    File.utime(NOW - 2000 ,NOW - 2000, "#{CALC_DIR}/input_b")
-    FileUtils.rm(LOCKFILE) if File.exist?(LOCKFILE)
+    File.utime(NOW - 1000 ,NOW - 1000, "#{calc_dir}/input_a")
+    File.utime(NOW - 2000 ,NOW - 2000, "#{calc_dir}/input_b")
+    @lockfile = "#{calc_dir}/lockfile"
+    FileUtils.rm(@lockfile) if File.exist?(@lockfile)
   end
 
   it "should return the state" do
@@ -46,155 +37,110 @@ describe Comana, "with not calculated" do
     @calc.latest_modified_time.should == (NOW - 1000)
   end
 
-  it "should return false without log." do
+  it "should return false without lock." do
     @calc.started?.should_not == nil
     @calc.started?.should be_false
   end
 
-  it "should return true with log." do
-    File.open(LOCKFILE, "w")
-    @calc.started?.should be_true
+  it "should return true with lock." do
+    @calc.started?.should be_false
   end
 
-  after do
-    FileUtils.rm(LOCKFILE) if File.exist?(LOCKFILE)
-  end
+  #after do
+  #  FileUtils.rm(@lockfile) if File.exist?(@lockfile)
+  #end
 end
 
-describe Comana, "with log" do
+describe Comana, "with lock" do
   class CalcStarted < Comana
-    def normal_ended?     ; false     ; end
     def finished?         ; false     ; end
     def set_parameters
-      @logfile    = "log"
+      @lockfile   = "lock"
       @alive_time = 5000
-      @outfiles   =  []
+      @outfiles   = ["output"]
     end
   end
 
   before do
-    @calc = CalcStarted   .new(CALC_DIR)
-    File.utime(NOW - 1000 ,NOW - 1000, "#{CALC_DIR}/input_a")
-    File.utime(NOW - 2000 ,NOW - 2000, "#{CALC_DIR}/input_b")
-    File.open(LOCKFILE, "w")
+    calc_dir = "spec/locked"
+    @calc = CalcStarted   .new(calc_dir)
+    File.utime(NOW - 1000 ,NOW - 1000, "#{calc_dir}/input_a")
+    File.utime(NOW - 2000 ,NOW - 2000, "#{calc_dir}/input_b")
   end
 
   it "should return :started" do
     @calc.state.should == :started
   end
-
-  after do
-    FileUtils.rm(LOCKFILE) if File.exist?(LOCKFILE)
-  end
 end
 
 describe Comana, "with output, without lock" do
   class CalcStarted < Comana
-    def normal_ended?     ; false     ; end
     def finished?         ; false     ; end
     def set_parameters
-      @logfile    = "log"
+      @lockfile   = "lock"
       @alive_time = 5000
-      @outfiles   =  []
-      @outfiles = ["output_a", "output_b"]
+      @outfiles   = ["output"]
     end
   end
 
   before do
-    @calc = CalcStarted   .new(CALC_DIR)
-    File.utime(NOW - 1000 ,NOW - 1000, "#{CALC_DIR}/input_a")
-    File.utime(NOW - 2000 ,NOW - 2000, "#{CALC_DIR}/input_b")
-    File.open(OUTFILES[0], "w")
+    calc_dir = "spec/outputted"
+    @calc = CalcStarted   .new(calc_dir)
+    File.utime(NOW - 1000 ,NOW - 1000, "#{calc_dir}/input_a")
+    File.utime(NOW - 2000 ,NOW - 2000, "#{calc_dir}/input_b")
+    File.utime(NOW - 2000 ,NOW - 2000, "#{calc_dir}/output")
+    #File.open(OUTFILES[0], "w")
   end
 
   it "should return :started" do
     @calc.state.should == :started
   end
 
-  after do
-    FileUtils.rm(OUTFILES[0]) if File.exist?(OUTFILES[0])
-  end
 end
 
-describe Comana, "with terminated" do
+describe Comana, "terminated" do
   class CalcTerminated < Comana
-    def normal_ended?     ; false     ; end
     def finished?         ; false     ; end
     def set_parameters
-      @logfile    = "log"
+      @lockfile   = "lock"
       @alive_time = 500
-      @outfiles   =  []
+      @outfiles   = ["output"]
     end
   end
 
   before do
-    @calc_terminated   = CalcTerminated.new(CALC_DIR)
+    calc_dir = "spec/locked_outputted"
+    @calc_terminated   = CalcTerminated.new(calc_dir)
 
-    File.utime(NOW - 1000 ,NOW - 1000, "#{CALC_DIR}/input_a")
-    File.utime(NOW - 2000 ,NOW - 2000, "#{CALC_DIR}/input_b")
-    File.open(LOCKFILE, "w")
+    File.utime(NOW - 1000 ,NOW - 1000, "#{calc_dir}/input_a")
+    File.utime(NOW - 2000 ,NOW - 2000, "#{calc_dir}/input_b")
+    File.utime(NOW - 9000 ,NOW - 9000, "#{calc_dir}/output")
   end
 
   it "should return the state" do
-    File.open(LOCKFILE, "w")
-    File.utime(NOW - 1000 ,NOW - 1000, LOCKFILE)
     @calc_terminated  .state.should == :terminated
   end
-
-  after do
-    FileUtils.rm(LOCKFILE) if File.exist?(LOCKFILE)
-  end
 end
 
-describe Comana, "with next" do
-  class CalcNext < Comana
-    def normal_ended?     ; true      ; end
-    def finished?         ; false     ; end
+describe Comana, "finished" do
+  class CalcFinished    < Comana
+    def finished?         ; true      ; end
     def set_parameters
-      @logfile    = "log"
+      @lockfile    = "lock"
       @alive_time =  500
-      @outfiles   =  []
+      @outfiles   = ["output"]
     end
   end
 
   before do
-    @calc_next         = CalcNext      .new(CALC_DIR)
+    calc_dir = "spec/locked_outputted"
+    @calc_finished     = CalcFinished  .new(calc_dir)
 
-    File.utime(NOW - 1000 ,NOW - 1000, "#{CALC_DIR}/input_a")
-    File.utime(NOW - 2000 ,NOW - 2000, "#{CALC_DIR}/input_b")
-    File.open(LOCKFILE, "w")
+    File.utime(NOW - 1000 ,NOW - 1000, "#{calc_dir}/input_a")
+    File.utime(NOW - 2000 ,NOW - 2000, "#{calc_dir}/input_b")
   end
 
   it "should return the state" do
-
-    File.open(LOCKFILE, "w")
-    File.utime(NOW - 1000 ,NOW - 1000, LOCKFILE)
-    @calc_next        .state.should == :next
-  end
-
-  after do
-    FileUtils.rm(LOCKFILE) if File.exist?(LOCKFILE)
-  end
-end
-
-describe Comana, "with finished" do
-  before do
-    @calc_finished     = CalcFinished  .new(CALC_DIR)
-
-    File.utime(NOW - 1000 ,NOW - 1000, "#{CALC_DIR}/input_a")
-    File.utime(NOW - 2000 ,NOW - 2000, "#{CALC_DIR}/input_b")
-    #FileUtils.rm(LOCKFILE) if File.exist?(LOCKFILE)
-    File.open(LOCKFILE, "w")
-  end
-
-  it "should return the state" do
-
-    File.open(LOCKFILE, "w")
-    File.utime(NOW - 1000 ,NOW - 1000, LOCKFILE)
     @calc_finished    .state.should == :finished
   end
-
-  after do
-    FileUtils.rm(LOCKFILE) if File.exist?(LOCKFILE)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comana
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78971360 !ruby/object:Gem::Requirement
+  requirement: &85029320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *78971360
+  version_requirements: *85029320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78970720 !ruby/object:Gem::Requirement
+  requirement: &85026760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *78970720
+  version_requirements: *85026760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &78970200 !ruby/object:Gem::Requirement
+  requirement: &85026410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *78970200
+  version_requirements: *85026410
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &78968420 !ruby/object:Gem::Requirement
+  requirement: &85025660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *78968420
+  version_requirements: *85025660
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &78967450 !ruby/object:Gem::Requirement
+  requirement: &85040750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78967450
+  version_requirements: *85040750
 description: ! "An aim of this gem is to provide a framework of\n    managing scientific
   computing.\n    Researchers on computing have to check calculation and\n    generate
   new calculation and execute, repeatedly.\n    The abstract class that this gem provide
@@ -87,8 +87,18 @@ files:
 - comana.gemspec
 - lib/comana.rb
 - spec/comana_spec.rb
-- spec/dummy/input_a
-- spec/dummy/input_b
+- spec/locked/input_a
+- spec/locked/input_b
+- spec/locked/lock
+- spec/locked_outputted/input_a
+- spec/locked_outputted/input_b
+- spec/locked_outputted/lock
+- spec/locked_outputted/output
+- spec/not_calculated/input_a
+- spec/not_calculated/input_b
+- spec/outputted/input_a
+- spec/outputted/input_b
+- spec/outputted/output
 - spec/spec_helper.rb
 homepage: http://github.com/ippei94da/comana
 licenses:
@@ -105,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 482408915
+      hash: 813074803
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: