mddb 0.0.6 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/lib/mddb/commands/load.rb +8 -6
  2. data/lib/mddb/parser.rb +2 -2
  3. data/lib/mddb/version.rb +1 -1
  4. data/mddb.gemspec +2 -0
  5. metadata +33 -11
data/lib/mddb/commands/load.rb CHANGED
@@ -5,9 +5,11 @@ def start_console
5
5
  require 'mddb/point'
6
6
  require 'irb'
7
7
  require 'irb/completion'
8
- ARGV.clear
8
+ ARGV.shift
9
+ file = ARGV.shift
10
+ pid = ARGV.shift
9
11
  begin
10
- last_frame = Frame.sort(:fid.desc).first.fid
12
+ last_frame = Frame.where(:pid => pid).sort(:fid.desc).first.fid
11
13
  rescue
12
14
  last_frame = 0
13
15
  end
@@ -25,17 +27,17 @@ def start_console
25
27
  end
26
28
  end
27
29
  end
28
- p = Mddb::Parser::Parser.new
30
+ p = Mddb::Parser::Parser.new file
29
31
  fid = 1 + last_frame
30
32
  p.each_frame do |f|
31
33
  puts "Frame: #{fid}"
32
- frame = Frame.new :fid => fid
34
+ frame = Frame.new :fid => fid, :pid => pid
33
35
  objects.keys.each do |mol|
34
36
  (objects[mol]['start']..(objects[mol]['start']+objects[mol]['count']) - 1).to_a.each do |i|
35
- m = Object.const_get(mol.capitalize).new :mid => i, :fid => fid
37
+ m = Object.const_get(mol.capitalize).new :mid => i, :fid => fid, :pid => pid
36
38
  objects[mol]['atom'].each_with_index do |a,z|
37
39
  line = z*objects[mol]['count'] + i
38
- a = Object.const_get(a.capitalize).new :aid => (z+1), :position => f[line-1], :fid => fid
40
+ a = Object.const_get(a.capitalize).new :aid => (z+1), :position => f[line-1], :fid => fid, :pid => pid
39
41
  m.atoms << a
40
42
  end
41
43
  m.save
data/lib/mddb/parser.rb CHANGED
@@ -2,8 +2,8 @@ module Mddb
2
2
  module Parser
3
3
 
4
4
  class Parser
5
- def initialize
6
- @file = File.open(Mddb::Config.simulation['file']).readlines
5
+ def initialize(file)
6
+ @file = File.open(file).readlines
7
7
  @objects = Mddb::Config.simulation['count']
8
8
  end
9
9
 
data/lib/mddb/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Mddb
2
- VERSION = "0.0.6"
2
+ VERSION = "0.0.7"
3
3
  end
data/mddb.gemspec CHANGED
@@ -24,4 +24,6 @@ Gem::Specification.new do |s|
24
24
  s.add_runtime_dependency "hirb"
25
25
  s.add_runtime_dependency "thor"
26
26
  s.add_runtime_dependency "micro-optparse"
27
+ s.add_runtime_dependency "resque"
28
+ s.add_runtime_dependency "require_all"
27
29
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mddb
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.6
4
+ version: 0.0.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-02-20 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: &70093632250640 !ruby/object:Gem::Requirement
16
+ requirement: &70236503078420 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70093632250640
24
+ version_requirements: *70236503078420
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: mongo_mapper
27
- requirement: &70093632250180 !ruby/object:Gem::Requirement
27
+ requirement: &70236503078000 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70093632250180
35
+ version_requirements: *70236503078000
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: hirb
38
- requirement: &70093632201360 !ruby/object:Gem::Requirement
38
+ requirement: &70236503077580 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70093632201360
46
+ version_requirements: *70236503077580
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: thor
49
- requirement: &70093632200820 !ruby/object:Gem::Requirement
49
+ requirement: &70236503077160 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70093632200820
57
+ version_requirements: *70236503077160
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: micro-optparse
60
- requirement: &70093632200280 !ruby/object:Gem::Requirement
60
+ requirement: &70236503076740 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,29 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70093632200280
68
+ version_requirements: *70236503076740
69
+ - !ruby/object:Gem::Dependency
70
+ name: resque
71
+ requirement: &70236503076320 !ruby/object:Gem::Requirement
72
+ none: false
73
+ requirements:
74
+ - - ! '>='
75
+ - !ruby/object:Gem::Version
76
+ version: '0'
77
+ type: :runtime
78
+ prerelease: false
79
+ version_requirements: *70236503076320
80
+ - !ruby/object:Gem::Dependency
81
+ name: require_all
82
+ requirement: &70236503075900 !ruby/object:Gem::Requirement
83
+ none: false
84
+ requirements:
85
+ - - ! '>='
86
+ - !ruby/object:Gem::Version
87
+ version: '0'
88
+ type: :runtime
89
+ prerelease: false
90
+ version_requirements: *70236503075900
69
91
  description: MDDB makes analysing molecular dynamics simulations easy
70
92
  email:
71
93
  - thom.mulvaney@gmail.com