vision_mate 0.1.4 → 0.2.0

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.
@@ -63,15 +63,18 @@ module VisionMate
63
63
  end
64
64
 
65
65
  def wait_for_data
66
- sleep 0.1 while scanner_status["finished_scan"]
67
- sleep 0.1 until scanner_status["data_ready"]
66
+ sleep 1
67
+ while true
68
+ status = scanner_status
69
+ break if !status["scanning"] && status["data_ready"]
70
+ sleep 0.1
71
+ end
68
72
  end
69
73
 
70
74
  def scanner_status
71
75
  result = telnet_command "L"
72
76
  status = strip_prefix(result)
73
- status_names = %w{initializing scanning finished_scan data_ready
74
- data_sent rack96 empty error}
77
+ status_names = %w{error empty rack96 data_sent data_ready finished_scan scanning initializing}
75
78
  status_values = extract_statuses(status)
76
79
 
77
80
  Hash[status_names.zip(status_values)]
@@ -84,7 +87,7 @@ module VisionMate
84
87
  end
85
88
 
86
89
  def to_binary_string(int)
87
- int.to_s(2)
90
+ int.to_s(2).rjust(8,"0")
88
91
  end
89
92
 
90
93
  def retrieve_data
@@ -95,8 +98,10 @@ module VisionMate
95
98
  telnet_command "M0"
96
99
  end
97
100
 
101
+ # The OK is followed by the command value then possibly a response value.
102
+ # E.g. if you send an "L" the response will be "OKL61"
98
103
  def strip_prefix(string)
99
- string[/^OK(.*)/, 1]
104
+ string[/^OK.(.*)/, 1]
100
105
  end
101
106
  end
102
107
  end
@@ -1,3 +1,3 @@
1
1
  module VisionMate
2
- VERSION = "0.1.4"
2
+ VERSION = "0.2.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vision_mate
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.2.0
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Joe Jackson
@@ -9,79 +10,89 @@ authors:
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2014-01-23 00:00:00.000000000 Z
13
+ date: 2014-09-19 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: bundler
16
17
  requirement: !ruby/object:Gem::Requirement
18
+ none: false
17
19
  requirements:
18
- - - "~>"
20
+ - - ~>
19
21
  - !ruby/object:Gem::Version
20
22
  version: '1.5'
21
23
  type: :development
22
24
  prerelease: false
23
25
  version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
24
27
  requirements:
25
- - - "~>"
28
+ - - ~>
26
29
  - !ruby/object:Gem::Version
27
30
  version: '1.5'
28
31
  - !ruby/object:Gem::Dependency
29
32
  name: rake
30
33
  requirement: !ruby/object:Gem::Requirement
34
+ none: false
31
35
  requirements:
32
- - - ">="
36
+ - - ! '>='
33
37
  - !ruby/object:Gem::Version
34
38
  version: '0'
35
39
  type: :development
36
40
  prerelease: false
37
41
  version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
38
43
  requirements:
39
- - - ">="
44
+ - - ! '>='
40
45
  - !ruby/object:Gem::Version
41
46
  version: '0'
42
47
  - !ruby/object:Gem::Dependency
43
48
  name: rspec
44
49
  requirement: !ruby/object:Gem::Requirement
50
+ none: false
45
51
  requirements:
46
- - - "~>"
52
+ - - ~>
47
53
  - !ruby/object:Gem::Version
48
54
  version: '2.13'
49
55
  type: :development
50
56
  prerelease: false
51
57
  version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
52
59
  requirements:
53
- - - "~>"
60
+ - - ~>
54
61
  - !ruby/object:Gem::Version
55
62
  version: '2.13'
56
63
  - !ruby/object:Gem::Dependency
57
64
  name: yard
58
65
  requirement: !ruby/object:Gem::Requirement
66
+ none: false
59
67
  requirements:
60
- - - ">="
68
+ - - ! '>='
61
69
  - !ruby/object:Gem::Version
62
70
  version: '0'
63
71
  type: :development
64
72
  prerelease: false
65
73
  version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
66
75
  requirements:
67
- - - ">="
76
+ - - ! '>='
68
77
  - !ruby/object:Gem::Version
69
78
  version: '0'
70
79
  - !ruby/object:Gem::Dependency
71
80
  name: rubocop
72
81
  requirement: !ruby/object:Gem::Requirement
82
+ none: false
73
83
  requirements:
74
- - - ">="
84
+ - - ! '>='
75
85
  - !ruby/object:Gem::Version
76
86
  version: '0'
77
87
  type: :development
78
88
  prerelease: false
79
89
  version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
80
91
  requirements:
81
- - - ">="
92
+ - - ! '>='
82
93
  - !ruby/object:Gem::Version
83
94
  version: '0'
84
- description: " Ruby client for the Thermo Scientific VisionMate 2D Scanner. "
95
+ description: ! ' Ruby client for the Thermo Scientific VisionMate 2D Scanner. '
85
96
  email:
86
97
  - joe.jackson@scimedsolutions.com
87
98
  - mail@josephjaber.com
@@ -89,10 +100,10 @@ executables: []
89
100
  extensions: []
90
101
  extra_rdoc_files: []
91
102
  files:
92
- - ".gitignore"
93
- - ".rspec"
94
- - ".rubocop.yml"
95
- - ".travis.yml"
103
+ - .gitignore
104
+ - .rspec
105
+ - .rubocop.yml
106
+ - .travis.yml
96
107
  - Gemfile
97
108
  - LICENSE.txt
98
109
  - README.md
@@ -119,26 +130,33 @@ files:
119
130
  homepage: http://github.com/SciMed/vision_mate
120
131
  licenses:
121
132
  - MIT
122
- metadata: {}
123
133
  post_install_message:
124
134
  rdoc_options: []
125
135
  require_paths:
126
136
  - lib
127
137
  required_ruby_version: !ruby/object:Gem::Requirement
138
+ none: false
128
139
  requirements:
129
- - - ">="
140
+ - - ! '>='
130
141
  - !ruby/object:Gem::Version
131
142
  version: '0'
143
+ segments:
144
+ - 0
145
+ hash: 3215525333886898766
132
146
  required_rubygems_version: !ruby/object:Gem::Requirement
147
+ none: false
133
148
  requirements:
134
- - - ">="
149
+ - - ! '>='
135
150
  - !ruby/object:Gem::Version
136
151
  version: '0'
152
+ segments:
153
+ - 0
154
+ hash: 3215525333886898766
137
155
  requirements: []
138
156
  rubyforge_project:
139
- rubygems_version: 2.2.0
157
+ rubygems_version: 1.8.23
140
158
  signing_key:
141
- specification_version: 4
159
+ specification_version: 3
142
160
  summary: Ruby client for the Thermo Scientific VisionMate 2D Scanner.
143
161
  test_files:
144
162
  - spec/assets/empty_tube_results.txt
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: 5f81c4d5d557338d38d6884e03ac5a3d1b55d3e3
4
- data.tar.gz: f23712ebbdf2179d3ec404a33710a0a534acf476
5
- SHA512:
6
- metadata.gz: 32ae55647d4b839b112b7101c055642235e2ce7e2c3158b47402f205b248a66677cf1d0f1e7cd431b401696474491a2a321155b7928703764258d82be9cafa6e
7
- data.tar.gz: 6cb1fb5ab28c3537035d3916469bd7fdf37d53b277b3f17c619a965e3b0d149057f1daf0a63515fb131335c3c23efa652407f713d30f48256a3c106e5085a181