mac-robot 0.5.2 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9855222330a767946be0b647797086cda4513eee3813e87d5aa6b0a7ed246b1b
-  data.tar.gz: 549a65285d0ef8f09c8f1a07054973f7bc317a9f039b0957ebe4fe7a79b27ea7
+  metadata.gz: 60baeb22867d9f1b436e4ab27cf588224f168aa1fa26db06bc1b8750b92d784c
+  data.tar.gz: 0c86df74a65049916202344feeeaa727fafdd6c6442f118cc538c950a64e0471
 SHA512:
-  metadata.gz: 499ef63790c67f397444e6cb88f4a7d533d0313cd94be3d4f95e1b9c54a5ff68e01ad701340f82a483ca4683dcb4874e26f3fcd6ae50cb4dedb173cdb8e1a68c
-  data.tar.gz: b21908c6e3069ea74d7d32e7ad61d7f475144d046c077b2de18c82b85373ae24ba2bbcad1e039c7ba9c9dfcb389d639404e39907ada83efb05e85143a0e01fd0
+  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 "jeweler", "~> 2.3.9"
+  gem "juwelier", "~> 2.4.9"
 end

data/Gemfile.lock

@@ -1,44 +1,63 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.1.3)
-    faraday (0.9.2)
+    diff-lcs (1.4.4)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    git (1.8.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    git (1.11.0)
       rchardet (~> 1.8)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
+    github_api (0.19.0)
+      addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
+      faraday (>= 0.8, < 2)
+      hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    hashie (4.1.0)
+    hashie (3.6.0)
     highline (2.0.3)
-    jeweler (2.3.9)
+    json (2.5.1)
+    juwelier (2.4.9)
       builder
       bundler
-      git (>= 1.2.5)
-      github_api (~> 0.16.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
+      git
+      github_api
+      highline
+      kamelcase (~> 0)
+      nokogiri
       psych
       rake
       rdoc
       semver2
-    json (2.5.1)
-    jwt (2.2.2)
-    mime-types (2.99.3)
-    mini_portile2 (2.5.0)
+    jwt (2.3.0)
+    kamelcase (0.0.2)
+      semver2 (~> 3)
+    mini_portile2 (2.8.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.11.3)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
@@ -46,20 +65,27 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.3.1)
-    racc (1.5.2)
-    rack (2.2.3)
-    rake (10.5.0)
+    psych (4.0.2)
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    rack (2.2.3.1)
+    rake (13.0.6)
     rchardet (1.8.0)
-    rdoc (6.3.0)
-    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)
+    rdoc (6.3.3)
+    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)
 
@@ -68,10 +94,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  jeweler (~> 2.3.9)
   json (~> 2.5.1)
-  rake (< 11.0)
-  rspec (~> 2.8.0)
+  juwelier (~> 2.4.9)
+  rake (>= 12.3.3)
+  rspec (~> 3.10.0)
 
 BUNDLED WITH
    2.1.4

data/Rakefile

@@ -11,8 +11,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "mac-robot"
   gem.homepage = "http://github.com/youpy/mac-robot"
@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["youpy"]
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 # rule to build the extension: this says
 # that the extension should be rebuilt
@@ -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.2
+0.5.5

data/ext/event_dispatcher/event_dispatcher.h

@@ -1,2 +1,2 @@
 #include <ruby/ruby.h>
-#import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>

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

@@ -1,18 +1,16 @@
-require 'event_dispatcher.h'
-require 'util.h'
+require 'event_dispatcher'
+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.2
+  version: 0.5.5
 platform: ruby
 authors:
 - youpy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-16 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
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.9
+        version: 2.4.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.9
+        version: 2.4.9
 description: A Library to Automate User Interactions
 email: youpy@buycheapviagraonlinenow.com
 executables: []