las_reader 0.0.2 → 0.0.3

data/Rakefile

@@ -5,3 +5,4 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('spec')
 
 task :default => :spec
+task :test => :spec

data/las_reader.gemspec

@@ -10,8 +10,6 @@ Gem::Specification.new do |gem|
   gem.email         = ["gpcarmo@gmail.com"]
   gem.description   = %q{A simple gem to read CWLS-LAS file format. File in this format will contain well log data in ASCII format}
 
-  gem.add_development_dependency  "rspec"
-
   gem.summary       = %q{Read CWLS LAS files}
   gem.homepage      = "https://github.com/gpcarmo/cwls-las-reader"
 
@@ -19,4 +17,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency  "rspec"
+  
 end

data/lib/las_reader.rb

@@ -42,92 +42,92 @@ module LasReader
 
   def set_well_info(info)
 
-    strt = info.match(/(STRT)\.(\w).+\s([0-9]+\.[0-9]+).*:\s*(.*)/)
+    strt = info.match(/(STRT)\s*\.(\w).+\s([0-9]+\.[0-9]+).*:\s*(.*)/)
     unless strt.nil?
       @well_info.start_depth = strt[3].to_f
       @well_info.depth_unit = strt[2]
       return
     end
 
-    stop = info.match(/(STOP)\.(\w).+\s([0-9]+\.[0-9]+).*:\s*(.*)/)
+    stop = info.match(/(STOP)\s*\.(\w).+\s([0-9]+\.[0-9]+).*:\s*(.*)/)
     unless stop.nil?
       @well_info.stop_depth = stop[3].to_f
       return
     end
 
-    step = info.match(/(STEP)\.(\w).+\s(-?[0-9]+\.[0-9]+).*:\s*(.*)/)
+    step = info.match(/(STEP)\s*\.(\w).+\s(-?[0-9]+\.[0-9]+).*:\s*(.*)/)
     unless step.nil?
       @well_info.step = step[3].to_f
       return
     end
 
-    null = info.match(/(NULL)\..+\s(-?[0-9]+\.[0-9]+).*:\s*(.*)/)
+    null = info.match(/(NULL)\s*\..+\s(-?[0-9]+\.[0-9]+).*:\s*(.*)/)
     unless null.nil?
       @well_info.null_value = null[2].to_f
       return
     end
 
-    comp = info.match(/(COMP\..+COMPANY:\s*(.*))|(COMP\s*\.\s*(.*)\s+:COMPANY)/)
+    comp = info.match(/(COMP\s*\..+COMPANY:\s*(.*))|(COMP\s*\.\s*(.*)\s+:COMPANY)/)
     unless comp.nil?
       @well_info.company_name = (comp[2] or comp[4]).strip
       return
     end
 
-    well = info.match(/(WELL\..+WELL:\s*(.*))|(WELL\s*\.\s*(.*)\s+:WELL)/)
+    well = info.match(/(WELL\s*\..+WELL:\s*(.*))|(WELL\s*\.\s*(.*)\s+:WELL)/)
     unless well.nil?
       @well_info.well_name = (well[2] or well[4]).strip
       return
     end
 
-    fld = info.match(/(FLD \..+FIELD:\s*(.*))|(FLD\s*\.\s*(.*)\s+:FIELD)/)
+    fld = info.match(/(FLD\s*\..+FIELD:\s*(.*))|(FLD\s*\.\s*(.*)\s+:FIELD)/)
     unless fld.nil?
       @well_info.field_name = (fld[2] or fld[4]).strip
       return
     end
 
-    loc = info.match(/(LOC \..+LOCATION:\s*(.*))|(LOC\s*\.\s*(.*)\s+:LOCATION)/)
+    loc = info.match(/(LOC\s*\..+LOCATION:\s*(.*))|(LOC\s*\.\s*(.*)\s+:LOCATION)/)
     unless loc.nil?
       @well_info.location = (loc[2] or loc[4]).strip
       return
     end
 
-    prov = info.match(/(PROV\..+PROVINCE:\s*(.*))|(PROV\s*\.\s*(.*)\s+:PROVINCE)/)
+    prov = info.match(/(PROV\s*\..+PROVINCE:\s*(.*))|(PROV\s*\.\s*(.*)\s+:PROVINCE)/)
     unless prov.nil?
       @well_info.province = (prov[2] or prov[4]).strip
       return
     end
 
