visual_studio 0.0.0.5 → 0.0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6aaa1737a0db9d1ec348f2076a8e1c29b4bad09
-  data.tar.gz: 0ba390804d52e478e005492b32a351fe23a69a3a
+  metadata.gz: 40f26054ca552b0d0f0215323683f4fdbe850693
+  data.tar.gz: 980f9dff84fbbe766fee4692939d3fce7c3476f3
 SHA512:
-  metadata.gz: 45e9a9716350c82a74f707ff0085994719f2f604e4c3ba06d112fbc01cd98ffab4d2be19aac77207c5bd0e91fb6029ebc016f16821e081eec707a0e76fcff9c9
-  data.tar.gz: 80249bc85d3f3b2fbf0c3f96ede80a0e279c2a6fb97f8ecd8ad04e3d533d479d6114ff7b8845bf0a488dc156221f26511c8025a0a5822a6125ef70c3b1791728
+  metadata.gz: e6f49ec8e989dd15173293ee3c19ca242c454b29aba857c444c27c7ebf34c62054e7f9935f7b118c248bf14e39a4d41d9696b388a04108e0b8e4db5c5bdfc442
+  data.tar.gz: fec2c8dfd37b1f174a470d18c287cb164df32a785b51600ebaace30a217e70934927b94d0f4374019aa499c6ce0c114fa7778e02d7b103bb761bcdefcbf7e13f

data/lib/visual_studio.rb

@@ -27,6 +27,7 @@ module VisualStudio
 
   require 'visual_studio/install'
   require 'visual_studio/product'
+  require 'visual_studio/environment'
 
   require 'visual_studio/sdks/windows'
 

data/lib/visual_studio/environment.rb

@@ -0,0 +1,34 @@
+module VisualStudio
+  module Environment
+    SEARCH_DIRECTORIES = ['PATH', 'INCLUDE', 'LIB', 'LIBPATH']
+
+    def self.merge(base, overlay)
+      # TODO(mtwilliams): Verify match-up between VCInstallDir and VisualStudioVersion?
+      # TODO(mtwilliams): Rederive environment variables based on VCInstallDir and/or WindowsSdkDir.
+      env = base.to_h.merge(overlay.to_h) do |variable, base, overlay|
+        if SEARCH_DIRECTORIES.include? variable
+          # TODO(mtwilliams): Detect new Visual Studio or Windows SDK related
+          # paths and replace the old ones based on that.
+          base    = base.split(';')
+          overlay = overlay.split(';')
+
+          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
+          # disastrous effects.
+          base = base.reject{|p| p=='.'}.map{|p| File.expand_path(p)}
+          overlay = overlay.reject{|p| p=='.'}.map{|p| File.expand_path(p)}
+
+          path = base | overlay
+          path = ['.'] + path if cwd
+
+          path.join(';')
+        else
+          # Default to the overlay, or right-hand side.
+          overlay
+        end
+      end
+    end
+  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, 5]
+      MAJOR, MINOR, PATCH, PRE = [0, 0, 0, 6]
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visual_studio
 version: !ruby/object:Gem::Version
-  version: 0.0.0.5
+  version: 0.0.0.6
 platform: ruby
 authors:
 - Michael Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -65,6 +65,7 @@ files:
 - README.md
 - Rakefile
 - lib/visual_studio.rb
+- lib/visual_studio/environment.rb
 - lib/visual_studio/gem.rb
 - lib/visual_studio/helpers/pretty_string.rb
 - lib/visual_studio/install.rb