u3d 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0be22743b701cf41ec7c0ec7502b3e83e398dfa3
-  data.tar.gz: 50cf04086a670bee0dd8712c9aa0a674bde8cb37
+SHA256:
+  metadata.gz: 0c128eb99e14bacffa362e52f40d1a2c4630f35d669165fddb9f6ab1a3f1879a
+  data.tar.gz: ae99d106583181bcd9e9809a9c03a16ba28a439bce5d897db5d667ec654e37f3
 SHA512:
-  metadata.gz: 579f873a2b755f118ee77795615e407c97757fcc49118137e1dc42bdfea366d3997cf03bf35c057d764df949286d3fb88bdab3a401d6f0fd57f4d8b31325aeae
-  data.tar.gz: 883df9835b2b0a77c13c124848d936658f558bda6927510f7ab3ca60865e381b7704f4cc1a99a28126be35d03780322ca712c40b463d54851eea545d75aba345
+  metadata.gz: a3dd9e7300532f9551b40367d9c20e16ff6e9c12fc2ef548beb09f3794033b3b15f85f7c6e47c3ad4f7bb9824e1084d9dbb6ad00084332d1cbd035a3949222bb
+  data.tar.gz: 3c7bd315433353642fde4c2a4d42850d6c4e00ee4bd6ffd57009cca741c7cf49a8818dfd946845340c8a626b02e7e8ad043359b86f5c48b333b60f81ea3c2c24

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## [v1.1.4](https://github.com/DragonBox/u3d/tree/v1.1.4) (2019-02-23)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.1.3...v1.1.4)
+
+**Implemented enhancements:**
+
+- u3d/asset: add feature that enables easy inspection of asset in a Unity project [\#341](https://github.com/DragonBox/u3d/pull/341) ([niezbop](https://github.com/niezbop))
+
+**Closed issues:**
+
+- u3d returns code=0 if failed [\#343](https://github.com/DragonBox/u3d/issues/343)
+- `user\_error!': package 'Mac' doesn't exist [\#340](https://github.com/DragonBox/u3d/issues/340)
+- list fails when version does not follow standard format, e.g. MagicLeap versions [\#331](https://github.com/DragonBox/u3d/issues/331)
+- Bug: Failed to install pkg file [\#310](https://github.com/DragonBox/u3d/issues/310)
+
+**Merged pull requests:**
+
+- u3d/list: support Magic Leap Versions parsing and sorting \(fixes \#331\) [\#346](https://github.com/DragonBox/u3d/pull/346) ([lacostej](https://github.com/lacostej))
+- Update to latest hub to label PRs and remove the hardcoding of the user's repo [\#345](https://github.com/DragonBox/u3d/pull/345) ([lacostej](https://github.com/lacostej))
+- u3d/install exit 1 when version not found. Fixes \#343 [\#344](https://github.com/DragonBox/u3d/pull/344) ([lacostej](https://github.com/lacostej))
+- Add `-t\*` flag for 7z when unpacking packages [\#342](https://github.com/DragonBox/u3d/pull/342) ([rawstacktech](https://github.com/rawstacktech))
+
 ## [v1.1.3](https://github.com/DragonBox/u3d/tree/v1.1.3) (2019-01-08)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.1.2...v1.1.3)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u3d (1.1.3)
+    u3d (1.1.4)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)
@@ -25,8 +25,8 @@ GEM
     byebug (10.0.2)
     coderay (1.1.2)
     colored (1.2)
-    commander (4.4.6)
-      highline (~> 1.7.2)
+    commander (4.4.7)
+      highline (~> 2.0.0)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
@@ -51,7 +51,7 @@ GEM
       rainbow (>= 2.1)
       rake (>= 10.0)
       retriable (~> 2.1)
-    highline (1.7.10)
+    highline (2.0.1)
     i18n (0.8.6)
     inifile (3.0.0)
     json (2.1.0)
@@ -134,4 +134,4 @@ DEPENDENCIES
   u3d!
 
 BUNDLED WITH
-   1.16.1
+   1.17.1

data/Rakefile

@@ -87,6 +87,32 @@ def run_command(command, error_message = nil)
   output
 end
 
+###
+### see https://github.com/github/hub/issues/2055
+def ensure_hub!
+  require 'English'
+  `which hub`
+  raise "Missing hub command. This script requires the hub command. Get it from https://hub.github.com" unless $CHILD_STATUS.exitstatus.zero?
+end
+
+def hub_config
+  require 'YAML'
+  File.open(File.expand_path("~/.config/hub"), 'r:bom|utf-8') { |f| Psych.safe_load(f.read) }
+end
+
+def hub_user(server)
+  hub_config[server][0]['user']
+end
+
+def hub_fork_remote_name
+  server = 'github.com'
+
+  user = hub_user(server)
+
+  `git remote -v`.split("\n").map(&:split).select { |a| a[2] == '(push)' && a[1] =~ /#{server}.#{user}/ }.first[0]
+end
+###
+
 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"
@@ -126,9 +152,11 @@ task pre_release: 'ensure_git_clean' do
   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}'" # requires hub pre-release " -l nochangelog"
+
+  ensure_hub!
+  hub_remote = hub_fork_remote_name
+  sh "git push #{hub_remote}"
+  sh "hub pull-request -m '#{msg}' -l nochangelog"
   sh 'git checkout master'
   sh "git branch -D #{pr_branch}"
 end

data/lib/u3d.rb

@@ -25,6 +25,7 @@ require 'u3d_core'
 require 'u3d/utils'
 require 'u3d/version'
 
+require 'u3d/asset'
 require 'u3d/cache'
 require 'u3d/commands'
 require 'u3d/commands_generator'

data/lib/u3d/asset.rb

@@ -0,0 +1,87 @@
+## --- BEGIN LICENSE BLOCK ---
+# Copyright (c) 2016-present WeWantToKnow AS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+## --- END LICENSE BLOCK ---
+
+require 'yaml'
+
+module U3d
+  # U3d::Asset provides you with a way to easily manipulate an search for assets in Unity Projects
+  class Asset
+    class << self
+      def glob(pattern, unity_project_path = Dir.pwd)
+        unity_project = U3d::UnityProject.new(unity_project_path)
+        Dir.glob(pattern).reject { |path| File.extname(path) == '.meta' || !File.file?(path) }.map { |path| Asset.new(path, unity_project) }
+      end
+    end
+
+    attr_reader :path, :meta_path, :meta, :guid
+
+    def initialize(path, unity_project = nil)
+      raise ArgumentError, "No file at #{path}" unless File.exist?(path)
+      @path = path
+      @meta_path = path + ".meta"
+      @meta = YAML.safe_load(File.read(@meta_path))
+      @guid = @meta['guid']
+      @unity_project = unity_project
+    end
+
+    def guid_references
+      @guid_references ||= U3dCore::CommandExecutor.execute(
+        command: "grep -rl #{@guid} #{grep_reference_root}",
+        print_command: false
+      ).split("\n").reject { |f| f == @meta_path }.map { |path| Asset.new(path) }
+    end
+
+    def name_references
+      @name_references ||= U3dCore::CommandExecutor.execute(
+        command: "grep -rl #{File.basename(@path, extension)} #{grep_reference_root} --include=*.cs",
+        print_command: false
+      ).split("\n").map { |path| Asset.new(path) }
+    end
+
+    def extension
+      File.extname(@path)
+    end
+
+    def eql?(other)
+      return false unless other.is_a? Asset
+      other.guid == @guid
+    end
+
+    def hash
+      @guid.to_i
+    end
+
+    def to_s
+      "#{@guid}:#{@path}"
+    end
+
+    def inspect
+      to_s
+    end
+
+    private
+
+    def grep_reference_root
+      @unity_project && @unity_project.exist? ? 'Assets/' : '.'
+    end
+  end
+end

data/lib/u3d/commands.rb

@@ -151,7 +151,7 @@ module U3d
         cache_versions = cache_versions(os, offline: !options[:download])
         version = interpret_latest(version, cache_versions)
         unless cache_versions[version]
-          UI.error "No version '#{version}' was found in cache. Either it doesn't exist or u3d doesn't know about it yet. Try refreshing with 'u3d available -f'"
+          UI.crash! "No version '#{version}' was found in cache. Either it doesn't exist or u3d doesn't know about it yet. Try refreshing with 'u3d available -f'"
           return
         end
 

data/lib/u3d/installer.rb

@@ -84,13 +84,7 @@ module U3d
     def installed_sorted_by_versions
       list = installed
       return [] if list.empty?
-      # version -> installations
-      arraym = list.map { |a| [a.version, a] }
-      map = Hash[*arraym.flatten]
-      # sorted versions
-      vcomparators = map.keys.map { |k| UnityVersionComparator.new(k) }
-      sorted_keys = vcomparators.sort.map { |v| v.version.to_s }
-      sorted_keys.map { |k| map[k] }
+      list.sort { |a, b| UnityVersionComparator.new(a.version) <=> UnityVersionComparator.new(b.version) }
     end
   end
 
@@ -285,7 +279,7 @@ module U3d
       Dir.mktmpdir do |tmp_dir|
         UI.verbose "Working in tmp dir #{tmp_dir}"
 
-        command = "7z -aos -o#{tmp_dir.shellescape} e #{file.shellescape}"
+        command = "7z -aos -t* -o#{tmp_dir.shellescape} e #{file.shellescape}"
         U3dCore::CommandExecutor.execute(command: command)
 
         target_location = pkg_install_path(installation_path, "#{tmp_dir}/PackageInfo")

data/lib/u3d/unity_project.rb

@@ -31,12 +31,20 @@ module U3d
     end
 
     def exist?
-      Dir.exist?("#{@path}/Assets") && Dir.exist?("#{@path}/ProjectSettings")
+      Dir.exist?(assets_path) && Dir.exist?(project_settings_path)
+    end
+
+    def assets_path
+      File.join(@path, 'Assets')
+    end
+
+    def project_settings_path
+      File.join(@path, 'ProjectSettings')
     end
 
     def editor_version
       require 'yaml'
-      project_version = "#{@path}/ProjectSettings/ProjectVersion.txt"
+      project_version = File.join(project_settings_path, 'ProjectVersion.txt')
       return nil unless File.exist? project_version
       yaml = YAML.safe_load(File.read(project_version))
       version = yaml['m_EditorVersion']

data/lib/u3d/unity_version_number.rb

@@ -24,10 +24,12 @@ require 'u3d/utils'
 
 module U3d
   class UnityVersionNumber
+    attr_reader :unity_version
     attr_reader :parts
 
     def initialize(version)
-      parsed = Utils.parse_unity_version(version)
+      @unity_version = version
+      parsed = Utils.parse_unity_version(@unity_version)
       parsed.each_with_index do |val, index|
         next if val.nil? || (index == 3)
         parsed[index] = val.to_i

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.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.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -376,6 +376,7 @@ files:
 - fastlane-plugin-u3d/spec/spec_helper.rb
 - lib/assets/utf8.txt
 - lib/u3d.rb
+- lib/u3d/asset.rb
 - lib/u3d/cache.rb
 - lib/u3d/commands.rb
 - lib/u3d/commands_generator.rb
@@ -433,7 +434,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