image_svd 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ba755a5c928c69d8bf6b2e84e51cb1a2493d641
-  data.tar.gz: ed5574e929155f21d39e95cf1b9d7026babb6fba
+  metadata.gz: ce7398aabec67a2fcb7e6ec057a0f09e9f86b693
+  data.tar.gz: aae65d572ac588b0e263dc58aadeeb8ce44a4080
 SHA512:
-  metadata.gz: 7653dc6421ad11f66c938b34a653ad5ed74372c803984d38d904c8017021d994abaa278fde9e93ae2598efd9fc40927fac904846ed477f49db1432b54c12c5a9
-  data.tar.gz: de64f94042ef0e17949ae4bd4b7772f4f60c9ed210bc3b10ceb9d781d93a36b36b77d0584dcbf99f48482ff08583e1e50eeb4e8e09deea5f70cdcd68ffc91d6d
+  metadata.gz: 37024e30240eab7642cc0996f156f398cce71d867da33f071d211bfe5c4ede0cc3a740c1dcca441050763b7cd018f0923eca069f4436715b7bcabd81f4131da5
+  data.tar.gz: 6b395393e0d37728026f450a32e7e377632e097442dddd2f21441a33643918fa1149b9d97867ab5a32929086765fae25452a2e0547ce045bcfa297ab69257d6a

data/lib/image_svd/cli.rb

@@ -5,7 +5,14 @@ module ImageSvd
   class CLI
     # The entry point for the application logic
     def run(options)
-      Options.iterate_on_input(options) do |o|
+      pool = Options.collect_input(options)
+      until pool.empty?
+        async_batch(pool.slice!(0..(options[:thread_count] - 1)))
+      end
+    end
+
+    def async_batch(arr_options)
+      arr_options.each do |o|
         if o[:directory]
           fork { run_single_image(o) }
         else
@@ -108,6 +115,14 @@ module ImageSvd
               ' it contains.',
             default: false,
             short: '-r'
+        opt :thread_count,
+            'Advanced feature. The amount of separate threads to use when'\
+              ' processing images. Relevant when processing many images in'\
+              ' a directory. Should not exceed (n - 1) where n is the'\
+              ' logical core count on the end user\'s computer. Otherwise,'\
+              ' a higher number means less total time spent processing.',
+            default: 3,
+            short: '-t'
       end
     end
     # rubocop:enable MethodLength
@@ -121,7 +136,8 @@ module ImageSvd
 
     def self.process(opts)
       vs = format_num_sing_vals(opts[:num_singular_values].to_s)
-      opts.merge(singular_values: vs)
+      n = validate_thread_count(opts[:thread_count])
+      opts.merge(singular_values: vs, thread_count: n)
     end
 
     # reformats the string cmd line option to an array
@@ -132,6 +148,11 @@ module ImageSvd
       vs.length == 1 ? vs : ((vs.first)..(vs.last)).to_a
     end
 
+    # prevent non positive requested thread_counts
+    def self.validate_thread_count(n)
+      n > 1 ? n : 1
+    end
+
     # reformats directory inputs into an array of files, or repackages file
     # inputs to be contained inside an array
     def self.expand_input_files(opts)
@@ -152,16 +173,17 @@ module ImageSvd
       (path_components << 'out' << filename).join('/')
     end
 
-    def self.iterate_on_input(opts)
+    def self.collect_input(opts)
       %x(mkdir #{opts[:input_file].path + 'out'}) if opts[:directory]
+      collection = []
       expand_input_files(opts).each do |file|
         new_options = { input_file: file }
         if opts[:directory]
           new_options.merge!(output_name: output_dir_path_for_input_file(file))
         end
-        o = process(opts).merge(new_options)
-        yield o
+        collection << process(opts).merge(new_options)
       end
+      collection
     end
   end
 end

data/lib/image_svd/image_matrix.rb

@@ -153,9 +153,10 @@ module ImageSvd
 
     # more info: http://www.imagemagick.org/Usage/formats/#profile_iptc
     def add_image_svd_credit!(path)
-      %x(echo '#{Util::IMAGE_CREDIT}' > iptcData.pro)
-      %x(convert #{path} +profile 8BIM -profile 8BIMTEXT:iptcData.pro #{path})
-      %x(rm iptcData.pro)
+      r = rand(99999)
+      %x(echo '#{Util::IMAGE_CREDIT}' > iptcData#{r}.pro)
+      %x(convert #{path} +profile 8BIM -profile 8BIMTEXT:iptcData#{r}.pro #{path})
+      %x(rm iptcData#{r}.pro)
     end
 
     def save_svd(path)

data/lib/image_svd/util.rb

@@ -15,7 +15,7 @@ module ImageSvd
 
     IMAGE_CREDIT = <<-EOS
       2#0="&#0;&#2;"
-      2#120#Caption="Created with image_svd"
+      2#120#Caption="Created with image_svd v #{ImageSvd::VERSION}"
       2#40#Special Instructions="http://www.rubygems.org/gems/image_svd"
       2#80#Byline="http://www.ilyakavalerov.com"
       2#110#Credit="Image manipulation by Ilya Kavalerov"

data/lib/image_svd/version.rb

@@ -1,4 +1,4 @@
 # This module holds the gem's code
 module ImageSvd
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/spec/cli_spec.rb

@@ -11,7 +11,8 @@ describe 'CLI' do
         input_file: orig,
         convert: true,
         num_singular_values: '2',
-        grayscale: true
+        grayscale: true,
+        thread_count: 3
       }
     end
 
@@ -69,7 +70,8 @@ describe 'CLI' do
         input_file: orig,
         convert: true,
         num_singular_values: '2',
-        grayscale: false
+        grayscale: false,
+        thread_count: 3
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_svd
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ilya Kavalerov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pnm