u3d 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199952a8dafdb71e6f683bee1f99524fdf9fb4b1
-  data.tar.gz: fec612515c47bff5cac69eaeb6b02690f15d91ec
+  metadata.gz: a0c7e57e6b80d3937d00e39ce113ef2ba676983f
+  data.tar.gz: 8000266d69992a3f6e33a51b869174b9f08d6cba
 SHA512:
-  metadata.gz: 659ef44c9f876b8f20f7b7cf9deeb53fbde68b404e150483b547ecbeb0ecfc9783405e249531f123a4f4b1a02cee4a272b92b644e358dae7bfe6217ed57878c9
-  data.tar.gz: 4c3e390741a69b465b0d2298e158485203c319539989687989de6fba9e03039eb53ad5715949e76398d43514507d1d57c2159968a839ebea2b1e30a1a8393368
+  metadata.gz: c71fa8f7124dcb6bd941feb32727c01e24b9b967c6c1a1065c05df1f779bbb058a94b196f0402f0dcf7df7341913302575026fc6403ff9573c8f6d9eea807147
+  data.tar.gz: 135902654a913d2a7bdbce289a330d2bb9409ee07fd7df3d07c2b0f6c6de1bce8d89d161df2372d7fd5281acde8adb538b8af9378a9678f9e84f9b5910458e53

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [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)
+
+**Implemented enhancements:**
+
+- u3d/list: also detect previously installed deb packages on Linux \(fixes \#189\) [\#190](https://github.com/DragonBox/u3d/pull/190) ([lacostej](https://github.com/lacostej))
+
+**Merged pull requests:**
+
+- 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))
+
 ## [v1.0.10](https://github.com/DragonBox/u3d/tree/v1.0.10) (2017-11-03)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.9...v1.0.10)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u3d (1.0.10)
+    u3d (1.0.11)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)
@@ -133,4 +133,4 @@ DEPENDENCIES
   u3d!
 
 BUNDLED WITH
-   1.15.4
+   1.16.0

data/README.md

@@ -154,6 +154,9 @@ Here you have multiple options
 
 * if on Mac, use the keychain option (you set it before hand on the machine, e.g. from the command line using `u3d credentials` add (use `u3d credentials check` to verify) and then use `u3d install -k` to activate the keychain while installing.
 
+
+For more information see also [how to use u3d to install Unity on a CI server](docs/ci_setup.md).
+
 ### Install ruby
 
  * __On MacOS and Linux:__

data/docs/ci_setup.md

@@ -0,0 +1,75 @@
+# CI Setup
+
+## Jenkins setup
+
+Example of how to setup Jenkins to install unity automatically on multiple slaves
+
+You might want to do things differently. Here are the decisions we took:
+
+* we install all Unity versions in the same way (i.e. same Unity platform modules for all installs)
+* we store the slave root passwords in the Jenkins credentials binding.
+* we depend on RVM to be present on the slaves
+
+Prerequisites:
+* Install the same version of RVM on all slaves where you will install u3d
+* add one root password credential per slave in the jenkins setup. Follow the "U3D_PASSWORD_$SLAVENAME" format 
+
+![jenkins credentials](https://github.com/DragonBox/u3d/raw/master/docs/assets/ci_jenkins_credentials.png)
+
+Required plugins:
+* [Credentials Binding Plugin](https://wiki.jenkins.io/display/JENKINS/Credentials+Binding+Plugin)
+* [Parametrized Builds](https://wiki.jenkins.io/display/JENKINS/Parameterized+Build)
+* [RVM Plugin](https://wiki.jenkins.io/display/JENKINS/RVM+Plugin)
+* [ANSI Color plugin](https://wiki.jenkins.io/display/JENKINS/AnsiColor+Plugin)
+
+Set up an install job:
+
+* create a freestyle job
+
+* Add a U3D_VERSION string parameter
+
+![jenkins version parameter](https://github.com/DragonBox/u3d/raw/master/docs/assets/ci_jenkins_version_param.png)
+
+* Configure the nodes you might want to install on as parameters
+
+![node parameter](https://github.com/DragonBox/u3d/raw/master/docs/assets/ci_jenkins_version_node.png)
+
+* Enable console coloring
+
+![console coloring](https://github.com/DragonBox/u3d/raw/master/docs/assets/ci_jenkins_ansi.png)
+
+* Enable RVM
+
+![console coloring](https://github.com/DragonBox/u3d/raw/master/docs/assets/ci_jenkins_rvm.png)
+
+* Configure the slave passwords
+
+![configure the slave passwords](https://github.com/DragonBox/u3d/raw/master/docs/assets/ci_jenkins_secret_passwords.png)
+
+
+* add an "execute Shell" step
+```bash
+# config. We could make this an option to the job. Or be project specific.
+U3D_INSTALL_ARGS=-p Unity,Android,iOS,Linux,Windows,WebGL
+
+# install or update u3d if it isn't already present
+if [[ ! `which u3d` ]]; then 
+  gem install u3d
+else
+  gem update u3d
+fi
+
+echo "${U3D_INSTALL_ARGS}"
+
+# display whether or not the slave has credentials stored
+u3d credentials check
+
+# fetch the password for the slave from the credentials
+PASS_KEY=U3D_PASSWORD_${NODE_NAME}
+echo "PASS KEY: ${PASS_KEY}"
+export U3D_PASSWORD=${!PASS_KEY}
+
+# install the specified version with the specified arguments
+u3d install --trace --verbose $U3D_VERSION $U3D_INSTALL_ARGS 
+u3d list
+````

data/lib/u3d/commands.rb

@@ -169,7 +169,7 @@ module U3d
         unless version # fall back in project default if we are on a Unity project
           version = up.editor_version if up.exist?
           unless version
-            UI.user_error!('Not sure which version of Unity to run. Are you in a project?')
+            UI.user_error!('Not sure which version of Unity to run. Are you in a Unity5 or later project?')
           end
         end
 

data/lib/u3d/installer.rb

@@ -106,10 +106,7 @@ module U3d
 
     def installed
       paths = (list_installed_paths + spotlight_installed_paths).uniq
-      versions = paths.map { |path| MacInstallation.new(root_path: path) }
-
-      # sorting should take into account stable/patch etc
-      versions.sort! { |x, y| x.version <=> y.version }
+      paths.map { |path| MacInstallation.new(root_path: path) }
     end
 
     # rubocop:disable UnusedMethodArgument
@@ -206,11 +203,8 @@ module U3d
     end
 
     def installed
-      find = File.join(DEFAULT_LINUX_INSTALL, 'unity-editor-*')
-      versions = Dir[find].map { |path| LinuxInstallation.new(root_path: path) }
-
-      # sorting should take into account stable/patch etc
-      versions.sort! { |x, y| x.version <=> y.version }
+      paths = (list_installed_paths + debian_installed_paths).uniq
+      paths.map { |path| LinuxInstallation.new(root_path: path) }
     end
 
     # rubocop:disable UnusedMethodArgument
@@ -261,6 +255,24 @@ module U3d
     else
       UI.success "Successfully uninstalled '#{unity.root_path}'"
     end
+
+    private
+
+    def list_installed_paths
+      find = File.join(DEFAULT_LINUX_INSTALL, 'unity-editor-*', 'Editor')
+      paths = Dir[find]
+      paths = paths.map { |u| Pathname.new(u).parent.to_s }
+      UI.verbose "Found list_installed_paths: #{paths}"
+      paths
+    end
+
+    def debian_installed_paths
+      find = File.join(DEFAULT_LINUX_INSTALL, 'Unity', 'Editor')
+      paths = Dir[find]
+      paths = paths.map { |u| Pathname.new(u).parent.to_s }
+      UI.verbose "Found debian_installed_paths: #{paths}"
+      paths
+    end
   end
 
   class WindowsInstaller
@@ -279,10 +291,7 @@ module U3d
 
     def installed
       find = File.join(DEFAULT_WINDOWS_INSTALL, 'Unity*', 'Editor', 'Uninstall.exe')
-      versions = Dir[find].map { |path| WindowsInstallation.new(root_path: File.expand_path('../..', path)) }
-
-      # sorting should take into account stable/patch etc
-      versions.sort! { |x, y| x.version <=> y.version }
+      Dir[find].map { |path| WindowsInstallation.new(root_path: File.expand_path('../..', path)) }
     end
 
     def install(file_path, version, installation_path: nil, info: {})

data/lib/u3d/unity_project.rb

@@ -36,7 +36,9 @@ module U3d
 
     def editor_version
       require 'yaml'
-      yaml = YAML.safe_load(File.read("#{@path}/ProjectSettings/ProjectVersion.txt"))
+      project_version = "#{@path}/ProjectSettings/ProjectVersion.txt"
+      return nil unless File.exist? project_version
+      yaml = YAML.safe_load(File.read(project_version))
       version = yaml['m_EditorVersion']
       version.gsub!(/(\d+\.\d+\.\d+)(?:x)?(\w\d+)(?:Linux)?/, '\1\2') if Helper.linux?
       version

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.10'.freeze
+  VERSION = '1.0.11'.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.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -269,9 +269,14 @@ files:
 - LOG_RULES.md
 - README.md
 - Rakefile
-- TODO.md
 - build.sh
 - config/log_rules.json
+- docs/assets/ci_jenkins_ansi.png
+- docs/assets/ci_jenkins_credentials.png
+- docs/assets/ci_jenkins_rvm.png
+- docs/assets/ci_jenkins_secret_passwords.png
+- docs/assets/ci_jenkins_version_node.png
+- docs/assets/ci_jenkins_version_param.png
 - docs/assets/u3d_available.png
 - docs/assets/u3d_install.png
 - docs/assets/u3d_list.png
@@ -279,6 +284,7 @@ files:
 - docs/assets/u3d_run_current.png
 - docs/assets/u3d_sanitize.png
 - docs/assets/u3d_uninstall.png
+- docs/ci_setup.md
 - examples/Example1/.gitignore
 - examples/Example1/Assets/Editor.meta
 - examples/Example1/Assets/Editor/EditorRun.cs

data/TODO.md

@@ -1,11 +0,0 @@
-= before release
-* core: moar tests if needed
-* [JL] prepare documentation / README / site
-
-= post
-* patch commander to support argument descriptions
-
-* u3d specific keychain (u3d_credentials_store)
-
-* if failure to download a package, display available ones
-  #No package "Mac" was found for version 5.6.0f3