u3d 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9238d65caf5c8cd801183c0026863160a1a1441
-  data.tar.gz: fafc5dfb82ddc9ffea6f2a41d062514dd625b861
+  metadata.gz: 8f69304001a1ba0ebd4324ddfdac8013dbd36dfe
+  data.tar.gz: bc9b22bb8dbce826877de47fcf5a96138415d9c1
 SHA512:
-  metadata.gz: 0420a044e314bb6aeaeed0dd58cef0549d6b51f87daa65849315d5d12a6dda96bff473cb1c3db6a93af813925de69d91a17b14fece0130131fa06c5cf86730a9
-  data.tar.gz: 773144d01f6966c29a9b42342b3106c36e3c8c3d858aabce7fe503ecbad2ef195bcb6c5711962d02f4990541678dfadead0025e2d385956fabb54a35cc4cd39a
+  metadata.gz: 5592d48d01dde17b76155b4d75243e5e3f5c5cfc06bda7240b205437c2aaa1fb5a7764182369f4cbd297934d962b35cafc8bb0175d47f9c1b9627d90f02ab2ce
+  data.tar.gz: 8dfbcc646715e7891f420005e8acd8bb7f7486fd97b8a7f559c653173e103a27165ff33a5070385a2e6a9e7e8462db99479093970eb740e17ff68e5afeb00748

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [v1.0.19](https://github.com/DragonBox/u3d/tree/v1.0.19) (2018-03-09)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.18...v1.0.19)
+
+**Implemented enhancements:**
+
+- u3d: standardize log and descriptions [\#263](https://github.com/DragonBox/u3d/pull/263) ([niezbop](https://github.com/niezbop))
+
+**Merged pull requests:**
+
+- u3d/licenses: add feature to display licenses [\#262](https://github.com/DragonBox/u3d/pull/262) ([lacostej](https://github.com/lacostej))
+
 ## [v1.0.18](https://github.com/DragonBox/u3d/tree/v1.0.18) (2018-03-08)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.17...v1.0.18)
 

data/Gemfile.lock

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

data/README.md

@@ -5,7 +5,7 @@
 [![Build Status](https://img.shields.io/circleci/project/DragonBox/u3d/master.svg?style=flat)](https://circleci.com/gh/DragonBox/u3d)
 [![Coverage Status](https://coveralls.io/repos/github/DragonBox/u3d/badge.svg?branch=master)](https://coveralls.io/github/DragonBox/u3d?branch=master)
 
-U3d is a set of tools to interact with Unity3D from command line. It is available on Linux, Macintosh and Windows.
+U3d is a set of tools to interact with Unity from command line. It is available on Linux, Macintosh and Windows.
 
 ---
 
@@ -17,38 +17,43 @@ U3d knows about your Unity project and behaves differently if invoked from withi
 
 Available commands are:
 
-* `u3d available`: List download-ready versions of Unity3d
+* `u3d available`: List download-ready versions of Unity
 
 ![u3d available](https://github.com/DragonBox/u3d/raw/master/docs/assets/u3d_available.png)
 
-* `u3d install`: Download and/or install Unity3D packages
+* `u3d install`: Download (and/or) install Unity editor packages
 
 ![u3d install](https://github.com/DragonBox/u3d/raw/master/docs/assets/u3d_install.png)
 
-* `u3d uninstall`: Uninstall Unity3D versions
+* `u3d uninstall`: Uninstall Unity versions
 
 ![u3d uninstall](https://github.com/DragonBox/u3d/raw/master/docs/assets/u3d_uninstall.png)
 
-* `u3d list`: List installed versions of Unity3d
+* `u3d list`: List installed versions of Unity
 
 ![u3d list](https://github.com/DragonBox/u3d/raw/master/docs/assets/u3d_list.png)
 
-* `u3d run`: Run Unity, and parses its output through u3d's log prettifier.
+* `u3d run`: Run Unity, and parses its output through u3d's log prettifier
 
 Here we start with the proper version of Unity:
 
 ![u3d run without arguments](https://github.com/DragonBox/u3d/raw/master/docs/assets/u3d_run_current.png)
 
 Here we pass some arguments:
+
 ![u3d run with arguments](https://github.com/DragonBox/u3d/raw/master/docs/assets/u3d_run.png)
 
-The prettifyer is on by default but can be turned off to get Unity3d's raw output.
+The prettifyer is on by default but can be turned off to get Unity's raw output.
 
 * `u3d prettify`: Prettify a saved editor logfile
 
   [Information on how `prettify` works](https://github.com/DragonBox/u3d/blob/master/LOG_RULES.md)
 
-* `u3d dependencies`: [Linux] Install dependencies that Unity don't install by default on Linux.
+* `u3d dependencies`: [Linux] Install dependencies that Unity don't install by default on Linux
+
+* `u3d licenses`: display information about your Unity licenses
+
+![u3d list](https://github.com/DragonBox/u3d/raw/master/docs/assets/u3d_licenses.png)
 
 ## Installation
 
@@ -58,8 +63,8 @@ gem install u3d
 
 ## Unity versions numbering
 
-Unity3d uses the following version formatting: 0.0.0x0. The \'x\' can takes different values:
-  * 'f' are the main release candidates for Unity3d
+Unity uses the following version formatting: 0.0.0x0. The \'x\' can takes different values:
+  * 'f' are the main release candidates for Unity
   * 'p' are patches fixing those releases
   * 'b' are the beta releases
   * 'a' are the alpha releases (not currently discovered online)
@@ -86,7 +91,7 @@ When referencing to a version on the CLI, u3d sanitizes these weird versions. Fo
 
   u3d should be able to find the different unity installed under those locations. If the Unity installations are not in those locations, u3d might not find them automatically.
 
-## Sanitize / standardize Unity3d installation paths
+## Sanitize / standardize Unity installation paths
 
   If you have installed Unity in different locations, u3d might discover them and propose you to move them to its standard location. The procedure should be self described and easily revertible (manually). This sanitization operation is only proposed in interactive mode (i.e. if you are not using u3d unattended, e.g. in a build script on a CI server).
 
@@ -136,7 +141,7 @@ u3d install 5.6.0f3 --no-download
 u3d run -- -batchmode -quit -logFile `pwd`/editor.log -executeMethod "WWTK.SimpleBuild.PerformAndroidBuild"
 ```
 
-* Open the proper Unity3d for the current project, displaying the raw editor logs in the command line:
+* Open the proper Unity for the current project, displaying the raw editor logs in the command line:
 
 ```shell
 u3d run -r

data/fastlane-plugin-u3d/README.md

@@ -12,7 +12,7 @@ fastlane add_plugin u3d
 
 ## About u3d
 
-Fastgame's u3d (a Unity3d CLI) integration
+Fastgame's u3d (a Unity CLI) integration
 
 **Note to author:** Add a more detailed description about this plugin here. If your plugin contains multiple actions, make sure to mention them here.
 

data/fastlane-plugin-u3d/fastlane-plugin-u3d.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.author        = %q{Jerome Lacoste}
   spec.email         = %q{jerome.lacoste@gmail.com}
 
-  spec.summary       = %q{Fastgame's u3d (a Unity3d CLI) integration}
+  spec.summary       = %q{Fastgame's u3d (a Unity CLI) integration}
   spec.homepage      = "https://github.com/DragonBox/u3d/tree/master/fastlane-plugin-u3d"
   spec.license       = "MIT"
 

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

@@ -36,7 +36,7 @@ module Fastlane
       end
 
       def self.description
-        "Fastgame's u3d (a Unity3d CLI) integration"
+        "Fastgame's u3d (a Unity CLI) integration"
       end
 
       def self.authors

data/lib/u3d.rb

@@ -34,6 +34,7 @@ require 'u3d/iniparser'
 require 'u3d/installation'
 require 'u3d/installer'
 require 'u3d/log_analyzer'
+require 'u3d/unity_license'
 require 'u3d/unity_project'
 require 'u3d/unity_runner'
 require 'u3d/unity_version_definition'

data/lib/u3d/commands.rb

@@ -195,6 +195,12 @@ module U3d
         end
       end
 
+      def licenses
+        U3d::License.licenses.sort_by { |l| l['LicenseVersion'] }.each do |license|
+          UI.message "#{license.path}: #{license['LicenseVersion']} #{license.number} #{license['UpdateDate']}"
+        end
+      end
+
       def local_analyze(args: [])
         raise ArgumentError, 'No files given' if args.empty?
         raise ArgumentError, "File #{args[0]} does not exist" unless File.exist? args[0]

data/lib/u3d/commands_generator.rb

@@ -71,7 +71,7 @@ module U3d
         run_args = extract_run_args
 
         c.syntax = 'u3d run [-u | --unity_version <version>] [-r | --raw_logs] [ -- <run_args>]'
-        c.summary = 'Run unity, and parses its output through u3d\'s log prettifier'
+        c.summary = 'Run Unity, and parse its output through u3d\'s log prettifier'
         c.description =  %(
 #{c.summary}
 The default prettifier rules file is packaged with u3d (#{U3d::LogAnalyzer::RULES_PATH}).
@@ -93,8 +93,8 @@ Fore more information about how the rules work, see https://github.com/DragonBox
       command :list do |c|
         c.syntax = 'u3d list [-p | --packages]'
         c.option '-p', '--packages', 'Lists installed packages as well'
-        c.example 'List currently installed Unity3d versions, as well as installed packages', 'u3d list -p'
-        c.description = 'List installed versions of Unity3d'
+        c.example 'List currently installed Unity versions, as well as installed packages', 'u3d list -p'
+        c.summary = 'List installed versions of Unity'
         c.action do |_args, options|
           Commands.list_installed(options: convert_options(options))
         end
@@ -114,7 +114,7 @@ Fore more information about how the rules work, see https://github.com/DragonBox
         c.example 'List all versions available for Linux platform', 'u3d available -o linux'
         c.example 'List packages available for Unity version 5.6.0f3', 'u3d available -u 5.6.0f3 -p'
         c.example 'List packages available for Unity version containing the 5.6 string', 'u3d available -u \'5.6\' -p'
-        c.description = 'List download-ready versions of Unity3d'
+        c.summary = 'List download-ready versions of Unity'
         c.action do |_args, options|
           options.default packages: false
           Commands.list_available(options: convert_options(options))
@@ -124,7 +124,7 @@ Fore more information about how the rules work, see https://github.com/DragonBox
       command :install do |c|
         oses = U3dCore::Helper.operating_systems
         c.syntax = 'u3d install [<version>] [ [-p | --packages <package1>,<package2> ...] | [-o | --operating_system <OS>] [-a | --all] ] [--[no-]download] [ [--[no-]install] [-i | --installation_path <path>] ]'
-        c.summary = "Download (and/or) install Unity3D editor packages."
+        c.summary = 'Download (and/or) install Unity editor packages'
         c.description = %(
 #{c.summary}
 This command allows you to either:
@@ -159,7 +159,7 @@ E.g. U3D_DOWNLOAD_PATH=/some/path/you/want u3d install ...
 
       command :uninstall do |c|
         c.syntax = 'u3d uninstall [<version>]'
-        c.description = "Uninstall the specified Unity3d version."
+        c.summary = 'Uninstall the specified Unity version'
         c.option '-k', '--keychain', 'Gain privileges right through the keychain. [OSX only]'
         c.example 'Uninstall Unity version 5.2.1f1', 'u3d uninstall 5.1.2f1'
         c.action do |args, options|
@@ -169,7 +169,7 @@ E.g. U3D_DOWNLOAD_PATH=/some/path/you/want u3d install ...
 
       command :dependencies do |c|
         c.syntax = 'u3d dependencies'
-        c.summary = 'Installs Unity dependencies. [Linux only]'
+        c.summary = 'Install Unity dependencies [Linux only]'
         c.description = %(
 #{c.summary}
 Regarding the package manager: if dpkg is installed, u3d uses apt-get else if rpm is installed yum is used. If none of them is insalled, fails.
@@ -183,15 +183,23 @@ More on that: https://forum.unity3d.com/threads/unity-on-linux-release-notes-and
 
       command :credentials do |c|
         c.syntax = "u3d credentials <#{Commands.credentials_actions.join(' | ')}>"
-        c.description = 'Manages keychain credentials so u3d remembers them. [OSX only]'
+        c.summary = 'Manage keychain credentials so u3d remembers them [OSX only]'
         c.action do |args, _options|
           Commands.credentials(args: args)
         end
       end
 
+      command :licenses do |c|
+        c.syntax = "u3d licenses"
+        c.description = 'Prints Unity license information.'
+        c.action do |_args, _options|
+          Commands.licenses
+        end
+      end
+
       command :prettify do |c|
         c.syntax = 'u3d prettify <logfile>'
-        c.summary = 'Prettify a saved logfile'
+        c.summary = 'Prettify a saved Unity logfile'
         c.description = %(
           #{c.summary}
           The default prettifier rules file is packaged with u3d (#{U3d::LogAnalyzer::RULES_PATH}).

data/lib/u3d/installer.rb

@@ -52,7 +52,7 @@ module U3d
       unclean = []
       installer.installed.each { |unity| unclean << unity unless unity.clean_install? }
       return if unclean.empty?
-      UI.important("u3d can optionally standardize the existing Unity3d installation names and locations.")
+      UI.important("u3d can optionally standardize the existing Unity installation names and locations.")
       UI.important("Check the documentation for more information:")
       UI.important("** https://github.com/DragonBox/u3d/blob/master/README.md#default-installation-paths **")
       unclean.each { |unity| installer.sanitize_install(unity, dry_run: true) }

data/lib/u3d/unity_license.rb

@@ -0,0 +1,76 @@
+## --- 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 'rexml/document'
+
+module U3d
+  class License
+    attr_reader :path
+
+    def initialize(path: nil, fields: nil)
+      @path = path
+      @fields = fields || {}
+    end
+
+    def [](index)
+      @fields[index]
+    end
+
+    # petit cachotier va!
+    def number
+      require 'base64'
+      Base64.decode64(self['DeveloperData'])[4..-1]
+    end
+
+    class << self
+      LICENSES_DIR_MAC = File.join("/", "Library", "Application Support", "Unity").freeze
+      LICENSES_DIR_WINDOWS = File.join("C:/ProgramData", "Unity").freeze
+      LICENSES_DIR_LINUX = File.join(ENV['HOME'], ".local", "share", "unity3d", "Unity").freeze
+
+      def from_path(path)
+        doc = REXML::Document.new(File.read(path))
+        fields = {}
+        license = REXML::XPath.first(doc, "root/License")
+        unless license.nil?
+          fields = []
+          license.each_element_with_attribute("Value") do |e|
+            fields << [e.name, e.attribute('Value').to_s]
+          end
+        end
+        License.new(path: path, fields: fields.to_h)
+      end
+
+      def licenses
+        glob = File.join(licenses_dir, "*.ulf")
+        Dir.glob(glob).map do |path|
+          from_path(path)
+        end
+      end
+
+      def licenses_dir
+        return LICENSES_DIR_MAC if U3d::Helper.mac?
+        return LICENSES_DIR_WINDOWS if U3d::Helper.windows?
+        return LICENSES_DIR_LINUX if U3d::Helper.linux?
+      end
+    end
+  end
+end

data/lib/u3d/version.rb

@@ -21,10 +21,10 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.18'.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"\
+  VERSION = '1.0.19'.freeze
+  DESCRIPTION = 'Provides numerous tools for installing, managing and running the Unity game engine from command line.'.freeze
+  UNITY_VERSIONS_NOTE = "Unity uses the following version formatting: 0.0.0x0. The \'x\' can takes different values:\n"\
+  "\t. 'f' are the main release candidates for Unity\n"\
   "\t. 'p' are patches fixing those releases\n"\
   "\t. 'b' are the beta releases\n"\
   "\t. 'a' are the alpha releases (not currently discovered)\n".freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -245,7 +245,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.52.1
-description: Provides numerous tools for installing, managing and running the Unity3D
+description: Provides numerous tools for installing, managing and running the Unity
   game engine from command line.
 email: jerome@wewanttoknow.com
 executables:
@@ -282,6 +282,7 @@ files:
 - docs/assets/ci_jenkins_version_param.png
 - docs/assets/u3d_available.png
 - docs/assets/u3d_install.png
+- docs/assets/u3d_licenses.png
 - docs/assets/u3d_list.png
 - docs/assets/u3d_run.png
 - docs/assets/u3d_run_current.png
@@ -382,6 +383,7 @@ files:
 - lib/u3d/installation.rb
 - lib/u3d/installer.rb
 - lib/u3d/log_analyzer.rb
+- lib/u3d/unity_license.rb
 - lib/u3d/unity_project.rb
 - lib/u3d/unity_runner.rb
 - lib/u3d/unity_version_definition.rb