ubb 0.0.1p1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7062533508ef6ae22567edb15f155cdc99a4cc77
-  data.tar.gz: be95b1172b992b73164f140137d2d0137d6a8b45
+  metadata.gz: d33000db9895bb667d213bbbccb063746b79467f
+  data.tar.gz: 859ae44cf28afc33df44f78b216cb300c292dbe3
 SHA512:
-  metadata.gz: 8c83b00af9a22e0e1fc8b8a9eb8d438e6d1537a0d106d047c8d31440187e39a43d80feb2b04461242ce854b3d7f824017b7aacea13dd2601493e8f50bffb0d81
-  data.tar.gz: 791a34278bec15f2846f88a02a8148602b19a28f0399cdf4e43bf9ecd020392381ba7a5d743c3de6ce3414b8ab05221cd9d5c991c5de71159ae39066955b8f6f
+  metadata.gz: 5b6f17837f3719d0d3c6d3959080531f8b7c1898e79467e59470de217891d45acd2906a034bfbc1ace1ec4fbd8357177e0343b60e4dc436949e40ceae560bcd5
+  data.tar.gz: 878ccfce2035fc603587fc2b112e0dccefc5ba540e06022dbe98d9e404c1355039d9656e75e81a8e9062016bc2a0d48f79eae3910d3be3c780d7fbc9a0d77a98

data/bin/ubb

@@ -1,149 +1,33 @@
 #!/usr/bin/env ruby
-LIB_PATH = "#{File.expand_path(File.dirname(__FILE__))}/../lib"
+LIB_PATH = File.expand_path("../../lib", __FILE__)
 $:.unshift LIB_PATH
+
+#require 'rubygems'
+require 'commander/import'
 require 'ubb'
 require 'optparse'
 require 'fileutils'
 require 'erb'
 
-class App
-  include FileUtils
-  include Ubb
-  TASKS = {
-    "showlog" => :task_showlog,
-    "export" => :task_export_package,
-    "import" => :task_import_package,
-    "build" => :task_build,
-  }
-
-  class AppError < StandardError
-    attr_reader :status
-    def initialize(msg, status)
-      super(msg)
-      @status = status
-    end
+$unity_app_path = "/Applications/Unity/Unity.app/Contents/MacOS/Unity"
+dirs = Dir.glob("**/Assets")
+dirs.each do |d|
+  d = d.sub(/(\/)?Assets$/, '')
+  if Dir.exist?("#{d}/ProjectSettings")
+    $project_path = File.expand_path(d)
   end
-
-
-
-  def initialize()
-    @unity_app_path = "/Applications/Unity/Unity.app/Contents/MacOS/Unity"
-    @project = ''
-    @output = ''
-    @options = {
-      :f => nil,
-      :build_path => "/../project",
-    }
-  end
-  def execute(argv)
-    @task = ''
-    @task = argv.shift if TASKS.keys.include?(argv[0])
-    parse(argv)
-    unless @task.empty?
-      self.method(TASKS[@task]).call
-    end
-
-    #ubbfilename = @options[:f] || 'Ubbfile'
-    #if File.exist?(ubbfilename)
-    #  ubb = UbbFile.new
-    #  ubb.parse(ubbfilename)
-    #else
-    #  raise 'ERROR'
-    #end
-  end
-
-
-  def parse(argv)
-    OptionParser.new do |opt|
-      opt.on("--unity-app-path UNITY_APP_PATH") { |f| @unity_app_path = f }
-      opt.on("--project PROJECT_PATH") { |f| @project = f }
-      opt.on("-f UBBFILE") { |f| @options[:f] = f }
-      opt.on("-o OUTPUTFILE") { |f| @output = f }
-      opt.parse!(argv)
-    end
-    @project = find_project_path if @project.empty?
-    @assets_path = "#{@project}/Assets"
-    @editor_path = "#{@assets_path}/Editor"
-    @argv = argv
-  end
-
-
-  def find_project_path
-    dirs = Dir.glob("**/Assets")
-    return nil if dirs.empty?
-    File.expand_path(dirs[0].sub(/(\/)?Assets$/, ''))
-  end
-  def sh(cmd)
-    print "exec: #{cmd}\n"
-    system cmd
-    if $? != 0
-      raise AppError.new("SHELL ERROR", $?.to_i)
-    end
-  end
-  def has_editor?
-    Dir.exist?(@editor_path)
-  end
-
-
-
-  def task_showlog
-    log = '~/Library/Logs/Unity/Editor.log'
-    sh "less #{log}"
-  end
-
-
-  # export unitypackage
-  #sh "#{UNITY_APP} -batchmode -projectPath #{PROJECT_PATH} -exportPackage Assets/#{EDITOR_ROOT} Assets/#{PLUGINS_ROOT} #{ADDITIONAL_EXPORT_PATH} ../#{UNITYPACKAGE_PATH} -quit"
-  def task_export_package()
-    raise 'specify output' if @output.empty?
-    @output += ".unitypackage" if @output !~ /\.unitypackage$/
-    paths = @argv.map { |pt| "Assets/#{pt}" }.join(' ')
-    output = File.expand_path(@output)
-    sh "#{@unity_app_path} -batchmode -projectPath #{@project} -exportPackage #{paths} #{output} -quit"
-    #p self
-  end
-  # import unitypackage
-  #sh "#{UNITY_APP} -batchmode -projectPath #{File.expand_path(PROJECT_PATH)} -importPackage #{latest} -quit"
-  def task_import_package()
-    raise 'specify unitypackage file' if @argv.size == 0
-    raise 'too many unitypackage files' if @argv.size > 1
-    input = @argv.shift
-    raise "does not exist #{input}" unless File.exist?(@argv)
-    sh "#{@unity_app_path} -batchmode -projectPath #{@project} -importPackage #{input} -quit"
-  end
-  # build
-  #$UNITY_APP_DIR -batchmode -projectPath $UNITY_PROJECT_PATH -quit -executeMethod Build.PerformiOSBuild $ADDITIONAL_OPTS -logFile UnityBuildLog.txt
-  def task_build()
-    raise 'specify output' if @output.empty?
-    begin
-      he = has_editor?
-      mkdir_p @editor_path unless he
-      cs = File.read("#{LIB_PATH}/Build.cs")
-      output = File.expand_path(@output)
-      csfile = File.open("#{@editor_path}/Build.cs", "w+")
-      csfile.write(ERB.new(cs).result binding)
-      csfile.flush
-      sh "#{@unity_app_path} -batchmode -projectPath #{@project} -quit -executeMethod Build.PerformiOSBuild -target DEV"
-    ensure
-      unless he
-        rm_rf @editor_path
-        rm_f "#{@editor_path}.meta"
-      end
-    end
-  end
-
-
-
-
-
-
 end
 
+program :version, Ubb::VERSION
+program :description, 'Unity Batch Build helper'
+program :help_formatter, :compact
 
+global_option('--verbose', 'VERBOSE') { $verbose = true }
+global_option('-p', '--project PATH', 'specify Unity project path') { |path| $project_path = path }
+global_option('-u', '--unity PATH', 'specify Unity application path') { |path| $unity_app_path = path }
 
+default_command :help
 
+always_trace!
 
 
-
-App.new.execute(ARGV)
-

data/lib/{Build.cs → assets/UbbBuild.cs}

@@ -17,7 +17,7 @@ public class Build {
   static void PerformBuild() {
     Debug.Log("build start");
     string[] scenes = GetAllScenes();
-    update_symbols();
+    //update_symbols();
     string error = BuildPipeline.BuildPlayer(scenes, "build.apk",  BuildTarget.Android, BuildOptions.None);
     if (string.IsNullOrEmpty(error)) {
       Debug.Log("build end");
@@ -30,6 +30,7 @@ public class Build {
   }
   // iOS
   public static void PerformiOSBuild() {
+    BuildTargetGroup group = BuildTargetGroup.iOS;
     Debug.Log("build start");
     string[] scenes = GetAllScenes();
     BuildOptions opt = BuildOptions.SymlinkLibraries;
@@ -56,14 +57,13 @@ public class Build {
       PlayerSettings.iOS.scriptCallOptimization = ScriptCallOptimizationLevel.FastButNoExceptions;
       break;
     }
-    push_symbols();
+    push_symbols(group);
     //
-    update_symbols();
+    update_symbols(group);
     BuildTarget buildTarget = BuildTarget.iOS;
-    //string path = Path.GetFullPath(Application.dataPath + "/../project");
     string error = BuildPipeline.BuildPlayer(scenes, _buildPath,  buildTarget, opt);
     //
-    pop_symbols();
+    pop_symbols(group);
     //
     if (string.IsNullOrEmpty(error)) {
       Debug.Log("build end");
@@ -93,28 +93,21 @@ public class Build {
     }
     return argv;
   }
-  private static void push_symbols() {
-    BuildTargetGroup tg = EditorUserBuildSettings.selectedBuildTargetGroup;
-    _bakDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(tg);
+  private static void push_symbols(BuildTargetGroup group) {
+    _bakDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(group);
   }
-  private static void pop_symbols() {
-    BuildTargetGroup tg = EditorUserBuildSettings.selectedBuildTargetGroup;
-    if (string.IsNullOrEmpty(_bakDefines)) {
-      PlayerSettings.SetScriptingDefineSymbolsForGroup(tg, null);
-    } else {
-      PlayerSettings.SetScriptingDefineSymbolsForGroup(tg, _bakDefines);
-    }
+  private static void pop_symbols(BuildTargetGroup group) {
+    PlayerSettings.SetScriptingDefineSymbolsForGroup(group, _bakDefines);
   }
-  private static void update_symbols() {
-    BuildTargetGroup tg = EditorUserBuildSettings.selectedBuildTargetGroup;
+  private static void update_symbols(BuildTargetGroup group) {
     List<string> symbols = get_argv("-symbol");
-    string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(tg);
+    string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(group);
     Debug.Log(string.Format("OLD: {0}", defines));
     foreach (string sym in symbols) {
       defines += string.Format(";{0}", sym);
     }
     Debug.Log(string.Format("NEW: {0}", defines));
-    PlayerSettings.SetScriptingDefineSymbolsForGroup(tg, defines);
+    PlayerSettings.SetScriptingDefineSymbolsForGroup(group, defines);
   }
   private static Target get_target() {
     List<string> tgts = get_argv("-target");

data/lib/ubb/version.rb

@@ -1,3 +1,3 @@
 module Ubb
-  VERSION = "0.0.1p1"
+  VERSION = "0.0.2"
 end

data/lib/ubb.rb

@@ -2,22 +2,84 @@ require "ubb/version"
 
 
 module Ubb
-  class UbbFile
-    def parse(filename)
-      s = File.read(filename)
-      eval(s)
+  def self.sh(cmd)
+    print "exec: #{cmd}\n"
+    system cmd
+    if $? != 0
+      raise "ERROR: #{$?.to_i}"
     end
-
-    def ubb(v)
-      p v
-    end
-
-
-
   end
+  def self.editor_path
+    "#{$project_path}/Assets/Editor"
+  end
+  def self.has_editor?
+    Dir.exist?(self.editor_path)
+  end
+end
 
+command :showlog do |c|
+  c.syntax = 'ubb showlog'
+  c.summary = 'show Unity Editor log'
+  c.action do |args, options|
+    log = '~/Library/Logs/Unity/Editor.log'
+    Ubb.sh "less #{log}"
+  end
+end
+alias_command :log, :showlog
 
+command :export do |c|
+  c.syntax = 'ubb export [options]'
+  c.summary = 'export .unitypackage'
+  c.description = 'hoge'
+  c.example 'export some folders to unitypackage', 'ubb export --project path/to/unityproject --output some.unitypackage Plugins/Something Resources/Something'
+  c.option '--output FILENAME', String, 'specify .unitypackage name'
+  c.action do |args, options|
+    raise 'specify output filename' if options.output.nil?
+    output = (options.output !~ /\.unitypackage$/)? options.output + ".unitypackage" : options.output
+    output = File.expand_path(output)
+    paths = args.map { |pt| "Assets/#{pt}" }.join(' ')
+    Ubb.sh "#{$unity_app_path} -batchmode -projectPath #{$project_path} -exportPackage #{paths} #{output} -quit"
+  end
+end
 
+command :import do |c|
+  c.syntax = 'ubb import [package]'
+  c.summary = 'import .unitypackage'
+  c.description = 'hoge'
+  c.example 'import some unitypackage', 'ubb import --project path/to/unityproject some.unitypackage'
+  c.action do |args, options|
+    raise 'specify unitypackage file' if args.size == 0
+    raise 'too many unitypackage files' if args.size > 1
+    input = args[0]
+    raise "#{input} does not exist" unless File.exist?(input)
+    Ubb.sh "#{$unity_app_path} -batchmode -projectPath #{$project_path} -importPackage #{input} -quit"
+  end
+end
 
-
+command :build do |c|
+  c.option '--output PATH', String, 'specify output path'
+  c.action do |args, options|
+    raise 'specify output path' if options.output.nil?
+    begin
+      output = File.expand_path(options.output)
+      has = Ubb.has_editor?
+      editor_path = Ubb.editor_path
+      FileUtils.mkdir_p editor_path unless has
+      src = "#{LIB_PATH}/assets/UbbBuild.cs"
+      dst = "#{editor_path}/UbbBuild.cs"
+      raise 'build script has already existed' if File.exist?(dst)
+      cs = File.read(src)
+      csfile = File.open(dst, "w+")
+      csfile.write(ERB.new(cs).result binding)
+      csfile.flush
+      Ubb.sh "#{$unity_app_path} -batchmode -projectPath #{$project_path} -quit -executeMethod Build.PerformiOSBuild -target DEV"
+    ensure
+      FileUtils.rm_f "#{editor_path}/UbbBuild.cs"
+      FileUtils.rm_f "#{editor_path}/UbbBuild.cs.meta"
+      unless has
+        FileUtils.rm_rf editor_path
+        FileUtils.rm_f "#{editor_path}.meta"
+      end
+    end
+  end
 end

data/ubb.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "commander", "~> 4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ubb
 version: !ruby/object:Gem::Version
-  version: 0.0.1p1
+  version: 0.0.2
 platform: ruby
 authors:
 - fum1h1ro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
 description: Helping batch build from Unity Editor
 email:
 - fumihiro@gmail.com
@@ -68,7 +82,7 @@ files:
 - README.md
 - Rakefile
 - bin/ubb
-- lib/Build.cs
+- lib/assets/UbbBuild.cs
 - lib/ubb.rb
 - lib/ubb/version.rb
 - spec/spec_helper.rb
@@ -90,9 +104,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5