mddb 0.0.18 → 0.0.19

data/lib/mddb/commands/run.rb

@@ -14,9 +14,18 @@ module Mddb::Commands
     end
 
     def local
-      puts "Running locally..."
-      x = Mddb::Runner.new
-      x.run(1,2)
+      ARGV.shift
+      if ARGV.split("..").count == 2
+        a = ARGV.split("..").map {|d| d.to_i}
+        x = Mddb::Runner.new
+        x.run(a[0],a[1])
+      elsif ARGV == "all"
+        a = ARGV.split("..").map {|d| d.to_i}
+        x = Mddb::Runner.new
+        x.run(0,0)
+      else
+        puts "Please supply a range of frames: eg. 1..10 or use 'all'"
+      end
     end
   end
   ARGV.shift

data/lib/mddb/runner.rb

@@ -19,9 +19,17 @@ module Mddb
 
     def run (start, finish)
       if self.fine?
-        (start..finish).each do |f|
-          puts "Running => Frame 1"
-          self.calculations(f)
+        unless start == 0 or finish == 0
+          (start..finish).each do |f|
+            puts "Running => Frame #{f}"
+            self.calculations(f)
+          end
+        else
+          fids = Frame.all.map {|f| f.fid}
+          fids.each do |f| 
+            puts "Running => Frame #{f}"
+            self.calculations(f)}
+          end
         end
       end
     end
@@ -33,13 +41,15 @@ module Mddb
         object_count = objects.count
         complete = 0
         failed = 0
+        calcs = objects.first.list_calculations
         objects.each do |o|
           begin
             o.run
             complete += 1
+            print "\r  Models (#{i+1}/#{model_count}) => #{k} Completed #{complete}/#{object_count}  Failed: #{failed}"
           rescue
             failed += 1
-            print "\r  Models (#{i}/#{model_count}) => #{k}  #{complete}/#{object_count}  Failed: #{failed}"
+            print "\r  Models (#{i+1}/#{model_count}) => #{k} Completed #{complete}/#{object_count}  Failed: #{failed}"
           end
         end
         print "\n"

data/lib/mddb/version.rb

@@ -1,3 +1,3 @@
 module Mddb
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

metadata

@@ -2,7 +2,7 @@
 name: mddb
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Thomas Mulvaney