ubb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d33000db9895bb667d213bbbccb063746b79467f
-  data.tar.gz: 859ae44cf28afc33df44f78b216cb300c292dbe3
+  metadata.gz: 4b6caf5ea8a6c97a58bd823fa5e27f0d511bc92e
+  data.tar.gz: 9ffc640e29c80060d4ad2398c0bbfa0f89c3f174
 SHA512:
-  metadata.gz: 5b6f17837f3719d0d3c6d3959080531f8b7c1898e79467e59470de217891d45acd2906a034bfbc1ace1ec4fbd8357177e0343b60e4dc436949e40ceae560bcd5
-  data.tar.gz: 878ccfce2035fc603587fc2b112e0dccefc5ba540e06022dbe98d9e404c1355039d9656e75e81a8e9062016bc2a0d48f79eae3910d3be3c780d7fbc9a0d77a98
+  metadata.gz: 6cbfce60a13faad0cc61a91871f125dd9c57380c900b4db31e9db01d5fa6b77a49a44071b80c87fd000217ac3ad184aa562e98cf3a91b205691dc81663ca0b69
+  data.tar.gz: 764d83fd0a60df9b8aba28fdd05f6d6ce601c4590943459723353406080411a29970c6679e1dc33b44de67e3432cde0170489b81f823e462e1c9dad8a3d7ae93

data/README.md

@@ -12,19 +12,11 @@ Unity Editor からビルドしたりパッケージを入出力する時に使
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Install it yourself as:
 
-```ruby
-gem 'ubb'
 ```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install ubb
+$ gem install ubb
+```
 
 ## Usage
 
@@ -56,10 +48,16 @@ ubb import 'パッケージファイル名'
 
 ### build
 
-（開発中）
-
+指定したプロジェクトのビルドを行います。
 
+```
+ubb build --output '出力先フォルダ' --target [ios] --config [development|release|distribution]
+```
 
+* target
+  * ビルドターゲットの指定。現在は `ios` のみ。
+* config
+  * ビルドコンフィグの指定。
 
 
 

data/bin/ubb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 LIB_PATH = File.expand_path("../../lib", __FILE__)
 $:.unshift LIB_PATH
-
 #require 'rubygems'
 require 'commander/import'
 require 'ubb'
@@ -10,13 +9,6 @@ require 'fileutils'
 require 'erb'
 
 $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
-end
 
 program :version, Ubb::VERSION
 program :description, 'Unity Batch Build helper'

data/lib/assets/UbbBuild.cs

@@ -5,16 +5,17 @@ using System.IO;
 using UnityEditor;
 
 public class Build {
-  enum Target {
+  enum Config {
     Unknown,
     Development,
     Release,
-    Final,
+    Distribution,
   }
   private static string _bakDefines;
   private static string _buildPath = "<%= output %>";
   // Android
-  static void PerformBuild() {
+  public static void PerformBuild_android() {
+    BuildTargetGroup group = BuildTargetGroup.Android;
     Debug.Log("build start");
     string[] scenes = GetAllScenes();
     //update_symbols();
@@ -29,29 +30,29 @@ public class Build {
     }
   }
   // iOS
-  public static void PerformiOSBuild() {
+  public static void PerformBuild_ios() {
     BuildTargetGroup group = BuildTargetGroup.iOS;
     Debug.Log("build start");
     string[] scenes = GetAllScenes();
     BuildOptions opt = BuildOptions.SymlinkLibraries;
-    Target tgt = (UnityEditorInternal.InternalEditorUtility.inBatchMode) ? get_target() : Target.Development;
-    if (tgt == Target.Unknown) {
+    Config tgt = (UnityEditorInternal.InternalEditorUtility.inBatchMode) ? get_config() : Config.Development;
+    if (tgt == Config.Unknown) {
       Debug.LogError("TARGET UNKNOWN");
       EditorApplication.Exit(1);
     }
     switch (tgt) {
-    case Target.Development:
+    case Config.Development:
       opt |= BuildOptions.Development;
       PlayerSettings.strippingLevel = StrippingLevel.Disabled;
       PlayerSettings.iOS.scriptCallOptimization = ScriptCallOptimizationLevel.SlowAndSafe;
       break;
-    case Target.Release:
+    case Config.Release:
       //opt |= BuildOptions.Development;
       //PlayerSettings.strippingLevel = StrippingLevel.StripByteCode; // リフレクション使ってる箇所で死ぬ
       PlayerSettings.strippingLevel = StrippingLevel.Disabled;
       PlayerSettings.iOS.scriptCallOptimization = ScriptCallOptimizationLevel.FastButNoExceptions;
       break;
-    case Target.Final:
+    case Config.Distribution:
       //PlayerSettings.strippingLevel = StrippingLevel.StripByteCode;
       PlayerSettings.strippingLevel = StrippingLevel.Disabled;
       PlayerSettings.iOS.scriptCallOptimization = ScriptCallOptimizationLevel.FastButNoExceptions;
@@ -60,8 +61,7 @@ public class Build {
     push_symbols(group);
     //
     update_symbols(group);
-    BuildTarget buildTarget = BuildTarget.iOS;
-    string error = BuildPipeline.BuildPlayer(scenes, _buildPath,  buildTarget, opt);
+    string error = BuildPipeline.BuildPlayer(scenes, _buildPath,  BuildTarget.iOS, opt);
     //
     pop_symbols(group);
     //
@@ -109,13 +109,13 @@ public class Build {
     Debug.Log(string.Format("NEW: {0}", defines));
     PlayerSettings.SetScriptingDefineSymbolsForGroup(group, defines);
   }
-  private static Target get_target() {
-    List<string> tgts = get_argv("-target");
+  private static Config get_config() {
+    List<string> tgts = get_argv("-config");
     foreach (string t in tgts) {
-      if (t == "DEV") return Target.Development;
-      if (t == "REL") return Target.Release;
-      if (t == "FNL") return Target.Final;
+      if (t == "development") return Config.Development;
+      if (t == "release") return Config.Release;
+      if (t == "distribution") return Config.Distribution;
     }
-    return Target.Unknown;
+    return Config.Unknown;
   }
 }

data/lib/ubb.rb

@@ -15,6 +15,28 @@ module Ubb
   def self.has_editor?
     Dir.exist?(self.editor_path)
   end
+  def self.find_project
+    return unless $project_path.nil?
+    dirs = Dir.glob("**/Assets")
+    dirs.each do |d|
+      d = d.sub(/(\/)?Assets$/, '')
+      if Dir.exist?("#{d}/ProjectSettings")
+        $project_path = File.expand_path(d)
+      end
+    end
+  end
+  def self.check_target(target)
+    cand = [ 'ios', 'android' ]
+    cand.select! { |c| c =~ /^#{target}/i }
+    return cand[0] if cand.size == 1
+    return nil
+  end
+  def self.check_config(config)
+    cand = [ 'development', 'release', 'distribution' ]
+    cand.select! { |c| c =~ /^#{config}/i }
+    return cand[0] if cand.size == 1
+    return nil
+  end
 end
 
 command :showlog do |c|
@@ -28,6 +50,7 @@ end
 alias_command :log, :showlog
 
 command :export do |c|
+  Ubb.find_project
   c.syntax = 'ubb export [options]'
   c.summary = 'export .unitypackage'
   c.description = 'hoge'
@@ -43,6 +66,7 @@ command :export do |c|
 end
 
 command :import do |c|
+  Ubb.find_project
   c.syntax = 'ubb import [package]'
   c.summary = 'import .unitypackage'
   c.description = 'hoge'
@@ -57,28 +81,46 @@ command :import do |c|
 end
 
 command :build do |c|
+  Ubb.find_project
+  c.syntax = 'ubb build [options]'
+  c.summary = 'build project'
+  c.description = 'hoge'
+  c.example 'build project', 'ubb build --project path/to/unityproject --output path/to/outputproject'
   c.option '--output PATH', String, 'specify output path'
+  c.option '--target TARGET', String, 'specify build target (ios|android)'
+  c.option '--config COFIGURATION', String, 'specify build configuration (development|release|distribution)'
   c.action do |args, options|
+    options.default :config => 'development'
     raise 'specify output path' if options.output.nil?
+    raise 'specify target' if options.target.nil?
+    output = File.expand_path(options.output)
+    target = Ubb.check_target(options.target)
+    config = Ubb.check_config(options.config)
+    raise "could not recognize a target: \"#{options.target}\"" if target.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)
+      FileUtils.mkdir_p editor_path unless has
+      noop = false
+      if File.exist?(dst)
+        noop = true
+        raise 'build script has already existed'
+      end
       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"
+      Ubb.sh "#{$unity_app_path} -batchmode -projectPath #{$project_path} -quit -executeMethod Build.PerformBuild_#{target} -config #{config}"
     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"
+      unless noop
+        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/lib/ubb/version.rb

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

data/ubb.gemspec

@@ -8,18 +8,18 @@ Gem::Specification.new do |spec|
   spec.version       = Ubb::VERSION
   spec.authors       = ["fum1h1ro"]
   spec.email         = ["fumihiro@gmail.com"]
-  spec.summary       = %q{Unity Batch Build Helper}
-  spec.description   = %q{Helping batch build from Unity Editor}
-  spec.homepage      = ""
+  spec.summary       = %q{Ubb}
+  spec.description   = %q{CLI for helping batch building from Unity Editor}
+  spec.homepage      = "https://github.com/fum1h1ro/ubb"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib", "bin"]
+  spec.require_paths = ["lib"]
 
   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"
+  spec.add_dependency "commander", "~> 4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ubb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - fum1h1ro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,14 +59,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
-description: Helping batch build from Unity Editor
+description: CLI for helping batch building from Unity Editor
 email:
 - fumihiro@gmail.com
 executables:
@@ -75,8 +75,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -88,7 +86,7 @@ files:
 - spec/spec_helper.rb
 - spec/ubb_spec.rb
 - ubb.gemspec
-homepage: ''
+homepage: https://github.com/fum1h1ro/ubb
 licenses:
 - MIT
 metadata: {}
@@ -96,7 +94,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- bin
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -112,7 +109,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Unity Batch Build Helper
+summary: Ubb
 test_files:
 - spec/spec_helper.rb
 - spec/ubb_spec.rb

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0