mac-robot 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a90d5f3016c0cc810bcaa51f9cb6949c7f9293661bcbaa1b7880e958d6a0e24e
-  data.tar.gz: 81f6896b40a2c5f9cfeb624ee6883f2f95aa9e4fcb4ec4e2678cfe4eb73dcdc6
+  metadata.gz: 60baeb22867d9f1b436e4ab27cf588224f168aa1fa26db06bc1b8750b92d784c
+  data.tar.gz: 0c86df74a65049916202344feeeaa727fafdd6c6442f118cc538c950a64e0471
 SHA512:
-  metadata.gz: c23a9f13609200d5dad63b928a9ca95fa49d524b202b8db2a9f73a8021dd97feecd4bcdec7beebdf5c36ccabb561e22de6f2af4b7654b61d10b8df9a6ca57f46
-  data.tar.gz: 8044b323b5ac28bf8a835eb0167990ea11063168a52a9b80a895fe0661c0029fb25ac2792dd7bd93b4413f41605312858fa30f9f2aab4e4a40e077b585ff525d
+  metadata.gz: 92bddcbf3718d54c33785ac0b5cf95d92b276d0cd2e49eb5b6e479bca4e5f5425695a8d1f4fb6f2c5cb67921614fcd3e68bd39608a963a01e661b448626de6d7
+  data.tar.gz: cfb2d6448dfac40197d8117176b9c0880817f76ba85614d80afc21b8459ea891e79e052ca28c9c3f5d9c03963bd162b66af2e8e84ebbdf50058dbd386b518cb3

data/Gemfile

@@ -6,9 +6,9 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rake", "< 11.0"
+  gem "rake", ">= 12.3.3"
   gem "json", "~> 2.5.1"
-  gem "rspec", "~> 2.8.0"
+  gem "rspec", "~> 3.10.0"
   gem "bundler"
   gem "juwelier", "~> 2.4.9"
 end

data/Gemfile.lock

@@ -6,7 +6,7 @@ GEM
     builder (3.2.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.4.4)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -26,7 +26,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    git (1.9.1)
+    git (1.11.0)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -52,12 +52,12 @@ GEM
     jwt (2.3.0)
     kamelcase (0.0.2)
       semver2 (~> 3)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
@@ -68,18 +68,23 @@ GEM
     psych (4.0.2)
     public_suffix (4.0.6)
     racc (1.6.0)
-    rack (2.2.3)
-    rake (10.5.0)
+    rack (2.2.3.1)
+    rake (13.0.6)
     rchardet (1.8.0)
     rdoc (6.3.3)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
     ruby2_keywords (0.0.5)
     semver2 (3.4.2)
     thread_safe (0.3.6)
@@ -91,8 +96,8 @@ DEPENDENCIES
   bundler
   json (~> 2.5.1)
   juwelier (~> 2.4.9)
-  rake (< 11.0)
-  rspec (~> 2.8.0)
+  rake (>= 12.3.3)
+  rspec (~> 3.10.0)
 
 BUNDLED WITH
    2.1.4

data/Rakefile

@@ -51,8 +51,6 @@ end
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/ext/util/util.m

@@ -15,7 +15,8 @@ static VALUE mUtil_get_pixel_color(int argc, VALUE *argv, VALUE self)
   intX = NUM2INT(x);
   intY = NUM2INT(y);
 
-  image = CGDisplayCreateImageForRect((CGDirectDisplayID)0, CGRectMake(intX, intY, 1, 1));
+  CGDirectDisplayID displayID = CGMainDisplayID();
+  image = CGDisplayCreateImageForRect(displayID, CGRectMake(intX, intY, 1, 1));
   bitmap = [[NSBitmapImageRep alloc] initWithCGImage:image];
   CGImageRelease(image);
   color = [bitmap colorAtX:0 y:0];
@@ -37,8 +38,9 @@ static VALUE mUtil_get_display_pixel_size(int argc, VALUE *argv, VALUE self)
   int width, height;
   VALUE result;
 
-  width = (int)CGDisplayPixelsWide((CGDirectDisplayID)0);
-  height = (int)CGDisplayPixelsHigh((CGDirectDisplayID)0);
+  CGDirectDisplayID displayID = CGMainDisplayID();
+  width = (int)CGDisplayPixelsWide(displayID);
+  height = (int)CGDisplayPixelsHigh(displayID);
 
   result = rb_ary_new();
   rb_ary_push(result, INT2NUM(width));

data/lib/mac-robot.rb

@@ -3,16 +3,14 @@ require 'util'
 
 module Mac
   class Robot
-    class Error < StandardError; end
-    class OutOfResolution < Error; end
+    class Error < StandardError
+    end
+    class OutOfResolution < Error
+    end
 
     attr_reader :x, :y
 
-    BUTTONS = {
-      :left => 0,
-      :right => 1,
-      :center => 2
-    }
+    BUTTONS = { left: 0, right: 1, center: 2 }
 
     def initialize
       @x = 0
@@ -70,16 +68,16 @@ module Mac
 
     def get_pixel_color(x, y)
       raise OutOfResolution if x < 0 || y < 0
