rbbt-util 5.17.84 → 5.17.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8842be9c30f7b099e160b65367eb410ff4388343
-  data.tar.gz: 711d01d859e0a3ff1cb7b13e259cafffff964ab6
+  metadata.gz: 5506140dc77115d9116f1ffaa8c607a7b1c10311
+  data.tar.gz: cbdd97fff8f718908d76633a6a5afacefd580131
 SHA512:
-  metadata.gz: 9234cf00cda78e567c2be8ba91dde0c202eac2b627f37493f5122c68524065e3d8d214bd930ac13da4c9fd537e39adb4b03c48a9389f5b45514d2381c654e77e
-  data.tar.gz: 864697c695ff8cd8390ea59f0677470696f611aaf738ce36252967440edca7f3d4bdcc044488488a3e6ff831f873085659fdb482728fffcdf6bdf20eabcbad34
+  metadata.gz: 19bb5c11c41cca14871e08b1b62bd8c0eef9c678620e34ee933047db73f24f6234caf430f7828ec3481e09e6d51c4838809343011b8d95d634c611f7a0a47bd8
+  data.tar.gz: 538b482550cbfa7eb760a85417f7b4f60a419e89701ced17ffaf4572ba8fe99e4f3d3c85dc640ac7da898ac659203f9de855c711262903c6febb47fc539ffd5a

data/share/rbbt_commands/conf/web_user/add

@@ -1,7 +1,32 @@
+
 #!/usr/bin/env ruby
 
-require 'rbbt'
-require 'highline/import'
+require 'rbbt-util'
+require 'rbbt/util/simpleopt'
+
+$0 = "rbbt #{$previous_commands*""} #{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+
+Description
+
+$ rbbt conf web_user add [options] <user> 
+
+Use - to read from STDIN
+
+-h--help Print this help
+-p--password* Set password (ask otherwise)
+
+EOF
+if options[:help]
+  if defined? rbbt_usage
+    rbbt_usage 
+  else
+    puts SOPT.usage
+  end
+  exit 0
+end
+
 
 if Rbbt.etc.web_users.exists?
   web_users = Rbbt.etc.web_users.yaml
@@ -13,13 +38,20 @@ user = ARGV.shift
 
 raise "No user provided" if user.nil?
 
-password = ask("Enter your password:  ") { |q| q.echo = "x" }
+if options[:password].nil?
+  require 'highline/import'
+
+  password = ask("Enter your password:  ") { |q| q.echo = "x" }
 
-raise "No password provided" if password.nil?
+  raise "No password provided" if password.nil?
 
-password_check = ask("Re-enter your password:  ") { |q| q.echo = "x" }
+  password_check = ask("Re-enter your password:  ") { |q| q.echo = "x" }
 
-raise "Passwords don't match" if password != password_check
+  raise "Passwords don't match" if password != password_check
+
+else
+  password = options[:password]
+end
 
 web_users[user] = password
 

data/test/rbbt/test_tsv.rb

@@ -556,4 +556,20 @@ row2    A AA AAA
   def test_merge_key_field
     assert TSV.open('/home/mvazquezg/git/workflows/genomics/share/gene_ages', :key_field => "FamilyAge", :merge => true,  :persist => false, :zipped => true, :type => :double).values.first.length > 1
   end
+
+  def test_flat_merge
+    content =<<-EOF
+#Id    ValueA    ValueB    OtherID
+row1    a|aa|aaa    b    Id1|Id2
+row2    A|aAa    B    Id3
+row3    AA    BB|BBB    Id3|Id2
+    EOF
+
+    TmpFile.with_file(content) do |filename|
+      tsv = TSV.open(filename, :sep => /\s+/, :key_field => "OtherID", :fields => ["ValueA"], :type => :flat, :merge => true)
+      assert_equal %w(A aAa AA).sort, tsv["Id3"].sort 
+      assert_equal %w(a aa aaa AA).sort, tsv["Id2"].sort 
+ 
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.84
+  version: 5.17.85
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake