mddb 0.0.6 → 0.0.7

data/lib/mddb/commands/load.rb

@@ -5,9 +5,11 @@ def start_console
   require 'mddb/point'
   require 'irb'
   require 'irb/completion'
-  ARGV.clear
+  ARGV.shift
+  file = ARGV.shift
+  pid = ARGV.shift
   begin
-    last_frame = Frame.sort(:fid.desc).first.fid
+    last_frame = Frame.where(:pid => pid).sort(:fid.desc).first.fid
   rescue
     last_frame = 0
   end
@@ -25,17 +27,17 @@ def start_console
       end
     end
   end
-  p = Mddb::Parser::Parser.new
+  p = Mddb::Parser::Parser.new file
   fid = 1 + last_frame
   p.each_frame do |f|
     puts "Frame: #{fid}"
-    frame = Frame.new :fid => fid
+    frame = Frame.new :fid => fid, :pid => pid
     objects.keys.each do |mol|
       (objects[mol]['start']..(objects[mol]['start']+objects[mol]['count']) - 1).to_a.each do |i|
-        m = Object.const_get(mol.capitalize).new :mid => i, :fid => fid
+        m = Object.const_get(mol.capitalize).new :mid => i, :fid => fid, :pid => pid
         objects[mol]['atom'].each_with_index do |a,z|
           line = z*objects[mol]['count'] + i
-          a = Object.const_get(a.capitalize).new :aid => (z+1), :position => f[line-1], :fid => fid
+          a = Object.const_get(a.capitalize).new :aid => (z+1), :position => f[line-1], :fid => fid, :pid => pid
           m.atoms << a
         end
         m.save

data/lib/mddb/parser.rb

@@ -2,8 +2,8 @@ module Mddb
   module Parser
 
     class Parser
-      def initialize
-        @file = File.open(Mddb::Config.simulation['file']).readlines
+      def initialize(file)
+        @file = File.open(file).readlines
         @objects = Mddb::Config.simulation['count']
       end
 

data/lib/mddb/version.rb

@@ -1,3 +1,3 @@
 module Mddb
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/mddb.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "hirb" 
   s.add_runtime_dependency "thor" 
   s.add_runtime_dependency "micro-optparse" 
+  s.add_runtime_dependency "resque"
+  s.add_runtime_dependency "require_all"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mddb
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70093632250640 !ruby/object:Gem::Requirement
+  requirement: &70236503078420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093632250640
+  version_requirements: *70236503078420
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &70093632250180 !ruby/object:Gem::Requirement
+  requirement: &70236503078000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093632250180
+  version_requirements: *70236503078000
 - !ruby/object:Gem::Dependency
   name: hirb
-  requirement: &70093632201360 !ruby/object:Gem::Requirement
+  requirement: &70236503077580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093632201360
+  version_requirements: *70236503077580
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70093632200820 !ruby/object:Gem::Requirement
+  requirement: &70236503077160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093632200820
+  version_requirements: *70236503077160
 - !ruby/object:Gem::Dependency
   name: micro-optparse
-  requirement: &70093632200280 !ruby/object:Gem::Requirement
+  requirement: &70236503076740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093632200280
+  version_requirements: *70236503076740
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: &70236503076320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70236503076320
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: &70236503075900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70236503075900
 description: MDDB makes analysing molecular dynamics simulations easy
 email:
 - thom.mulvaney@gmail.com