-      raise OutOfResolution if display_pixel_size.width < x || display_pixel_size.height < y
+      if display_pixel_size.width < x || display_pixel_size.height < y
+        raise OutOfResolution
+      end
 
       # workarownd for exeption occurs when x == display_pixel_size.width
       #
       # *** Assertion failure in -[NSBitmapImageRep initWithCGImage:], /SourceCache/AppKit/AppKit-1265/AppKit.subproj/NSBitmapImageRep.m:1286
       # An uncaught exception was raised
       # Invalid parameter not satisfying: cgImage != NULL
-      if display_pixel_size.width == x
-        x = x - 0.1
-      end
+      x = x - 0.1 if display_pixel_size.width == x
 
       color = Util.get_pixel_color(x, y)
       Struct.new(:red, :green, :blue, :alpha).new(*color)
@@ -97,7 +95,13 @@ module Mac
 
     def scroll_wheel_event(unit, scroll_y, scroll_x = 0, scroll_z = 0)
       wheel_count = 3
-      @dispatcher.dispatchScrollWheelEvent(unit, wheel_count, scroll_y, scroll_x, scroll_z)
+      @dispatcher.dispatchScrollWheelEvent(
+        unit,
+        wheel_count,
+        scroll_y,
+        scroll_x,
+        scroll_z
+      )
     end
 
     def scroll_count_extract(args = {})
@@ -118,7 +122,7 @@ module Mac
         end
       end
 
-      return [scroll_y, scroll_x, scroll_z]
+      return scroll_y, scroll_x, scroll_z
     end
 
     def keyboard_event(keycode, keydown)

data/spec/mac-robot_spec.rb

@@ -2,9 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 # how to test???
 describe Mac::Robot do
-  subject do
-    Mac::Robot.new
-  end
+  subject { Mac::Robot.new }
 
   describe 'mouse event' do
     it 'should simulate mouse event' do
@@ -20,10 +18,10 @@ describe Mac::Robot do
 
   describe 'scroll wheel event' do
     it 'should simulate scroll wheel event' do
-      subject.scroll_wheel_line(:y => 10)  # down 10 lines
-      subject.scroll_wheel(:y => -10)      # up 10 lines
-      subject.scroll_wheel_pixel(:x => 10, :y => -20, :z => 5)
-      subject.scroll_wheel_pixel(:y => 20, :x => -10, :z => -5)
+      subject.scroll_wheel_line(y: 10) # down 10 lines
+      subject.scroll_wheel(y: -10) # up 10 lines
+      subject.scroll_wheel_pixel(x: 10, y: -20, z: 5)
+      subject.scroll_wheel_pixel(y: 20, x: -10, z: -5)
     end
   end
 
@@ -39,21 +37,21 @@ describe Mac::Robot do
   describe 'color' do
     it 'should get color from given coordinate' do
       color = subject.get_pixel_color(0, 0)
-      color.red.should be_a_kind_of(Float)
-      color.green.should be_a_kind_of(Float)
-      color.blue.should be_a_kind_of(Float)
-      color.alpha.should be_a_kind_of(Float)
+      expect(color.red).to be_a_kind_of(Float)
+      expect(color.green).to be_a_kind_of(Float)
+      expect(color.blue).to be_a_kind_of(Float)
+      expect(color.alpha).to be_a_kind_of(Float)
     end
 
     it 'should raise if given coordinate is out of resolution' do
       [9999, -1].each do |p|
-        lambda {
-          subject.get_pixel_color(p, 0)
-        }.should raise_error(Mac::Robot::OutOfResolution)
+        expect { subject.get_pixel_color(p, 0) }.to raise_error(
+          Mac::Robot::OutOfResolution
+        )
 
-        lambda {
-          subject.get_pixel_color(0, p)
-        }.should raise_error(Mac::Robot::OutOfResolution)
+        expect { subject.get_pixel_color(0, p) }.to raise_error(
+          Mac::Robot::OutOfResolution
+        )
       end
     end
 
@@ -61,18 +59,18 @@ describe Mac::Robot do
       display_pixel_size = subject.display_pixel_size
 
       color = subject.get_pixel_color(display_pixel_size.width, 0)
-      color.red.should be_a_kind_of(Float)
-      color.green.should be_a_kind_of(Float)
-      color.blue.should be_a_kind_of(Float)
-      color.alpha.should be_a_kind_of(Float)
+      expect(color.red).to be_a_kind_of(Float)
+      expect(color.green).to be_a_kind_of(Float)
+      expect(color.blue).to be_a_kind_of(Float)
+      expect(color.alpha).to be_a_kind_of(Float)
     end
   end
 
   describe 'current mouse location' do
     it 'should have current mouse location' do
       subject.mouse_move(20, 0)
-      subject.mouse_current_location.x.should eql(20)
-      subject.mouse_current_location.y.should eql(0)
+      expect(subject.mouse_current_location.x).to eql(20)
+      expect(subject.mouse_current_location.y).to eql(0)
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mac-robot
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - youpy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement