motion.h 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be4b20cc5a9df900392e473d3bffcc51f5e3a52d
-  data.tar.gz: 409003301af6fdc598cad5d2120568ab8791aefa
+  metadata.gz: 511528c649ad4a3843b64b4a92f5a8f4894d6210
+  data.tar.gz: 3ea00c01f5388e197681382011cf57f5413a358d
 SHA512:
-  metadata.gz: a8a11705edb6e7749d15e559d836faf5134ca7c9a22815ea6337248aca3370f34ecc3bfe572bc915d6d61e346d4b81b72dcf16067c0dc7a15a453df6694b3188
-  data.tar.gz: dd945be80a47f5c4880725ad978c58817ccaf37dbb4a8a80b2f6a2b80b2c7d01d91b58e8a0c539f5d46d2c46d79dfeb76f1d3b1b7d60df98992b03b351b14b7e
+  metadata.gz: 1d4bc836006f18b002eb46f4879b8f9361ac3f8f202cc3797f7492242cbb6d0f716d8937259450c9225b3c15748359128b3005d6841042af9ca3a3542cacb3ac
+  data.tar.gz: d28c3f961aa804f253b4dd143b3c3f2e1bff62e0bb0cfa8f3fa8ec8be49a2dda7a233c48e1f1cdbe7336c3d62d997721edc20b76d5d9714eea685a41b7980c6c

data/README.md

@@ -1,8 +1,8 @@
 # motion.h
 
-Expose iOS system C libraries in RubyMotion.
+Expose iOS and OS X system libraries in RubyMotion.
 
-Outside of the usual Apple frameworks, iOS includes many system C libraries,
+Outside of the usual Apple frameworks, iOS and OS X include many system libraries,
 with the most well known examples being [SQLite](http://www.sqlite.org/), and
 [Libxml2](http://www.xmlsoft.org/). RubyMotion provides the ability to directly
 call into C libraries through a mechanism called BridgeSupport, which takes us
@@ -49,8 +49,20 @@ end
 Example: Creating an in-memory database:
 
 ```ruby
-db = Pointer.new(Sqlite3.type)
-sqlite3_open(':memory', db)
+dbptr_out = Pointer.new(Sqlite3.type) # => sqlite3 **
+sqlite3_open(':memory:', dbptr_out)
+dbptr = dbptr_out.value # => sqlite3 *
+sqlite3_exec(dbptr, 'create table gems (name text)', nil, nil, nil)
+sqlite3_exec(dbptr, 'insert into gems values ("motion.h")', nil, nil, nil)
+callback = ->(_context, count, values_array_ptr, column_names_array_ptr) {
+  count.times do |column_number|
+    column_name = column_names_array_ptr[column_number]
+    value = values_array_ptr[column_number]
+    puts "#{column_name}: #{value.inspect}"
+  end
+  0 # sqlite3_exec requires 0 to continue
+}
+sqlite3_exec(dbptr, 'select * from gems', callback, nil, nil)
 ```
 
 ### Objective-C Runtime

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+
+task :default do
+  system 'gem uninstall -ax motion.h'
+  system 'gem build motion.h.gemspec'
+  system 'gem install ./motion.h-0.0.7.gem'
+end

data/lib/motion.h.rb

@@ -2,13 +2,31 @@ unless defined? Motion::Project::Config
   raise '"motion.h" must be required within a RubyMotion project Rakefile.'
 end
 
-class Motion::Project::Config
-  # @param [String] header_file Requested C header file.
-  # @param [Hash] options Options for customizing BridgeSupport file generation
-  # @option options [String] :prefix Subdirectory of /usr/include used for root of included header files.
-  # @option options [String] :bridgesupport_dir Path where the generated bridgesupport file is saved. Defaults to ./build
-  def include(header_file, options={})
-    MotionHeader.new(header_file, self, options).integrate
+module Motion::Project
+  class Config
+    # @param [String] header_file Requested C header file.
+    # @param [Hash] options Options for customizing BridgeSupport file generation
+    # @option options [String] :prefix Subdirectory of /usr/include used for root of included header files.
+    # @option options [String] :bridgesupport_dir Path where the generated bridgesupport file is saved. Defaults to ./build
+    def include(header_file, options={})
+      motion_h << MotionHeader.new(header_file, self, options).integrate
+    end
+
+    def motion_h
+      @motion_h ||= []
+    end
+  end
+
+  class App
+    class << self
+      def build_with_motion_h(platform, opts = {})
+        config.bridgesupport_files.concat(config.motion_h)
+        build_without_motion_h(platform, opts)
+      end
+
+      alias_method "build_without_motion_h", "build"
+      alias_method "build", "build_with_motion_h"
+    end
   end
 end
 
@@ -31,7 +49,7 @@ class MotionHeader
   def integrate
     verify_header_file
     generate_bridgesupport_file
-    @config.bridgesupport_files << bridgesupport_file
+    bridgesupport_file
   end
 
   def verify_header_file
@@ -42,16 +60,52 @@ class MotionHeader
   def generate_bridgesupport_file
     return if File.exist?(bridgesupport_file)
     Dir.mkdir(@bridgesupport_dir) unless Dir.exist?(@bridgesupport_dir)
-    `/usr/bin/gen_bridge_metadata --format complete --no-64-bit --cflags '-I#{include_path}' #{@header_file} > #{bridgesupport_file}`
+    cflags = [
+      "-I#{include_path}",
+      "-F#{frameworks_path}"
+    ]
+    if product_version >= catalina_version
+      cflags << "--isysroot #{isysroot_dir}"
+    end
+    Bundler.with_unbundled_env do
+      `/Library/RubyMotion/bin/gen_bridge_metadata --format complete --64-bit --cflags '#{cflags.join(' ')}' #{@header_file} > #{bridgesupport_file}`
+    end
+  end
+
+  def catalina_version
+    Gem::Version.new('10.15')
+  end
+
+  def product_version
+    Gem::Version.new(`sw_vers -productVersion`)
   end
 
   def include_path
-    path_components = [@config.xcode_dir, *sdk_dir(@config.sdk_version), 'usr', 'include', @prefix].compact
+    sdk_dir = sdk_dir(@config.sdk_version)
+    path_components = [@config.xcode_dir, *sdk_dir, 'usr', 'include', @prefix].compact
     File.join(*path_components)
   end
 
+  def frameworks_path
+    sdk_dir = sdk_dir(@config.sdk_version)
+    path_components = [@config.xcode_dir, *sdk_dir, 'System', 'Library', 'Frameworks'].compact
+    File.join(*path_components)
+  end
+
+  def isysroot_dir
+    case platform
+    when :ios then 'iPhoneOS'
+    when :osx then 'MacOSX'
+    end
+  end
+
   def sdk_dir(sdk_version)
-    ['Platforms', 'iPhoneOS.platform', 'Developer', 'SDKs', "iPhoneOS#{sdk_version}.sdk"]
+    case platform
+    when :ios
+      ['Platforms', 'iPhoneOS.platform', 'Developer', 'SDKs', "iPhoneOS#{sdk_version}.sdk"]
+    when :osx
+      ['Platforms', 'MacOSX.platform', 'Developer', 'SDKs', "MacOSX#{sdk_version}.sdk"]
+    end
   end
 
   def bridgesupport_file
@@ -59,4 +113,7 @@ class MotionHeader
     "#{@bridgesupport_dir}/#{file_name}.bridgesupport"
   end
 
+  def platform
+    Motion::Project::App.respond_to?(:template) ? Motion::Project::App.template : :ios
+  end
 end

data/motion.h.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "motion.h"
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.7'
   spec.authors       = ["Dave Lee"]
   spec.email         = ['dave@kastiglione.com']
-  spec.description   = 'Expose iOS system C libraries in RubyMotion'
-  spec.summary       = 'Expose iOS system C libraries in RubyMotion'
+  spec.description   = 'Expose iOS system C libraries in RubyMotion.'
+  spec.summary       = 'Expose iOS system C libraries in RubyMotion.'
   spec.homepage      = 'https://github.com/kastiglione/motion.h'
   spec.license       = "MIT"
 

metadata

@@ -1,51 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: motion.h
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Dave Lee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Expose iOS system C libraries in RubyMotion
+description: Expose iOS system C libraries in RubyMotion.
 email:
 - dave@kastiglione.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -56,25 +56,24 @@ homepage: https://github.com/kastiglione/motion.h
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 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: 2.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.5.2.3
+signing_key:
 specification_version: 4
-summary: Expose iOS system C libraries in RubyMotion
+summary: Expose iOS system C libraries in RubyMotion.
 test_files: []
-has_rdoc: