u3d 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0c7e57e6b80d3937d00e39ce113ef2ba676983f
-  data.tar.gz: 8000266d69992a3f6e33a51b869174b9f08d6cba
+  metadata.gz: a0c1e2820005f0cd8619bbf7a31012dae404676a
+  data.tar.gz: 296a26b08f4a9e31e77bf7e2eecc8fe949f042d9
 SHA512:
-  metadata.gz: c71fa8f7124dcb6bd941feb32727c01e24b9b967c6c1a1065c05df1f779bbb058a94b196f0402f0dcf7df7341913302575026fc6403ff9573c8f6d9eea807147
-  data.tar.gz: 135902654a913d2a7bdbce289a330d2bb9409ee07fd7df3d07c2b0f6c6de1bce8d89d161df2372d7fd5281acde8adb538b8af9378a9678f9e84f9b5910458e53
+  metadata.gz: 56e9c29febfd62bf0ccb7a3e33966a7100638b5583a84e7ca10f0a2f6ea0418325338ec5b78db23d8498b8f5a1442102ef85e452fbaab0c9d3bc4b93927f6b4a
+  data.tar.gz: b563408cdeade18fccaae5896c5d3f330a099a3d11534e672e3d41d8322c20c556a7e3ddecab4b86c0eecd60e7431ea02b20b3f8a45b1c1c2054628c6bfded61

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## [v1.0.12](https://github.com/DragonBox/u3d/tree/v1.0.12) (2018-01-03)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.11...v1.0.12)
+
+**Implemented enhancements:**
+
+- Incorrect package check downloads and reinstalls it [\#198](https://github.com/DragonBox/u3d/issues/198)
+
+**Fixed bugs:**
+
+- u3d/install enforce\_setup\_coherence interferes with download only operation [\#206](https://github.com/DragonBox/u3d/issues/206)
+- Fix unity\_version argument of fastlane plugin u3d type [\#193](https://github.com/DragonBox/u3d/pull/193) ([niezbop](https://github.com/niezbop))
+
+**Merged pull requests:**
+
+- u3d/install: download only should not filter out already installed packages \(fixes \#206\) [\#208](https://github.com/DragonBox/u3d/pull/208) ([lacostej](https://github.com/lacostej))
+- u3d/install: help fixes [\#207](https://github.com/DragonBox/u3d/pull/207) ([lacostej](https://github.com/lacostej))
+- u3d/install: do not reinstall already installed packages [\#202](https://github.com/DragonBox/u3d/pull/202) ([niezbop](https://github.com/niezbop))
+- u3d/install: describe how password can be passed to u3d \(fixes \#200\) [\#201](https://github.com/DragonBox/u3d/pull/201) ([lacostej](https://github.com/lacostej))
+
 ## [v1.0.11](https://github.com/DragonBox/u3d/tree/v1.0.11) (2017-12-07)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.10...v1.0.11)
 
@@ -9,6 +28,7 @@
 
 **Merged pull requests:**
 
+- Preparing release for 1.0.11 [\#192](https://github.com/DragonBox/u3d/pull/192) ([lacostej](https://github.com/lacostej))
 - doc: explain CI setup with jenkins [\#191](https://github.com/DragonBox/u3d/pull/191) ([lacostej](https://github.com/lacostej))
 - u3d/run: fail with a proper message when opening a Unity4 project [\#187](https://github.com/DragonBox/u3d/pull/187) ([lacostej](https://github.com/lacostej))
 
@@ -22,7 +42,6 @@
 **Closed issues:**
 
 - u3d/install: confusing "-p not available on linux" message [\#181](https://github.com/DragonBox/u3d/issues/181)
-- Linux CLI Activation in Unity \>= 5.4 [\#176](https://github.com/DragonBox/u3d/issues/176)
 - u3d/install: already installed packages are reinstalled [\#161](https://github.com/DragonBox/u3d/issues/161)
 
 **Merged pull requests:**

data/Gemfile.lock

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

data/fastlane-plugin-u3d/lib/fastlane/plugin/u3d/actions/u3d_action.rb

@@ -57,7 +57,7 @@ module Fastlane
                                   env_name: "U3D_VERSION",
                                description: "Unity version",
                                   optional: true,
-                                      type: Array),
+                                      type: String),
           FastlaneCore::ConfigItem.new(key: :raw_logs,
           #                       env_name: "U3D_YOUR_OPTION",
                                description: "Disable u3d log parsing",

data/lib/u3d/commands.rb

@@ -311,36 +311,39 @@ module U3d
         nil
       end
 
+      # rubocop:disable Metrics/BlockNesting
       def enforce_setup_coherence(packages, options, unity, definition)
         if options[:all]
           packages.clear
           packages.concat(definition.available_packages)
         end
-        if unity
-          UI.important "Unity #{unity.version} is already installed"
-          # Not needed since Linux custom u3d files contain only one entry wich is Unity
-          # return false if definition.os == :linux
-          if packages.include?('Unity')
-            UI.important 'Ignoring Unity module, it is already installed'
-            packages.delete('Unity')
-
-            # FIXME: Move me to the WindowsInstaller
-            options[:installation_path] ||= unity.root_path if definition.os == :win
-          end
-          if unity.packages
-            unity.packages.each do |pack|
-              UI.important "Ignoring #{pack} module, it is already installed" if packages.delete(pack)
+        if options[:install]
+          if unity
+            UI.important "Unity #{unity.version} is already installed"
+            # Not needed since Linux custom u3d files contain only one entry wich is Unity
+            # return false if definition.os == :linux
+            if packages.include?('Unity')
+              UI.important 'Ignoring Unity module, it is already installed'
+              packages.delete('Unity')
+
+              # FIXME: Move me to the WindowsInstaller
+              options[:installation_path] ||= unity.root_path if definition.os == :win
+            end
+            packages.select { |pack| unity.package_installed?(pack) }.each do |pack|
+              packages.delete pack
+              UI.important "Ignoring #{pack} module, it is already installed"
+            end
+            return false if packages.empty?
+          else
+            unless packages.include?('Unity')
+              UI.error 'Please install Unity before any of its packages'
+              return false
             end
-          end
-          return false if packages.empty?
-        else
-          unless packages.include?('Unity')
-            UI.error 'Please install Unity before any of its packages'
-            return false
           end
         end
         true
       end
+      # rubocop:enable Metrics/BlockNesting
 
       def get_administrative_privileges(options)
         U3dCore::Globals.use_keychain = true if options[:keychain] && Helper.mac?

data/lib/u3d/commands_generator.rb

@@ -122,8 +122,8 @@ Fore more information about how the rules work, see https://github.com/DragonBox
       end
 
       command :install do |c|
-        c.syntax = 'u3d install [<version>] [ [-p | --packages <package> ...] | [-a | --all] ] [ [-n | --no_install] [-i | --installation_path <path>] ]'
-        c.summary = "Download (and/or) install Unity3D packages."
+        c.syntax = 'u3d install [<version>] [ [-p | --packages <package1>,<package2> ...] | [-a | --all] ] [--[no-]download] [ [--[no-]install] [-i | --installation_path <path>] ]'
+        c.summary = "Download (and/or) install Unity3D editor packages."
         c.description = %(
 #{c.summary}
 
@@ -131,15 +131,19 @@ This command allows you to either:
 * download and install packages
 * download packages but not install them
 * install already downloaded packages
+
+Already installed packages are skipped if asked to be installed again (except for the 'Example' package).
         )
         c.option '--[no-]download', 'Perform or not downloading before installation. Downloads by default'
         c.option '--[no-]install', 'Perform or not installation after downloading. Installs by default'
         c.option '-p', '--packages PACKAGES', Array, 'Specifies which packages to download/install. Overriden by --all'
         c.option '-a', '--all', 'Download all available packages. Overrides -p'
-        c.option '-X', '--installation_path PATH', String, 'Specifies where package(s) will be downloaded/installed. Conflicts with --no-install'
+        c.option '-i', '--installation_path PATH', String, 'Specifies where package(s) will be downloaded/installed. Conflicts with --no-install'
         c.option '-k', '--keychain', 'Gain privileges right through the keychain. [OSX only]'
         c.example 'Download and install Unity, its Documentation and the Android build support and install them for version 5.1.2f1', 'u3d install 5.1.2f1 -p Unity,Documentation,Android'
         c.example "The 'version' argument can be a specific version number, such as 5.6.1f1, or an alias in [#{Commands.release_letter_mapping.keys.join(', ')}]. If not specified, u3d will download the unity version for the current project", 'u3d install latest'
+        c.example "The admin password can be passed through the U3D_PASSWORD environment variable.", 'U3D_PASSWORD=mysecret u3d install a_version'
+        c.example "On Mac, the admin password can be fetched from (and stored into) the keychain.", 'u3d install -k a_version'
         c.action do |args, options|
           options.default all: false
           options.default install: true

data/lib/u3d/installation.rb

@@ -29,6 +29,24 @@ module U3d
   class Installation
     attr_reader :root_path
 
+    NOT_PLAYBACKENGINE_PACKAGES = %w[Documentation StandardAssets MonoDevelop].freeze
+    PACKAGE_ALIASES =
+      {
+        'Android' => [],
+        'iOS' => ['iPhone'],
+        'AppleTV' => ['tvOS'],
+        'Linux' => ['StandaloneLinux'],
+        'Mac' => %w[StandaloneOSXIntel StandaloneOSXIntel64 StandaloneOSX],
+        'Windows' => ['StandaloneWindows'],
+        'Metro' => [],
+        'UWP-IL2CPP' => [],
+        'Samsung-TV' => [],
+        'Tizen' => [],
+        'WebGL' => [],
+        'Facebook-Games' => ['Facebook'],
+        'Vuforia-AR' => ['UnityExtensions']
+      }.freeze
+
     def initialize(root_path: nil, path: nil)
       @root_path = root_path
       @path = path
@@ -44,6 +62,22 @@ module U3d
         WindowsInstallation.new(root_path: root_path, path: path)
       end
     end
+
+    def packages
+      false
+    end
+
+    def package_installed?(package)
+      return true if (packages || []).include?(package)
+
+      aliases = PACKAGE_ALIASES[package]
+
+      # If no aliases for the package are found, then it's a new package not yet known by Unity
+      # If the exact name doesn't match then we have to suppose it's not installed
+      return false unless aliases
+
+      return !(aliases & packages).empty?
+    end
   end
 
   class PlaybackEngineUtils
@@ -90,8 +124,26 @@ module U3d
     end
 
     def packages
-      PlaybackEngineUtils.list_module_configs(root_path).map do |mpath|
-        PlaybackEngineUtils.module_name(mpath)
+      pack = []
+      PlaybackEngineUtils.list_module_configs(root_path).each do |mpath|
+        pack << PlaybackEngineUtils.module_name(mpath)
+      end
+      NOT_PLAYBACKENGINE_PACKAGES.each do |module_name|
+        pack << module_name unless Dir[module_name_pattern(module_name)].empty?
+      end
+      pack
+    end
+
+    def module_name_pattern(module_name)
+      case module_name
+      when 'Documentation'
+        return "#{root_path}/Documentation/"
+      when 'StandardAssets'
+        return "#{root_path}/Standard Assets/"
+      when 'MonoDevelop'
+        return "#{root_path}/MonoDevelop.app/"
+      else
+        UI.crash! "No pattern is known for #{module_name} on Mac"
       end
     end
 
@@ -137,10 +189,6 @@ module U3d
       @root_path || @path
     end
 
-    def packages
-      false
-    end
-
     def clean_install?
       !(root_path =~ UNITY_DIR_CHECK_LINUX).nil?
     end
@@ -179,8 +227,26 @@ module U3d
 
     def packages
       path = "#{root_path}/Editor/Data/"
-      PlaybackEngineUtils.list_module_configs(path).map do |mpath|
-        PlaybackEngineUtils.module_name(mpath)
+      pack = []
+      PlaybackEngineUtils.list_module_configs(path).each do |mpath|
+        pack << PlaybackEngineUtils.module_name(mpath)
+      end
+      NOT_PLAYBACKENGINE_PACKAGES.each do |module_name|
+        pack << module_name unless Dir[module_name_pattern(module_name)].empty?
+      end
+      pack
+    end
+
+    def module_name_pattern(module_name)
+      case module_name
+      when 'Documentation'
+        return "#{root_path}/Editor/Data/Documentation/"
+      when 'StandardAssets'
+        return "#{root_path}/Editor/Standard Assets/"
+      when 'MonoDevelop'
+        return "#{root_path}/MonoDevelop/"
+      else
+        UI.crash! "No pattern is known for #{module_name} on Windows"
       end
     end
 

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.11'.freeze
+  VERSION = '1.0.12'.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.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander