u3d 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9c9db8b88f9c7f182b88f35bc6679cc6834ebbe
-  data.tar.gz: 7adc661141c3939a5ad6a336a67d6f485982350f
+  metadata.gz: c156945d41aa0c5753f61054c8618d6d706a0fb5
+  data.tar.gz: fa35a0de169dc91df2fa4cc3ada92d1304107942
 SHA512:
-  metadata.gz: 817e030bd2287a8584006bfac86d9651f9b75d62fb3c98959cbd91a5bd6c5b606867111a41f84c4c4f4a395caaaa3cec07fbd8869a035b6e095b5bf74b8faea1
-  data.tar.gz: 7a95301d40fb53e6409c6aca3866a855c986bbdb7ed85cc972b6ff0e98254bcffa2d2bf47843598a61c19f5a7f122af1f7f98330c692a77e0e0a5022168329b3
+  metadata.gz: 1c9b94cf16b94a61101755148c5da1413e41ed0c2091cf19af09bba9567131533e04f7d06df22f38c7e3ce35942b833f8a16e586cddcb91db8f58329d23e2432
+  data.tar.gz: b5cdd481bc2d15091aad3caa612ba3fc9682923c246bb328be2ca363370e53a26615e04b77721cf00238bb77a3ee15b426b1b161654103e3bf2ae47272a379c6

data/.github_changelog_generator

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

data/.gitignore

@@ -1,2 +1,5 @@
 pkg/
 coverage/
+gems/
+doc/
+LOCAL/

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Change Log
 
+## [v1.0.3](https://github.com/DragonBox/u3d/tree/v1.0.3) (2017-09-11)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.2...v1.0.3)
+
+**Implemented enhancements:**
+
+- u3d/internal: create a argescape cross platform method [\#132](https://github.com/DragonBox/u3d/issues/132)
+- u3d/prettifyer should fail with contextual information to ease improvement [\#128](https://github.com/DragonBox/u3d/issues/128)
+- u3d: accept password-less sudo [\#126](https://github.com/DragonBox/u3d/issues/126)
+
+**Fixed bugs:**
+
+- u3d run: -logFile /dev/stdout causes crashes on Linux [\#43](https://github.com/DragonBox/u3d/issues/43)
+
+**Closed issues:**
+
+- Create a full circleci mac/linux example [\#15](https://github.com/DragonBox/u3d/issues/15)
+
+**Merged pull requests:**
+
+- Automate bump & changelog tasks [\#135](https://github.com/DragonBox/u3d/pull/135) ([lacostej](https://github.com/lacostej))
+- u3d/prettifyer: fail with contextual information \(Fixes \#128\) [\#134](https://github.com/DragonBox/u3d/pull/134) ([lacostej](https://github.com/lacostej))
+- u3d/internal: introduce a argescape string function \(Fixes \#132\) [\#133](https://github.com/DragonBox/u3d/pull/133) ([lacostej](https://github.com/lacostej))
+- u3d/credentials support empty passwords for passwordless sudo \(Fixes \#128\) [\#130](https://github.com/DragonBox/u3d/pull/130) ([lacostej](https://github.com/lacostej))
+- Download file now prints progress also in non interactive mode \(only in verbose\) [\#129](https://github.com/DragonBox/u3d/pull/129) ([lacostej](https://github.com/lacostej))
+
 ## [v1.0.2](https://github.com/DragonBox/u3d/tree/v1.0.2) (2017-09-05)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.1...v1.0.2)
 

data/Gemfile.lock

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

data/Rakefile

@@ -23,6 +23,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require 'rubocop/rake_task'
+require 'u3d'
+UI = U3dCore::UI
+
 # doesn't yet support dot file
 # https://github.com/skywinder/github-changelog-generator/issues/473
 # require 'github_changelog_generator/task'
@@ -30,6 +33,115 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
+class GithubChangelogGenerator
+  PATH = '.github_changelog_generator'.freeze
+  class << self
+    def future_release
+      s = File.read(PATH)
+      s.split("\n").each do |line|
+        m = line.match(/future-release=v(.*)/)
+        return m[1] if m
+      end
+      raise "Couldn't find future-release in #{PATH}"
+    end
+
+    def future_release=(nextv)
+      s = File.read(PATH)
+      lines = s.split("\n").map do |line|
+        m = line.match(/future-release=v(.*)/)
+        if m
+          "future-release=v#{nextv}"
+        else
+          line
+        end
+      end
+      File.write(PATH, lines.join("\n") + "\n")
+    end
+  end
+end
+
+class U3dCode
+  PATH = 'lib/u3d/version.rb'.freeze
+  class << self
+    def version=(version)
+      s = File.read(PATH)
+      lines = s.split("\n").map do |line|
+        m = line.match(/(.*VERSION = ').*('.freeze.*)/)
+        if m
+          "#{m[1]}#{version}#{m[2]}"
+        else
+          line
+        end
+      end
+      File.write(PATH, lines.join("\n") + "\n")
+    end
+  end
+end
+
+def run_command(command, error_message = nil)
+  output = `#{command}`
+  unless $CHILD_STATUS.success?
+    error_message = "Failed to run command '#{command}'" if error_message.nil?
+    UI.user_error!(error_message)
+  end
+  output
+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"
+  output = run_command('git status --porcelain', "Couldn't get git status")
+  UI.user_error!("git status not clean:\n#{output}") unless output == ""
+end
+
+# ensure 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
+
+task pre_release: 'ensure_git_clean' do
+  require 'u3d/version'
+  nextversion = U3d::VERSION
+
+  # check not already released
+  output = run_command("git tag -l v#{nextversion}").strip
+  UI.user_error! "Version '#{nextversion}' already released. Run 'rake bump'" unless output == ''
+
+  gh_future_release = GithubChangelogGenerator.future_release
+  UI.user_error! "GithubChangelogGenerator version #{gh_future_release} != #{nextversion}" unless gh_future_release == nextversion
+
+  pr_branch = "release_#{nextversion}"
+  Rake::Task["prepare_git_pr"].invoke(pr_branch)
+
+  Rake::Task["changelog"].invoke
+
+  sh('git diff')
+  UI.user_error! "Pre release stopped by user." unless UI.confirm("CHANGELOG PR for version #{nextversion}. Confirm?")
+
+  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}' -l nochangelog"
+  sh 'git checkout master'
+  sh "git branch -D #{pr_branch}"
+end
+
+task bump: 'ensure_git_clean' do
+  nextversion = UI.input "Next version will be:"
+  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 'git add .github_changelog_generator lib/u3d/version.rb Gemfile.lock'
+  sh "git commit -m 'Bump version to #{nextversion}'"
+  sh 'git push'
+end
+
 task :changelog do
   puts "Updating changelog #{ENV['CHANGELOG_GITHUB_TOKEN']}"
   sh "github_changelog_generator" if ENV['CHANGELOG_GITHUB_TOKEN']

data/lib/u3d.rb

@@ -25,7 +25,7 @@ require 'u3d/unity_version_number'
 
 require 'u3d_core'
 # require 'terminal-table'
-require 'shellwords'
+require 'u3d_core/core_ext/string'
 
 module U3d
   Helper = U3dCore::Helper

data/lib/u3d/installer.rb

@@ -21,6 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 require 'u3d/utils'
+require 'u3d_core/core_ext/string'
 require 'u3d/installation'
 require 'fileutils'
 require 'file-tail'
@@ -229,8 +230,8 @@ module U3d
 
       source_path.tr!('/', '\\')
       new_path.tr!('/', '\\')
-      source_path = "\"" + source_path + "\"" if source_path =~ / /
-      new_path = "\"" + new_path + "\"" if new_path =~ / /
+      source_path = source_path.argescape
+      new_path = new_path.argescape
 
       command = "move #{source_path} #{new_path}"
 

data/lib/u3d/log_analyzer.rb

@@ -197,7 +197,8 @@ module U3d
       if @active_rule
         # Active rule should be finished
         # If it is still active during phase change, it means that something went wrong
-        UI.error("[#{@active_phase}] Could not finish active rule '#{@active_rule}'. Aborting it.")
+        context = @lines_memory.map { |l| "\n> #{l}" }.join('')
+        UI.error("[#{@active_phase}] Could not finish active rule '#{@active_rule}'. Aborting it. Context:#{context}")
         @active_rule = nil
       end
       UI.verbose("--- Ending #{@active_phase} phase ---")

data/lib/u3d/unity_runner.rb

@@ -21,6 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 require 'u3d/utils'
+require 'u3d_core/core_ext/string'
 require 'fileutils'
 require 'file-tail'
 
@@ -49,11 +50,7 @@ module U3d
 
       begin
         args.unshift(installation.exe_path)
-        if Helper.windows?
-          args.map! { |a| a =~ / / ? "\"#{a}\"" : a }
-        else
-          args.map!(&:shellescape)
-        end
+        args.map!(&:argescape)
 
         U3dCore::CommandExecutor.execute_command(command: args, output_callback: output_callback)
       ensure

data/lib/u3d/utils.rb

@@ -64,6 +64,7 @@ module U3d
           uri = URI(url)
           current = 0
           last_print_update = 0
+          print_progress = UI.interactive? || U3dCore::Globals.verbose?
           Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
             request = Net::HTTP::Get.new uri
             http.request request do |response|
@@ -79,7 +80,7 @@ module U3d
                 # wait for Net::HTTP buffer on slow networks
                 # FIXME revisits, this slows down download on fast network
                 # sleep 0.08 # adjust to reduce CPU
-                next unless UI.interactive?
+                next unless print_progress
                 next unless Time.now.to_f - last_print_update > 0.5
                 last_print_update = Time.now.to_f
                 if size
@@ -87,10 +88,11 @@ module U3d
                 else
                   Utils.print_progress_nosize(current, started_at)
                 end
+                print "\n" unless UI.interactive?
               end
             end
           end
-          print "\n" if UI.interactive?
+          print "\n" if print_progress
         end
       end
 

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.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/core_ext/string.rb

@@ -0,0 +1,35 @@
+## --- 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 'u3d_core/helper'
+
+class String
+  # a crossplatform version of shellescape
+  def argescape
+    if U3dCore::Helper.windows?
+      self =~ / / ? "\"#{self}\"" : self
+    else
+      require 'shellwords'
+      Shellwords.escape(self)
+    end
+  end
+end

data/lib/u3d_core/credentials.rb

@@ -51,12 +51,12 @@ module U3dCore
       if Helper.mac? && @use_keychain
         unless @password
           UI.message 'Fetching password from keychain'
-          password_holder = Security::InternetPassword.find(server: MAC_U3D_SERVER)
+          password_holder = Security::InternetPassword.find(server: server_name)
           @password = password_holder.password unless password_holder.nil?
         end
       end
 
-      if @password.to_s.empty?
+      if @password.nil?
         UI.verbose 'Could not retrieve password'
         if U3dCore::Globals.do_not_login?
           UI.verbose 'Login disabled'
@@ -73,8 +73,8 @@ module U3dCore
 
       raise CredentialsError, 'No username specified' unless user
 
-      while @password.to_s.empty?
-        UI.verbose 'Password does not exist or is empty'
+      while @password.nil?
+        UI.verbose 'Password does not exist'
         raise CredentialsError, 'Password missing and context is not interactive. Please make sure it is correct' unless UI.interactive?
         @password = UI.password "Password for #{user}:"
       end
@@ -91,7 +91,7 @@ module U3dCore
       ENV['U3D_PASSWORD'] = @password
       if Helper.mac? && @use_keychain
         UI.message 'Storing credentials to the keychain'
-        return Security::InternetPassword.add(MAC_U3D_SERVER, user, password)
+        return Security::InternetPassword.add(server_name, user, password)
       end
 
       return false
@@ -103,12 +103,16 @@ module U3dCore
       if force || UI.interactive?
         if Helper.mac? && @use_keychain && (force || UI.confirm('Remove credentials from the keychain?'))
           UI.message 'Deleting credentials from the keychain'
-          Security::InternetPassword.delete(server: MAC_U3D_SERVER)
+          Security::InternetPassword.delete(server: server_name)
         end
       elsif Helper.mac?
         UI.verbose 'Keychain may store invalid credentials for u3d'
       end
     end
+
+    def server_name
+      MAC_U3D_SERVER
+    end
   end
 
   class CredentialsError < StandardError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -380,6 +380,7 @@ files:
 - lib/u3d_core.rb
 - lib/u3d_core/command_executor.rb
 - lib/u3d_core/command_runner.rb
+- lib/u3d_core/core_ext/string.rb
 - lib/u3d_core/credentials.rb
 - lib/u3d_core/globals.rb
 - lib/u3d_core/helper.rb