matr 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80d6c9518b454fe72a9138b450a353f170ccc882
-  data.tar.gz: 172c485d6288892205603bb7674aec296a23561f
+  metadata.gz: 6672fd898e7f5f1eec949a4a62a1890c6f2ac3d5
+  data.tar.gz: 88e75f5fb713d0dc63cbd541bac61a9fe19ff326
 SHA512:
-  metadata.gz: e557e7d01b461c16d0d87c0170d186109c6ad9222f52512023c38867f14d3248067a5cd6ed313b0e38b2e79903095406d32120c3bd1427a2a80a0f522935a5e3
-  data.tar.gz: 963de1d088e8821ff1a2535f82a72a80b053b5e780ea4a4821600048eeaafce1bcefccb9bc25cabdd3f9e869958f0f3f874ec1e0f251618446e22eb1f0b8e84b
+  metadata.gz: 3d8c700258567c6622d51d923243636a1524df0ef4ade2fd98f93acf9dd62b1429367fecd2a0ae262cfab76f66d3c4af12d44170a4ffcdc633d07b9c32a93234
+  data.tar.gz: 707177495bb98b4977b26e40767cc6dd88ec18d05e40f7f8aab0f429626a987e628c1a8ea28765ad59272767e3e883f9cc45bf298337a992f9d50da5c127e5f3

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    matr (0.2.1)
-      trollop (~> 2.1, >= 2.1.3)
+    matr (0.3.0)
+      optimist (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
+    optimist (3.0.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -22,7 +23,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    trollop (2.1.3)
 
 PLATFORMS
   ruby

data/exe/matr

@@ -5,7 +5,7 @@ Signal.trap("PIPE", "EXIT")
 require "matr"
 
 require "set"
-require "trollop"
+require "optimist"
 
 mode_info = <<-EOS
   Available modes: ava, ava_symmetric
@@ -26,11 +26,13 @@ mode_info = <<-EOS
       I will raise an error.
 EOS
 
-opts = Trollop.options do
+opts = Optimist.options do
   banner <<-EOS
 
   Take a three-column matrix file and do stuff with it.
 
+  Note:  The output will sort the keys.
+
 #{mode_info}
 
   Option details
@@ -53,6 +55,8 @@ opts = Trollop.options do
   opt(:infile,
       "Input file",
       type: :string)
+  opt(:no_header,
+      "Pass this opt if the infile does NOT have a header line")
 
   opt(:mode,
       "Which mode should I run in?",

data/lib/matr.rb

@@ -7,10 +7,11 @@ module Matr
 
   def self.main opts
 
-    infile             = opts[:infile]
-    mode               = self.default_opt opts, :mode, "ava"
-    self_score         = self.default_opt opts, :self_score, 100
-    ensure_self_scores = self.default_opt opts, :ensure_self_scores, true
+    infile               = opts[:infile]
+    mode                 = self.default_opt opts, :mode, "ava"
+    self_score           = self.default_opt opts, :self_score, 100
+    ensure_self_scores   = self.default_opt opts, :ensure_self_scores, true
+    no_header = self.default_opt opts, :no_header, false
 
     if opts[:na_replace_given]
       missing_score = opts[:na_replace]
@@ -35,7 +36,7 @@ module Matr
     File.open(infile, "rt").each_line.with_index do |line, idx|
       line.chomp!
 
-      if idx.zero?
+      if idx.zero? && !no_header
         header = line
       else
         source, target, score = line.split "\t"
@@ -76,7 +77,7 @@ module Matr
     end
 
     if output_style == "long"
-      puts header
+      puts header unless no_header
 
       all_keys.each do |source|
         all_keys.each do |target|

data/lib/matr/version.rb

@@ -1,3 +1,3 @@
 module Matr
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/matr.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "trollop", "~> 2.1", ">= 2.1.3"
+  spec.add_runtime_dependency "optimist", "~> 3.0"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: matr
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Moore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement