wformat 0.3.1 → 0.3.2

data/lib/wall_merger.rb

@@ -11,12 +11,17 @@ class WallMerger
     width_two  = options['width_two']  || 1920
     height_one = options['height_one'] || 1200
     height_two = options['height_two'] || 1200
+    color      = options['color']      || 'black'
     title      = options['title']      || "#{File.basename(image_one, ".jpg")} and #{File.basename(image_two, ".jpg")}.jpg"
 
     # prepare image will retrieve the image and scale it
     im_one = prepare_image(image_one, width_one, height_one)
     im_two = prepare_image(image_two, width_two, height_two)
-    result = prepare_backdrop(width_one, height_one, width_two, height_two)
+    result = prepare_backdrop({'width_one'  => width_one,
+                               'width_two'  => width_two,
+                               'height_one' => height_one,
+                               'height_two' => height_two,
+                               'color'      => color})
 
     # place through will drop the image onto the target with shifting
     place_through(0, 0, width_one, height_one, im_one, result)

data/lib/wall_operations.rb

@@ -23,8 +23,13 @@ module WallOperations
     end
   end
 
-  def prepare_backdrop(width_one, height_one, width_two = 0, height_two = 0)
-    Image.new(width_one + width_two, [height_one, height_two].max) { self.background_color = 'black'}
+  def prepare_backdrop(options = {})
+    color      = options['color']  || 'black'
+    width_one  = options['width']  || options['width_one']  || 1920
+    height_one = options['height'] || options['height_one'] || 1200
+    width_two  = options['width_two']  || 0
+    height_two = options['height_two'] || 0
+    Image.new(width_one + width_two, [height_one, height_two].max) { self.background_color = color}
   end
 
   # Places image on target, also applying rightward or downward shift to given coordinates based on bounds

data/lib/wall_scaler.rb

@@ -9,11 +9,14 @@ class WallScaler
   def scale(image, options = {})
     width  = options['width']  || 1920
     height = options['height'] || 1200
-
+    color  = options['color']  || 'black'
     title  = options['title']  || "#{File.basename(image, ".jpg")} scaled.jpg"
 
     im = prepare_image(image, width, height)
-    result = prepare_backdrop(width, height)
+
+    result = prepare_backdrop({'width'  => width,
+                               'height' => height,
+                               'color'  => color})
 
     place_through(0, 0, width, height, im, result)
     save_image(result, title)

data/lib/wformat.rb

@@ -45,6 +45,10 @@ optparse = OptionParser.new do |opts|
     options['title'] = title
   end
 
+  opts.on('--color=COLOR', "Backdrop color") do |color|
+    options['color'] = color
+  end
+
   opts.on('--trace', "Provide stack trace when error occurs") do
     options['trace'] = true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wformat
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000 Z
+date: 2011-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &10502880 !ruby/object:Gem::Requirement
+  requirement: &11975440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.13'
   type: :runtime
   prerelease: false
-  version_requirements: *10502880
+  version_requirements: *11975440
 description: ! "wformat is a command line utility to organize collections of wallpapers\n\n
   \   For now, it can only reformat images into proper sizes(for dualmonitors too)\n\n
   \   \n\n    Soon it will feature organization through renaming and the ability to