mgem 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aff684b1b46f4cf20be41e70a3eea1fcb0c6f91d
-  data.tar.gz: 805ea401404c9e967a7f1fda87ef242af759639b
+  metadata.gz: 6fcd5e06cd00d8ad8ac67574fc402ca628e552d6
+  data.tar.gz: c866f30bdc6da568e0dcf662ddca76f80d3882e9
 SHA512:
-  metadata.gz: c3d32755ba98a56d7cf341af1a04c9d0cce8068d7d793d14054354961d7052bdd01b776e7001cc0405b33a10d815f6e516ff95d2d2da99ec8353863bbd4f156e
-  data.tar.gz: afd0bf3783f5b994b462aab96a9567f1af8f162a67942e9fb5b3baabbace9f3864fd3b8a22d263965e62bb724ef4b2b28fb797cea227c8d3a44b2abff754a77e
+  metadata.gz: a0cc2be19c6f06cadd2d82fc1254edf15c2c78a9e11f8e6b04a0836d4e296c12e23306cd68cb0eb1e3670f6d4862ba61a6e4c837b7cceb1328dc3837ea8b4e3e
+  data.tar.gz: b49e93f42d03d550b3d1d51a8c2d8fda81e9489f5f1a95af0b36dbc034975177437941031fa87498adf864951e2836bcafda7b78a9def26f93bbc29637e708eb

data/bin/mgem

@@ -3,11 +3,16 @@
 require "#{File.dirname(__FILE__)}/../lib/mgem"
 extend Mrbgem
 
-gems = load_gems unless ARGV[0] == 'help'
+main_cmd = ARGV[0]
+arg1 = ARGV[1]
+arg2 = ARGV[2]
+
+gems = load_gems unless main_cmd == 'help'
 
 info_proc = lambda do |obj| 
   puts "  #{obj.name.ljust(30)}#{obj.description}"
 end
+r = lambda { |o| /^(#{1.upto(o.size).map{|x|o[0...(x)]}.join('|')})$/ }
 
 detail_info_proc = lambda do |obj|
   puts <<INFO
@@ -34,108 +39,120 @@ def get_toolchain
   puts <<__TOOLCHAIN_SELECT__
 
 Please choose your toolchain:
-  'gcc' for GNU Compiler Collection
-  'clang' for LLVM C Compiler
-  'vs' for Visual Studio 2012 on Windows
-
+#{Mrbgem::TOOLCHAINS.map{|x| "  '#{x[0]}' for #{Mrbgem::TOOLCHAINS[x[0]][:desc]}\n" }.join}
 __TOOLCHAIN_SELECT__
 
   print 'Toolchain: '
   STDOUT.flush
-  toolchain = case STDIN.gets.chomp
-  when 'vs'
-    'vs2012'
-  when 'clang'
-    'clang'
-  when 'gcc'
-    'gcc'
+  toolchain = STDIN.gets.chomp
+  if Mrbgem::TOOLCHAINS.has_key? toolchain
+    toolchain = Mrbgem::TOOLCHAINS[toolchain][:id]
   else
+    toolchain = 'gcc'
     puts <<__ERROR__
 
 Your input "#{toolchain}" wasn't valid.
 Fallback to GCC toolchain!
 __ERROR__
-
-    'gcc'
   end
 
   toolchain
 end
 
-def get_binaries
-  puts
-  print 'Compile mrbc? (Y/n): '
-  mrbc = STDIN.gets.chomp
-
-  binaries = []
-  binaries << 'mrbc' unless mrbc == 'n'
-
-  binaries.join ' '
-end
-
 CORE_GEMS = {
-  'irb Executable' => 'bin-mirb',
-  'mruby Executable' => 'bin-mruby',
-  'Array ext' => 'array-ext',
-  'Enumeration ext' => 'enum-ext',
+  'Interactive Shell [mirb]' => 'bin-mirb',
+  'Interpreter [mruby]' => 'bin-mruby',
+  'Compiler [mrbc]' => 'bin-mrbc',
+  'Configurator [mruby-config]' => 'bin-mruby-config',
+  'Debugger [mrdb]' => 'bin-debugger',
+
+  'Array Extensions' => 'array-ext',
+  'Enumerator' => 'enumerator',
+  'Enumerator Lazy' => 'enum-lazy',
+  'Enumerator Extensions' => 'enum-ext',
   'eval' => 'eval',
   'exit' => 'exit',
   'Fiber' => 'fiber',
-  'Hash ext' => 'hash-ext',
+  'Hash Extensions' => 'hash-ext',
+  'Kernel Extensions' => 'kernel-ext',
   'Math' => 'math',
-  'Numeric ext' => 'numeric-ext',
-  'Object ext' => 'object-ext',
+  'Numeric Extensions' => 'numeric-ext',
+  'Object Extensions' => 'object-ext',
   'ObjectSpace' => 'objectspace',
   'print' => 'print',
-  'Proc ext' => 'proc-ext',
+  'Proc Extensions' => 'proc-ext',
   'random' => 'random',
-  'Range ext' => 'range-ext',
+  'Range Extensions' => 'range-ext',
   'sprintf' => 'sprintf',
-  'String ext' => 'string-ext',
-  'String UTF8' => 'string-utf8',
+  'String Extensions' => 'string-ext',
   'Struct' => 'struct',
-  'Symbol ext' => 'symbol-ext',
+  'Symbol Extensions' => 'symbol-ext',
   'Time' => 'time',
-  'Toplevel ext' => 'toplevel-ext'
+  'Toplevel Extensions' => 'toplevel-ext'
+}
+
+COMPILE_OPTIONS = {
+  'bin-debugger' => [
+    'conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK)'
+  ],
+  'test' => [
+    'conf.enable_bintest',
+    'conf.enable_test'
+  ],
+  'debug' => [
+    'enable_debug'
+  ]
 }
 
+DEFAULT_NO = ['bin-debugger', 'bin-mruby-config']
+
 def get_default_gems
   puts
   gems = []
   CORE_GEMS.each do |gem, path|
-    print "Include '#{gem}' GEM? (Y/n): "
+    y_n = 'Y/n'
+    y_n = 'y/N' if DEFAULT_NO.include? path
+    print "Include '#{gem}' GEM? (#{y_n}): "
     question = STDIN.gets.chomp
-    unless question == 'n'
-      gems << path
+
+    if DEFAULT_NO.include? path
+      if question == 'y'
+        gems << path
+      end
+    else
+      unless question == 'n'
+        gems << path
+      end
     end
   end
   gems
 end
 
-if ARGV[0] == 'info' or ARGV[0] == 'detail'
-  puts "Detail information of '#{ARGV[1]}':"
-  gems.search(ARGV[1], :name).each {|gem| detail_info_proc.call(gem) }
-elsif ARGV[0] == 'size'
+case main_cmd
+when r.('info'), r.('detail')
+  puts "Detail information of '#{arg1}':"
+  gems.search(arg1, :name).each {|gem| detail_info_proc.call(gem) }
+when r.('size')
   puts "Total # of GEMs: #{gems.size}"
-elsif ARGV[0] == 'list'
-  if ARGV[1] == 'active'
+when r.('list')
+  if arg1 =~ r.('active')
     list_active_gems(gems)
   else
     puts "List of all GEMs:"
     gems.each { |gem| info_proc.call(gem) }
   end
-elsif ARGV[0] == 'add'
-  gems.activate(ARGV[1])
+when r.('add')
+  gems.activate(arg1)
   puts
   list_active_gems(gems)
-elsif ARGV[0] == 'rm'
-  gems.deactivate(ARGV[1])
+when r.('rm')
+  gems.deactivate(arg1)
   puts
   list_active_gems(gems)
-elsif ARGV[0] == 'search'
-  puts "Search result for '#{ARGV[1]}':"
-  gems.search(ARGV[1]).each {|gem| info_proc.call(gem) }
-elsif ARGV[0] == 'update'
+when r.('find'), 'search'
+  puts "Search result for '#{arg1}':"
+  gems.search(arg1).each {|gem| info_proc.call(gem) }
+when r.('update')
   puts 'Update list of GEMs...'
   amount = gems.size
   gems.update!
@@ -148,33 +165,54 @@ elsif ARGV[0] == 'update'
   else
     puts "No new GEM"
   end
-elsif ARGV[0] == 'config'
-  if ARGV[1] == 'default'
-    toolchain = 'gcc'
-    binaries = 'mrbc'
+when r.('config')
+  test_env = '  # Deactivated!'
+  debug_flags = '  # Deactivated!'
+  toolchain = 'gcc'
+  if arg1 =~ r.('default')
     default_gems = CORE_GEMS.each_value.to_a
+    default_gem_command = "  conf.gembox 'default'"
   else
     toolchain = get_toolchain
-    binaries = get_binaries
-    default_gems = get_default_gems
-  end
 
-  default_gem_command = default_gems.map do |g|
-    "  conf.gem 'mrbgems/mruby-#{g}'"
-  end.join("\n") 
-  if default_gem_command == ''
-    default_gem_command = '  # No GEMs activated'
+    puts
+    print "Build testing environment [mrbtest]? (y/N): "
+    question = STDIN.gets.chomp
+    if question =~ r.('yes')
+      test_env = "#{COMPILE_OPTIONS['test'].map {|o| "  #{o}"}.join("\n")}\n"
+    end
+
+    puts
+    print "Enable debug flags? (y/N): "
+    question = STDIN.gets.chomp
+    if question =~ r.('yes')
+      debug_flags = "#{COMPILE_OPTIONS['debug'].map {|o| "  #{o}"}.join("\n")}\n"
+    end
+
+    default_gem_command = get_default_gems.map do |g|
+      opt = ''
+      if COMPILE_OPTIONS.include? g
+        opt = "#{COMPILE_OPTIONS[g].map {|o| "  #{o}"}.join("\n")}\n"
+      end
+      "#{opt}  conf.gem :core => 'mruby-#{g}'"
+    end.join("\n")
+    if default_gem_command == ''
+      default_gem_command = '  # No GEMs activated!'
+    end
   end
 
+  write_file = nil
+  [arg1, arg2].each {|x| write_file ||= x =~ r.('write')}
+
   gem_command = gems.active.map do |g|
     options = ", :options => \'#{g.repooptions}\'" unless g.repooptions.nil?
     "  conf.gem :git => \'#{g.repository}\'#{options}"
   end.join("\n")
   if gem_command == ''
-    gem_command = '  # No GEMs activated'
+    gem_command = '  # No GEMs activated!'
   end
 
-  puts <<__CONFIG__
+  build_config = <<__CONFIG__
 
 ############################
 # Start of your build_config
@@ -182,32 +220,43 @@ elsif ARGV[0] == 'config'
 MRuby::Build.new do |conf|
   toolchain :#{toolchain}
 
-  conf.bins = %w(#{binaries})
-
   # mruby's Core GEMs
 #{default_gem_command}
 
   # user-defined GEMs
 #{gem_command}
+
+  # Testing environment
+#{test_env}
+
+  # Debug Flags
+#{debug_flags}
 end
 
 # End of your build_config
 ############################
 __CONFIG__
+
+  if write_file
+    open('./build_config.rb', 'w') {|f| f.puts build_config}
+  else
+    puts build_config
+  end
 else
   puts <<INFO
 mgem (Version #{Mrbgem::MGEM_VERSION}) is a library manager for mruby
 
 Usage:
-  mgem size              How many GEMs are available?
-  mgem list [active]     List GEMs
-  mgem info *pattern*    Show detail information about a GEM
-  mgem add *name*        Activate a GEM
-  mgem rm *name*         De-Activate a GEM
-  mgem search *pattern*  Search for GEMs
-  mgem config            Generate a mruby build config including all active GEMs
-  mgem config default    Same as 'mgem config' but w/o interactive questions
-  mgem update            Update the list of GEMs
+  mgem size             How many GEMs are available?
+  mgem list active      List GEMs
+  mgem info *pattern*   Show detail information about a GEM
+  mgem add *name*       Activate a GEM
+  mgem rm *name*        De-Activate a GEM
+  mgem find *pattern*   Search for GEMs
+  mgem config           Generate a mruby build config including all active GEMs
+              default   Same as 'mgem config' but w/o interactive questions
+              write     Same as 'mgem config' but writes to build_config.rb
+  mgem update           Update the list of GEMs
 
 Website:
   https://github.com/bovi/mgem

data/lib/mgem.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 require "stringio"
 
 module Mrbgem
-  MGEM_VERSION = '0.2.0'
+  MGEM_VERSION = '0.3.0'
 
   MGEM_HOME = ENV['MGEM_HOME'] ||= ENV['HOME']
   MGEM_DIR = '.mgem'
@@ -11,6 +11,16 @@ module Mrbgem
   GEMS_LIST = 'mgem-list'
   GEMS_REPO = 'https://github.com/mruby/mgem-list.git'
 
+  TOOLCHAINS = {
+    'gcc' => {:desc => 'GNU Compiler Collection', :id => 'gcc'},
+    'clang' => {:desc => 'LLVM C Compiler', :id => 'clang'},
+    'vc' => {:desc => 'Visual C++', :id => 'visualcpp'},
+    'wrt' => {:desc => 'OpenWRT Build environment', :id => 'openwrt'},
+    'ndk' => {:desc => 'Android NDK', :id => 'android'}
+  }
+
+  include Enumerable
+
   def load_gems
     config = {}
     config[:mgem_dir] = [ENV["MGEM_HOME"], MGEM_DIR].join File::SEPARATOR
@@ -25,7 +35,8 @@ module Mrbgem
   def initialize_mgem_list(config = {})
     unless File.exists? config[:mgem_list]
       puts "Loading fresh GEM list..."
-      `git clone #{GEMS_REPO} #{config[:mgem_list]}`
+      cmd = %Q(git clone "#{GEMS_REPO}" "#{config[:mgem_list]}")
+      `#{cmd}`
       puts "done!"
     end
 
@@ -65,6 +76,7 @@ class MrbgemData
   def protocol; @gem_data["protocol"]; end
   def repository; @gem_data["repository"]; end
   def repooptions; @gem_data["repooptions"]; end
+  def dependencies; @gem_data['dependencies']; end
 
   def method_missing(method_name)
     err = "Mrbgem Field \"#{method_name}\" doesn't exist!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgem
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Bovensiepen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies: []
 description: mgem helps you search and find GEMs specifically written for mruby. It
   also supports by creating a mruby build configuration.
@@ -40,8 +40,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A program to manage GEMs for mruby.
 test_files: []
+has_rdoc: