u3d 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 813e4d8ddef2c11fe1a549b6d0aa09d5b9aab78f
-  data.tar.gz: ce1a8c173179537130883253e5e9b852e5540ac0
+  metadata.gz: 71adab2b2a03a3bc2b9d6af6dd6dd42cc02114d9
+  data.tar.gz: cb3f2acc27496edbf00ac8a2c5e942576ddb01f6
 SHA512:
-  metadata.gz: 4d5a77dba51fa0e6a859431c7fdbb66b66f5426548bd5797860f40bed1dda157a5b6e828b4e1a274c9ace30861a5dff5df12d77c5c4cc0b63cfa9197e92db899
-  data.tar.gz: a321d0da32d1151f831f31234d96c546b7ba2b92c1cac5364934197d4e2a76c384c7c647374ff772a9c7d245681c2d8957d54095d16e89d310bfeb766ddce639
+  metadata.gz: 482ad130cd557980293b600ff3b19818b28441705f99e5b17244bb6638c44a1ace808fdfd83798656b96644a3a8c86faca70ebb9acd27eaa797a72bface947aa
+  data.tar.gz: f19eae468d593e8ab1e64c4ce1224773e963c9020f09fd0857e59b9e5029ad83f63eb393372e59ff6a5195ceb5e3932c4310958d4e5e66b8060f4f32f3999777

data/.github_changelog_generator

