scout-essentials 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3193beb1b7024505d5a238bb6d9caa280ddab034b23431652138697ebc9ac7f0
-  data.tar.gz: 29ef13d1a7862228eabc8f153f602ba728eda98cf4907b23770a8fb65cb36b98
+  metadata.gz: 2ccc931c0ac9a43124ba25f56b1d1e940ee2a00504c37d530df92949bd8a104e
+  data.tar.gz: 4fab60400647db1a7ceb761c7e59c5900e22630afacbb2516467483f07dff402
 SHA512:
-  metadata.gz: c074200ead16664e4ecdcd262315f389500cd59391b533bcdd1f4a84bdf9ab3fcf96152698f643393d198d9cc1d552707144fd4fbc9c962badbb33d57c79d364
-  data.tar.gz: 57663384b0258537a626eb867e8dd209c9e84bc477dbc462c6096af539f54b176936b1cd4ace7cd47525b5e791a6b13ac41a000fdf2709a9add3a830eb1a33ab
+  metadata.gz: 172b38d8cb18f249f322429df932379c71b4b5067cc92ac26bf26e93c9fba486da6a0e0e51873387d79e0fdc46f6697fc999eaaf6fb93daa99e29b405b19680e
+  data.tar.gz: 49ae1f7eca956c1fffd420efc34b2c2b700aaf3f66a780ccb34acabc02f4d598420df64bb5552a6b759fc0451229e77c4c56cd11459b3352965a5f4f663fbfc2

data/VERSION

@@ -1 +1 @@
-1.8.7
+1.8.8

data/lib/scout/misc/digest.rb

@@ -7,11 +7,12 @@ module Misc
     else
       case obj
       when String
-        if Path.is_filename?(obj) && Open.exists?(obj)
-          Path.setup(obj).digest_str
-        else
-          obj.dup
-        end
+          if Path.is_filename?(obj) && Open.exists?(obj)
+            @@digest_str_cache ||= {}
+            @@digest_str_cache[obj] ||= Path.setup(obj).digest_str
+          else
+            obj.dup
+          end
       when Integer, Symbol
         obj.to_s
       when Array

data/lib/scout/open/util.rb

@@ -36,22 +36,22 @@ module Open
   end
    
   def self.gunzip(stream, options = {})
-    options = IndiferentHash.add_defaults options, :pipe => true, :no_fail => false, :no_wait => true, in: stream
+    options = IndiferentHash.add_defaults options, :pipe => true, :no_fail => true, :no_wait => true, in: stream
     CMD.cmd('zcat', options)
   end
 
   def self.gzip(stream, options = {})
-    options = IndiferentHash.add_defaults options, :pipe => true, :no_fail => false, :no_wait => true, in: stream
+    options = IndiferentHash.add_defaults options, :pipe => true, :no_fail => true, :no_wait => true, in: stream
     CMD.cmd('gzip', options)
   end
 
   def self.bgzip(stream, options = {})
-    options = IndiferentHash.add_defaults options, :pipe => true, :no_fail => false, :no_wait => true, in: stream
+    options = IndiferentHash.add_defaults options, :pipe => true, :no_fail => true, :no_wait => true, in: stream
     CMD.cmd('bgzip', options)
   end
 
   def self.unzip(stream, options = {})
-    options = IndiferentHash.add_defaults options, :pipe => true, :no_fail => false, :no_wait => true, in: stream
+    options = IndiferentHash.add_defaults options, "-p" => true, :pipe => true, :no_fail => true, :no_wait => true, in: stream
     TmpFile.with_file(stream.read) do |filename|
       StringIO.new(CMD.cmd("unzip '{opt}' #{filename}", options))
     end

data/lib/scout/open.rb

@@ -52,9 +52,9 @@ module Open
 
     io = file_open(file, grep, mode, invert_grep, fixed_grep, options)
 
-    io = unzip(io, options)   if ((String === file and zip?(file))   and not options[:noz]) or options[:zip]
-    io = gunzip(io, options)  if ((String === file and gzip?(file))  and not options[:noz]) or options[:gzip]
-    io = bgunzip(io, options) if ((String === file and bgzip?(file)) and not options[:noz]) or options[:bgzip]
+    io = unzip(io, options.dup)   if ((String === file and zip?(file))   and not options[:noz]) or options[:zip]
+    io = gunzip(io, options.dup)  if ((String === file and gzip?(file))  and not options[:noz]) or options[:gzip]
+    io = bgunzip(io, options.dup) if ((String === file and bgzip?(file)) and not options[:noz]) or options[:bgzip]
 
     io.extend NamedStream
     io.filename = file

data/lib/scout/resource/produce.rb

@@ -125,7 +125,15 @@ module Resource
                 raise "Unkown object produced: #{Log.fingerprint data}"
               end
             when :rake
-              run_rake(path, content, rake_dir)
+              begin
+                run_rake(path, content, rake_dir)
+              rescue
+                if $!.message.include?("Don't know how to build task")
+                  raise ResourceNotFound, "Resource is missing and does not seem to be claimed: #{ self } -- #{ path } "
+                else
+                  raise $!
+                end
+              end
             when :install
               software_dir = self.root.software
               name = File.basename(path)

data/scout-essentials.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-essentials 1.8.7 ruby lib
+# stub: scout-essentials 1.8.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.8.7".freeze
+  s.version = "1.8.8".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/test/scout/open/test_remote.rb

@@ -26,10 +26,9 @@ class TestOpenRemote < Test::Unit::TestCase
     teardown
     sss 0
     assert_raises ConcurrentStreamProcessFailed do
-      stream = Open.open("ftp://ftp.ncbi.nlm.nih.gov/pub/geo/DATA/SOFT/GDS/GDS3148.soft.gz", nocache: true)
+      stream = Open.open("ftp://ftp.ncbi.nlm.nih.gov/pub/geo/DATA/SOFT/GDS/GDS3148.soft.gz", nocache: true, no_fail: false)
       stream.read
     end
   end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - Miguel Vazquez