Merge pull request #33 from hone/public-release

mruby-cli app can be released with task release

Author: hone

Rakefile

@@ -19,6 +19,12 @@ Rake::Task[:mruby].invoke unless Dir.exist?(mruby_root)
 Dir.chdir(mruby_root)
 load "#{mruby_root}/Rakefile"
 
+load File.join(File.expand_path(File.dirname(__FILE__)), "mrbgem.rake")
+
+current_gem = MRuby::Gem.current
+app_version = MRuby::Gem.current.version
+APP_VERSION = (app_version.nil? || app_version.empty?) ? "unknown" : app_version
+
 desc "compile all the binaries"
 task :compile => [:all] do
   MRuby.each_target do |target|
@@ -77,12 +83,11 @@ end
 desc "generate a release tarball"
 task :release => :compile do
   require 'tmpdir'
-  require_relative 'mrblib/mruby-cli/version'
 
   # since we're in the mruby/
-  release_dir  = "releases/v#{MRubyCLI::Version::VERSION}"
+  release_dir  = "releases/v#{APP_VERSION}"
   release_path = Dir.pwd + "/../#{release_dir}"
-  app_name     = "mruby-cli-#{MRubyCLI::Version::VERSION}"
+  app_name     = "#{APP_NAME}-#{APP_VERSION}"
   FileUtils.mkdir_p(release_path)
 
   Dir.mktmpdir do |tmp_dir|
@@ -109,10 +114,9 @@ task :release => :compile do
 end
 
 namespace :local do
-  desc "show help"
+  desc "show version"
   task :version do
-    require_relative 'mrblib/mruby-cli/version'
-    puts "mruby-cli #{MRubyCLI::Version::VERSION}"
+    puts "#{APP_NAME} #{APP_VERSION}"
   end
 end
 
@@ -139,9 +143,8 @@ end
 namespace :package do
   require 'fileutils'
   require 'tmpdir'
-  require_relative "#{MRUBY_ROOT}/../mrblib/mruby-cli/version"
 
-  version = MRubyCLI::Version::VERSION
+  version = APP_VERSION
   release_dir = "releases/v#{version}"
   package_dir = "packages/v#{version}"
   release_path = Dir.pwd + "/../#{release_dir}"

mrbgem.rake

@@ -1,14 +1,15 @@
 require_relative 'mrblib/mruby-cli/version'
 
-MRuby::Gem::Specification.new('mruby-cli') do |spec|
-  spec.license = 'MIT'
-  spec.authors = ['Terence Lee', 'Zachary Scott']
-  spec.summary = 'mruby cli utility'
+spec = MRuby::Gem::Specification.new('mruby-cli') do |spec|
   spec.bins    = ['mruby-cli']
-  spec.version = MRubyCLI::Version
-
   spec.add_dependency 'mruby-io',      :mgem => 'mruby-io'
   spec.add_dependency 'mruby-getopts', :mgem => 'mruby-getopts'
   spec.add_dependency 'mruby-dir',     :mgem => 'mruby-dir'
   spec.add_dependency 'mruby-mtest',   :mgem => 'mruby-mtest'
 end
+
+spec.license = 'MIT'
+spec.authors = ['Terence Lee', 'Zachary Scott']
+spec.summary = 'mruby cli utility'
+spec.version = MRubyCLI::Version::VERSION
+

mrblib/mruby-cli/setup.rb

@@ -100,16 +100,16 @@ def mrbgem_rake
       <<MRBGEM_RAKE
 require_relative 'mrblib/#{@name}/version'
 
-MRuby::Gem::Specification.new('#{@name}') do |spec|
-  spec.license = 'MIT'
-  spec.author  = 'MRuby Developer'
-  spec.summary = '#{@name}'
+spec = MRuby::Gem::Specification.new('#{@name}') do |spec|
   spec.bins    = ['#{@name}']
-  spec.version = #{Util.camelize(@name)}::VERSION
-
   spec.add_dependency 'mruby-print', :core => 'mruby-print'
   spec.add_dependency 'mruby-mtest', :mgem => 'mruby-mtest'
 end
+
+spec.license = 'MIT'
+spec.author  = 'MRuby Developer'
+spec.summary = '#{@name}'
+spec.version = #{Util.camelize(@name)}::VERSION
 MRBGEM_RAKE
     end
 
@@ -304,6 +304,9 @@ def docker_compose_yml
 shell:
   <<: *defaults
   command: bash
+release:
+  <<: *defaults
+  command: rake release
 DOCKER_COMPOSE_YML
     end
 
@@ -330,6 +333,13 @@ def rakefile
 Dir.chdir(mruby_root)
 load "\#{mruby_root}/Rakefile"
 
+
+load File.join(File.expand_path(File.dirname(__FILE__)), "mrbgem.rake")
+
+current_gem = MRuby::Gem.current
+app_version = MRuby::Gem.current.version
+APP_VERSION = (app_version.nil? || app_version.empty?) ? "unknown" : app_version
+
 desc "compile binary"
 task :compile => [:all] do
 
@@ -386,11 +396,43 @@ def clean_env(envs)
   sh "rake deep_clean"
 end
 
+desc "generate a release tarball"
+task :release => :compile do
+  require 'tmpdir'
+
+  # since we're in the mruby/
+  release_dir  = "releases/v\#{APP_VERSION}"
+  release_path = Dir.pwd + "/../\#{release_dir}"
+  app_name     = "\#{APP_NAME}-\#{APP_VERSION}"
+  FileUtils.mkdir_p(release_path)
+
+  Dir.mktmpdir do |tmp_dir|
+    Dir.chdir(tmp_dir) do
+      MRuby.each_target do |target|
+        next if name == "host"
+
+        arch = name
+        bin  = "\#{build_dir}/bin/\#{exefile(APP_NAME)}"
+        FileUtils.mkdir_p(name)
+        FileUtils.cp(bin, name)
+
+        Dir.chdir(arch) do
+          arch_release = "\#{app_name}-\#{arch}"
+          puts "Writing \#{release_dir}/\#{arch_release}.tgz"
+          `tar czf \#{release_path}/\#{arch_release}.tgz *`
+        end
+      end
+
+      puts "Writing \#{release_dir}/\#{app_name}.tgz"
+      `tar czf \#{release_path}/\#{app_name}.tgz *`
+    end
+  end
+end
+
 namespace :local do
-  desc "show help"
+  desc "show version"
   task :version do
-    require_relative 'mrblib/mruby-cli/version'
-    puts "mruby-cli \#{MRubyCLI::Version::VERSION}"
+    puts "\#{APP_NAME} \#{APP_VERSION}"
   end
 end