win32screenshot 2.1.0 → 4.0.0

data/spec/win32/screenshot/image_spec.rb

@@ -1,78 +1,78 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-describe Win32::Screenshot::Image do
-
-  before :all do
-    IO.popen("notepad")
-    @notepad = RAutomation::Window.new(:title => /notepad/i).pid
-    @image = Win32::Screenshot::Take.of(:window, :pid => @notepad)
-  end
-
-  describe "stores raw bitmap data" do
-    it "#bitmap" do
-      @image.bitmap[0..1].should == 'BM'
-    end
-  end
-
-  describe "saving the image to the disk" do
-    context "saving to the bmp format" do
-      it "#write" do
-        file_path = @temp_dir + '/image.bmp'
-        expect {@image.write(file_path)}.to_not raise_exception
-        File.open(file_path, "rb") {|io| io.read}[0..1].should == "BM"
-      end
-    end
-
-    context "saving to the png format" do
-      it "#write" do
-        file_path = @temp_dir + '/image.png'
-        expect {@image.write(file_path)}.to_not raise_exception
-        File.open(file_path, "rb") {|io| io.read}[0..3].should == "\211PNG".force_encoding(Encoding::ASCII_8BIT)
-      end
-    end
-
-    context "trying to save to the unknown format" do
-      it "#write" do
-        file_path = @temp_dir + '/image.notknown'
-        expect {@image.write(file_path)}.
-                to raise_exception("File '#{file_path}' has to have one of the following extensions: #{Win32::Screenshot::Image::FORMATS.join(", ")}")
-        File.should_not exist(file_path)
-      end
-    end
-
-    context "trying to save with the filename without an extension" do
-      it "#write" do
-        file_path = @temp_dir + '/image'
-        expect {@image.write(file_path)}.
-                to raise_exception("File '#{file_path}' has to have one of the following extensions: #{Win32::Screenshot::Image::FORMATS.join(", ")}")
-        File.should_not exist(file_path)
-      end
-    end
-
-    context "not allowing to overwrite existing files" do
-      it "#write" do
-        file_path = @temp_dir + '/invalid-image.png'
-        content = "invalid content"
-        File.open(file_path, "w") {|io| io.write content}
-        expect {@image.write(file_path)}.to raise_exception("File already exists: #{file_path}!")
-        File.size(file_path).should == content.size
-      end
-    end
-
-    context "allowing to overwrite existing files when desired" do
-      it "#write!" do
-        file_path = @temp_dir + '/overwritten-image.png'
-        content = "content"
-        File.open(file_path, "w") {|io| io.write content}
-        @image.write!(file_path)
-        File.size(file_path).should_not eq(content.size)
-      end
-    end    
-  end
-
-  after :all do
-    # kill in a jruby friendly way
-    system("taskkill /PID #{@notepad} > nul")
-  end
-
-end
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Win32::Screenshot::Image do
+
+  before :all do
+    IO.popen("notepad")
+    @notepad = RAutomation::Window.new(:title => /notepad/i).pid
+    @image = Win32::Screenshot::Take.of(:window, :pid => @notepad)
+  end
+
+  describe "stores raw bitmap data" do
+    it "#bitmap" do
+      expect(@image.bitmap[0..1]).to eq('BM')
+    end
+  end
+
+  describe "saving the image to the disk" do
+    context "saving to the bmp format" do
+      it "#write" do
+        file_path = @temp_dir + '/image.bmp'
+        expect {@image.write(file_path)}.to_not raise_exception
+        expect(File.open(file_path, "rb") {|io| io.read}[0..1]).to eq("BM")
+      end
+    end
+
+    context "saving to the png format" do
+      it "#write" do
+        file_path = @temp_dir + '/image.png'
+        expect {@image.write(file_path)}.to_not raise_exception
+        expect(File.open(file_path, "rb") {|io| io.read}[0..3]).to eq("\211PNG".force_encoding(Encoding::ASCII_8BIT))
+      end
+    end
+
+    context "trying to save to the unknown format" do
+      it "#write" do
+        file_path = @temp_dir + '/image.notknown'
+        expect {@image.write(file_path)}.
+                to raise_exception("File '#{file_path}' has to have one of the following extensions: #{Win32::Screenshot::Image::FORMATS.join(", ")}")
+        expect(File.exist?(file_path)).to eq(false)
+      end
+    end
+
+    context "trying to save with the filename without an extension" do
+      it "#write" do
+        file_path = @temp_dir + '/image'
+        expect {@image.write(file_path)}.
+                to raise_exception("File '#{file_path}' has to have one of the following extensions: #{Win32::Screenshot::Image::FORMATS.join(", ")}")
+        expect(File.exist?(file_path)).to eq(false)
+      end
+    end
+
+    context "not allowing to overwrite existing files" do
+      it "#write" do
+        file_path = @temp_dir + '/invalid-image.png'
+        content = "invalid content"
+        File.open(file_path, "w") {|io| io.write content}
+        expect {@image.write(file_path)}.to raise_exception("File already exists: #{file_path}!")
+        expect(File.size(file_path)).to eq(content.size)
+      end
+    end
+
+    context "allowing to overwrite existing files when desired" do
+      it "#write!" do
+        file_path = @temp_dir + '/overwritten-image.png'
+        content = "content"
+        File.open(file_path, "w") {|io| io.write content}
+        @image.write!(file_path)
+        expect(File.size(file_path)).to_not eq(content.size)
+      end
+    end    
+  end
+
+  after :all do
+    # kill in a jruby friendly way
+    system("taskkill /PID #{@notepad} > nul")
+  end
+
+end

data/spec/win32/screenshot/take_spec.rb

@@ -1,151 +1,83 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-describe Win32::Screenshot::Take do
-
-  before :all do
-    Dir.chdir("c:/program files/Internet Explorer") { IO.popen(".\\iexplore about:blank") }
-    IO.popen("notepad")
-    @iexplore = RAutomation::Window.new(:title => /internet explorer/i).pid
-    @notepad = RAutomation::Window.new(:title => /notepad/i).pid
-  end
-
-  it "captures the foreground" do
-    image = Win32::Screenshot::Take.of(:foreground)
-    save_and_verify_image(image, 'foreground')
-    hwnd = Win32::Screenshot::BitmapMaker.foreground_window
-    [image.width, image.height].should == Win32::Screenshot::BitmapMaker.dimensions_for(hwnd, :window)
-  end
-
-  it "captures an area of the foreground" do
-    image = Win32::Screenshot::Take.of(:foreground, :area => [30, 30, 100, 150])
-    save_and_verify_image(image, 'foreground_area')
-    image.width.should == 70
-    image.height.should == 120
-  end
-
-  it "doesn't allow to capture an area of the foreground with invalid coordinates" do
-    expect {Win32::Screenshot::Take.of(:foreground, :area => [0, 0, -1, 100])}.
-            to raise_exception("specified coordinates (x1: 0, y1: 0, x2: -1, y2: 100) are invalid - cannot be negative!")
-  end
-
-  it "captures the desktop" do
-    image = Win32::Screenshot::Take.of(:desktop)
-    save_and_verify_image(image, 'desktop')
-    hwnd = Win32::Screenshot::BitmapMaker.desktop_window
-    [image.width, image.height].should == Win32::Screenshot::BitmapMaker.dimensions_for(hwnd, :window)
-  end
-
-  it "captures an area of the desktop" do
-    image = Win32::Screenshot::Take.of(:desktop, :area => [30, 30, 100, 150])
-    save_and_verify_image(image, 'desktop_area')
-    image.width.should == 70
-    image.height.should == 120
-  end
-
-  it "doesn't allow to capture an area of the desktop with invalid coordinates" do
-    expect {Win32::Screenshot::Take.of(:desktop, :area => [0, 0, -1, 100])}.
-            to raise_exception("specified coordinates (x1: 0, y1: 0, x2: -1, y2: 100) are invalid - cannot be negative!")
-  end
-
-  it "captures a maximized window" do
-    window = RAutomation::Window.new(:pid => @iexplore)
-    window.maximize
-    image = Win32::Screenshot::Take.of(:window, :pid => @iexplore)
-    save_and_verify_image(image, 'iexplore_max')
-    [image.width, image.height].should == Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd, :window)
-  end
-
-  it "captures a minimized window" do
-    window = RAutomation::Window.new(:pid => @notepad)
-    window.minimize
-    image = Win32::Screenshot::Take.of(:window, :pid => @notepad)
-    save_and_verify_image(image, 'notepad_min')
-    [image.width, image.height].should == Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd, :window)
-  end
-
-  it "captures a small window" do
-    title = /Internet Explorer/
-    resize(title)
-    image = Win32::Screenshot::Take.of(:window, :pid => @iexplore)
-    save_and_verify_image(image, 'iexplore_resized')
-
-    # we should get the size of the picture because
-    # screenshot doesn't include titlebar and the size
-    # varies between different themes and Windows versions
-    window = RAutomation::Window.new(:pid => @iexplore)
-    [image.width, image.height].should == Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd, :window)
-  end
-
-  it "captures a window context of the window" do
-    image = Win32::Screenshot::Take.of(:window, :pid => @notepad, :context => :window)
-    save_and_verify_image(image, 'notepad_context_window')
-    window = RAutomation::Window.new(:pid => @notepad)
-    [image.width, image.height].should == Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd, :window)
-  end
-
-  it "captures a client context of the window" do
-    image = Win32::Screenshot::Take.of(:window, :pid => @notepad, :context => :client)
-    save_and_verify_image(image, 'notepad_context_client')
-    window = RAutomation::Window.new(:pid => @notepad)
-    [image.width, image.height].should == Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd, :client)
-  end
-
-  it "captures an area of the window" do
-    image = Win32::Screenshot::Take.of(:window, :pid => @notepad, :area => [30, 30, 100, 150])
-    save_and_verify_image(image, 'notepad_area')
-    image.width.should == 70
-    image.height.should == 120
-  end
-
-  it "captures by the RAutomation::Window" do
-    window = RAutomation::Window.new(:pid => @notepad)
-    image = Win32::Screenshot::Take.of(:window, :rautomation => window)
-    save_and_verify_image(image, 'notepad_rautomation')
-    [image.width, image.height].should == Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd, :window)
-  end
-
-  it "captures a child windows" do
-    window = RAutomation::Window.new(:pid => @iexplore).child(:class => "Internet Explorer_Server")
-    image = Win32::Screenshot::Take.of(:window, :rautomation => window)
-    save_and_verify_image(image, 'iexplore_child')
-    [image.width, image.height].should == Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd, :window)
-  end
-
-  it "captures a whole window if window size is specified as coordinates" do
-    window = RAutomation::Window.new(:pid => @notepad)
-    expected_width, expected_height = Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd, :window)
-    image = Win32::Screenshot::Take.of(:window, :rautomation => window, :area => [0, 0, expected_width, expected_height])
-    save_and_verify_image(image, 'notepad_area_full_window')
-    image.width.should == expected_width
-    image.height.should == expected_height
-  end
-
-  it "doesn't allow to capture an area of the window with negative coordinates" do
-    expect {Win32::Screenshot::Take.of(:window, :pid => @notepad, :area => [0, 0, -1, 100])}.
-            to raise_exception("specified coordinates (x1: 0, y1: 0, x2: -1, y2: 100) are invalid - cannot be negative!")
-  end
-
-  it "doesn't allow to capture an area of the window if coordinates are the same" do
-    expect {Win32::Screenshot::Take.of(:window, :pid => @notepad, :area => [10, 0, 10, 20])}.
-            to raise_exception("specified coordinates (x1: 10, y1: 0, x2: 10, y2: 20) are invalid - cannot be x1 >= x2 or y1 >= y2!")
-  end
-
-  it "doesn't allow to capture an area of the window if second coordinate is smaller than first one" do
-    expect {Win32::Screenshot::Take.of(:window, :pid => @notepad, :area => [0, 10, 10, 9])}.
-            to raise_exception("specified coordinates (x1: 0, y1: 10, x2: 10, y2: 9) are invalid - cannot be x1 >= x2 or y1 >= y2!")
-  end
-
-  it "doesn't allow to capture an area of the window with too big coordinates" do
-    window = RAutomation::Window.new(:pid => @notepad)
-    expected_width, expected_height = Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd, :window)
-    expect {Win32::Screenshot::Take.of(:window, :pid => @notepad, :area => [0, 0, 10, 1000])}.
-            to raise_exception("specified coordinates (x1: 0, y1: 0, x2: 10, y2: 1000) are invalid - maximum x2: #{expected_width} and y2: #{expected_height}!")
-  end
-
-  after :all do
-    [@iexplore, @notepad].each do |pid|
-      # kill them in a jruby friendly way
-      system("taskkill /PID #{pid} > nul")
-    end
-  end
-end
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Win32::Screenshot::Take do
+
+  before :all do
+    Dir.chdir("c:/program files/Internet Explorer") { IO.popen(".\\iexplore about:blank") }
+    IO.popen("notepad")
+    @iexplore = RAutomation::Window.new(:title => /internet explorer/i).pid
+    @notepad = RAutomation::Window.new(:title => /notepad/i).pid
+  end
+
+  it "captures the foreground" do
+    image = Win32::Screenshot::Take.of(:foreground)
+    save_and_verify_image(image, 'foreground')
+    hwnd = Win32::Screenshot::BitmapMaker.foreground_window
+    expect([image.width, image.height]).to eq(Win32::Screenshot::BitmapMaker.dimensions_for(hwnd))
+  end
+
+  it "captures the desktop" do
+    image = Win32::Screenshot::Take.of(:desktop)
+    desktop_dimensions = Win32::Screenshot::BitmapMaker::desktop
+    save_and_verify_image(image, 'desktop')
+
+    expect([image.width, image.height]).to eq([desktop_dimensions.width, desktop_dimensions.height])
+  end
+
+  it "captures a window" do
+    image = Win32::Screenshot::Take.of(:window, :pid => @notepad)
+    save_and_verify_image(image, 'notepad_context_window')
+    window = RAutomation::Window.new(:pid => @notepad)
+    expect([image.width, image.height]).to eq(Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd))
+  end
+
+  it "captures a maximized window" do
+    window = RAutomation::Window.new(:pid => @iexplore)
+    window.maximize
+    image = Win32::Screenshot::Take.of(:window, :pid => @iexplore)
+    save_and_verify_image(image, 'iexplore_max')
+    expect([image.width, image.height]).to eq(Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd))
+  end
+
+  it "captures a minimized window" do
+    window = RAutomation::Window.new(:pid => @notepad)
+    window.minimize
+    image = Win32::Screenshot::Take.of(:window, :pid => @notepad)
+    save_and_verify_image(image, 'notepad_min')
+    expect([image.width, image.height]).to eq(Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd))
+  end
+
+  it "captures a small window" do
+    title = /Internet Explorer/
+    resize(title)
+    image = Win32::Screenshot::Take.of(:window, :pid => @iexplore)
+    save_and_verify_image(image, 'iexplore_resized')
+
+    # we should get the size of the picture because
+    # screenshot doesn't include titlebar and the size
+    # varies between different themes and Windows versions
+    window = RAutomation::Window.new(:pid => @iexplore)
+    expect([image.width, image.height]).to eq(Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd))
+  end
+
+  it "captures by the RAutomation::Window" do
+    window = RAutomation::Window.new(:pid => @notepad)
+    image = Win32::Screenshot::Take.of(:window, :rautomation => window)
+    save_and_verify_image(image, 'notepad_rautomation')
+    expect([image.width, image.height]).to eq(Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd))
+  end
+
+  it "captures a child window" do
+    window = RAutomation::Window.new(:pid => @iexplore).child(:class => "Internet Explorer_Server")
+    image = Win32::Screenshot::Take.of(:window, :rautomation => window)
+    save_and_verify_image(image, 'iexplore_child')
+    expect([image.width, image.height]).to eq(Win32::Screenshot::BitmapMaker.dimensions_for(window.hwnd))
+  end
+
+  after :all do
+    [@iexplore, @notepad].each do |pid|
+      # kill them in a jruby friendly way
+      system("taskkill /PID #{pid} > nul")
+    end
+  end
+end

