mrb 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1044b40a821e666cf29545373999082f6ee240d5
-  data.tar.gz: 690d0ab0389f198378c874df07f6695f9f08abd3
+  metadata.gz: d8527524e3b2cb21e9e74a8e55340675b5b025a3
+  data.tar.gz: 16d9840def0e4e19a6b3957c93e4eac4aa2dad42
 SHA512:
-  metadata.gz: 210107874307b7668277931a9e5c371a9855b999441f022cfe9631f6358c6bf42042c4d844b7b054877170705c138482c984b00754b8d75cded38387c8295db9
-  data.tar.gz: 0bd666aa3111d5ba1d89bc11a1c91ddc512e5a7311b651b9b2fe023baf5c2edd9b647360a07d9bb9f0498fa989e0edce6ed3c32d9edf3b411e07728825bf1765
+  metadata.gz: 3072c56d4dac309d301f356738e5aa7f7107637aa795939033c77b8b83d2188bb1e0ce6f055056cfee6d26e07eb25bc52d8e04e960eb80c273f3a9095c191ecb
+  data.tar.gz: 035ad8b87bff7ec8a8ce63b105ef032b5f2c198c72ed6616b6213a9a79a9c06d7646fc2d50f7822b462757e6839dac0f149fe85a08eaf0b4d2c2d3a3791f4f56

data/assets/templates/config/build_config_crossbuild.erb

@@ -3,15 +3,17 @@ MRuby::CrossBuild.new('<%= config['name'] %>') do |conf|
   toolchain :<%= config['toolchain'] %>
 <% end %>
 
-<% if config.key?('debug') %>
+<% if config.key?('debug') && config['debug'].casecmp('enable') == 0 %>
   enable_debug
 <% end %>
 
-<% config['gem'].each do |gem| %>
-<%   if gem.is_a?(String) %>
+<% if config.key?('gem') && config['gem'].is_a?(Array) %>
+<%   config['gem'].each do |gem| %>
+<%     if gem.is_a?(String) %>
   conf.gem '<%= gem %>'
-<%   elsif gem.is_a?(Hash) && gem.key?('github') %>
+<%     elsif gem.is_a?(Hash) && gem.key?('github') %>
   conf.gem :github => '<%= gem['github'] %>'
+<%     end %>
 <%   end %>
 <% end %>
 

data/assets/templates/config/build_config_host.erb

@@ -3,15 +3,17 @@ MRuby::Build.new('<%= config['name'] %>') do |conf|
   toolchain :<%= config['toolchain'] %>
 <% end %>
 
-<% if config.key?('debug') %>
+<% if config.key?('debug') && config['debug'].casecmp('enable') == 0 %>
   enable_debug
 <% end %>
 
-<% config['gem'].each do |gem| %>
-<%   if gem.is_a?(String) %>
+<% if config.key?('gem') && config['gem'].is_a?(Array) %>
+<%   config['gem'].each do |gem| %>
+<%     if gem.is_a?(String) %>
   conf.gem '<%= gem %>'
-<%   elsif gem.is_a?(Hash) && gem.key?('github') %>
+<%     elsif gem.is_a?(Hash) && gem.key?('github') %>
   conf.gem :github => '<%= gem['github'] %>'
+<%     end %>
 <%   end %>
 <% end %>
 

data/lib/mrb/cli.rb

@@ -12,36 +12,25 @@ module Mrb
 
     desc "gem NAME", "create necessary files, directory constitution"
     def gem(name)
-      if m = name.match(/^mruby-(.*)/)
-        full_name = name
-        name = m[1]
-      else
-        full_name = "mruby-#{name}"
-        name = name
-      end
+      variables = Util.gen_names(name)
+      full_name = variables[:full_name]
 
+      FileUtils.mkdir_p full_name
       puts "Creating gem '#{full_name}'..."
 
-      variables = {
-        :full_name => full_name,
-        :internal_name => full_name.gsub(/-/, '_'),
-        :name => name,
-      }
-
-      FileUtils.mkdir_p full_name
-      File.write "#{full_name}/README.md", Mrb::Template.render('gem/README.md.erb', variables)
+      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('gem/mrbgem.rake.erb', variables)
+      File.write "#{full_name}/mrbgem.rake", Mrb::Template.render_mrbgem(variables)
       puts "  create #{full_name}/mrbgem.rake"
 
       FileUtils.mkdir_p "#{full_name}/src"
-      File.write "#{full_name}/src/example.c", Mrb::Template.render('gem/example.c.erb', variables)
+      File.write "#{full_name}/src/example.c", Mrb::Template.render_example_c(variables)
       puts "  create #{full_name}/src/example.c"
 
       FileUtils.mkdir_p "#{full_name}/test"
-      File.write "#{full_name}/test/example.c", Mrb::Template.render('gem/test_example.c.erb', variables)
+      File.write "#{full_name}/test/example.c", Mrb::Template.render_test_example_c(variables)
       puts "  create #{full_name}/test/example.c"
-      File.write "#{full_name}/test/example.rb", Mrb::Template.render('gem/test_example.rb.erb', variables)
+      File.write "#{full_name}/test/example.rb", Mrb::Template.render_test_example_rb(variables)
       puts "  create #{full_name}/test/example.rb"
     end
 
@@ -49,20 +38,32 @@ module Mrb
     def config(file)
       yaml = YAML.load_file(file)
 
+      unless yaml.is_a?(Hash)
+        # minimize_config
+        yaml = {
+          'build' => {
+            'host' => {
+              'toolchain' => 'gcc',
+              'gembox'    => 'default',
+            }
+          }
+        }
+      end
+
       text = ''
       if yaml.key?('build')
         yaml['build'].keys.each do |name|
           config = yaml['build'][name]
           config['name'] = name
-          text << Mrb::Template.render_config('config/build_config_host.erb', config)
+          text << Mrb::Template.render_build_config_host(config)
         end
       end
 
-      if yaml.key?('cross_build')
-        yaml['cross_build'].keys.each do |name|
-          config = yaml['cross_build'][name]
+      if yaml.key?('crossbuild')
+        yaml['crossbuild'].keys.each do |name|
+          config = yaml['crossbuild'][name]
           config['name'] = name
-          text << Mrb::Template.render_config('config/build_config_crossbuild.erb', config)
+          text << Mrb::Template.render_build_config_crossbuild(config)
         end
       end
 
@@ -70,6 +71,31 @@ module Mrb
       File.write "./build_config.rb", text.gsub(/^$\n/, '')
     end
 
+    desc "build", "build mruby"
+    def build(file)
+      yaml = YAML.load_file(file)
+
+      if !yaml.is_a?(Hash) || yaml.key?('mruby')
+        $stderr.puts 'Error: Not found mruby location.'
+        return
+      end
+
+      if yaml['mruby'].key?('github')
+        github_path = yaml['mruby']['github']
+        %x{git clone https://github.com/#{github_path}.git}
+        mruby_path = './mruby'
+      elsif yaml['mruby'].key?('path')
+        mruby_path = yaml['mruby']['path']
+      end
+
+      puts "Buildding ..."
+      file_path = File.expand_path(file)
+      Dir.chdir(mruby_path) do
+        config file_path
+        %x{rake}
+      end
+    end
+
     desc "version", "show version number"
     def version()
       puts Mrb::VERSION

data/lib/mrb/template.rb

@@ -16,6 +16,34 @@ module Mrb
       ERB.new(self.read(name)).result(b)
     end
 
+    def self.render_readme(variables)
+      render('gem/README.md.erb', variables)
+    end
+
+    def self.render_mrbgem(variables)
+      render('gem/mrbgem.rake.erb', variables)
+    end
+
+    def self.render_example_c(variables)
+      render('gem/example.c.erb', variables)
+    end
+
+    def self.render_test_example_c(variables)
+      render('gem/test_example.c.erb', variables)
+    end
+
+    def self.render_test_example_rb(variables)
+      render('gem/test_example.rb.erb', variables)
+    end
+
+    def self.render_build_config_host(config)
+      render_config('config/build_config_host.erb', config)
+    end
+
+    def self.render_build_config_crossbuild(config)
+      render_config('config/build_config_crossbuild.erb', config)
+    end
+
     private
     def self.config_to_binding(config)
       config = {}  unless config.is_a?(Hash)

data/lib/mrb/util.rb

@@ -0,0 +1,19 @@
+module Mrb
+  class Util
+    def self.gen_names(name)
+      if m = name.match(/^mruby-(.*)/)
+        full_name = name
+        name = m[1]
+      else
+        full_name = "mruby-#{name}"
+        name = name
+      end
+
+      {
+        :full_name => full_name,
+        :internal_name => full_name.gsub(/-/, '_'),
+        :name => name,
+      }
+    end
+  end
+end

data/lib/mrb/version.rb

@@ -1,3 +1,3 @@
 module Mrb
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/mrb.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - qtakamitsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - lib/mrb.rb
 - lib/mrb/cli.rb
 - lib/mrb/template.rb
+- lib/mrb/util.rb
 - lib/mrb/version.rb
 - mrb.gemspec
 homepage: https://github.com/qtkmz/mrb