movewin 1.5 → 1.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmU4MmIyMzIxZGZiYjY4ODQ2NTQ4NDIxYWQ4ZjJlNTIwMjJhNmQyZA==
+  data.tar.gz: !binary |-
+    NWIxMjcyMDY0MzMxMzkzOTg0ZTI0MzI4ZmMxYmI5NjA0YTg0Mzk1Yg==
+SHA512:
+  metadata.gz: !binary |-
+    NmNkNmNhMWRiYmM2YTBhYTNhZTYwMGE2ZTZlYWU1YTJkMmRhNjY1MTljMDhh
+    MjUxODk1ODhkZTljODNhOGUyNzZmNzIxNDJiZmE4ZDI5ODRmYmQ0MDQ3ZDdl
+    YTI5MjE5ZDNmZDM0M2Y3ZTE3YmRiOGQzYWQwMTEyZDQ0NDZkNmY=
+  data.tar.gz: !binary |-
+    YWJmNjUyNWM0ODc0MTMwMGRlNWYzNzY4NGNkMmNlNjI1ZDQ0MzY0YmQ1YTMy
+    ZDBjZWE4MWNkNWM1MWIwOWU2ZjAzYjhkNjZmYjg4ODg3NDMwN2FkMjc3OWE1
+    ZWExN2JlNmY5MzhiZDYwZGMwNGYzODVlZjYwMWUxMTc1MGQzNDI=

data/ext/movewin/extconf.rb

@@ -1,13 +1,88 @@
+#!/usr/bin/env ruby
+
 require 'mkmf'
+require 'rubygems'
+
+def main(argv = [])
+  $CFLAGS = '-Wall'
+  $LDFLAGS = '-Wall -framework Carbon'
+
+  # No have_framework() in mkmf that ships with Ruby versions earlier than 1.9
+  if ruby_older_than?('1.9')
+    have_header('Carbon/Carbon.h')
+  else
+    have_framework('Carbon')
+  end
+
+  # On Yosemite or newer, fix bug in Carbon header that breaks under gcc
+  if yosemite_or_newer? && using_gcc?
+    fix_dispatch_object_header!
+  end
+
+  create_makefile('movewin/movewin_ext')
+end
+
+# Return true if current Ruby version is older than given version
+def ruby_older_than?(version)
+  Gem::Version.new(RUBY_VERSION) < Gem::Version.new(version)
+end
 
-# No have_framework() in mkmf that ships with Ruby versions earlier than 1.9
-RUBY_VERSIONS = RUBY_VERSION.split('.').collect { |s| s.to_i }
-unless RUBY_VERSIONS[0] < 1 || (RUBY_VERSIONS[0] == 1 && RUBY_VERSIONS[1] < 9)
-  have_framework('Carbon')
+# Return true if this is OS X 10.10 (Yosemite) or newer
+def yosemite_or_newer?
+  Gem::Version.new(`sw_vers -productVersion`) >= Gem::Version.new('10.10')
 end
-have_header('Carbon/Carbon.h')
 
-$CFLAGS = '-Wall'
-$LDFLAGS = '-Wall -framework Carbon'
+# Return true if our compiler is GCC (not clang), as for RVM installed Ruby
+def using_gcc?
+  true  # TODO: make this really work
+end
+
+# Building with GCC on Yosemite (OS X 10.10) results in an error
+# (https://github.com/andrewgho/movewin-ruby/issues/1).
+# Patch header file to work around this issue.
+def fix_dispatch_object_header!
+  srcfile = find_header_file('dispatch/object.h')
+  tmpfile = "#{File.dirname(__FILE__)}/dispatch/object.h.tmp.#{$$}"
+  begin
+    patched = false
+    File.open(tmpfile, 'w') do |tmpfh|
+      File.open(srcfile, 'r').each do |srcline|
+        patched ||= srcline.sub!(
+          /\Atypedef void \(\^dispatch_block_t\)\(void\);/,
+          'typedef void* dispatch_block_t;'
+        )
+        tmpfh.print(srcline)
+      end
+    end
+    if patched
+      destfile = "#{File.dirname(__FILE__)}/dispatch/object.h"
+      File.rename(tmpfile, destfile)
+      if $CFLAGS.nil? || $CFLAGS.empty?
+        $CFLAGS = "-I#{File.dirname(__FILE__)}"
+      else
+        $CFLAGS += " -I#{File.dirname(__FILE__)}"
+      end
+      set_constant!(:CLEANINGS, "CLEANFILES += dispatch/object.h\n" + CLEANINGS)
+    end
+  ensure
+    File.unlink(tmpfile) if File.exists?(tmpfile)
+  end
+end
+
+# Given an #include <foo/bar.h>, return actual filename /path/to/foo/bar.h
+def find_header_file(header)
+  # TODO: really crawl through cpp include path to find this
+  "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/#{header}"
+end
+
+# Redefine constant without warning (http://stackoverflow.com/q/3375360)
+class Object
+  def set_constant!(const, value)
+    mod = self.is_a?(Module) ? self : self.class
+    mod.send(:remove_const, const) if mod.const_defined?(const)
+    mod.const_set(const, value)
+  end
+end
 
-create_makefile('movewin/movewin_ext')
+# Run main loop and exit
+exit(main(ARGV))

data/lib/movewin.rb

@@ -36,7 +36,7 @@
 require 'movewin/movewin_ext'
 
 module MoveWin
-  VERSION = '1.5'
+  VERSION = '1.6'
 
   # Individual accessors for display size components
   def self.display_width;  MoveWin.display_size[0]; end

metadata

@@ -1,68 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: movewin
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 1
-  - 5
-  version: "1.5"
+version: !ruby/object:Gem::Version
+  version: '1.6'
 platform: ruby
-authors: 
+authors:
 - Andrew Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-10-31 00:00:00 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies: []
-
 description: List and move OS X windows from Ruby via the OS X accessibility APIs.
 email: andrew@zeuscat.com
 executables: []
-
-extensions: 
+extensions:
 - ext/movewin/extconf.rb
 extra_rdoc_files: []
-
-files: 
-- lib/movewin.rb
+files:
+- ext/movewin/extconf.rb
 - ext/movewin/movewin_ext.c
 - ext/movewin/winutils.c
 - ext/movewin/winutils.h
-- ext/movewin/extconf.rb
+- lib/movewin.rb
 homepage: https://github.com/andrewgho/movewin-ruby
-licenses: 
+licenses:
 - BSD-3-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: List and move OS X windows from Ruby
 test_files: []
-