xcinvoke 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5801a55bb74f9fc80bc999371bfa4076e9b7cf7b
-  data.tar.gz: 4d83ebf8936738acf25c676e600ffe234adb85e5
+  metadata.gz: 3bae7231afd1f410041f2cd6a06aa33a0649c9e6
+  data.tar.gz: 046dd15b60a8aa1ef6caeab70cd9927b6af3596a
 SHA512:
-  metadata.gz: b317b87f5b74c579ab3977e5a0b7e6449069a5f59a0a32314cb0040d4f3a5382658a46998e764e3d20d1b27c4380fc3be7fe888612a775b21f0f1e3d01c62219
-  data.tar.gz: 1d060b6f26b1912d9d16f718297cbe92e6310331cd11653bc1c64f8ec73bce19faf396d2955e796c2e91ff978315ef4e0f608b41be1b6e1db651442da4f04d6b
+  metadata.gz: 56b5ab6ed2588eee66f8f3247b890d4ffd1e50bed5e3c94aef841d3be8b7ce6654b16d891b9f5adb89de2c2c4d779cf49ce2e66306bd30222d00024030006a0a
+  data.tar.gz: 0bf2bc085ac3f97d0bd51f815627d7a04256809a846cd129388634c10d35f6721d012877339d76f3e7811631040d8227ed02e0f5ff8687e8efbd2b9eb6ac718c

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.2.0
+
+##### Enhancements
+
+* Return `Xcode#swift_version` as a `Version` object.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+##### Bug Fixes
+
+* The entirety of `DYLD_FRAMEWORK_PATH` and `DYLD_LIBRARY_PATH` are no longer
+  overwritten in the generated Xcode environment.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 0.1.0
 
 ##### Enhancements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xcinvoke (0.1.0)
+    xcinvoke (0.2.0)
       liferaft (~> 0.0.4)
 
 GEM

data/lib/xcinvoke/version.rb

@@ -1,3 +1,3 @@
 module XCInvoke
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/xcinvoke/xcode.rb

@@ -49,12 +49,13 @@ module XCInvoke
     end
 
     def self.find_swift_version(swift_version)
+      swift_version = Gem::Version.create(swift_version)
       select { |xc| xc.swift_version == swift_version }.sort.last
     end
 
     def swift_version
       info = swift_info
-      info.first if info
+      Gem::Version.new(info.first) if info
     end
 
     def build_number
@@ -63,25 +64,34 @@ module XCInvoke
     end
 
     def version
-      Liferaft::Version.new(build_number)
+      build = build_number
+      Liferaft::Version.new(build) if build
     end
 
     def <=>(other)
       version <=> other.version
     end
 
-    def xcrun(cmd, env: {})
+    def xcrun(cmd, env: {}, err: false)
       env = env.merge(as_env)
       cmd = %w(xcrun) + cmd
-      output, = Open3.capture2(env, *cmd, err: '/dev/null')
-      output
+      case err
+      when :merge
+        oe, = Open3.capture2e(env, *cmd)
+        oe
+      else
+        o, e, = Open3.capture3(env, *cmd)
+        err ? [o, e] : o
+      end
     end
 
     def as_env
       {
         'DEVELOPER_DIR' => developer_dir.to_path,
-        'DYLD_FRAMEWORK_PATH' => dyld_framework_path.to_path,
-        'DYLD_LIBRARY_PATH' => dyld_library_path.to_path,
+        'DYLD_FRAMEWORK_PATH' =>
+          unshift_path(ENV['DYLD_FRAMEWORK_PATH'], dyld_framework_path),
+        'DYLD_LIBRARY_PATH' =>
+          unshift_path(ENV['DYLD_LIBRARY_PATH'], dyld_library_path),
       }
     end
 
@@ -106,5 +116,11 @@ module XCInvoke
       return unless xcrun(%w(swift --version)) =~ swift_info_regex
       [Regexp.last_match(1), Regexp.last_match(2)]
     end
+
+    def unshift_path(paths, path)
+      paths = (paths || '').split(File::PATH_SEPARATOR)
+      paths.unshift(path.to_s)
+      paths.join(File::PATH_SEPARATOR)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcinvoke
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel E. Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liferaft