comana 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/comana.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "comana"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
@@ -29,10 +29,8 @@ Gem::Specification.new do |s|
     "spec/comana_spec.rb",
     "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",

data/lib/comana.rb

@@ -35,8 +35,11 @@ class Comana
   # If log of Comana exist, raise Comana::AlreadyStartedError,
   # because the calculation has been done by other process already.
   def calculate
-    raise AlreadyStartedError if started?
-    File.open(@lockfile, "w")
+    begin
+      Dir.mkdir @lockdir
+    rescue Errno::EEXIST
+      raise AlreadyStartedError
+    end
     send_command
   end
 
@@ -50,7 +53,7 @@ class Comana
     raise NotImplementedError, "#{self.class}::set_parameters need to be redefined"
 
     # e.g.,
-    #@lockfile    = "comana.lock"
+    #@lockdir    = "comana_lock"
     #@alive_time = 3600
     #@outfiles   = ["output_a", "ouput_b"] # Files only to output should be indicated.
   end
@@ -66,10 +69,10 @@ class Comana
   end
 
   def started?
-    return true if File.exist?( "#{@dir}/#{@lockfile}" )
-    @outfiles.each do |file|
-      return true if File.exist?( "#{@dir}/#{file}" )
-    end
+    return true if File.exist?( "#{@dir}/#{@lockdir}" )
+    #@outfiles.each do |file|
+    #  return true if File.exist?( "#{@dir}/#{file}" )
+    #end
     return false
   end
 

data/spec/comana_spec.rb

@@ -2,9 +2,6 @@ require "fileutils"
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 NOW = Time.now
-#CALC_DIR = "spec/dummy"
-#LOCKFILE = "#{CALC_DIR}/lock"
-#OUTFILES = ["#{CALC_DIR}/output_a", "#{CALC_DIR}/output_b"]
 
 class Comana
   public :latest_modified_time, :started?
@@ -14,7 +11,7 @@ describe Comana, "not calculated" do
   class CalcYet < Comana
     def finished?         ; false     ; end
     def set_parameters
-      @lockfile   = "lock"
+      @lockdir   = "lock"
       @alive_time = 3600
       @outfiles   = ["output"]
     end
@@ -25,8 +22,8 @@ describe Comana, "not calculated" do
 
     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)
+    @lockdir = "#{calc_dir}/lockdir"
+    FileUtils.rm(@lockdir) if File.exist?(@lockdir)
   end
 
   it "should return the state" do
@@ -47,7 +44,7 @@ describe Comana, "not calculated" do
   end
 
   #after do
-  #  FileUtils.rm(@lockfile) if File.exist?(@lockfile)
+  #  FileUtils.rm(@lockdir) if File.exist?(@lockdir)
   #end
 end
 
@@ -55,7 +52,7 @@ describe Comana, "with lock" do
   class CalcStarted < Comana
     def finished?         ; false     ; end
     def set_parameters
-      @lockfile   = "lock"
+      @lockdir   = "lock"
       @alive_time = 5000
       @outfiles   = ["output"]
     end
@@ -77,7 +74,7 @@ describe Comana, "with output, without lock" do
   class CalcStarted < Comana
     def finished?         ; false     ; end
     def set_parameters
-      @lockfile   = "lock"
+      @lockdir   = "lock"
       @alive_time = 5000
       @outfiles   = ["output"]
     end
@@ -89,11 +86,12 @@ describe Comana, "with output, without lock" do
     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.utime(NOW - 9000 ,NOW - 9000, "#{calc_dir}/lock")
     #File.open(OUTFILES[0], "w")
   end
 
   it "should return :started" do
-    @calc.state.should == :started
+    @calc.state.should == :yet
   end
 
 end
@@ -102,7 +100,7 @@ describe Comana, "terminated" do
   class CalcTerminated < Comana
     def finished?         ; false     ; end
     def set_parameters
-      @lockfile   = "lock"
+      @lockdir   = "lock"
       @alive_time = 500
       @outfiles   = ["output"]
     end
@@ -115,6 +113,7 @@ describe Comana, "terminated" do
     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")
+    File.utime(NOW - 9000 ,NOW - 9000, "#{calc_dir}/lock")
   end
 
   it "should return the state" do
@@ -126,7 +125,7 @@ describe Comana, "finished" do
   class CalcFinished    < Comana
     def finished?         ; true      ; end
     def set_parameters
-      @lockfile    = "lock"
+      @lockdir    = "lock"
       @alive_time =  500
       @outfiles   = ["output"]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comana
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   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: &85029320 !ruby/object:Gem::Requirement
+  requirement: &84974590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *85029320
+  version_requirements: *84974590
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &85026760 !ruby/object:Gem::Requirement
+  requirement: &84974230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *85026760
+  version_requirements: *84974230
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &85026410 !ruby/object:Gem::Requirement
+  requirement: &84973850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *85026410
+  version_requirements: *84973850
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &85025660 !ruby/object:Gem::Requirement
+  requirement: &84973550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *85025660
+  version_requirements: *84973550
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &85040750 !ruby/object:Gem::Requirement
+  requirement: &84973190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85040750
+  version_requirements: *84973190
 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
@@ -89,10 +89,8 @@ files:
 - spec/comana_spec.rb
 - 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
@@ -115,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 813074803
+      hash: -295869967
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: