u3d 0.9.4 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c68ca1631ef225a55a415c640c57eaed1473e61a
-  data.tar.gz: 4899c1c544a85d41d1f3e2b92bcba1d1d600537a
+  metadata.gz: e508672f1da9f6624953f8f6a90f0afaf1beef3c
+  data.tar.gz: 87742f09a7fef30a80581e63246e2eedea1e43cd
 SHA512:
-  metadata.gz: aab3ea744686801d7400624c14420774473ed7fdcfdbf8aad94c5ae18dad3e64923ea4c0b17b7889fad997413c40f7bc91f5ca4df0c625dbe122c68c408a1a98
-  data.tar.gz: fb2c35b58767186afcf78d14471464ddf767868bcc93fb5b310c95a3dc93927695129f0f7d69e80ed2cfa72b61d8ff43da0a8c44da11ee36d77adab4e87c9eb8
+  metadata.gz: 43d5d3c4a0265738647680ea9162b196710e72f7499bc4035cc0c35f4452c1fb6ecf858f301d65d8b36c56c30c9b5dc2005ade7498ab4e152d98c90a8d7ea922
+  data.tar.gz: 789fb379c38576c2d5825e6cac1cf5787fb68f85a59f699a11559aa69f00a4bc8109db9b4f1d6586992e539dc3a69727bd78d588830568110020ed6d3680e159

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Change Log
 
+## [v1.0.0.rc1](https://github.com/DragonBox/u3d/tree/v1.0.0.rc1) (2017-08-30)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v0.9.4...v1.0.0.rc1)
+
+**Implemented enhancements:**
+
+- u3d/install: move chmod +x of linux files at install time  [\#91](https://github.com/DragonBox/u3d/issues/91)
+
+**Fixed bugs:**
+
+- Log prettifier not logging command line arguments \(among other initialisation things\) on Unity 2017+ [\#99](https://github.com/DragonBox/u3d/issues/99)
+- Error if stdout closed while writing to it [\#96](https://github.com/DragonBox/u3d/issues/96)
+- Downloader not as fast as it should be [\#93](https://github.com/DragonBox/u3d/issues/93)
+
+**Closed issues:**
+
+- u3d/prettify: missing executeMethod failure / exception catching [\#102](https://github.com/DragonBox/u3d/issues/102)
+- Ensure u3d works well on ruby 2.4.1 [\#82](https://github.com/DragonBox/u3d/issues/82)
+
+**Merged pull requests:**
+
+- fastlane-plugin-u3d: allow to depend on coming 1.0.0 version [\#109](https://github.com/DragonBox/u3d/pull/109) ([lacostej](https://github.com/lacostej))
+- u3d/run allow to configure the rules.json location using U3D\_RULES\_PATH env variable [\#108](https://github.com/DragonBox/u3d/pull/108) ([lacostej](https://github.com/lacostej))
+- u3d/run: if thread exits abnormally, don't wait for it and return [\#107](https://github.com/DragonBox/u3d/pull/107) ([lacostej](https://github.com/lacostej))
+- Add log rules to parse exceptions and aborts [\#106](https://github.com/DragonBox/u3d/pull/106) ([niezbop](https://github.com/niezbop))
+- Fix INIT log phase not starting when intended [\#101](https://github.com/DragonBox/u3d/pull/101) ([niezbop](https://github.com/niezbop))
+- u3d/install: move chmod +x of linux files at install time \(Fixes \#91\) [\#100](https://github.com/DragonBox/u3d/pull/100) ([lacostej](https://github.com/lacostej))
+- logger: Hide EPIPE errors when stdout already closed [\#97](https://github.com/DragonBox/u3d/pull/97) ([lacostej](https://github.com/lacostej))
+
 ## [v0.9.4](https://github.com/DragonBox/u3d/tree/v0.9.4) (2017-08-28)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v0.9.3...v0.9.4)
 
@@ -7,7 +35,6 @@
 
 - Merge install and local\_install commands [\#84](https://github.com/DragonBox/u3d/issues/84)
 - Document installation path sanitization [\#50](https://github.com/DragonBox/u3d/issues/50)
-- Make unity versions test unit [\#72](https://github.com/DragonBox/u3d/pull/72) ([niezbop](https://github.com/niezbop))
 - \[tech\] rubocop: update version and fix windows compatibility [\#61](https://github.com/DragonBox/u3d/pull/61) ([lacostej](https://github.com/lacostej))
 - u3d/install local\_install: if no version specified, fallback on version required by current project [\#53](https://github.com/DragonBox/u3d/pull/53) ([lacostej](https://github.com/lacostej))
 - u3d/install: display more information during sanization, including what would happen \(fixes \#50\) [\#51](https://github.com/DragonBox/u3d/pull/51) ([lacostej](https://github.com/lacostej))

data/Gemfile.lock

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

data/config/log_rules.json

@@ -22,6 +22,29 @@
         ],
         "type": "error"
       },
+      "exception": {
+        "active": true,
+        "start_pattern": "[eE]xception.*: (?<message>.*)\\n",
+        "end_pattern": "Filename: (?:[\\w/:]+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)",
+        "start_message": false,
+        "end_message": "%{file}(line %{line}): %{message}",
+        "store_lines": false,
+        "ignore_lines": [
+          "UnityEditor",
+          "UnityEngine",
+          "^\\n"
+        ],
+        "type": "error"
+      },
+      "exception_report": {
+        "active": true,
+        "start_pattern": "^(?<message>.*threw exception\\.)\\n",
+        "end_pattern": "Filename: (?:[\\w/:]+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)",
+        "start_message": false,
+        "end_message": "%{file}(line %{line}): %{message}",
+        "store_lines": false,
+        "type": "error"
+      },
       "log": {
         "active": true,
         "start_pattern": "UnityEngine\\.Debug:Log\\(Object\\)",
@@ -99,6 +122,12 @@
         "active": true,
         "start_pattern": "Exiting batchmode successfully now!",
         "type": "success"
+      },
+      "batchmode_abort": {
+        "active": true,
+        "start_pattern": "Aborting batchmode due to failure",
+        "end_pattern": ".*",
+        "type": "error"
       }
     }
   },
@@ -118,7 +147,7 @@
     "active": true,
     "silent": false,
     "comment": "Initialization on editor launch",
-    "phase_start_pattern": "Initialize mono",
+    "phase_start_pattern": "(?:COMMAND LINE|Initialize mono)",
     "rules": {
       "mono_options": {
         "active": true,

data/examples/Example1/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
-  remote: /Users/lacostej/Code/WWTK/u3d/fastlane-plugin-u3d
+  remote: /Users/lacostej/Code/OSS/u3d/fastlane-plugin-u3d
   specs:
-    fastlane-plugin-u3d (0.1.0)
-      u3d (~> 0.9)
+    fastlane-plugin-u3d (0.1.1)
+      u3d (>= 0.9, < 2.0)
 
 PATH
-  remote: /Users/lacostej/Code/WWTK/u3d
+  remote: /Users/lacostej/Code/OSS/u3d
   specs:
-    u3d (0.9.1)
+    u3d (1.0.0.rc1)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)
@@ -20,8 +20,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     babosa (1.0.2)
     claide (1.0.2)
     colored (1.2)
@@ -35,16 +35,16 @@ GEM
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.2.1)
-    excon (0.57.1)
-    faraday (0.12.1)
+    excon (0.58.0)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.47.0)
+    fastlane (2.54.4)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -58,7 +58,7 @@ GEM
       faraday_middleware (~> 0.9)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.0.1, < 2.0.0)
-      google-api-client (>= 0.12.0, < 0.13.0)
+      google-api-client (>= 0.13.1, < 0.14.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
@@ -66,6 +66,7 @@ GEM
       multi_xml (~> 0.5)
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
       rubyzip (>= 1.1.0, < 2.0.0)
       security (= 0.1.3)
       slack-notifier (>= 1.3, < 2.0.0)
@@ -73,21 +74,21 @@ GEM
       terminal-table (>= 1.4.5, < 2.0.0)
       tty-screen (~> 0.5.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.4.4, < 2.0.0)
+      xcodeproj (>= 1.5.0, < 2.0.0)
       xcpretty (>= 0.2.4, < 1.0.0)
       xcpretty-travis-formatter (>= 0.0.3)
     file-tail (1.2.0)
       tins (~> 1.0)
     filesize (0.1.1)
     gh_inspector (1.0.3)
-    google-api-client (0.12.0)
+    google-api-client (0.13.4)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.5)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.5.2)
+    googleauth (0.5.3)
       faraday (~> 0.12)
       jwt (~> 1.4)
       logging (~> 2.0)
@@ -122,7 +123,7 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    retriable (3.0.2)
+    retriable (3.1.1)
     rouge (2.0.7)
     rubyzip (1.2.1)
     security (0.1.3)
@@ -162,4 +163,4 @@ DEPENDENCIES
   u3d!
 
 BUNDLED WITH
-   1.15.3
+   1.15.4

data/examples/Example2/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
-  remote: /Users/lacostej/Code/WWTK/u3d/fastlane-plugin-u3d
+  remote: /Users/lacostej/Code/OSS/u3d/fastlane-plugin-u3d
   specs:
-    fastlane-plugin-u3d (0.1.0)
-      u3d (~> 0.9)
+    fastlane-plugin-u3d (0.1.1)
+      u3d (>= 0.9, < 2.0)
 
 PATH
-  remote: /Users/lacostej/Code/WWTK/u3d
+  remote: /Users/lacostej/Code/OSS/u3d
   specs:
-    u3d (0.9.1)
+    u3d (1.0.0.rc1)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)
@@ -20,8 +20,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     babosa (1.0.2)
     claide (1.0.2)
     colored (1.2)
@@ -35,16 +35,16 @@ GEM
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.2.1)
-    excon (0.57.1)
-    faraday (0.12.1)
+    excon (0.58.0)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.47.0)
+    fastlane (2.54.4)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -58,7 +58,7 @@ GEM
       faraday_middleware (~> 0.9)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.0.1, < 2.0.0)
-      google-api-client (>= 0.12.0, < 0.13.0)
+      google-api-client (>= 0.13.1, < 0.14.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
@@ -66,6 +66,7 @@ GEM
       multi_xml (~> 0.5)
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
       rubyzip (>= 1.1.0, < 2.0.0)
       security (= 0.1.3)
       slack-notifier (>= 1.3, < 2.0.0)
@@ -73,21 +74,21 @@ GEM
       terminal-table (>= 1.4.5, < 2.0.0)
       tty-screen (~> 0.5.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.4.4, < 2.0.0)
+      xcodeproj (>= 1.5.0, < 2.0.0)
       xcpretty (>= 0.2.4, < 1.0.0)
       xcpretty-travis-formatter (>= 0.0.3)
     file-tail (1.2.0)
       tins (~> 1.0)
     filesize (0.1.1)
     gh_inspector (1.0.3)
-    google-api-client (0.12.0)
+    google-api-client (0.13.4)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.5)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.5.2)
+    googleauth (0.5.3)
       faraday (~> 0.12)
       jwt (~> 1.4)
       logging (~> 2.0)
@@ -122,7 +123,7 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    retriable (3.0.2)
+    retriable (3.1.1)
     rouge (2.0.7)
     rubyzip (1.2.1)
     security (0.1.3)
@@ -162,4 +163,4 @@ DEPENDENCIES
   u3d!
 
 BUNDLED WITH
-   1.15.3
+   1.15.4

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

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = %q{jerome.lacoste@gmail.com}
 
   spec.summary       = %q{Fastgame's u3d (a Unity3d CLI) integration}
-  # spec.homepage      = "https://github.com/<GITHUB_USERNAME>/fastlane-plugin-u3d"
+  spec.homepage      = "https://github.com/DragonBox/u3d/tree/master/fastlane-plugin-u3d"
   spec.license       = "MIT"
 
   spec.files         = Dir["lib/**/*"] + %w(README.md LICENSE)
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   # Don't add a dependency to fastlane or fastlane_re
   # since this would cause a circular dependency
 
-  spec.add_dependency 'u3d', '~> 0.9'
+  spec.add_dependency 'u3d', '>= 0.9', "<2.0"
 
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'bundler'

data/fastlane-plugin-u3d/lib/fastlane/plugin/u3d/version.rb

@@ -22,6 +22,6 @@
 
 module Fastlane
   module U3d
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/u3d/commands_generator.rb

@@ -71,7 +71,17 @@ module U3d
         run_args = extract_run_args
 
         c.syntax = 'u3d run [-u | --unity_version <version>] [-r | --raw_logs] [ -- <run_args>]'
-        c.description = 'Run unity, and parses its output through u3d\'s log prettifier'
+        c.summary = 'Run unity, and parses its output through u3d\'s log prettifier'
+        c.description =  %(
+#{c.summary}
+
+The default prettifier rules file is packaged with u3d (#{U3d::LogAnalyzer::RULES_PATH}).
+You may which to pass your own using the environment variable U3D_RULES_PATH.
+
+E.g. U3D_RULES_PATH=my_rules.json u3d -- ...
+
+Fore more information about how the rules work, see https://github.com/DragonBox/u3d/blob/master/LOG_RULES.md
+        )
         c.option '-u', '--unity_version STRING', String, 'Version of Unity to run with. If not specified, it runs with the version of the project (either specified as -projectpath or current)'
         c.option '-r', '--raw_logs', 'Raw Unity output, not filtered by u3d\'s log prettifier'
         c.action do |args, options|

data/lib/u3d/downloader.rb

@@ -53,11 +53,6 @@ module U3d
         packages.each do |package|
           get_package(downloader, validator, package, definition, files)
         end
-
-        # On Linux, make sure the files are executable
-        # FIXME: Move me to the LinuxInstaller
-        files.each { |f| U3dCore::CommandExecutor.execute(command: "chmod a+x #{f[1]}") } if definition.os == :linux
-
         files
       end
 

data/lib/u3d/installer.rb

@@ -192,15 +192,23 @@ module U3d
         installation_path: path
       )
       # Forces sanitation for installation of 'weird' versions eg 5.6.1xf1Linux
-      sanitize_install(installed.select { |u| u.version == version }.first)
+      unity = installed.select { |u| u.version == version }.first
+      if unity
+        sanitize_install(unity)
+      else
+        UI.error "Unity was not installed properly"
+      end
     end
 
     def install_sh(file, installation_path: nil)
       cmd = file.shellescape
+
+      U3dCore::CommandExecutor.execute(command: "chmod a+x #{cmd}")
+
       if installation_path
-        command = "cd \"#{installation_path}\"; #{cmd}"
+        command = "cd #{installation_path.shellescape}; #{cmd}"
         unless File.directory? installation_path
-          command = "mkdir -p \"#{installation_path}\"; #{command}"
+          command = "mkdir -p #{installation_path.shellescape}; #{command}"
         end
         U3dCore::CommandExecutor.execute(command: command, admin: true)
       else

data/lib/u3d/log_analyzer.rb

@@ -42,7 +42,7 @@ module U3d
       generic_rules = {}
       phases = {}
 
-      data = JSON.parse(File.read(RULES_PATH))
+      data = JSON.parse(File.read(rules_path))
 
       if data['GENERAL'] && data['GENERAL']['active']
         data['GENERAL']['rules'].each do |rn, r|
@@ -195,6 +195,16 @@ module U3d
 
     private
 
+    def rules_path
+      path = ENV["U3D_RULES_PATH"]
+      unless path.nil?
+        UI.user_error!("Specified rules path '#{path}' isn't a file") unless File.exist? path
+        UI.message("Using #{path} for prettify rules path")
+      end
+      path = RULES_PATH if path.nil?
+      path
+    end
+
     def inject(string, params: {})
       message = "This is a default message."
       begin

data/lib/u3d/unity_runner.rb

@@ -45,7 +45,8 @@ module U3d
       end
 
       # Wait for tail_thread setup to be complete
-      sleep 0.5 while tail_thread.status != 'sleep'
+      sleep 0.5 while tail_thread.status == 'run'
+      return unless tail_thread.status
       tail_thread.run
 
       begin

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '0.9.4'.freeze
+  VERSION = '1.0.0.rc1'.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_core/ui/implementations/shell.rb

@@ -33,7 +33,7 @@ module U3dCore
       @log ||= if Helper.test?
                  Logger.new(nil) # don't show any logs when running tests
                else
-                 Logger.new($stdout)
+                 Logger.new(EPipeIgnorerLogDevice.new($stdout))
                end
 
       @log.formatter = proc do |severity, datetime, _progname, msg|
@@ -45,6 +45,20 @@ module U3dCore
       @log
     end
 
+    class EPipeIgnorerLogDevice < Logger::LogDevice
+      def initialize(logdev)
+        @logdev = logdev
+      end
+
+      # rubocop:disable HandleExceptions
+      def write(message)
+        @logdev.write(message)
+      rescue Errno::EPIPE
+        # ignored
+      end
+      # rubocop:enable HandleExceptions
+    end
+
     def format_string(datetime = Time.now, severity = "")
       if U3dCore::Globals.log_timestamps?
         timestamp = ENV["U3D_UI_TIMESTAMP"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -405,9 +405,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12