u3d 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c156945d41aa0c5753f61054c8618d6d706a0fb5
-  data.tar.gz: fa35a0de169dc91df2fa4cc3ada92d1304107942
+  metadata.gz: 74659cdf831f537229e6bda64ca7cb74a38d2be3
+  data.tar.gz: fb365f32df6f0f2f3d6440c9639f351ed40311a2
 SHA512:
-  metadata.gz: 1c9b94cf16b94a61101755148c5da1413e41ed0c2091cf19af09bba9567131533e04f7d06df22f38c7e3ce35942b833f8a16e586cddcb91db8f58329d23e2432
-  data.tar.gz: b5cdd481bc2d15091aad3caa612ba3fc9682923c246bb328be2ca363370e53a26615e04b77721cf00238bb77a3ee15b426b1b161654103e3bf2ae47272a379c6
+  metadata.gz: 3a5792a58962e9beac0eb337342e2fd5ece94907de70d51dc919265bd7f682e5f1767bc80cb6d505a53793aa09d99df9bf6f388350f39e8af358896d19cb6f47
+  data.tar.gz: 2c7588a8d3629ab28a132d8eab653cecea060b9d8d6fb59266b8fd86242cb2f4c542900c9622e60db36d7dcfd7289dbc9da1b6a7075838f4c79443db99f9d294

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## [v1.0.4](https://github.com/DragonBox/u3d/tree/v1.0.4) (2017-09-16)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.3...v1.0.4)
+
+**Fixed bugs:**
+
+- u3d/installer might not see a newly installed version on Mac [\#139](https://github.com/DragonBox/u3d/issues/139)
+- Issue with using installer \(error: undefined method `\[\]' for nil:NilClass.\) [\#138](https://github.com/DragonBox/u3d/issues/138)
+
+**Merged pull requests:**
+
+- u3d/available: restore Linux version. [\#144](https://github.com/DragonBox/u3d/pull/144) ([lacostej](https://github.com/lacostej))
+- u3d/installer: allow to find the installation we just installed, and fallback on spotlight on mac [\#143](https://github.com/DragonBox/u3d/pull/143) ([lacostej](https://github.com/lacostej))
+- u3d/analyzer: remove extra end of lines in context information [\#141](https://github.com/DragonBox/u3d/pull/141) ([lacostej](https://github.com/lacostej))
+- u3d/installer: hard fail if we ask for a non existant package \(Related to \#138\) [\#140](https://github.com/DragonBox/u3d/pull/140) ([lacostej](https://github.com/lacostej))
+- u3d/internal: load all internal modules in top 'u3d' file [\#137](https://github.com/DragonBox/u3d/pull/137) ([lacostej](https://github.com/lacostej))
+
 ## [v1.0.3](https://github.com/DragonBox/u3d/tree/v1.0.3) (2017-09-11)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.2...v1.0.3)
 

data/Gemfile.lock

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

data/Rakefile

@@ -119,14 +119,15 @@ task pre_release: 'ensure_git_clean' do
   Rake::Task["changelog"].invoke
 
   sh('git diff')
+  # FIXME: cleanup branch, etc
   UI.user_error! "Pre release stopped by user." unless UI.confirm("CHANGELOG PR for version #{nextversion}. Confirm?")
 
   msg = "Preparing release for #{nextversion}"
   sh 'git add CHANGELOG.md'
   sh "git commit -m '#{msg}'"
   sh "git push lacostej" # FIXME: hardcoded
-  # FIXME check hub present
-  sh "hub pull-request -m '#{msg}' -l nochangelog"
+  # FIXME: check hub present
+  sh "hub pull-request -m '#{msg}'" # requires hub pre-release " -l nochangelog"
   sh 'git checkout master'
   sh "git branch -D #{pr_branch}"
 end

data/lib/u3d/commands.rb

@@ -123,6 +123,8 @@ module U3d
         unity = check_unity_presence(version: version)
         return unless enforce_setup_coherence(packages, options, unity, definition)
 
+        verify_package_names(definition, packages)
+
         if options[:install]
           U3d::Globals.use_keychain = true if options[:keychain] && Helper.mac?
           UI.important 'Root privileges are required'
@@ -217,6 +219,12 @@ module U3d
 
       private
 
+      def verify_package_names(definition, packages)
+        packages.each do |package|
+          UI.user_error! "package '#{package}' doesn't exist" unless definition.available_package? package
+        end
+      end
+
       def specified_or_current_project_version(version)
         unless version # no version specified, use the one from the current unity project if any
           UI.message "No unity version specified. If the current directory is a Unity project, we try to install the one it requires"

data/lib/u3d/installer.rb

@@ -101,18 +101,8 @@ module U3d
     end
 
     def installed
-      unless (`mdutil -s /` =~ /disabled/).nil?
-        $stderr.puts 'Please enable Spotlight indexing for /Applications.'
-        exit(1)
-      end
-
-      bundle_identifiers = ['com.unity3d.UnityEditor4.x', 'com.unity3d.UnityEditor5.x']
-
-      mdfind_args = bundle_identifiers.map { |bi| "kMDItemCFBundleIdentifier == '#{bi}'" }.join(' || ')
-
-      cmd = "mdfind \"#{mdfind_args}\" 2>/dev/null"
-      UI.verbose cmd
-      versions = `#{cmd}`.split("\n").map { |path| MacInstallation.new(path: path) }
+      paths = (list_installed_paths + spotlight_installed_paths).uniq
+      versions = paths.map { |path| MacInstallation.new(path: path) }
 
       # sorting should take into account stable/patch etc
       versions.sort! { |x, y| x.version <=> y.version }
@@ -159,6 +149,30 @@ module U3d
     else
       UI.success "Successfully installed package from #{file_path}"
     end
+
+    private
+
+    def list_installed_paths
+      find = File.join(DEFAULT_MAC_INSTALL, 'Unity*', 'Unity.app')
+      paths = Dir[find].map { |path| File.expand_path('..', path) }
+      paths
+    end
+
+    def spotlight_installed_paths
+      unless (`mdutil -s /` =~ /disabled/).nil?
+        UI.warning 'Please enable Spotlight indexing for /Applications.'
+        return []
+      end
+
+      bundle_identifiers = ['com.unity3d.UnityEditor4.x', 'com.unity3d.UnityEditor5.x']
+
+      mdfind_args = bundle_identifiers.map { |bi| "kMDItemCFBundleIdentifier == '#{bi}'" }.join(' || ')
+
+      cmd = "mdfind \"#{mdfind_args}\" 2>/dev/null"
+      UI.verbose cmd
+      paths = `#{cmd}`.split("\n")
+      paths
+    end
   end
 
   class LinuxInstaller

data/lib/u3d/log_analyzer.rb

@@ -197,8 +197,8 @@ module U3d
       if @active_rule
         # Active rule should be finished
         # If it is still active during phase change, it means that something went wrong
-        context = @lines_memory.map { |l| "\n> #{l}" }.join('')
-        UI.error("[#{@active_phase}] Could not finish active rule '#{@active_rule}'. Aborting it. Context:#{context}")
+        context = @lines_memory.map { |l| "> #{l}" }.join('')
+        UI.error("[#{@active_phase}] Could not finish active rule '#{@active_rule}'. Aborting it. Context:\n#{context}")
         @active_rule = nil
       end
       UI.verbose("--- Ending #{@active_phase} phase ---")

data/lib/u3d/unity_version_definition.rb

@@ -44,6 +44,10 @@ module U3d
       @ini.keys
     end
 
+    def available_package?(p)
+      available_packages.include? p
+    end
+
     def [](key)
       return nil unless @ini
       @ini[key]

data/lib/u3d/unity_versions.rb

@@ -31,7 +31,7 @@ module U3d
     # @!group URLS: Locations to fetch information from
     #####################################################
     # URL for the forum thread listing all the Linux releases
-    UNITY_LINUX_DOWNLOADS = 'https://forum.unity3d.com/threads/unity-on-linux-release-notes-and-known-issues.350256/'.freeze
+    UNITY_LINUX_DOWNLOADS = 'https://forum.unity.com/threads/unity-on-linux-release-notes-and-known-issues.350256/'.freeze
     # URL for the main releases for Windows and Macintosh
     UNITY_DOWNLOADS = 'https://unity3d.com/get-unity/download/archive'.freeze
     # URL for the patch releases for Windows and Macintosh

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.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"\

data/lib/u3d.rb

@@ -20,12 +20,25 @@
 # SOFTWARE.
 ## --- END LICENSE BLOCK ---
 
+require 'u3d_core'
+
+require 'u3d/utils'
 require 'u3d/version'
-require 'u3d/unity_version_number'
 
-require 'u3d_core'
-# require 'terminal-table'
-require 'u3d_core/core_ext/string'
+require 'u3d/cache'
+require 'u3d/commands'
+require 'u3d/commands_generator'
+require 'u3d/download_validator'
+require 'u3d/downloader'
+require 'u3d/iniparser'
+require 'u3d/installation'
+require 'u3d/installer'
+require 'u3d/log_analyzer'
+require 'u3d/unity_project'
+require 'u3d/unity_runner'
+require 'u3d/unity_version_definition'
+require 'u3d/unity_version_number'
+require 'u3d/unity_versions'
 
 module U3d
   Helper = U3dCore::Helper

data/lib/u3d_core.rb

@@ -20,6 +20,7 @@
 # SOFTWARE.
 ## --- END LICENSE BLOCK ---
 
+require 'u3d_core/core_ext/string'
 require 'u3d_core/globals'
 require 'u3d_core/helper'
 require 'u3d_core/credentials'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander