mrb 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e14cfba78a14ede89c6cf16eef27c1b5b61549a1
-  data.tar.gz: cf58ec56a3f4cb7ff73e5f24476dca6fae6b22d0
+  metadata.gz: 264963a85561a0e0380b8e1f69e482b604736f9a
+  data.tar.gz: 0e1793cde02af8d35089381430bd64822ddeaee7
 SHA512:
-  metadata.gz: de7499557cefe2f80214eb6dcb29ebcdc8d4edd8c074cf5fe3f78cdda2603fc91b39d4f33764045b581e3942ffe358c35bd0c2d18dba50df9ca2f3819c5456d5
-  data.tar.gz: 8f9fa6a1ab3e48fe76ce34b465fa22fd6d7957723062b40fabd1c8b03d5b1ab3b213b824f27787c506af97cf81d2897a2dda4c282af068baf4d2f924da5f1345
+  metadata.gz: 10dbbb0bf347eb158f1f4ea805a328ca0f35d977ab479c4b8c95eabe8822bd17b8db7d8d076038ca54e2f55f83b675535ca42dfb87ee3169d4a857da64b38fca
+  data.tar.gz: 5547fff79796c3be317564ca26188cc02e399351ef43ec36c0fac1e00c1ce03b845f55a60e4d131bdee3756eeea4d556d97cf06edf24ffde699c350e1df4187e

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mrb.gemspec
 gemspec
+gem "test-unit"

data/README.md

@@ -1,5 +1,7 @@
 # Mrb
 
+![Gem](https://img.shields.io/gem/v/formatador.svg)
+
 The Command Line Interface is a unified tool to manage your mruby and mrbgems.
 
 ## Installation

data/Rakefile

@@ -1,6 +1,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'rake/testtask'
 
-RSpec::Core::RakeTask.new(:spec)
+Rake::TestTask.new do |t|
+    t.libs << 'test'
+end
 
-task :default => :spec
+task :default => :test

data/assets/templates/gem/build_config.rb.erb

@@ -0,0 +1,12 @@
+MRuby::Build.new do |conf|
+  toolchain :gcc
+
+  conf.gem File.dirname __FILE__
+
+  enable_debug
+
+  conf.enable_bintest
+  conf.enable_test
+
+  conf.gembox 'default'
+end

data/lib/mrb.rb

@@ -1,7 +1,7 @@
 require "mrb/version"
+require 'mrb/util.rb'
 require "mrb/cli.rb"
 require 'mrb/template.rb'
-require 'mrb/util.rb'
 
 module Mrb
   # Your code goes here...

data/lib/mrb/cli.rb

@@ -1,10 +1,13 @@
 require 'thor'
-require 'erb'
 require 'fileutils'
 require 'yaml'
+require "mrb/version"
+require "mrb/config"
 
 module Mrb
   class CLI < Thor
+    MRB_CONFIG_PATH = ".mrb"
+
     desc "get", "get mruby source code"
     def get()
       %x{git clone https://github.com/mruby/mruby.git}
@@ -18,10 +21,21 @@ module Mrb
       FileUtils.mkdir_p full_name
       puts "Creating gem '#{full_name}'..."
 
+      FileUtils.mkdir_p "#{full_name}/#{MRB_CONFIG_PATH}"
+
+      config = nil
+      if File.exist? "#{full_name}/#{MRB_CONFIG_PATH}/config"
+        config = Config.load "#{full_name}/#{MRB_CONFIG_PATH}/config"
+      else
+        config = Config.create "#{full_name}/#{MRB_CONFIG_PATH}/config"
+      end
+
       File.write "#{full_name}/README.md", Mrb::Template.render_readme(variables)
       puts "  create #{full_name}/README.md"
       File.write "#{full_name}/mrbgem.rake", Mrb::Template.render_mrbgem(variables)
       puts "  create #{full_name}/mrbgem.rake"
+      File.write "#{full_name}/mrb-build_config.rb", Mrb::Template.render_mrb_build_config(variables)
+      puts "  create #{full_name}/mrb-build_config.rb"
 
       FileUtils.mkdir_p "#{full_name}/src"
       File.write "#{full_name}/src/example.c", Mrb::Template.render_example_c(variables)
@@ -96,9 +110,114 @@ module Mrb
       end
     end
 
-    desc "version", "show version number"
+    desc "install", "install mruby"
+    option :list, :aliases => :l
+    def install(version = "")
+      available_versions = %w(1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 master)
+
+      if options[:list]
+        puts "available versions:"
+        available_versions.each {|v| puts "  #{v}"}
+        return
+      end
+
+      unless available_versions.include?(version)
+        $stderr.puts "Error: Not supported version. version=#{version}"
+        return
+      end
+
+      config = Config.load "#{MRB_CONFIG_PATH}/config"
+
+      if File.directory? "#{MRB_CONFIG_PATH}/#{version}"
+        $stderr.puts "Error: already exists path=#{MRB_CONFIG_PATH}/#{version}"
+        return
+      end
+
+      config["current"]["version"] = version
+      config["current"]["installed"] << version  unless config["current"]["installed"].include? version
+      Config.save "#{MRB_CONFIG_PATH}/config", config
+
+      system Util.git_clone_command(config["mruby"]["url"], version, MRB_CONFIG_PATH)
+      invoke :rake, "", {}
+    end
+
+    desc "uninstall", "uninstall a specific mruby"
+    def uninstall(version)
+      config = Config.load "#{MRB_CONFIG_PATH}/config"
+      unless config["current"]["installed"].include? version
+        $stderr.puts "Error: not found. version=#{version}"
+        return
+      end
+
+      print "Are you sure you want to remove mruby? (y/n): "
+      answer = STDIN.gets.chomp
+      unless answer == "y"
+        $stderr.puts "cancel"
+        return
+      end
+
+      config["current"]["version"] = ""  if config["current"]["version"] == version
+      config["current"]["installed"] = config["current"]["installed"].delete_if {|v| v == version }
+      Config.save "#{MRB_CONFIG_PATH}/config", config
+
+      FileUtils.rm_rf "#{MRB_CONFIG_PATH}/#{version}"
+      puts "done."
+    end
+
+    desc "versions", "list installed mruby version"
+    def versions()
+      config = Config.load "#{MRB_CONFIG_PATH}/config"
+      current_version = config["current"]["version"]
+      config["current"]["installed"].each do |version|
+        if current_version == version
+          print "* "
+        else
+          print "  "
+        end
+        puts "#{version} (set by #{MRB_CONFIG_PATH}/#{version})"
+      end
+    end
+
+    desc "version", "show current mruby version"
     def version()
-      puts Mrb::VERSION
+      config = Config.load "#{MRB_CONFIG_PATH}/config"
+      version = config["current"]["version"]
+
+      puts "#{version} (set by #{MRB_CONFIG_PATH}/#{version})"
+    end
+
+    desc "use", "switch mruby version"
+    def use(version)
+      config = Config.load "#{MRB_CONFIG_PATH}/config"
+      unless config["current"]["installed"].include? version
+        $stderr.puts "Error: not found. version=#{version}"
+        return
+      end
+
+      config["current"]["version"] = version
+      Config.save "#{MRB_CONFIG_PATH}/config", config
+
+      invoke :version, [], {}
+    end
+
+    desc "test", "execute mruby test"
+    def test()
+      invoke :rake, ["test"], {}
+    end
+
+    desc "clean", "clean up build files"
+    def clean()
+      invoke :rake, ["clean"], {}
+    end
+
+    desc "rake", "execute mruby minirake task"
+    def rake(task = "")
+      config = Config.load "#{MRB_CONFIG_PATH}/config"
+      version = config["current"]["version"]
+
+      Dir.chdir("#{MRB_CONFIG_PATH}/#{version}") do
+        system "MRUBY_CONFIG=../../mrb-build_config.rb ./minirake #{task}"
+      end
     end
   end
 end

data/lib/mrb/config.rb

@@ -0,0 +1,34 @@
+require "yaml"
+
+module Mrb
+  class Config
+    DEFAULT_CONFIG = {
+      "mruby" => {
+        "url" => "https://github.com/mruby/mruby.git",
+        "tag" => []
+      },
+      "current" => {
+        "version" => "",
+        "installed" => []
+      }
+    }
+
+    def self.create(config_path)
+      File.open(config_path, "w") do |fout|
+        YAML.dump(DEFAULT_CONFIG, fout)
+      end
+      DEFAULT_CONFIG
+    end
+
+    def self.load(config_path)
+      YAML.load_file(config_path)
+    end
+
+    def self.save(config_path, config)
+      File.open(config_path, "w") do |fout|
+        YAML.dump(config, fout)
+      end
+    end
+  end
+end
+

data/lib/mrb/template.rb

@@ -24,6 +24,10 @@ module Mrb
       render('gem/mrbgem.rake.erb', variables)
     end
 
+    def self.render_mrb_build_config(variables)
+      render('gem/build_config.rb.erb', variables)
+    end
+
     def self.render_example_c(variables)
       render('gem/example.c.erb', variables)
     end

data/lib/mrb/util.rb

@@ -15,5 +15,11 @@ module Mrb
         :name => name,
       }
     end
+
+    def self.git_clone_command(mruby_repo_url, version, mrb_config_path)
+      git_cone_cmd = "git clone --depth=1 "
+      git_cone_cmd << " -b #{version} "    unless version.casecmp("master") == 0
+      git_cone_cmd << " #{mruby_repo_url} #{mrb_config_path}/#{version}"
+    end
   end
 end

data/lib/mrb/version.rb

@@ -1,3 +1,3 @@
 module Mrb
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrb
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - qtakamitsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - assets/templates/config/build_config_crossbuild.erb
 - assets/templates/config/build_config_host.erb
 - assets/templates/gem/README.md.erb
+- assets/templates/gem/build_config.rb.erb
 - assets/templates/gem/example.c.erb
 - assets/templates/gem/mrbgem.rake.erb
 - assets/templates/gem/test_example.c.erb
@@ -95,6 +96,7 @@ files:
 - exe/mrb
 - lib/mrb.rb
 - lib/mrb/cli.rb
+- lib/mrb/config.rb
 - lib/mrb/template.rb
 - lib/mrb/util.rb
 - lib/mrb/version.rb