u3d 1.2.3 → 1.3.2

data/Gemfile.lock

@@ -1,139 +1,201 @@
 PATH
   remote: .
   specs:
-    u3d (1.2.3)
+    u3d (1.3.2)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
+      fiddle
       file-tail (>= 1.2.0)
       filesize (>= 0.1.1)
       inifile (>= 3.0.0, < 4.0.0)
       plist (>= 3.1.0, < 4.0.0)
+      rexml
       rubyzip (>= 1.0.0)
       security (= 0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.3)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    ast (2.3.0)
-    builder (3.2.3)
-    byebug (10.0.2)
-    coderay (1.1.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    async (1.30.2)
+      console (~> 1.10)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-http (0.56.6)
+      async (>= 1.25)
+      async-io (>= 1.28)
+      async-pool (>= 0.2)
+      protocol-http (~> 0.22.0)
+      protocol-http1 (~> 0.14.0)
+      protocol-http2 (~> 0.14.0)
+      traces (~> 0.4.0)
+    async-http-faraday (0.11.0)
+      async-http (~> 0.42)
+      faraday
+    async-io (1.33.0)
+      async
+    async-pool (0.3.10)
+      async (>= 1.25)
     colored (1.2)
-    commander (4.4.7)
+    commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.0.5)
-    coveralls (0.8.21)
+    concurrent-ruby (1.1.10)
+    console (1.15.3)
+      fiber-local
+    coveralls (0.8.23)
       json (>= 1.8, < 3)
-      simplecov (~> 0.14.1)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
+      thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    faraday (0.12.2)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    excon (0.92.3)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.0.0)
-      faraday (~> 0.8)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    fiber-local (1.0.0)
+    fiddle (1.1.0)
     file-tail (1.2.0)
       tins (~> 1.0)
     filesize (0.2.0)
-    github_changelog_generator (1.14.3)
+    github_changelog_generator (1.16.4)
       activesupport
+      async (>= 1.25.0)
+      async-http-faraday
       faraday-http-cache
       multi_json
       octokit (~> 4.6)
-      rainbow (>= 2.1)
+      rainbow (>= 2.2.1)
       rake (>= 10.0)
-      retriable (~> 2.1)
     highline (2.0.3)
-    i18n (0.8.6)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
     inifile (3.0.0)
-    json (2.1.0)
-    method_source (0.9.0)
-    minitest (5.10.3)
-    multi_json (1.12.1)
-    multipart-post (2.0.0)
-    octokit (4.7.0)
+    json (2.6.2)
+    minitest (5.15.0)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    nio4r (2.5.8)
+    octokit (4.22.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    plist (3.5.0)
-    powerpack (0.1.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    public_suffix (2.0.5)
-    rainbow (3.0.0)
-    rake (10.5.0)
-    retriable (2.1.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    plist (3.6.0)
+    protocol-hpack (1.4.2)
+    protocol-http (0.22.6)
+    protocol-http1 (0.14.4)
+      protocol-http (~> 0.22)
+    protocol-http2 (0.14.2)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.18)
+    public_suffix (4.0.7)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.4.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.52.1)
+    rubocop (1.28.2)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    rubyzip (2.0.0)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     security (0.1.3)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    term-ansicolor (1.6.0)
+    simplecov-html (0.10.2)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tins (1.15.0)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    thor (1.2.1)
+    timers (4.3.3)
+    tins (1.31.1)
+      sync
+    traces (0.4.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
-  x64-mingw32
-  x86-mingw32
 
 DEPENDENCIES
+  activesupport (>= 5.2.4.3)
+  addressable (>= 2.8.0)
   bundler (~> 2.0)
   coveralls
-  github_changelog_generator
-  pry-byebug
-  rake (~> 10.0)
-  rspec (~> 3.1.0)
-  rspec_junit_formatter (~> 0.2.3)
-  rubocop (~> 0.52.1)
+  excon (>= 0.71.0)
+  github_changelog_generator (>= 1.16.4)
+  json (>= 2.3.0)
+  rake (>= 12.3.3)
+  rspec (~> 3.11.0)
+  rspec_junit_formatter (~> 0.5.1)
+  rubocop (~> 1.27)
+  rubocop-rake (~> 0.6.0)
   u3d!
 
 BUNDLED WITH
-   2.1.4
+   2.3.13

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #
@@ -35,7 +37,7 @@ RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
 class GithubChangelogGenerator
-  PATH = '.github_changelog_generator'.freeze
+  PATH = '.github_changelog_generator'
   class << self
     def future_release
       s = File.read(PATH)
@@ -56,25 +58,25 @@ class GithubChangelogGenerator
           line
         end
       end
-      File.write(PATH, lines.join("\n") + "\n")
+      File.write(PATH, "#{lines.join("\n")}\n")
     end
   end
 end
 
 class U3dCode
-  PATH = 'lib/u3d/version.rb'.freeze
+  PATH = 'lib/u3d/version.rb'
   class << self
     def version=(version)
       s = File.read(PATH)
       lines = s.split("\n").map do |line|
-        m = line.match(/(.*VERSION = ').*('.freeze.*)/)
+        m = line.match(/(.*VERSION = ').*(')/)
         if m
           "#{m[1]}#{version}#{m[2]}"
         else
           line
         end
       end
-      File.write(PATH, lines.join("\n") + "\n")
+      File.write(PATH, "#{lines.join("\n")}\n")
     end
   end
 end
@@ -126,6 +128,7 @@ def github_reviewers
 end
 ###
 
+desc 'Ensure the git repository is clean. Fails otherwise'
 task :ensure_git_clean do
   branch = run_command('git rev-parse --abbrev-ref HEAD', "Couldn't get current git branch").strip
   UI.user_error!("You are not on 'master' but on '#{branch}'") unless branch == "master"
@@ -133,10 +136,11 @@ task :ensure_git_clean do
   UI.user_error!("git status not clean:\n#{output}") unless output == ""
 end
 
-# ensure ready to prepare a PR
+desc 'Ensure we are ready to prepare a PR'
 task :prepare_git_pr, [:pr_branch] do |_t, args|
   pr_branch = args['pr_branch']
   raise "Missing pr_branch argument" unless pr_branch
+
   UI.user_error! "Prepare git PR stopped by user" unless UI.confirm("Creating PR branch #{pr_branch}")
   run_command("git checkout -b #{pr_branch}")
 end
@@ -180,7 +184,7 @@ task bump: 'ensure_git_clean' do
   UI.user_error! "Bump version stopped by user" unless UI.confirm("Next version will be #{nextversion}. Confirm?")
   U3dCode.version = nextversion
   GithubChangelogGenerator.future_release = nextversion
-  sh 'rspec'
+  sh 'bundle exec rspec'
   sh 'git add .github_changelog_generator lib/u3d/version.rb Gemfile.lock'
   sh "git commit -m 'Bump version to #{nextversion}'"
   sh 'git push'
@@ -216,9 +220,10 @@ def parse_changelog
     if (m = line.match(/^## \[(.*)\]/))
       releases[version] = buffer if buffer
       version = m[1]
-      buffer = version + "\n\n"
+      buffer = "#{version}\n\n"
     else
       next unless version # skip first lines
+
       buffer += line
     end
   end

data/examples/Example1/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'fastlane'
@@ -5,6 +7,6 @@ REPO_ROOT = File.expand_path(File.join('..', '..'))
 gem 'u3d', path: REPO_ROOT
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
-# rubocop:disable Eval
+# rubocop:disable Security/Eval
 eval(File.read(plugins_path), binding) if File.exist?(plugins_path)
-# rubocop:enable Eval
+# rubocop:enable Security/Eval

data/examples/Example1/Gemfile.lock

@@ -1,19 +1,20 @@
 PATH
-  remote: /Users/lacostej/Code/OSS/u3d/fastlane-plugin-u3d
+  remote: /Users/lacostej/Code/OSS/u3d_releases/fastlane-plugin-u3d
   specs:
     fastlane-plugin-u3d (0.1.2)
       u3d (>= 0.9, < 2.0)
 
 PATH
-  remote: /Users/lacostej/Code/OSS/u3d
+  remote: /Users/lacostej/Code/OSS/u3d_releases
   specs:
-    u3d (1.2.1)
+    u3d (1.2.3)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)
       filesize (>= 0.1.1)
       inifile (>= 3.0.0, < 4.0.0)
       plist (>= 3.1.0, < 4.0.0)
+      rexml
       rubyzip (>= 1.0.0)
       security (= 0.1.3)
 
@@ -21,7 +22,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
     babosa (1.0.3)
@@ -118,7 +119,7 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     inifile (3.0.0)
-    json (2.2.0)
+    json (2.6.2)
     jwt (2.1.0)
     memoist (0.16.0)
     mime-types (3.3)
@@ -138,6 +139,7 @@ GEM
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    rexml (3.2.5)
     rouge (2.0.7)
     rubyzip (1.3.0)
     security (0.1.3)
@@ -154,7 +156,7 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tins (1.24.1)
+    tins (1.31.1)
       sync
     tty-cursor (0.7.0)
     tty-screen (0.7.0)

data/examples/Example1/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Example integration of u3d
 
 task :u3d_load_save_scenes do

data/examples/Example1/fastlane/Fastfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 desc "Run the EditorRun.LoadSaveScenes task"
 lane :u3d_build do
   u3d(run_args: "-logFile './editor.log' -executeMethod U3d.EditorRun.LoadSaveScenes -quit -batchmode")

data/examples/Example2/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'fastlane'
@@ -5,6 +7,6 @@ REPO_ROOT = File.expand_path(File.join('..', '..'))
 gem 'u3d', path: REPO_ROOT
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
-# rubocop:disable Eval
+# rubocop:disable Security/Eval
 eval(File.read(plugins_path), binding) if File.exist?(plugins_path)
-# rubocop:enable Eval
+# rubocop:enable Security/Eval

data/examples/Example2/Gemfile.lock

@@ -1,26 +1,28 @@
 PATH
-  remote: /Users/lacostej/Code/OSS/u3d/fastlane-plugin-u3d
+  remote: /Users/lacostej/Code/OSS/u3d_releases/fastlane-plugin-u3d
   specs:
     fastlane-plugin-u3d (0.1.2)
       u3d (>= 0.9, < 2.0)
 
 PATH
-  remote: /Users/lacostej/Code/OSS/u3d
+  remote: /Users/lacostej/Code/OSS/u3d_releases
   specs:
-    u3d (1.1.6)
+    u3d (1.2.3)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)
       filesize (>= 0.1.1)
       inifile (>= 3.0.0, < 4.0.0)
       plist (>= 3.1.0, < 4.0.0)
+      rexml
+      rubyzip (>= 1.0.0)
       security (= 0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
     babosa (1.0.3)
@@ -38,7 +40,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.5)
     emoji_regex (1.0.1)
-    excon (0.68.0)
+    excon (0.92.3)
     faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
@@ -117,7 +119,7 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     inifile (3.0.0)
-    json (2.2.0)
+    json (2.6.2)
     jwt (2.1.0)
     memoist (0.16.0)
     mime-types (3.3)
@@ -137,6 +139,7 @@ GEM
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    rexml (3.2.5)
     rouge (2.0.7)
     rubyzip (1.3.0)
     security (0.1.3)
@@ -149,10 +152,12 @@ GEM
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
+    sync (0.5.0)
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tins (1.22.0)
+    tins (1.31.1)
+      sync
     tty-cursor (0.7.0)
     tty-screen (0.7.0)
     tty-spinner (0.9.1)

data/examples/Example2/fastlane/Fastfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 desc "Run the EditorRun.Build task"
 lane :u3d_build do |options|
   u3d(raw_logs: options[:raw_logs], run_args: "-logFile './editor.log' -executeMethod U3d.EditorRun.Build -quit -batchmode")

data/exe/u3d

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.push File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('../lib', __dir__)
 
 require 'u3d'
 require 'u3d/commands_generator'

data/lib/u3d/asset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #
@@ -36,8 +38,9 @@ module U3d
 
     def initialize(path, unity_project = nil)
       raise ArgumentError, "No file at #{path}" unless File.exist?(path)
+
       @path = path
-      @meta_path = path + ".meta"
+      @meta_path = "#{path}.meta"
       @meta = YAML.safe_load(File.read(@meta_path))
       @guid = @meta['guid']
       @unity_project = unity_project
@@ -63,6 +66,7 @@ module U3d
 
     def eql?(other)
       return false unless other.is_a? Asset
+
       other.guid == @guid
     end
 
@@ -81,7 +85,7 @@ module U3d
     private
 
     def grep_reference_root
-      @unity_project && @unity_project.exist? ? 'Assets/' : '.'
+      @unity_project&.exist? ? 'Assets/' : '.'
     end
   end
 end

data/lib/u3d/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #
@@ -32,12 +34,12 @@ module U3d
     using ::CoreExtensions::OperatingSystem
 
     # Name of the cache file
-    DEFAULT_NAME = 'cache.json'.freeze
+    DEFAULT_NAME = 'cache.json'
     # Maximum duration after which the cache is considered outdated
     # Currently set to 24h
     CACHE_LIFE = 60 * 60 * 24
 
-    GLOBAL_CACHE_URL = 'https://dragonbox.github.io/unities/v1/versions.json'.freeze
+    GLOBAL_CACHE_URL = 'https://dragonbox.github.io/unities/v1/versions.json'
 
     private
 
@@ -49,11 +51,13 @@ module U3d
 
     def [](key)
       return nil if @cache[key].nil?
+
       @cache[key]
     end
 
     def initialize(path: nil, force_os: nil, force_refresh: false, offline: false, central_cache: false)
       raise "Cache: cannot specify both offline and force_refresh" if offline && force_refresh
+
       @path = path || Cache.default_os_path
       @cache = {}
       os = force_os || U3dCore::Helper.operating_system
@@ -78,23 +82,23 @@ module U3d
     def check_for_update(file_path, os)
       need_update = false
       data = {}
-      if !File.file?(file_path)
-        need_update = true
-      else
+      if File.file?(file_path)
         begin
           File.open(file_path, 'r') do |f|
             data = JSON.parse(f.read)
           end
-        rescue JSON::ParserError => json_error
-          UI.error 'Failed to parse cache.json: ' + json_error.to_s
+        rescue JSON::ParserError => e
+          UI.error "Failed to parse cache.json: #{e}"
           need_update = true
-        rescue SystemCallError => file_error
-          UI.error 'Failed to open cache.json: ' + file_error.to_s
+        rescue SystemCallError => e
+          UI.error "Failed to open cache.json: #{e}"
           need_update = true
         else
           need_update = os_data_need_update?(data, os)
           data[os.id2name] = nil if need_update
         end
+      else
+        need_update = true
       end
       return need_update, data
     end
@@ -111,7 +115,7 @@ module U3d
       update_cache(os) unless central_cache && fetch_central_cache(os)
 
       File.delete(file_path) if File.file?(file_path)
-      File.open(file_path, 'w') { |f| f.write(@cache.to_json) }
+      File.write(file_path, @cache.to_json)
     end
 
     # Fetches central versions.json. Ignore it if it is too old