metamri 0.2.7 → 0.2.8

data/Gemfile.lock

@@ -1,10 +1,12 @@
 PATH
   remote: .
   specs:
-    metamri (0.2.5)
+    metamri (0.2.7)
       activeresource (~> 3.0)
-      dicom (~> 0.8)
+      dicom (~> 0.8.0)
+      hirb (~> 0.4)
       metamri
+      rmagick (~> 2.13.1)
       sqlite3 (~> 1.3.3)
 
 GEM
@@ -19,10 +21,16 @@ GEM
       activesupport (= 3.0.9)
     activesupport (3.0.9)
     builder (2.1.2)
-    dicom (0.9.1)
+    bzip2-ruby (0.2.7)
+    dicom (0.8)
     diff-lcs (1.1.2)
+    escoffier (0.1.3)
+      bzip2-ruby
+      snmp
+      term-ansicolor
     hirb (0.4.5)
     i18n (0.5.0)
+    rmagick (2.13.1)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -31,13 +39,14 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    sqlite3 (1.3.3)
+    snmp (1.0.3)
+    sqlite3 (1.3.4)
+    term-ansicolor (1.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource (~> 3.0)
-  hirb (~> 0.4)
+  escoffier
   metamri!
   rspec (~> 2.5)

data/Rakefile

@@ -13,11 +13,12 @@ begin
     gemspec.homepage = "http://github.com/brainmap/metamri"
     gemspec.authors = ["Kristopher J. Kosmatka", "Erik Kastman"]
     gemspec.add_dependency('sqlite3', '~>1.3.3')
-    gemspec.add_dependency('dicom', '~>0.8')
+    gemspec.add_dependency('dicom', '~>0.8.0')
     gemspec.add_dependency('activeresource', '~>3.0')
-    gemspec.add_development_dependency('rspec', '~>2.5')
+    gemspec.add_dependency('rmagick', '~>2.13.1')
     gemspec.add_dependency('hirb', '~>0.4')
-
+    gemspec.add_development_dependency('rspec', '~>2.5')
+    gemspec.add_development_dependency('escoffier')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/metamri.rb

@@ -7,7 +7,8 @@ begin
   require 'active_resource'
   require 'hirb'
   require 'rspec'
-  require 'dicom'  
+  require 'dicom'
+  require 'rmagick'
 rescue LoadError
 end
 
@@ -20,9 +21,9 @@ require 'metamri/raw_image_dataset_resource'
 require 'metamri/visit_raw_data_directory_resource'
 require 'metamri/image_dataset_quality_check_resource'
 require 'metamri/dicom_additions'
+require 'metamri/raw_image_dataset_thumbnail'
 require 'fileutils'
 
-# require 'metamri/raw_image_dataset_thumbnail'
 # TODO Move raw_image_dataset_thumbnail out of metamri.  
 
 begin

data/metamri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{metamri}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristopher J. Kosmatka", "Erik Kastman"]
-  s.date = %q{2011-07-26}
+  s.date = %q{2011-07-28}
   s.description = %q{Extraction of MRI metadata and insertion into compatible sqlite3 databases.}
   s.email = %q{kk4@medicine.wisc.edu}
   s.executables = ["convert_visit.rb", "import_visit.rb", "import_respiratory_files.rb", "import_study.rb", "list_visit"]
@@ -87,22 +87,46 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.5"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<escoffier>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<escoffier>, [">= 0"])
       s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_runtime_dependency(%q<dicom>, ["~> 0.8"])
+      s.add_runtime_dependency(%q<dicom>, ["~> 0.8.0"])
       s.add_runtime_dependency(%q<activeresource>, ["~> 3.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_runtime_dependency(%q<rmagick>, ["~> 2.13.1"])
       s.add_runtime_dependency(%q<hirb>, ["~> 0.4"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<escoffier>, [">= 0"])
     else
       s.add_dependency(%q<metamri>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<escoffier>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<escoffier>, [">= 0"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_dependency(%q<dicom>, ["~> 0.8"])
+      s.add_dependency(%q<dicom>, ["~> 0.8.0"])
       s.add_dependency(%q<activeresource>, ["~> 3.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<rmagick>, ["~> 2.13.1"])
       s.add_dependency(%q<hirb>, ["~> 0.4"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<escoffier>, [">= 0"])
     end
   else
     s.add_dependency(%q<metamri>, [">= 0"])
@@ -110,11 +134,23 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.5"])
     s.add_dependency(%q<rspec>, ["~> 2.5"])
     s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<escoffier>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<escoffier>, [">= 0"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-    s.add_dependency(%q<dicom>, ["~> 0.8"])
+    s.add_dependency(%q<dicom>, ["~> 0.8.0"])
     s.add_dependency(%q<activeresource>, ["~> 3.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<rmagick>, ["~> 2.13.1"])
     s.add_dependency(%q<hirb>, ["~> 0.4"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<escoffier>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metamri
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Kristopher J. Kosmatka
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -05:00
+date: 2011-07-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,11 +93,159 @@ dependencies:
         - 5
         version: "2.5"
   requirement: *id005
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: escoffier
+  type: :development
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id013
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
+  requirement: *id014
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: escoffier
+  type: :development
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: sqlite3
   type: :runtime
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -108,27 +256,28 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  requirement: *id006
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: dicom
   type: :runtime
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 63
         segments: 
         - 0
         - 8
-        version: "0.8"
-  requirement: *id007
+        - 0
+        version: 0.8.0
+  requirement: *id017
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: activeresource
   type: :runtime
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -138,27 +287,28 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  requirement: *id008
+  requirement: *id018
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
-  type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: rmagick
+  type: :runtime
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 57
         segments: 
         - 2
-        - 5
-        version: "2.5"
-  requirement: *id009
+        - 13
+        - 1
+        version: 2.13.1
+  requirement: *id019
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: hirb
   type: :runtime
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -168,7 +318,36 @@ dependencies:
         - 0
         - 4
         version: "0.4"
-  requirement: *id010
+  requirement: *id020
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
+  requirement: *id021
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: escoffier
+  type: :development
+  version_requirements: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id022
 description: Extraction of MRI metadata and insertion into compatible sqlite3 databases.
 email: kk4@medicine.wisc.edu
 executables: