visual_studio 0.0.0.6 → 0.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40f26054ca552b0d0f0215323683f4fdbe850693
-  data.tar.gz: 980f9dff84fbbe766fee4692939d3fce7c3476f3
+  metadata.gz: 38c15ded9a23970f8ebd645bae32928356583bcb
+  data.tar.gz: 015f9f7e2367f5623b8fa49aa86d8d3d6c047721
 SHA512:
-  metadata.gz: e6f49ec8e989dd15173293ee3c19ca242c454b29aba857c444c27c7ebf34c62054e7f9935f7b118c248bf14e39a4d41d9696b388a04108e0b8e4db5c5bdfc442
-  data.tar.gz: fec2c8dfd37b1f174a470d18c287cb164df32a785b51600ebaace30a217e70934927b94d0f4374019aa499c6ce0c114fa7778e02d7b103bb761bcdefcbf7e13f
+  metadata.gz: 08d288974cf0bf71856357445f97515c5004059970120161aa912d7c1b924812267850ca06ffb096289b0da3d097b7f49adbe30d3b9f27917e2a1d77e7b3237f
+  data.tar.gz: 96e52c28e3201f69dfd979cc4bcc1794be2f0e95feaaa67d6d3e63597b9bb1c5ae40da4540ba14e52e39787feb7e3ce8e97f6622dd17fd72499caef5b93b7b6b

data/lib/visual_studio/environment.rb

@@ -12,7 +12,7 @@ module VisualStudio
           base    = base.split(';')
           overlay = overlay.split(';')
 
-          cwd = base.include?('.') || overlay.include?('.')
+          should_include_cwd = base.include?('.') || overlay.include?('.')
 
           # HACK(mtwilliams): We're using File.expand_path here to "normalize"
           # paths to prevent duplicates, but this could very likely have
@@ -21,11 +21,11 @@ module VisualStudio
           overlay = overlay.reject{|p| p=='.'}.map{|p| File.expand_path(p)}
 
           path = base | overlay
-          path = ['.'] + path if cwd
+          path = ['.'] + path if should_include_cwd
 
           path.join(';')
         else
-          # Default to the overlay, or right-hand side.
+          # Right-hand side takes precedence.
           overlay
         end
       end

data/lib/visual_studio/gem.rb

@@ -41,7 +41,7 @@ module VisualStudio
     end
 
     module VERSION #:nodoc:
-      MAJOR, MINOR, PATCH, PRE = [0, 0, 0, 6]
+      MAJOR, MINOR, PATCH, PRE = [0, 1, 0, 0]
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
     end
 

data/lib/visual_studio/product.rb

@@ -24,9 +24,37 @@ module VisualStudio
       @supports  = desc[:supports]
     end
 
+    def environment(opts={})
+      # TODO(mtwilliams): Raise an exception.
+      return nil unless @name.to_s == 'VC'
+
+      # HACK(mtwilliams): We should reimplement this logic inside this gem.
+      require 'open3'
+      require 'json'
+
+      target = opts[:target] || {platform: :windows,
+                                 architecture: :x86}
+      # TODO(mtwilliams): Handle other platforms.
+      platform = :windows
+      arch = {:x86 => 'x86', :x86_64 => 'amd64', :arm => 'arm'}[target[:architecture]]
+      # TODO(mtwilliams): Check if the architecture is supported.
+       # @supports.include?(target[:architecture])
+
+      delim = "d33b66512b1a01e9e3ee46e5f96a8036"
+      cmd   = "call \"#{File.join(@root, 'vcvarsall.bat')}\" #{arch} & " +
+              "echo puts '#{delim}'; require('json'); print JSON.generate(ENV.to_h); | ruby\n"
+      out, _, status = Open3.capture3(opts[:base] || ENV.to_h, "cmd.exe /C \"#{cmd}\"")
+      return nil unless status == 0
+
+      env = JSON.parse(out.split(delim)[1])
+      env = VisualStudio::Environment.merge(env, opts[:overlay] || {})
+
+      env
+    end
+
     def self.find(product, version)
       if VisualStudio::Product::NAMES.include?(product)
-        name = Helpers::PrettyString.new VisualStudio::VERSION_TO_NAME[version],
+        name = Helpers::PrettyString.new product,
                                          pretty: VisualStudio::VERSION_TO_PRETTY_NAME[version]
 
         root = self._find_via_registry(product, version)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visual_studio
 version: !ruby/object:Gem::Version
-  version: 0.0.0.6
+  version: 0.1.0.0
 platform: ruby
 authors:
 - Michael Williams