u3d 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fa90ce7799123f17d7760705c0e678a9c24a057
-  data.tar.gz: 973b34ba000a634b8bcf544de1a4b6ede5bc7553
+  metadata.gz: 43c7834c3f3b774506971cb0cb9d30fa947a9084
+  data.tar.gz: 15a1b29791c19f11fd8d301dc94d43f2129bceb2
 SHA512:
-  metadata.gz: 5bd4042294072a4a90f70dfe7287e0eb5c0ef6a9151fcc42bf477873c8bc21e0118d3b1123013584f8f32dc3daaa2d415c3a2ede586665b469202adc75092ff4
-  data.tar.gz: 1ee8b5bdf89fa4ef179794516d9943fb64d5bd3b29cedaf11de91a81ace1b1dc133ca146cdf7bdd06fad13988aae8f4420220a298d0c21048cc1c553e9f144ca
+  metadata.gz: a394c25724713e499cddf74a03fd3054ef20ed65384242afc490790b6aa63ac8928d92a87f75399317a94cb67284d17a5b1974885ed26d1420dcb913b7ff1b71
+  data.tar.gz: 60acfb2ade3034640bb195466a5b6315844f10ff13818a31fabd71e1782a9253bc673482c93a2edc4f7f128891d58fd15df71ab6d4888598f1d45eec23e37a63

data/CHANGELOG.md

@@ -0,0 +1,31 @@
+# Change Log
+
+## [v0.9.2](https://github.com/DragonBox/u3d/tree/v0.9.2) (2017-08-04)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v0.9.1...v0.9.2)
+
+**Fixed bugs:**
+
+- Fix missing key failure [\#13](https://github.com/DragonBox/u3d/pull/13) ([niezbop](https://github.com/niezbop))
+
+**Closed issues:**
+
+- -logFile /dev/stdout not supported [\#11](https://github.com/DragonBox/u3d/issues/11)
+- Do you have any relevant documents? [\#7](https://github.com/DragonBox/u3d/issues/7)
+- rspec broken on linux [\#5](https://github.com/DragonBox/u3d/issues/5)
+
+**Merged pull requests:**
+
+- Better support for /dev/stdout \(\#11\) [\#17](https://github.com/DragonBox/u3d/pull/17) ([lacostej](https://github.com/lacostej))
+- u3d/list: sort versions [\#16](https://github.com/DragonBox/u3d/pull/16) ([lacostej](https://github.com/lacostej))
+- Fix tail logs synchronization [\#12](https://github.com/DragonBox/u3d/pull/12) ([niezbop](https://github.com/niezbop))
+- Various test fixes, including linux rspec support, and a regression [\#9](https://github.com/DragonBox/u3d/pull/9) ([lacostej](https://github.com/lacostej))
+- specs: ensure test pass on Linux [\#8](https://github.com/DragonBox/u3d/pull/8) ([lacostej](https://github.com/lacostej))
+- Linux versions fix [\#6](https://github.com/DragonBox/u3d/pull/6) ([niezbop](https://github.com/niezbop))
+- Document further the prettifier [\#1](https://github.com/DragonBox/u3d/pull/1) ([lacostej](https://github.com/lacostej))
+
+## [v0.9.1](https://github.com/DragonBox/u3d/tree/v0.9.1) (2017-07-24)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v0.9...v0.9.1)
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile.lock

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

data/lib/u3d/commands.rb

@@ -42,14 +42,14 @@ module U3d
           return
         end
         # version -> installations
-        arraym = list.map{|a| [a.version, a]}
+        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.each do |k|
           u = map[k]
-          UI.message "Version #{u.version}\t(#{u.path})"
+          UI.message "%-*s%s" % [30, "Version #{u.version}", " (#{u.path})"]
           packages = u.packages
           next unless options[:packages] && packages && !packages.empty?
           UI.message 'Packages:'
@@ -114,11 +114,8 @@ module U3d
         versions = cache[os.id2name]['versions']
         version = interpret_latest(version, versions)
 
-        unless packages.include?('Unity')
-          unity = check_unity_presence(version: version)
-          return unless unity
-          options[:installation_path] ||= unity.path if Helper.windows?
-        end
+        unity = check_unity_presence(version: version)
+        return unless enforce_setup_coherence(packages, options, unity)
 
         U3d::Globals.use_keychain = true if options[:keychain] && Helper.mac?
 
@@ -156,18 +153,16 @@ module U3d
 
         packages = packages_with_unity_first(options)
 
-        unless packages.include?('Unity')
-          unity = check_unity_presence(version: version)
-          return unless unity
-          options[:installation_path] ||= unity.path if Helper.windows?
-        end
+        os = U3dCore::Helper.operating_system
+
+        unity = check_unity_presence(version: version)
+        return unless enforce_setup_coherence(packages, options, unity)
 
         U3d::Globals.use_keychain = true if options[:keychain] && Helper.mac?
 
         UI.important 'Root privileges are required'
         raise 'Could not get administrative privileges' unless U3dCore::CommandExecutor.has_admin_privileges?
 
-        os = U3dCore::Helper.operating_system
         files = []
         if os == :linux
           UI.important 'Option -a | --all not available for Linux' if options[:all]
@@ -218,7 +213,7 @@ module U3d
         %w(add remove check)
       end
 
-      def credentials(args: [], options: {})
+      def credentials(args: [], _options: {})
         action = args[0]
         raise "Please specify an action to perform, one of #{credentials_actions.join(',')}" unless action
         raise "Unknown action '#{action}'. Use one of #{credentials_actions.join(',')}" unless credentials_actions.include? action
@@ -297,13 +292,36 @@ module U3d
         installed = Installer.create.installed
         unity = installed.find { |u| u.version == version }
         if unity.nil?
-          UI.error "Version #{version} of Unity is not installed yet. Please install it first before installing any other module"
+          UI.verbose "Version #{version} of Unity is not installed yet"
         else
           UI.verbose "Unity #{version} is installed at #{unity.path}"
           return unity
         end
         nil
       end
+
+      def enforce_setup_coherence(packages, options, unity)
+        if unity
+          UI.important "Unity #{unity.version} is already installed"
+          return false if Helper.linux?
+          if packages.include?('Unity')
+            UI.important 'Ignoring Unity module, it is already installed'
+            packages.delete('Unity')
+            options[:installation_path] ||= unity.path if Helper.windows?
+          end
+          if unity.packages
+            unity.packages.each do |pack|
+              UI.important "Ignoring #{pack} module, it is already installed" if packages.delete(pack)
+            end
+          end
+        else
+          unless packages.include?('Unity')
+            UI.error "Please install Unity #{unity.version} before any of its packages"
+            return false
+          end
+        end
+        true
+      end
     end
   end
 end

data/lib/u3d/downloader.rb

@@ -65,6 +65,7 @@ module U3d
         File.open(path, 'wb') do |f|
           uri = URI(url)
           current = 0
+          last_print_update = 0
           Net::HTTP.start(uri.host, uri.port) do |http|
             request = Net::HTTP::Get.new uri
             http.request request do |response|
@@ -77,7 +78,11 @@ module U3d
               response.read_body do |segment|
                 f.write(segment)
                 current += segment.length
+                # wait for Net::HTTP buffer on slow networks
+                sleep 0.08 # adjust to reduce CPU
                 next unless UI.interactive?
+                next unless Time.now.to_f - last_print_update > 0.5
+                last_print_update = Time.now.to_f
                 if size
                   Utils.print_progress(current, size, started_at)
                 else

data/lib/u3d/installer.rb

@@ -30,7 +30,9 @@ module U3d
   DEFAULT_MAC_INSTALL = '/'.freeze
   DEFAULT_WINDOWS_INSTALL = 'C:/Program Files/'.freeze
   UNITY_DIR = "Unity_%s".freeze
+  UNITY_DIR_LINUX = "unity-editor-%s".freeze
   UNITY_DIR_CHECK = /Unity_\d+\.\d+\.\d+[a-z]\d+/
+  UNITY_DIR_CHECK_LINUX = /unity-editor-\d+\.\d+\.\d+[a-z]\d+\z/
 
   class Installation
     def self.create(path: nil)
@@ -75,6 +77,10 @@ module U3d
       Dir.entries(fpath).select { |e| File.directory?(File.join(fpath, e)) && !(e == '.' || e == '..') }
     end
 
+    def clean_install?
+      path =~ UNITY_DIR_CHECK
+    end
+
     private
 
     def plist
@@ -92,7 +98,7 @@ module U3d
     def version
       # I don't find an easy way to extract the version on Linux
       require 'rexml/document'
-      fpath = "#{path}/Data/PlaybackEngines/LinuxStandaloneSupport/ivy.xml"
+      fpath = "#{path}/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/ivy.xml"
       raise "Couldn't find file #{fpath}" unless File.exist? fpath
       doc = REXML::Document.new(File.read(fpath))
       version = REXML::XPath.first(doc, 'ivy-module/info/@e:unityVersion').value
@@ -107,12 +113,16 @@ module U3d
     end
 
     def exe_path
-      "#{path}/Unity"
+      "#{path}/Editor/Unity"
     end
 
     def packages
       false
     end
+
+    def clean_install?
+      path =~ UNITY_DIR_CHECK_LINUX
+    end
   end
 
   class WindowsInstallation < Installation
@@ -157,6 +167,10 @@ module U3d
       raise "Unity installation does not seem correct. Couldn't locate PlaybackEngines." unless Dir.exist? fpath
       Dir.entries(fpath).select { |e| File.directory?(File.join(fpath, e)) && !(e == '.' || e == '..') }
     end
+
+    def clean_install?
+      path =~ UNITY_DIR_CHECK
+    end
   end
 
   class Installer
@@ -170,7 +184,7 @@ module U3d
                   end
       if UI.interactive?
         unclean = []
-        installer.installed.each { |unity| unclean << unity unless unity.path =~ UNITY_DIR_CHECK }
+        installer.installed.each { |unity| unclean << unity unless unity.clean_install? }
         if !unclean.empty? && UI.confirm("#{unclean.count} Unity installation should be moved. Proceed?")
           unclean.each { |unity| installer.sanitize_install(unity) }
         end
@@ -263,7 +277,7 @@ module U3d
     def sanitize_install(unity)
       source_path = File.expand_path(unity.path)
       parent = File.expand_path('..', source_path)
-      new_path = File.join(parent, UNITY_DIR % unity.version)
+      new_path = File.join(parent, UNITY_DIR_LINUX % unity.version)
       UI.important "Moving #{source_path} to #{new_path}..."
       source_path = "\"#{source_path}\"" if source_path =~ / /
       new_path = "\"#{new_path}\"" if new_path =~ / /
@@ -275,7 +289,7 @@ module U3d
     end
 
     def installed
-      find = File.join(DEFAULT_LINUX_INSTALL, 'Unity*')
+      find = File.join(DEFAULT_LINUX_INSTALL, 'unity-editor-*')
       versions = Dir[find].map { |path| LinuxInstallation.new(path: path) }
 
       # sorting should take into account stable/patch etc
@@ -285,23 +299,28 @@ module U3d
     def install(file_path, version, installation_path: nil, info: {})
       extension = File.extname(file_path)
       raise "Installation of #{extension} files is not supported on Linux" if extension != '.sh'
-      path = installation_path || File.join(DEFAULT_LINUX_INSTALL, UNITY_DIR % version)
+      path = installation_path || DEFAULT_LINUX_INSTALL
       install_sh(
         file_path,
         installation_path: path
       )
+      # Forces sanitation for installation of 'weird' versions eg 5.6.1xf1Linux
+      sanitize_install(installed.select { |u| u.version == version }.first)
     end
 
     def install_sh(file, installation_path: nil)
       cmd = file.shellescape
       if installation_path
-        Utils.ensure_dir(installation_path)
-        U3dCore::CommandExecutor.execute(command: "cd #{installation_path}; #{cmd}", admin: true)
+        command = "cd \"#{installation_path}\"; #{cmd}"
+        unless File.directory? installation_path
+          command = "mkdir -p \"#{installation_path}\"; #{command}"
+        end
+        U3dCore::CommandExecutor.execute(command: command, admin: true)
       else
         U3dCore::CommandExecutor.execute(command: cmd, admin: true)
       end
     rescue => e
-      UI.error "Failed to install bash file at #{file_path}: #{e}"
+      UI.error "Failed to install bash file at #{file}: #{e}"
     else
       UI.success 'Installation successful'
     end
@@ -381,7 +400,9 @@ module U3d
     def editor_version
       require 'yaml'
       yaml = YAML.load(File.read("#{@path}/ProjectSettings/ProjectVersion.txt"))
-      yaml['m_EditorVersion']
+      version = yaml['m_EditorVersion']
+      version.gsub!(/(\d+\.\d+\.\d+)(?:x)?(\w\d+)(?:Linux)?/, '\1\2') if Helper.linux?
+      version
     end
   end
 end

data/lib/u3d/unity_runner.rb

@@ -36,6 +36,7 @@ module U3d
         log_file = installation.default_log_file
       end
 
+      Utils.ensure_dir File.dirname(log_file)
       FileUtils.touch(log_file) unless File.exist? log_file
 
       tail_thread = Thread.new do
@@ -53,7 +54,7 @@ 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 != 'sleep'
       tail_thread.run
 
       begin
@@ -63,7 +64,7 @@ module U3d
         else
           args.map!(&:shellescape)
         end
-        # FIXME return value not handled
+        
         U3dCore::CommandExecutor.execute(command: args, print_all: true)
       ensure
         sleep 1

data/lib/u3d/unity_versions.rb

@@ -166,7 +166,7 @@ module U3d
             if response.kind_of? Net::HTTPSuccess
               capt = response.body.match(LINUX_DOWNLOAD_RECENT_FILE)
               if capt && capt[1] && capt[2]
-                versions[capt[2].gsub(/x/, '')] = capt[1]
+                versions[capt[2].delete('x')] = capt[1]
               else
                 UI.error("Could not retrieve a fitting file from #{url}")
               end

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '0.9.2'.freeze
+  VERSION = '0.9.3'.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/command_executor.rb

@@ -73,7 +73,7 @@ module U3dCore
           if Helper.windows?
             raise CredentialsError, "The command \'#{command}\' must be run in administrative shell" unless has_admin_privileges?
           else
-            command = "sudo -k && echo #{cred.password.shellescape} | sudo -S " + command
+            command = "sudo -k && echo #{cred.password.shellescape} | sudo -S bash -c \"#{command}\""
           end
           UI.verbose 'Admin privileges granted for command execution'
         end
@@ -120,7 +120,8 @@ module U3dCore
           credentials = U3dCore::Credentials.new(user: ENV['USER'])
           begin
             result = system("sudo -k && echo #{credentials.password.shellescape} | sudo -S /usr/bin/whoami",
-              out: File::NULL, err: File::NULL)
+              out: File::NULL,
+              err: File::NULL)
           rescue
             result = false
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -243,6 +243,7 @@ files:
 - ".licenses.json"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE