tasci_merger 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f10594bede6524d79ed1c0c641259b552de123d7
-  data.tar.gz: 3e2b209ca98e63a1da4b30133d12c2f19d440ca5
+  metadata.gz: 00fc6d54856de52b4177c2e01db4583748854a53
+  data.tar.gz: 4097c9807bef4d820121ddb49a5cc33e672ba4fe
 SHA512:
-  metadata.gz: b19a2dfcadfedce47b7ee889976e89e06a57c92f7c7937eacd625d1645f9c1e9d91371e2bdec9156619e38d8011c3b5879e99affca63b45f1006dca040fa2e25
-  data.tar.gz: ed8f3528f7125e8031fbfb09322069cb50b1d66b8ca4767e46fd1d2cd016d6e54f2e8048e493dbaae892ad17ffaa2656c130331eaf8ddea8a4855c887e210bbc
+  metadata.gz: 0bbe88091909e0b08395e202f120cf9104e8eda3ca94da48343a46e1e0f8ab253c10d6d7bc6e6ced2b58fcee145c838a6db197535b3f66fde39d957e05dfff53
+  data.tar.gz: dd4753c3782d6e844d4836650e27c798340f1ad8616e47a88253809a3540f0a5e7537297d1e81fb6ed75c3d066c7e85d27c9aaf5d2548dd9fda7165b5e7a2cbf

data/LICENSE

@@ -1,22 +1,22 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Piotr Mankowski
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+The MIT License (MIT)
+
+Copyright (c) 2015 Piotr Mankowski
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README.md

@@ -1,77 +1,77 @@
-# Instructions for Tasci File Merger
-
-## Installation
-1. Install Ruby.
-  - [http://rubyinstaller.org/](http://rubyinstaller.org/)
-  - Download Ruby 2.1.5 (x64) installer.
-  - Install to desired *RUBY_DIRECTORY*
-  - Choose option to add ruby to *PATH*
-  - Choose option to associate *.rb files with Ruby
-
-2. Verify ruby installation.
-  - Go into command line.
-  - Enter `ruby -v`
-  - Ouput should look like `ruby 2.1.5p273...`
-  - Enter `gem -v`
-  - Output should look like `2.2.2`
-
-3. Fix potential RubyGems certificate bug, as documented on [this page](https://gist.github.com/luislavena/f064211759ee0f806c88)
-  - Try running `gem install activesupport --no-ri --no-rdoc`
-  - Click `Allow access` if prompted by Windows Firewall message, choosing option for *Private networks*
-  - If installation fails with an `SSL_error`, follow the following steps:
-    - Save certificate file from [this website](https://raw.githubusercontent.com/rubygems/rubygems/master/lib/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem) to the Downloads directory.
-    - **Make sure file is saved with the *.pem extension**
-    - Find rubygems folder location by typing `gem which rubygems` into the console. You should get output like `C:/Ruby21/lib/ruby/2.1.0/rubygems.rb`
-    - Locate the directory and open it in an explorer window. For the above path, the directory would be `C:\Ruby21\lib\ruby\2.1.0\rubygems`
-    - Open the `ssl_certs` directory, and copy the previously-downloaded `*.pem` file into this directory.
-    - Close and re-open a console window.
-
-4. Install required gem.
-  - Run:
-
-  ```
-    gem install tasci_merger
-  ```
-
-## Usage in IRB
-
-1. Open console and run `irb` to open interactive ruby console.
-
-2. Run `require 'tasci_merger'`
-
-3. Create tasci merger object:
-
-  ```ruby
-    tm = TasciMerger.new("SUBJECT_CODE", "TASCI_DIRECTORY", "OUTPUT_DIRECTORY")
-  ```
-
-4. Create master file:
-
-  ```ruby
-    tm.create_master_list
-  ```
-
-5. Create 2 merged files:
-
-  ```ruby
-    tm.merge_files
-  ```
-
-## Command-line Usage
-
-The ruby gem makes the `tasci_merger` command available.
-
-The command takes the following parameters:
-- SUBJECT_CODE
-- TASCI_DIRECTORY
-- OUTPUT_DIRECTORY
-
-The command creates a master file and two merged files in the output directory.
-
-**Example Usage:**
-
-```
-  merge_tasci 3441GX X:/TasciFilesFor3441GX C:/Circadian
-```
-
-This command would create the 2 files in the `C:/Circadian` directory.
+# Instructions for Tasci File Merger
+
+## Installation
+1. Install Ruby.
+  - [http://rubyinstaller.org/](http://rubyinstaller.org/)
+  - Download Ruby 2.1.5 (x64) installer.
+  - Install to desired *RUBY_DIRECTORY*
+  - Choose option to add ruby to *PATH*
+  - Choose option to associate *.rb files with Ruby
+
+2. Verify ruby installation.
+  - Go into command line.
+  - Enter `ruby -v`
+  - Ouput should look like `ruby 2.1.5p273...`
+  - Enter `gem -v`
+  - Output should look like `2.2.2`
+
+3. Fix potential RubyGems certificate bug, as documented on [this page](https://gist.github.com/luislavena/f064211759ee0f806c88)
+  - Try running `gem install activesupport --no-ri --no-rdoc`
+  - Click `Allow access` if prompted by Windows Firewall message, choosing option for *Private networks*
+  - If installation fails with an `SSL_error`, follow the following steps:
+    - Save certificate file from [this website](https://raw.githubusercontent.com/rubygems/rubygems/master/lib/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem) to the Downloads directory.
+    - **Make sure file is saved with the *.pem extension**
+    - Find rubygems folder location by typing `gem which rubygems` into the console. You should get output like `C:/Ruby21/lib/ruby/2.1.0/rubygems.rb`
+    - Locate the directory and open it in an explorer window. For the above path, the directory would be `C:\Ruby21\lib\ruby\2.1.0\rubygems`
+    - Open the `ssl_certs` directory, and copy the previously-downloaded `*.pem` file into this directory.
+    - Close and re-open a console window.
+
+4. Install required gem.
+  - Run:
+
+  ```
+    gem install tasci_merger
+  ```
+
+## Usage in IRB
+
+1. Open console and run `irb` to open interactive ruby console.
+
+2. Run `require 'tasci_merger'`
+
+3. Create tasci merger object:
+
+  ```ruby
+    tm = TasciMerger.new("SUBJECT_CODE", "TASCI_DIRECTORY", "OUTPUT_DIRECTORY")
+  ```
+
+4. Create master file:
+
+  ```ruby
+    tm.create_master_list
+  ```
+
+5. Create 2 merged files:
+
+  ```ruby
+    tm.merge_files
+  ```
+
+## Command-line Usage
+
+The ruby gem makes the `tasci_merger` command available.
+
+The command takes the following parameters:
+- SUBJECT_CODE
+- TASCI_DIRECTORY
+- OUTPUT_DIRECTORY
+
+The command creates a master file and two merged files in the output directory.
+
+**Example Usage:**
+
+```
+  merge_tasci 3441GX X:/TasciFilesFor3441GX C:/Circadian
+```
+
+This command would create the 2 files in the `C:/Circadian` directory.

data/bin/merge_tasci

@@ -1,10 +1,9 @@
-#!/usr/bin/env ruby
-
-require 'tasci_merger'
-
-# SUBJECT_CODE, TASCI_DIR
-tm = TasciMerger.new(ARGV[0], ARGV[1], ARGV[2])
-tm.create_master_list
-tm.merge_files
-
+#!/usr/bin/env ruby
+require 'tasci_merger'
+
+# SUBJECT_CODE, TASCI_DIR
+tm = TasciMerger.new(ARGV[0], ARGV[1], ARGV[2])
+tm.create_master_list
+tm.merge_files
+
 m = TasciMerger.new("3232GX", "/T/IPM/CSR_32d_FD_20h/3232GX/PSG/Scored/TASCI", "/home/pwm4/Desktop/")

data/lib/labtime.rb

@@ -1,111 +1,111 @@
-require('active_support/values/time_zone')
-require('active_support/time_with_zone')
-require 'active_support/core_ext/time/zones'
-require 'active_support/core_ext/time'
-require 'active_support/core_ext/numeric/time'
-
-class Labtime
-  include Comparable
-
-  attr_accessor :year, :hour, :min, :sec, :time_zone
-  DEFAULT_TIME_ZONE = ActiveSupport::TimeZone.new("Eastern Time (US & Canada)")
-
-  def self.parse(realtime)
-    # Return nil if nil parameter
-    return nil if realtime.nil?
-
-    # Make sure datetime is an ActiveSupport:TimeWithZone object
-    raise ArgumentError, "realtime class #{realtime.class} is not ActiveSupport::TimeWithZone" unless realtime.is_a?(ActiveSupport::TimeWithZone)
-
-    # year is easy
-    year = realtime.year
-
-    # Reference fo labtime is start of year
-    Time.zone = realtime.time_zone
-    reference_time = Time.zone.local(year)
-
-    # find difference between reference and
-    second_difference = realtime.to_i - reference_time.to_i
-
-    # convert second difference to labtime
-    hour = second_difference / 3600
-    min = (second_difference - (hour * 3600)) / 60
-    sec = (second_difference - (hour * 3600) - (min * 60))
-
-    self.new(year, hour, min, sec, realtime.time_zone)
-  end
-
-  def self.from_decimal(decimal_labtime, year, time_zone = ActiveSupport::TimeZone.new("Eastern Time (US & Canada)"))
-    raise ArguementError, "No year supplied!" if year.blank?
-
-    hour = decimal_labtime.to_i
-    remainder = decimal_labtime - hour.to_f
-    min_labtime = 60.0 * remainder
-    min = min_labtime.to_i
-    remainder = min_labtime - min.to_f
-    sec = (60 * remainder).round.to_i
-
-    self.new(year, hour, min, sec, time_zone)
-  end
-
-  def self.from_seconds(sec_time, year, time_zone = DEFAULT_TIME_ZONE)
-    hour = (sec_time / 3600.0).to_i
-    sec_time = sec_time - (hour * 3600)
-    min = (sec_time / 60.0).to_i
-    sec_time = sec_time - (min * 60)
-    sec = sec_time
-
-    self.new(year, hour, min, sec, time_zone)
-  end
-
-  def self.from_s(str, time_params = {}, time_zone = DEFAULT_TIME_ZONE)
-    time_captures = /(\d+)\:(\d{1,2})(\:(\d{1,2}))?(\s(\d\d\d\d))?\z/.match(str).captures
-
-    time_params[:hour] ||= time_captures[0]
-    time_params[:min] ||= time_captures[1]
-    time_params[:sec] ||= time_captures[3]
-    time_params[:year] ||= time_captures[5]
-
-    self.new(time_params[:year], time_params[:hour], time_params[:min], time_params[:sec], time_zone)
-  end
-
-  def initialize(year, hour, min, sec, time_zone = nil)
-    @year = year.to_i
-    @hour = hour.to_i
-    @min = min.to_i
-    @sec = sec.to_i
-    @time_zone = time_zone || DEFAULT_TIME_ZONE
-  end
-
-  def to_time
-    reference_time = time_zone.local(year)
-    reference_time + time_in_seconds
-  end
-
-  def <=>(other)
-    to_time <=> other.to_time
-  end
-
-  def to_s
-    "#{year} #{hour}:#{min}:#{sec} #{time_zone.to_s}"
-  end
-
-  def to_short_s
-    "#{hour}:#{min}:#{sec}"
-  end
-
-  def time_in_seconds
-    hour * 3600 + min * 60 + sec
-  end
-
-  def add_seconds(sec)
-    self.class.from_seconds(self.time_in_seconds + sec, self.year, self.time_zone)
-  end
-
-  def to_decimal
-    hour.to_f + (min.to_f/60.0) + (sec.to_f/3600.0)
-  end
-
-  private
-
+require('active_support/values/time_zone')
+require('active_support/time_with_zone')
+require 'active_support/core_ext/time/zones'
+require 'active_support/core_ext/time'
+require 'active_support/core_ext/numeric/time'
+
+class Labtime
+  include Comparable
+
+  attr_accessor :year, :hour, :min, :sec, :time_zone
+  DEFAULT_TIME_ZONE = ActiveSupport::TimeZone.new("Eastern Time (US & Canada)")
+
+  def self.parse(realtime)
+    # Return nil if nil parameter
+    return nil if realtime.nil?
+
+    # Make sure datetime is an ActiveSupport:TimeWithZone object
+    raise ArgumentError, "realtime class #{realtime.class} is not ActiveSupport::TimeWithZone" unless realtime.is_a?(ActiveSupport::TimeWithZone)
+
+    # year is easy
+    year = realtime.year
+
+    # Reference fo labtime is start of year
+    Time.zone = realtime.time_zone
+    reference_time = Time.zone.local(year)
+
+    # find difference between reference and
+    second_difference = realtime.to_i - reference_time.to_i
+
+    # convert second difference to labtime
+    hour = second_difference / 3600
+    min = (second_difference - (hour * 3600)) / 60
+    sec = (second_difference - (hour * 3600) - (min * 60))
+
+    self.new(year, hour, min, sec, realtime.time_zone)
+  end
+
+  def self.from_decimal(decimal_labtime, year, time_zone = ActiveSupport::TimeZone.new("Eastern Time (US & Canada)"))
+    raise ArguementError, "No year supplied!" if year.blank?
+
+    hour = decimal_labtime.to_i
+    remainder = decimal_labtime - hour.to_f
+    min_labtime = 60.0 * remainder
+    min = min_labtime.to_i
+    remainder = min_labtime - min.to_f
+    sec = (60 * remainder).round.to_i
+
+    self.new(year, hour, min, sec, time_zone)
+  end
+
+  def self.from_seconds(sec_time, year, time_zone = DEFAULT_TIME_ZONE)
+    hour = (sec_time / 3600.0).to_i
+    sec_time = sec_time - (hour * 3600)
+    min = (sec_time / 60.0).to_i
+    sec_time = sec_time - (min * 60)
+    sec = sec_time
+
+    self.new(year, hour, min, sec, time_zone)
+  end
+
+  def self.from_s(str, time_params = {}, time_zone = DEFAULT_TIME_ZONE)
+    time_captures = /(\d+)\:(\d{1,2})(\:(\d{1,2}))?(\s(\d\d\d\d))?\z/.match(str).captures
+
+    time_params[:hour] ||= time_captures[0]
+    time_params[:min] ||= time_captures[1]
+    time_params[:sec] ||= time_captures[3]
+    time_params[:year] ||= time_captures[5]
+
+    self.new(time_params[:year], time_params[:hour], time_params[:min], time_params[:sec], time_zone)
+  end
+
+  def initialize(year, hour, min, sec, time_zone = nil)
+    @year = year.to_i
+    @hour = hour.to_i
+    @min = min.to_i
+    @sec = sec.to_i
+    @time_zone = time_zone || DEFAULT_TIME_ZONE
+  end
+
+  def to_time
+    reference_time = time_zone.local(year)
+    reference_time + time_in_seconds
+  end
+
+  def <=>(other)
+    to_time <=> other.to_time
+  end
+
+  def to_s
+    "#{year} #{hour}:#{min}:#{sec} #{time_zone.to_s}"
+  end
+
+  def to_short_s
+    "#{hour}:#{min}:#{sec}"
+  end
+
+  def time_in_seconds
+    hour * 3600 + min * 60 + sec
+  end
+
+  def add_seconds(sec)
+    self.class.from_seconds(self.time_in_seconds + sec, self.year, self.time_zone)
+  end
+
+  def to_decimal
+    hour.to_f + (min.to_f/60.0) + (sec.to_f/3600.0)
+  end
+
+  private
+
 end