-    cnty = info.match(/(CNTY\..+COUNTY:\s*(.*))|(CNTY\s*\.\s*(.*)\s+:COUNTY)/)
+    cnty = info.match(/(CNTY\s*\..+COUNTY:\s*(.*))|(CNTY\s*\.\s*(.*)\s+:COUNTY)/)
     unless cnty.nil?
       @well_info.county = (cnty[2] or cnty[4]).strip
       return
     end
 
-    stat = info.match(/(STAT\..+STATE:\s*(.*))|(STAT\s*\.\s*(.*)\s+:STATE)/)
+    stat = info.match(/(STAT\s*\..+STATE:\s*(.*))|(STAT\s*\.\s*(.*)\s+:STATE)/)
     unless stat.nil?
       @well_info.state = (stat[2] or stat[4]).strip
       return
     end
 
-    ctry  = info.match(/(CTRY\..+COUNTRY:\s*(.*))|(CTRY\s*\.\s*(.*)\s+:COUNTRY)/)
+    ctry  = info.match(/(CTRY\s*\..+COUNTRY:\s*(.*))|(CTRY\s*\.\s*(.*)\s+:COUNTRY)/)
     unless ctry.nil?
       @well_info.country = (ctry[2] or ctry[4]).strip
       return
     end
 
-    srvc = info.match(/(SRVC\..+SERVICE COMPANY:\s*(.*))|(SRVC\s*\.\s*(.*)\s+:SERVICE COMPANY)/)
+    srvc = info.match(/(SRVC\s*\..+SERVICE COMPANY:\s*(.*))|(SRVC\s*\.\s*(.*)\s+:SERVICE COMPANY)/)
     unless srvc.nil?
       @well_info.service_company = (srvc[2] or srvc[4]).strip
       return
     end
 
-    data = info.match(/(DATE\..+LOG DATE:\s*(.*))|(DATE\s*\.\s*(.*)\s+:LOG DATE)/)
+    data = info.match(/(DATE\s*\..+LOG DATE:\s*(.*))|(DATE\s*\.\s*(.*)\s+:LOG DATE)/)
     unless data.nil?
       @well_info.date_logged = (data[2] or data[4]).strip
       return
     end
 
-    uwi = info.match(/(UWI \..+UNIQUE WELL ID:\s*(.*))|(UWI\s*\.\s*(.*)\s+:UNIQUE WELL ID)/)
+    uwi = info.match(/(UWI\s*\..+UNIQUE WELL ID:\s*(.*))|(UWI\s*\.\s*(.*)\s+:UNIQUE WELL ID)/)
     unless uwi.nil?
       @well_info.uwi = (uwi[2] or uwi[4]).strip
       return
@@ -170,15 +170,6 @@ module LasReader
 
     read_state = 0
 
-    #section_definition = {
-    #  'V' => "Version and wrap mode information",
-    #  'W' => "well identification",
-    #  'C' => "curve information",
-    #  'P' => "parameters or constants",
-    #  'O' => "other information such as comments",
-    #  'A' => "ASCII log data"
-    #}
-
     unless File.exist?(file_name)
       raise "No such file or directory"
     end
@@ -188,9 +179,6 @@ module LasReader
       next if line[0].chr == '#' 
       # The '~' is used to inform the beginning of a section
       if line[0].chr == '~' 
-         # unless section_definition.keys.include? line[1].chr
-         #   raise "unsupported_file_format for #{line}"
-         # end
           case line[1].chr
             when 'V' # Version information section
               read_state = 1 

data/lib/las_reader/version.rb

@@ -1,3 +1,3 @@
 module LasReader
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/las_reader_spec.rb

@@ -91,7 +91,7 @@ describe "CWLS LAS reader" do
     context "get DT curve from wrap_mode with nil values from LAS v2.0 file 'example23.las'" do
       c = [nil, nil, nil, nil, nil]
       las = CWLSLas.new
-      las.load_file(file_path+'/example3.las')
+      las.load_file(file_path+'/example23.las')
       it { expect(las.curve('DT').log_data).to eq(c) }
     end
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: las_reader
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Gilberto P. Carmo Jr.
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-08 00:00:00 -02:00
-default_executable: 
+date: 2013-01-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -25,6 +25,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -63,7 +64,6 @@ files:
 - spec/fixtures/files/example3.las
 - spec/las_reader_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/gpcarmo/cwls-las-reader
 licenses: []
 
@@ -77,6 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -85,13 +86,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7.1
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Read CWLS LAS files