@@ -1,4 +1,4 @@
-future-release=v1.0.7
+future-release=v1.0.8
 since-tag=v0.9
 exclude_tags_regex=v0\.[0-8]\..*
 exclude-labels=nochangelog

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## [v1.0.8](https://github.com/DragonBox/u3d/tree/v1.0.8) (2017-10-18)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.7...v1.0.8)
+
+**Fixed bugs:**
+
+- `install': uninitialized constant U3d::Globals \(NameError\) [\#166](https://github.com/DragonBox/u3d/issues/166)
+- u3d doesn't detect Unity version anterior to 5.0 on Windows [\#165](https://github.com/DragonBox/u3d/issues/165)
+
+**Merged pull requests:**
+
+- Fix Windows version detection for Unity4 \(fixes \#165\) [\#168](https://github.com/DragonBox/u3d/pull/168) ([niezbop](https://github.com/niezbop))
+- Fix module name issue for Globals call [\#167](https://github.com/DragonBox/u3d/pull/167) ([niezbop](https://github.com/niezbop))
+
 ## [v1.0.7](https://github.com/DragonBox/u3d/tree/v1.0.7) (2017-10-03)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.6...v1.0.7)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u3d (1.0.7)
+    u3d (1.0.8)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)

data/lib/u3d/commands.rb

@@ -127,7 +127,7 @@ module U3d
         verify_package_names(definition, packages)
 
         if options[:install]
-          U3d::Globals.use_keychain = true if options[:keychain] && Helper.mac?
+          U3dCore::Globals.use_keychain = true if options[:keychain] && Helper.mac?
           UI.important 'Root privileges are required'
           raise 'Could not get administrative privileges' unless U3dCore::CommandExecutor.has_admin_privileges?
         end

data/lib/u3d/installation.rb

@@ -1,167 +1,170 @@
-## --- BEGIN LICENSE BLOCK ---
-# Copyright (c) 2016-present WeWantToKnow AS
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-## --- END LICENSE BLOCK ---
-
-require 'u3d/utils'
-
-module U3d
-  UNITY_DIR_CHECK = /Unity_\d+\.\d+\.\d+[a-z]\d+/
-  UNITY_DIR_CHECK_LINUX = /unity-editor-\d+\.\d+\.\d+[a-z]\d+\z/
-
-  class Installation
-    def self.create(path: nil)
-      if Helper.mac?
-        MacInstallation.new path
-      elsif Helper.linux?
-        LinuxInstallation.new path
-      else
-        WindowsInstallation.new path
-      end
-    end
-  end
-
-  class MacInstallation < Installation
-    attr_reader :path
-
-    require 'plist'
-
-    def initialize(path: nil)
-      @path = path
-    end
-
-    def version
-      plist['CFBundleVersion']
-    end
-
-    def default_log_file
-      "#{ENV['HOME']}/Library/Logs/Unity/Editor.log"
-    end
-
-    def exe_path
-      "#{path}/Contents/MacOS/Unity"
-    end
-
-    def packages
-      if Utils.parse_unity_version(version)[0].to_i <= 4
-        # Unity < 5 doesn't have packages
-        return []
-      end
-      fpath = File.expand_path('../PlaybackEngines', path)
-      return [] unless Dir.exist? fpath # install without package
-      Dir.entries(fpath).select { |e| File.directory?(File.join(fpath, e)) && !(e == '.' || e == '..') }
-    end
-
-    def clean_install?
-      path =~ UNITY_DIR_CHECK
-    end
-
-    private
-
-    def plist
-      @plist ||= Plist.parse_xml("#{@path}/Contents/Info.plist")
-    end
-  end
-
-  class LinuxInstallation < Installation
-    attr_reader :path
-
-    def initialize(path: nil)
-      @path = path
-    end
-
-    def version
-      # I don't find an easy way to extract the version on Linux
-      require 'rexml/document'
-      fpath = "#{path}/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/ivy.xml"
-      raise "Couldn't find file #{fpath}" unless File.exist? fpath
-      doc = REXML::Document.new(File.read(fpath))
-      version = REXML::XPath.first(doc, 'ivy-module/info/@e:unityVersion').value
-      if (m = version.match(/^(.*)x(.*)Linux$/))
-        version = "#{m[1]}#{m[2]}"
-      end
-      version
-    end
-
-    def default_log_file
-      "#{ENV['HOME']}/.config/unity3d/Editor.log"
-    end
-
-    def exe_path
-      "#{path}/Editor/Unity"
-    end
-
-    def packages
-      false
-    end
-
-    def clean_install?
-      path =~ UNITY_DIR_CHECK_LINUX
-    end
-  end
-
-  class WindowsInstallation < Installation
-    attr_reader :path
-
-    def initialize(path: nil)
-      @path = path
-    end
-
-    def version
-      require 'rexml/document'
-      fpath = "#{path}/Editor/Data/PlaybackEngines/windowsstandalonesupport/ivy.xml"
-      raise "Couldn't find file #{fpath}" unless File.exist? fpath
-      doc = REXML::Document.new(File.read(fpath))
-      version = REXML::XPath.first(doc, 'ivy-module/info/@e:unityVersion').value
-
-      version
-    end
-
-    def default_log_file
-      if @logfile.nil?
-        begin
-          loc_appdata = Utils.windows_local_appdata
-          log_dir = File.expand_path('Unity/Editor/', loc_appdata)
-          UI.important "Log directory (#{log_dir}) does not exist" unless Dir.exist? log_dir
-          @logfile = File.expand_path('Editor.log', log_dir)
-        rescue RuntimeError => ex
-          UI.error "Unable to retrieve the editor logfile: #{ex}"
-        end
-      end
-      @logfile
-    end
-
-    def exe_path
-      File.join(@path, 'Editor', 'Unity.exe')
-    end
-
-    def packages
-      # Unity prior to Unity5 did not have package
-      return [] if Utils.parse_unity_version(version)[0].to_i <= 4
-      fpath = "#{path}/Editor/Data/PlaybackEngines/"
-      return [] unless Dir.exist? fpath # install without package
-      Dir.entries(fpath).select { |e| File.directory?(File.join(fpath, e)) && !(e == '.' || e == '..') }
-    end
-
-    def clean_install?
-      path =~ UNITY_DIR_CHECK
-    end
-  end
-end
+## --- BEGIN LICENSE BLOCK ---
+# Copyright (c) 2016-present WeWantToKnow AS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+## --- END LICENSE BLOCK ---
+
+require 'u3d/utils'
+
+module U3d
+  UNITY_DIR_CHECK = /Unity_\d+\.\d+\.\d+[a-z]\d+/
+  UNITY_DIR_CHECK_LINUX = /unity-editor-\d+\.\d+\.\d+[a-z]\d+\z/
+
+  class Installation
+    def self.create(path: nil)
+      if Helper.mac?
+        MacInstallation.new path
+      elsif Helper.linux?
+        LinuxInstallation.new path
+      else
+        WindowsInstallation.new path
+      end
+    end
+  end
+
+  class MacInstallation < Installation
+    attr_reader :path
+
+    require 'plist'
+
+    def initialize(path: nil)
+      @path = path
+    end
+
+    def version
+      plist['CFBundleVersion']
+    end
+
+    def default_log_file
+      "#{ENV['HOME']}/Library/Logs/Unity/Editor.log"
+    end
+
+    def exe_path
+      "#{path}/Contents/MacOS/Unity"
+    end
+
+    def packages
+      if Utils.parse_unity_version(version)[0].to_i <= 4
+        # Unity < 5 doesn't have packages
+        return []
+      end
+      fpath = File.expand_path('../PlaybackEngines', path)
+      return [] unless Dir.exist? fpath # install without package
+      Dir.entries(fpath).select { |e| File.directory?(File.join(fpath, e)) && !(e == '.' || e == '..') }
+    end
+
+    def clean_install?
+      path =~ UNITY_DIR_CHECK
+    end
+
+    private
+
+    def plist
+      @plist ||= Plist.parse_xml("#{@path}/Contents/Info.plist")
+    end
+  end
+
+  class LinuxInstallation < Installation
+    attr_reader :path
+
+    def initialize(path: nil)
+      @path = path
+    end
+
+    def version
+      # I don't find an easy way to extract the version on Linux
+      require 'rexml/document'
+      fpath = "#{path}/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/ivy.xml"
+      raise "Couldn't find file #{fpath}" unless File.exist? fpath
+      doc = REXML::Document.new(File.read(fpath))
+      version = REXML::XPath.first(doc, 'ivy-module/info/@e:unityVersion').value
+      if (m = version.match(/^(.*)x(.*)Linux$/))
+        version = "#{m[1]}#{m[2]}"
+      end
+      version
+    end
+
+    def default_log_file
+      "#{ENV['HOME']}/.config/unity3d/Editor.log"
+    end
+
+    def exe_path
+      "#{path}/Editor/Unity"
+    end
+
+    def packages
+      false
+    end
+
+    def clean_install?
+      path =~ UNITY_DIR_CHECK_LINUX
+    end
+  end
+
+  class WindowsInstallation < Installation
+    attr_reader :path
+
+    def initialize(path: nil)
+      @path = path
+    end
+
+    def version
+      require 'rexml/document'
+      # For versions >= 5
+      fpath = "#{path}/Editor/Data/PlaybackEngines/windowsstandalonesupport/ivy.xml"
+      # For versions < 5
+      fpath = "#{path}/Editor/Data/PlaybackEngines/wp8support/ivy.xml" unless File.exist? fpath
+      raise "Couldn't find file #{fpath}" unless File.exist? fpath
+      doc = REXML::Document.new(File.read(fpath))
+      version = REXML::XPath.first(doc, 'ivy-module/info/@e:unityVersion').value
+
+      version
+    end
+
+    def default_log_file
+      if @logfile.nil?
+        begin
+          loc_appdata = Utils.windows_local_appdata
+          log_dir = File.expand_path('Unity/Editor/', loc_appdata)
+          UI.important "Log directory (#{log_dir}) does not exist" unless Dir.exist? log_dir
+          @logfile = File.expand_path('Editor.log', log_dir)
+        rescue RuntimeError => ex
+          UI.error "Unable to retrieve the editor logfile: #{ex}"
+        end
+      end
+      @logfile
+    end
+
+    def exe_path
+      File.join(@path, 'Editor', 'Unity.exe')
+    end
+
+    def packages
+      # Unity prior to Unity5 did not have package
+      return [] if Utils.parse_unity_version(version)[0].to_i <= 4
+      fpath = "#{path}/Editor/Data/PlaybackEngines/"
+      return [] unless Dir.exist? fpath # install without package
+      Dir.entries(fpath).select { |e| File.directory?(File.join(fpath, e)) && !(e == '.' || e == '..') }
+    end
+
+    def clean_install?
+      path =~ UNITY_DIR_CHECK
+    end
+  end
+end

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.7'.freeze
+  VERSION = '1.0.8'.freeze
   DESCRIPTION = 'Provides numerous tools for installing, managing and running the Unity3D game engine from command line.'.freeze
   UNITY_VERSIONS_NOTE = "Unity3d uses the following version formatting: 0.0.0x0. The \'x\' can takes different values:\n"\
   "\t. 'f' are the main release candidates for Unity3d\n"\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -414,7 +414,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: U3d