visual_studio 0.0.0.1 → 0.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6891bd4f1a9085fae52467f5bed6cb34811db9c3
-  data.tar.gz: eaac0c5a88ec84b0d4c2557e0f4e2f08839bc5bd
+  metadata.gz: ecf6432e82f273c61131810726bac356c0fdab8a
+  data.tar.gz: cf7b56e584955844acd2d0cac638d2d910114d04
 SHA512:
-  metadata.gz: e1d832e5983dd2553dffb347019f0a3a2e2d79b228b2e9b9420de36533c0d396f46ceac2eaff1cfe991b6f0fceae8e50a04493d1ce13802b84e14269a3a5284b
-  data.tar.gz: 2fd6b8ef6f648f20b6df6dc7b4d263aad2b36b74fcd75158e51135a2f5fb6a15dfad0d3c029d3cdb260aa7fa4a05711d418fb1e359380ffcb3d7f3d96e136525
+  metadata.gz: 22280b6319f9fcba3b50bd5ad74c16f3dbdc7f5f0c4e6cae0fb2b78eb8a49355dd2ec2ed301694ca03da63d618e88666f78079f85ebe9a7c5eb65c3e5069e501
+  data.tar.gz: 03a0052124bef8d0f74b07acf4cbb19a853dd2cdc9e887c85ef3d7660a64cab38e73db55d7b88d8e5af23ed67c560cb4a67f89a4d756f5c944e6bea68f8723d7

data/.gitignore

@@ -3,3 +3,4 @@
 
 # RubyGems
 *.gem
+pkg/

data/lib/visual_studio.rb

@@ -1,82 +1,43 @@
 require 'hashie'
 
-class VisualStudio
-  NAMES           = ['vs2015', 'vs2013', 'vs2012', 'vs2010', 'vs2008', 'vs2005', 'vs2003', 'vs2002', 'vs6']
-  PRETTY_NAMES    = ['Visual Studio 2015', 'Visual Studio 2013', 'Visual Studio 2012', 'Visual Studio 2010',
-                     'Visual Studio 2008', 'Visual Studio 2005', 'Visual Studio .NET 2003', 'Visual Studio 6.0']
-  VERSIONS        = ['14.0', '12.0', '11.0', '10.0', '9.0', '8.0', '7.1', '7.0', '6.0']
-  NAME_TO_VERSION = Hash[NAMES.zip(VERSIONS)]
-  NAME_TO_PRETTY_NAME = Hash[NAMES.zip(PRETTY_NAMES)]
-  VERSION_TO_NAME = Hash[VERSIONS.zip(NAMES)]
+module VisualStudio
+  autoload :VERSION, 'visual_studio/version'
 
-  attr_reader :name
-  attr_reader :version
-  attr_reader :install
-  attr_reader :toolsets
-  attr_reader :sdks
+  autoload :Name, 'visual_studio/name'
+  autoload :Install, 'visual_studio/install'
 
-  def initialize(opts={})
-    require 'visual_studio/name'
-    @name = VisualStudio::Name.new(opts[:name], pretty: NAME_TO_PRETTY_NAME[opts[:name]])
-    @version = opts[:version]
-    @install = opts[:install]
-    @toolsets = opts[:toolsets]
-    @sdks = opts[:sdks]
-  end
+  NAMES = [VisualStudio::Name.new('vs2015', pretty: 'Visual Studio 2015'),
+           VisualStudio::Name.new('vs2013', pretty: 'Visual Studio 2013'),
+           VisualStudio::Name.new('vs2012', pretty: 'Visual Studio 2012'),
+           VisualStudio::Name.new('vs2010', pretty: 'Visual Studio 2010'),
+           VisualStudio::Name.new('vs2008', pretty: 'Visual Studio 2008'),
+           VisualStudio::Name.new('vs2005', pretty: 'Visual Studio 2005'),
+           VisualStudio::Name.new('vs2003', pretty: 'Visual Studio .NET 2003'),
+           VisualStudio::Name.new('vs2003', pretty: 'Visual Studio .NET 2002'),
+           VisualStudio::Name.new('vs6', pretty: 'Visual Studio 6.0')]
+
+  VERSIONS = %w{14.0 12.0 11.0 10.0 9.0 8.0 7.1 7.0 6.0}
+
+  NAME_TO_VERSION = Hash[NAMES.zip(VERSIONS)]
+  VERSION_TO_NAME = Hash[VERSIONS.zip(NAMES)]
 
   def self.available?
-    VERSIONS.any? { |version| installed?(version) }
+    VERSIONS.any? { |version| self.installed?(version) }
   end
 
   def self.installed?(name_or_version)
-    !!(find(name_or_version))
+    VisualStudio::Install.exists?(name_or_version)
   end
 
   def self.find(name_or_version)
-    return find_by_name(name_or_version) if NAMES.include?(name_or_version)
-    return find_by_version(name_or_version) if VERSIONS.include?(name_or_version)
+    VisualStudio::Install.find(name_or_version)
   end
 
   def self.find_by_name(name)
-    find_by_version(NAME_TO_VERSION[name]) if NAMES.include?(name)
+    VisualStudio::Install.find_by_name(name)
   end
 
   def self.find_by_version(version)
-    install = _find_install_via_registry(version)
-    return if install.nil?
-
-    # HACK(mtwilliams): Assume C/C++ is installed.
-    c_and_cpp = File.join(install, 'VC')
-    # TODO(mtwilliams): Search for other toolsets, notably C#.
-    csharp = nil # File.join(install, 'VC#')
-
-    # TODO(mtwilliams): Look for SDKs, including packaged ones.
-    sdk = nil # ...
-
-    # TODO(mtwilliams): Cache.
-    VisualStudio.new(name: VERSION_TO_NAME[version],
-                     version: version,
-                     install: install,
-                     toolsets: Hashie::Mash.new({
-                       c: c_and_cpp,
-                       cpp: c_and_cpp,
-                       csharp: csharp }),
-                     sdks: Hashie::Mash.new({
-                       windows: nil }))
+    VisualStudio::Install.find_by_version(version)
   end