data/win32screenshot.gemspec

@@ -1,25 +1,25 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "win32/screenshot/version"
-
-Gem::Specification.new do |s|
-  s.name = "win32screenshot"
-  s.version = Win32::Screenshot::VERSION
-  s.authors = ["Jarmo Pertman", "Aslak Hellesøy"]
-  s.email = ["jarmo.p@gmail.com", "aslak.hellesoy@gmail.com"]
-  s.description = "Capture Screenshots on Windows with Ruby to bmp, gif, jpg or png formats."
-  s.homepage = "http://github.com/jarmo/win32screenshot"
-  s.summary = "Capture Screenshots on Windows with Ruby to bmp, gif, jpg or png formats."
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- spec/*`.split("\n")
-  s.require_paths = ["lib"]
-  s.license = "MIT"
-  
-  s.add_dependency("ffi", "~> 1.9.0")
-  s.add_dependency("mini_magick", "~> 4.3.0")
-  s.add_dependency("rautomation", "~> 0.7")
-  
-  s.add_development_dependency("rspec", "~> 2.5")
-  s.add_development_dependency("yard")
-  s.add_development_dependency("rake")
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "win32/screenshot/version"
+
+Gem::Specification.new do |s|
+  s.name = "win32screenshot"
+  s.version = Win32::Screenshot::VERSION
+  s.authors = ["Jarmo Pertman", "Aslak Hellesøy"]
+  s.email = ["jarmo.p@gmail.com", "aslak.hellesoy@gmail.com"]
+  s.description = "Capture Screenshots on Windows with Ruby to bmp, gif, jpg or png formats."
+  s.homepage = "http://github.com/jarmo/win32screenshot"
+  s.summary = "Capture Screenshots on Windows with Ruby to bmp, gif, jpg or png formats."
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- spec/*`.split("\n")
+  s.require_paths = ["lib"]
+  s.license = "MIT"
+  
+  s.add_dependency("ffi", "~> 1.15.0")
+  s.add_dependency("mini_magick", "~> 4.9")
+  s.add_dependency("rautomation", "~> 1.1.0")
+  
+  s.add_development_dependency("rspec", "~> 3.10")
+  s.add_development_dependency("yard")
+  s.add_development_dependency("rake")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32screenshot
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Jarmo Pertman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -17,56 +17,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '4.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '4.9'
 - !ruby/object:Gem::Dependency
   name: rautomation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -106,18 +106,19 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".yardopts"
+- CHANGES.md
 - Gemfile
 - Gemfile.lock
-- History.rdoc
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- ext/ImageMagick-6.9.3-0-portable-Q16-x86/LICENSE.txt
-- ext/ImageMagick-6.9.3-0-portable-Q16-x86/convert.exe
-- ext/ImageMagick-6.9.3-0-portable-Q16-x86/identify.exe
-- ext/ImageMagick-6.9.3-0-portable-Q16-x86/mogrify.exe
+- ext/ImageMagick-7.0.9-8-portable-Q16-x86/LICENSE.txt
+- ext/ImageMagick-7.0.9-8-portable-Q16-x86/convert.exe
+- ext/ImageMagick-7.0.9-8-portable-Q16-x86/identify.exe
+- ext/ImageMagick-7.0.9-8-portable-Q16-x86/mogrify.exe
 - lib/win32/screenshot.rb
 - lib/win32/screenshot/bitmap_maker.rb
+- lib/win32/screenshot/desktop.rb
 - lib/win32/screenshot/image.rb
 - lib/win32/screenshot/take.rb
 - lib/win32/screenshot/version.rb
@@ -144,8 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Capture Screenshots on Windows with Ruby to bmp, gif, jpg or png formats.
@@ -153,4 +153,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/win32/screenshot/image_spec.rb
 - spec/win32/screenshot/take_spec.rb
-has_rdoc: