u3d 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4be70d9ffab56f3537c7f5081359d2eaa2a46ad5
-  data.tar.gz: cd8c671f66176935802e26be92d219aee76bd761
+SHA256:
+  metadata.gz: 0e34b0f9202cf4e0351462879c8719ff898285538f1dc046c62e89bd96978c9b
+  data.tar.gz: 4a8413ab008d81a86cee87e02c28428b41e27c927b60826e80fb2b00cdff21fe
 SHA512:
-  metadata.gz: 6dc822de300ad849dfe6a2a2fbb84f16e4180e5bb50b193ba177fb2578cd269192cf4d55ba46d720dffed209235d5ac3c58381f48408d168e62b7836a5e72715
-  data.tar.gz: b2c7aa41b6f652047f19b2184ed505c9498f72c2a7d1922a5f24fce7e9b63663c3592c3a64f07b45da7e711b331e215da220d3594a722c3cde30806f82f850d6
+  metadata.gz: 5270c48e07ea3d371747ed6b8192345a543a6ed7be5b2102683d1fd585bf1facf998fcee407f339a2ba893e43b2f512cc709ec66dd76dab4e8bb1b4e3729c49a
+  data.tar.gz: 22391cbcbca376248c726cec2615adf91c7630bec60244616fe51fd3c11a88986676db54e5cac9d405e8dd91efcbeb2d08c0e843d935585f55657d421a9d642b

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [v1.1.1](https://github.com/DragonBox/u3d/tree/v1.1.1) (2018-07-12)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.1.0...v1.1.1)
+
+**Fixed bugs:**
+
+- Unity 2018.2.x is not listed as available [\#321](https://github.com/DragonBox/u3d/issues/321)
+- u3d/versions: Accept new pattern for mac above 2018.2+ [\#322](https://github.com/DragonBox/u3d/pull/322) ([niezbop](https://github.com/niezbop))
+- u3d/runner: Fix -projectPath argument [\#320](https://github.com/DragonBox/u3d/pull/320) ([niezbop](https://github.com/niezbop))
+
+**Closed issues:**
+
+- Inconsistency regarding -projectpath / -projectPath argument [\#319](https://github.com/DragonBox/u3d/issues/319)
+- Betas not fetched anymore [\#314](https://github.com/DragonBox/u3d/issues/314)
+
 ## [v1.1.0](https://github.com/DragonBox/u3d/tree/v1.1.0) (2018-06-27)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.21...v1.1.0)
 
@@ -44,7 +58,6 @@
 
 **Merged pull requests:**
 
-- Preparing release for 1.0.21 [\#308](https://github.com/DragonBox/u3d/pull/308) ([lacostej](https://github.com/lacostej))
 - u3d/console: remove require on pry [\#307](https://github.com/DragonBox/u3d/pull/307) ([lacostej](https://github.com/lacostej))
 - Allow spaces in installation paths on Windows \#302 [\#306](https://github.com/DragonBox/u3d/pull/306) ([lacostej](https://github.com/lacostej))
 - u3d/install: support full pkg for Linux [\#305](https://github.com/DragonBox/u3d/pull/305) ([lacostej](https://github.com/lacostej))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u3d (1.1.0)
+    u3d (1.1.1)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)
@@ -25,7 +25,7 @@ GEM
     byebug (10.0.2)
     coderay (1.1.2)
     colored (1.2)
-    commander (4.4.4)
+    commander (4.4.5)
       highline (~> 1.7.2)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)

data/lib/u3d/commands.rb

@@ -204,7 +204,7 @@ module U3d
         end
 
         if up.exist? && args_pp.nil?
-          extra_run_args = ['-projectpath', up.path]
+          extra_run_args = ['-projectPath', up.path]
           run_args = [extra_run_args, run_args].flatten
         end
 

data/lib/u3d/commands_generator.rb

@@ -91,7 +91,7 @@ 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 '-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|
           UI.user_error! "Run doesn't take arguments. Did you forget '--' or did you mistake your command? (#{args})" if args.count > 0

data/lib/u3d/unity_runner.rb

@@ -85,7 +85,7 @@ module U3d
       end
 
       def find_projectpath_in_args(args)
-        find_arg_in_args('-projectpath', args)
+        find_arg_in_args('-projectPath', args)
       end
 
       def find_arg_in_args(arg_to_find, args)

data/lib/u3d/unity_versions.rb

@@ -121,6 +121,7 @@ module U3d
     # Captures a version and its base url
     LINUX_DOWNLOAD = %r{'(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)(./)?UnitySetup-(\d+\.\d+\.\d+\w\d+)'}
     MAC_DOWNLOAD = %r{"(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)MacEditorInstaller/[a-zA-Z0-9/\.\+]+-(\d+\.\d+\.\d+\w\d+)\.?\w+"}
+    MAC_DOWNLOAD_2018_2 = %r{"(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)UnityDownloadAssistant-[a-zA-Z0-9/\.\+]+-(\d+\.\d+\.\d+\w\d+)\.?\w+"}
     WIN_DOWNLOAD = %r{"(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)Windows..EditorInstaller/[a-zA-Z0-9/\.\+]+-(\d+\.\d+\.\d+\w\d+)\.?\w+"}
     LINUX_DOWNLOAD_DATED = %r{"(https?://[\w/\._-]+/unity\-editor\-installer\-(\d+\.\d+\.\d+\w\d+).*\.sh)"}
     LINUX_DOWNLOAD_RECENT_PAGE = %r{"(https?://beta\.unity3d\.com/download/[a-zA-Z0-9/\.\+]+/public_download\.html)"}
@@ -227,15 +228,19 @@ module U3d
 
       def initialize(pattern:)
         @versions = {}
-        @pattern = pattern
+        @patterns = pattern.is_a?(Array) ? pattern : [pattern]
       end
 
       def fetch_some(type, url)
         UI.message "Loading Unity #{type} releases"
-        current = UnityVersions.fetch_version_paged(url, @pattern)
-        current = UnityVersions.fetch_version(url, @pattern) if current.empty?
-        UI.success "Found #{current.count} #{type} releases."
-        @versions.merge!(current)
+        total = {}
+        @patterns.each do |pattern|
+          current = UnityVersions.fetch_version_paged(url, pattern)
+          current = UnityVersions.fetch_version(url, pattern) if current.empty?
+          total.merge!(current)
+        end
+        UI.success "Found #{total.count} #{type} releases."
+        @versions.merge!(total)
       end
 
       def fetch_all_channels
@@ -250,7 +255,7 @@ module U3d
     class MacVersions
       class << self
         def list_available
-          VersionsFetcher.new(pattern: MAC_DOWNLOAD).fetch_all_channels
+          VersionsFetcher.new(pattern: [MAC_DOWNLOAD, MAC_DOWNLOAD_2018_2]).fetch_all_channels
         end
       end
     end

data/lib/u3d/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -433,7 +433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: U3d