movewin 1.8 → 1.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTNkNjFiZmZlMzU5OGY3ZjBmZDhmNDVhODAwMWE4ZWUyOTY3MTY3Zg==
+    NWFkNzU4Yzc0MzdjNGJhMDhmOTIxMzdmNDVmNGZmMjI4MTQ2ODIxNA==
   data.tar.gz: !binary |-
-    NjliNzQwMTIzYjE4ZGVlOTcwNzc2YjFiNzBmOGFhNjAxYTg5ZDc3OQ==
+    N2VmYjRiN2M5NzEyZWI3MzAzYTU5ZDExZjNkNjlkN2MwMTQ4NWRjZA==
 SHA512:
   metadata.gz: !binary |-
-    NjY3MmI1MjA3MWJlZjM5MDg5NzA0ZTEwOTYzZWUyYmM0NjBmZjNjY2Y4ZWVh
-    MGFlMTUxNmMyN2I3YTM1ODNhODliMWRiMzY1Njc0ZjliZTE4M2NiNDVjZmVj
-    NGQzODE0MDJlMDJhYTI0ZjE2NGM0ZGRiYTJkMzc3NzdjMjgyZjU=
+    OTMwZWRiNWUzNzYxMDUzNmQ3NjkwZmM1ZGRjYTcxZmU2ODU0ZjE1ODYwMDJj
+    ZDUwZjYyNDZkYzVlM2ZlZDM2MDI2N2I5NGYxYmI5MTg1Y2FlYmExNTcyMWE5
+    ZTZiZThlMzFhZWVkMjFjYzFkMDE1MWQ5NzczY2RhZWU5MDk4NTE=
   data.tar.gz: !binary |-
-    YmM4OTc2YmZlZTY0MzcxZDAyNDEyODY5ZWJjYThlOWE3MjU5ZjIxMTA3ZmU3
-    YzU4YWM4NjI1MTUwZmRjYzE0YzQ5MDY4OGVmZDc5Y2E4YThmYjMzYzQ1NTY5
-    NjU5YjZiZmFjYTg3YzZjNjRmYmQ0ZGQ1MTIxNDE4MTYxYmYyNjg=
+    ZWEyY2IyMTgxOWNiNzE0NjQ0Njc3NWRlNjdjNDNiMGFhNDJjNjM2ZjFhMTY5
+    NjIyMjAwMzIwN2Y5N2YyMDUwMmUxOTQ4ZGIxNjJjMjA3NjVhYTc3MjU4MTVk
+    ZDExYmY0MTlkMTMyN2ZmZTUxMGUwOWViN2I5ZTEzNTJmY2YwYmE=

data/ext/movewin/extconf.rb

@@ -22,48 +22,116 @@ def yosemite_or_newer?
   Gem::Version.new(`sw_vers -productVersion`) >= Gem::Version.new('10.10')
 end
 
-# Return true if our compiler is GCC (not clang), as for RVM installed Ruby
+# Return true if our compiler is GCC (not Clang), as for RVM installed Ruby
 def using_gcc?
-  true  # TODO: make this really work
+  # Match gcc, /usr/local/bin/gcc-4.2, etc. (Clang is "xcrun cc")
+  File.basename(RbConfig::MAKEFILE_CONFIG["CC"]).match(/\Agcc\b/)
 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)
+  $stdout.print 'Creating patched copy of dispatch/object.h... '
+  $stdout.flush
+  status = 'failed'
+  if (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
-    end
-    if patched
-      destfile = "#{File.dirname(__FILE__)}/dispatch/object.h"
-      File.rename(tmpfile, destfile)
-      if $CFLAGS.nil? || $CFLAGS.empty?
-        $CFLAGS = "-I#{File.dirname(__FILE__)}"
+      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,
+          "DISTCLEANFILES += dispatch/object.h\n" + CLEANINGS
+        status = "patched #{destfile}"
       else
-        $CFLAGS += " -I#{File.dirname(__FILE__)}"
+        status = 'skipped'
       end
-      set_constant! :CLEANINGS,
-        "DISTCLEANFILES += dispatch/object.h\n" + CLEANINGS
+    ensure
+      File.unlink(tmpfile) if File.exists?(tmpfile)
     end
-  ensure
-    File.unlink(tmpfile) if File.exists?(tmpfile)
+  else
+    status = 'header not found'
   end
+  $stdout.puts status
+  $stdout.flush
 end
 
-# Given an #include <foo/bar.h>, return actual filename /path/to/foo/bar.h
+# Given an #include <dispatch/object.h>, return actual filename
+# /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/dispatch/object.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}"
+  filename = nil
+  header_include_paths.each do |path|
+    maybe_filename = "#{path}/#{header}"
+    if File.exists?(maybe_filename)
+      filename = maybe_filename
+      break
+    end
+  end
+  filename
+end
+
+# Return GCC header include path
+# (http://stackoverflow.com/a/19839946, http://stackoverflow.com/a/19852298)
+# gcc -Wp,-v -xc /dev/null -fsyntax-only 2>&1
+def header_include_paths
+  cmd = RbConfig::MAKEFILE_CONFIG["CC"]
+  args = %w{-Wp,-v -xc /dev/null -fsyntax-only}
+  paths = []
+  reading_paths = false
+  run_command(cmd, *args) do |line|
+    line.chomp!
+    if reading_paths
+      if line == 'End of search list.'
+        reading_paths = false
+      elsif line.match(/\A /)
+        line.strip!
+        line.sub!(/\s+\(framework directory\)\Z/, '')
+        paths << line
+      end
+    elsif line == '#include <...> search starts here:'
+      reading_paths = true
+    end
+  end
+  paths
+end
+
+# Safely run a command with no shell escapes, pass output lines to callback
+def run_command(cmd, *args)
+  raise ArgumentError.new('missing required cmd to run') if cmd.nil?
+  rd, wr = IO.pipe
+  if fork
+    wr.close
+    if block_given?
+      rd.each { |line| yield(line) }
+    else
+      rd.read
+    end
+    rd.close
+    Process.wait
+  else
+    rd.close
+    $stdout.reopen(wr)
+    $stderr.reopen(wr)
+    exec cmd, *args
+    raise "exec #{cmd} failed"
+  end
+  $? == 0 # return a bool indicating a successful exit
 end
 
 # Redefine constant without warning (http://stackoverflow.com/q/3375360)

data/lib/movewin.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: movewin
 version: !ruby/object:Gem::Version
-  version: '1.8'
+  version: '1.9'
 platform: ruby
 authors:
 - Andrew Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-11-07 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