-
-  private
-    def self._find_install_via_registry(version)
-      # TODO(mtwilliams): Try other products, like C#.
-      keys = ["SOFTWARE\\Microsoft\\VisualStudio\\#{version}\\Setup\\VC",
-              "SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\#{version}\\Setup\\VC"]
-      keys.each do |key|
-        begin
-          require 'win32/registry'
-          return File.expand_path(File.join(::Win32::Registry::HKEY_LOCAL_MACHINE.open(key, ::Win32::Registry::KEY_READ)['ProductDir'], '..')).to_s
-        rescue
-          return nil
-        end
-      end
-    end
 end

data/lib/visual_studio/install.rb

@@ -0,0 +1,69 @@
+module VisualStudio
+  class Install
+    attr_reader :name
+    attr_reader :version
+    attr_reader :install
+    attr_reader :toolsets
+    attr_reader :sdks
+
+    def initialize(opts={})
+      @name = opts[:name]
+      @version = opts[:version]
+      @install = opts[:install]
+      @toolsets = opts[:toolsets]
+      @sdks = opts[:sdks]
+    end
+
+    def self.exists?(name_or_version)
+      !!(find(name_or_version))
+    end
+
+    def self.find(name_or_version)
+      return find_by_name(name_or_version) if NAMES.include?(name_or_version)
+      return find_by_version(name_or_version) if VERSIONS.include?(name_or_version)
+    end
+
+    def self.find_by_name(name)
+      find_by_version(NAME_TO_VERSION[name]) if NAMES.include?(name)
+    end
+
+    def self.find_by_version(version)
+      install = _find_install_via_registry(version)
+      return if install.nil?
+
+      # HACK(mtwilliams): Assume C/C++ is installed.
+      c_and_cpp = File.join(install, 'VC')
+      # TODO(mtwilliams): Search for other toolsets, notably C#.
+      csharp = nil # File.join(install, 'VC#')
+
+      # TODO(mtwilliams): Look for SDKs, including packaged ones.
+      sdk = nil # ...
+
+      # TODO(mtwilliams): Cache.
+      VisualStudio::Install.new(name: VERSION_TO_NAME[version],
+                                version: version,
+                                install: install,
+                                toolsets: Hashie::Mash.new({
+                                  c: c_and_cpp,
+                                  cpp: c_and_cpp,
+                                  csharp: csharp }),
+                                sdks: Hashie::Mash.new({
+                                  windows: nil }))
+    end
+
+    private
+      def self._find_install_via_registry(version)
+        # TODO(mtwilliams): Try other products, like C#.
+        keys = ["SOFTWARE\\Microsoft\\VisualStudio\\#{version}\\Setup\\VC",
+                "SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\#{version}\\Setup\\VC"]
+        keys.each do |key|
+          begin
+            require 'win32/registry'
+            return File.expand_path(File.join(::Win32::Registry::HKEY_LOCAL_MACHINE.open(key, ::Win32::Registry::KEY_READ)['ProductDir'], '..')).to_s
+          rescue
+            return nil
+          end
+        end
+      end
+  end
+end

data/lib/visual_studio/name.rb

@@ -1,9 +1,9 @@
-class VisualStudio
+module VisualStudio
   class Name < String
     attr_reader :pretty
     def initialize(name, opts={})
       super(name)
-      @pretty = opts[:pretty] || nil
+      @pretty = opts[:pretty] if opts[:pretty]
     end
   end
 end

data/lib/visual_studio/version.rb

@@ -0,0 +1,11 @@
+class VisualStudio
+  module VERSION #:nodoc:
+    MAJOR, MINOR, PATCH, PRE = [0, 0, 0, 2]
+    STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+  end
+
+  # Returns the semantic version of `visual_studio`.
+  def self.version
+    VisualStudio::VERSION::STRING
+  end
+end

data/visual_studio.gemspec

@@ -1,9 +1,9 @@
 $:.push File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
-require 'visual_studio/gem/version'
+require 'visual_studio/version'
 
 Gem::Specification.new do |s|
   s.name              = 'visual_studio'
-  s.version           = VisualStudio::Gem.version
+  s.version           = VisualStudio.version
   s.platform          = Gem::Platform::RUBY
   s.author            = 'Michael Williams'
   s.email             = 'm.t.williams@live.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visual_studio
 version: !ruby/object:Gem::Version
-  version: 0.0.0.1
+  version: 0.0.0.2
 platform: ruby
 authors:
 - Michael Williams
@@ -79,8 +79,9 @@ files:
 - README.md
 - Rakefile
 - lib/visual_studio.rb
-- lib/visual_studio/gem/version.rb
+- lib/visual_studio/install.rb
 - lib/visual_studio/name.rb
+- lib/visual_studio/version.rb
 - visual_studio.gemspec
 - visual_studio.sublime-project
 homepage: https://github.com/mtwilliams/visual_studio

data/lib/visual_studio/gem/version.rb

@@ -1,13 +0,0 @@
-class VisualStudio
-  module Gem
-    module VERSION #:nodoc:
-      MAJOR, MINOR, PATCH, PRE = [0, 0, 0, 1]
-      STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
-    end
-
-    # Returns the semantic version of Visual Studio.
-    def self.version
-      VisualStudio::Gem::VERSION::STRING
-    end
-  end
-end