demake 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3274ff2579bbe99e1f34dc59d4ea928cc8038f2887299035ce4dd91b48ec1e5f
-  data.tar.gz: d3b8bd0a0c724ae6ecf7934fc51ac2d0dabeef510688c864643e6fad63c8dbac
+  metadata.gz: 2ffe6f303e6b1353350fca9dfbfe5b4cff29a4150797efb62677fef654c0ad96
+  data.tar.gz: e104191198f2de99aa479e9c577dd623829b8b19e4b437e7f1dc140c11d9ca99
 SHA512:
-  metadata.gz: 19fbd37bdbae3376ff3a3a2b08d1957d849b10d28d166db72b95e08caac6bae7ad77d6bfbcf038344684fa73a781c2eac26d3d49f44db530f75d49c4fd187e64
-  data.tar.gz: a12f2d3c0f18888b523332fc3dbfb612236c11a5bce1112fbede19f7123eac5448095f01c89a4982080849de86256579be314ee0bb09218b3d4a3ca587968b95
+  metadata.gz: a5e213d7abbdc81750dcff7afc5caf988265e105cf386dfc40d366f7a2a03f531859c49e453b160c24baa3044f86a7ee360f2ac04447e86c21f28af0e6005071
+  data.tar.gz: 602615ed7ccf3bc3a7af337d0f453b6f4160c8539180f89b82ea575b9c54090f272ed1b0d6a3ca350f915b443758182c86b23e587ff23ab285d3b9de80f85ce4

data/bin/demake

@@ -1,12 +1,17 @@
 #!/usr/bin/env ruby
 #
-# demake - Executable script which uses Ruby to generate decorated GNU Makefiles
-#          for multiple related applications.
+# demake
+#
+# Develop, Decorate and manage Dependencies for C (GNU) Makefiles easily with Ruby
 #
 require 'rbconfig'	# Needed by older versions of Ruby
 require 'pipetext'
+@lib_dir = File.join(File.expand_path("../..", __FILE__), "lib")
+@lib_data = File.join(File.expand_path("../..", __FILE__), "lib", "data")
+@lib_apps = File.join(File.expand_path("../..", __FILE__), "lib", "apps")
+load @lib_dir + '/to_plural.rb'
 
-demake_version = "0.2.2"
+demake_version = "0.2.4"
 
 @silent = false
 @compiler = "gcc"
@@ -119,11 +124,7 @@ def notify(string)
   STDERR.puts(@pipe.pipetext(string))
 end
 
-@lib_data = File.join(File.expand_path("../..", __FILE__), "lib", "data")
-@lib_apps = File.join(File.expand_path("../..", __FILE__), "lib", "apps")
-@lib_dir = File.join(File.expand_path("../..", __FILE__), "lib")
 @available_apps = Array.new
-
 Dir.entries(@lib_apps).each do |e|
   if(e != '.' && e != '..')
     @available_apps << e
@@ -151,7 +152,7 @@ def file_open_read_close(filename, notify_warning=true)
       notify("|YWARNING|n: #{$!.to_s.sub(/@ rb_[a-zA-Z_]* /, '')}")
     end
   end
-  return(data)
+  return data
 end
 
 def copy_template(filename)
@@ -175,32 +176,291 @@ def copy_template(filename)
       exit!
     end
   else
-    data = file_open_read_close(filename)
+#    data = file_open_read_close(filename)
     new_name = filename.sub(/^#{@lib_apps}./, '')
     file_open_write_close(new_name, file_open_read_close(filename))
     notify("#{@emoji_success} Created file: |y#{new_name}|n |[page facing up]\n")
   end
 end
 
-@found_application = nil
-@suggestion = String.new
-@available_apps.sort.each do |app|
-  if(ARGV[0] =~ /^#{app}$/)
-    if(File.directory?(app) == true)
-      notify("\n#{@emoji_fail}|RError|n: |Ydirectory #{app} |Ralready exists, aborting creation|n\n\n" +
-             "Delete the directory and try again if you wish to recreate it.\n\n")
-      exit!
+def create_new_application(new_name)
+  begin
+    if(File.directory?(new_name) != true)
+      Dir.mkdir(new_name)
+      notify("#{@emoji_success} Created directory: |g#{new_name}|n |[open file folder]\n")
     end
-    @found_application = app
-    copy_template(File.join(@lib_apps, app))
+    if(File.directory?(new_name + "/demake") != true)
+      Dir.mkdir(new_name + "/demake")
+      notify("#{@emoji_success} Created directory: |g#{new_name}/demake|n |[open file folder]\n")
+    end
+    begin
+      File.open("#{new_name}/demake/applications", 'w') do |f|
+        f.write("#{new_name}\n")
+      end
+      notify("#{@emoji_success} Created file: |y#{new_name}/demake/applications|n |[page facing up]\n")
+    rescue
+      notify("|RError|n: #{$!}")
+    end
+    file_open_write_close(new_name + "/demake/settings.rb", file_open_read_close(@lib_apps + "/example/demake/settings.rb"))
+    notify("#{@emoji_success} Created file: |y#{new_name}/demake/settings.rb|n |[page facing up]\n")
+    file_open_write_close(new_name + "/demake/license", file_open_read_close(@lib_apps + "/example/demake/license"))
+    notify("#{@emoji_success} Created file: |y#{new_name}/demake/license|n |[page facing up]\n")
+    file_open_write_close(new_name + "/demake/auto_bits.rb", file_open_read_close(@lib_apps + "/example/demake/auto_bits.rb"))
+    notify("#{@emoji_success} Created file: |y#{new_name}/demake/auto_bits.rb|n |[page facing up]\n")
+    file_open_write_close(new_name + "/demake/auto_list.rb", file_open_read_close(@lib_apps + "/example/demake/auto_list.rb"))
+    notify("#{@emoji_success} Created file: |y#{new_name}/demake/auto_list.rb|n |[page facing up]\n")
     begin
-      File.open(File.join(@lib_apps, app, 'demake', 'suggestion'), 'r') do |f|
-        @suggestion = f.read.chomp
+      File.open("#{new_name}/demake/test-target.rb", 'w') do |f|
+        f.write("test_targets = <<-END_OF_STRING\n")
+        f.write("\t@echo\n\t@echo \"|YTesting command:|n\"\n\tbin/#{new_name}\n")
+        f.write("END_OF_STRING\n")
+        f.write("test_target << test_targets\n")
       end
+      notify("#{@emoji_success} Created file: |y#{new_name}/demake/test-target.rb|n |[page facing up]\n")
     rescue
+      notify("|RError|n: #{$!}")
+    end
+    if(File.directory?(new_name + "/src") != true)
+      Dir.mkdir(new_name + "/src")
+      notify("#{@emoji_success} Created directory: |g#{new_name}/src|n |[open file folder]\n")
+    end
+    file_open_write_close(new_name + "/src/Makefile", file_open_read_close(@lib_apps + "/example/src/Makefile"))
+    notify("#{@emoji_success} Created file: |y#{new_name}/src/Makefile|n |[page facing up]\n")
+    file_open_write_close(new_name + "/src/typedefs.h", file_open_read_close(@lib_data + "/libsrc/typedefs.h"))
+    notify("#{@emoji_success} Created file: |y#{new_name}/src/typedefs.h|n |[page facing up]\n")
+    file_open_write_close(new_name + "/src/defines.h", file_open_read_close(@lib_data + "/libsrc/defines.h"))
+    notify("#{@emoji_success} Created file: |y#{new_name}/src/defines.h|n |[page facing up]\n")
+    file_open_write_close(new_name + "/src/base.h", file_open_read_close(@lib_data + "/libsrc/base.h"))
+    notify("#{@emoji_success} Created file: |y#{new_name}/src/base.h|n |[page facing up]\n")
+    begin
+      File.open("#{new_name}/src/#{new_name}.c", 'w') do |f|
+        f.write("/*\n\n  #{new_name}.c - #{new_name} main application entry point\n\n*/\n\n" +
+                "#include <stdio.h>\n\n#include \"base.h\"\n\n" +
+                "i32 main(i32 argc, c8 *argv[]) {\n  printf(\"Hello, world!\\n\");\n  return 0;\n}\n")
+      end
+      notify("#{@emoji_success} Created file: |y#{new_name}/src/#{new_name}.c|n |[page facing up]\n")
+    rescue
+      notify("|RError|n: #{$!}")
+    end
+  rescue Errno::EACCES
+    notify("|RError|n: #{$!.to_s.sub(/@ dir_s_mkdir /, '')}")
+    exit!
+  rescue
+    notify("|RError|n: #{$!}")
+  end
+end
+
+@auto_bits = Hash.new
+def auto_bits_add(prefix, list, file=nil)
+  @auto_bits[prefix] = { 'prefix' => prefix, 'list' => list, 'file' => file }
+end
+
+@auto_list = Hash.new
+def auto_list_add(prefix, list, file=nil)
+  @auto_list[prefix] = { 'prefix' => prefix, 'list' => list, 'file' => file }
+end
+
+@found_application = nil
+@suggestion = String.new
+
+if(ARGV[0] =~ /^new/)
+  if(ARGV[1] == nil || ARGV[1] == "")
+    notify("\n#{@emoji_fail}|RError|n: |Ynew application name |Rrequired|n.\n\n");
+    exit!
+  end
+  @found_application = "new"
+  create_new_application(ARGV[1])
+  Dir.chdir(ARGV[1])
+  @working_directory = Dir.pwd
+elsif(ARGV[0] =~ /^auto_bits/ || ARGV[0] =~ /^auto-bits/ || ARGV[0] =~ /^auto_list/ || ARGV[0] =~ /^auto-list/)
+  if(ARGV[0] =~ /^auto_bits/ || ARGV[0] =~ /^auto-bits/)
+    auto_bits = true
+  elsif(ARGV[0] =~ /^auto_list/ || ARGV[0] =~ /^auto-list/)
+    auto_list = true
+  end
+  begin
+    if(ARGV[1] != nil)
+      code = file_open_read_close(ARGV[1])
+    else
+      if(auto_bits)
+        code = file_open_read_close('demake/auto_bits.rb')
+      elsif(auto_list)
+        code = file_open_read_close('demake/auto_list.rb')
+      end
+    end
+    if(@emojis == false)
+      strip_emojis!(code)
+    end
+    eval code
+  rescue Errno::ENOENT
+    if(auto_bits)
+      notify("\n#{@emoji_fail}|RError|n: |Ydemake/auto_bits.rb|n or |Yadditional argument|n |Rrequired|n.\n\n")
+    elsif(auto_list)
+      notify("\n#{@emoji_fail}|RError|n: |Ydemake/auto_list.rb|n or |Yadditional argument|n |Rrequired|n.\n\n")
+    end
+    exit!
+  rescue
+    notify("\n#{@emoji_fail}|RError|n: #{$!}\n\n")
+    exit!
+  end
+  if(@auto_bits == {} && auto_bits)
+    notify("\n#{@emoji_fail}|RError|n: No auto_bits.rb configurations found.\n\n")
+    exit!
+  end
+  if(@auto_list == {} && auto_list)
+    notify("\n#{@emoji_fail}|RError|n: No auto_list.rb configurations found.\n\n")
+    exit!
+  end
+  if(!defined?(@prespace))
+    @prespace = 0
+  end
+  if(!defined?(@target_tab_column))
+    @target_tab_column = 5
+  end
+  @text = String.new
+  @spaces = " " * @prespace
+  @auto_bits.each do |bits|
+    bits[1]['list'].each_with_index do |entry, index|
+      text = @spaces + "#define #{bits[1]['prefix'].upcase.gsub(' ', '_')}_"
+      text << entry.upcase.gsub(' ', '_')
+      text << "\t" * [1, @target_tab_column - (text.length / 8).floor].max
+      text << "(1 << #{index})\n"
+      @text << text
+    end
+    text = @spaces + "#define NUM_#{to_plural(bits[1]['prefix']).upcase.gsub(' ', '_')}"
+    text << "\t" * [1, @target_tab_column - (text.length / 8).floor].max
+    text << bits[1]['list'].count.to_s + "\n"
+    @text << "\n" + text
+    @text << "\n" + @spaces + "cc8 #{to_plural(bits[1]['prefix']).gsub(' ', '_')}_list[] = {\n"
+    bits[1]['list'].each do |entry|
+      text = @spaces + "  \"#{entry}\",\n"
+      @text << text
+    end
+    @text << @spaces + "  NULL\n"
+    @text << @spaces + "};\n\n"
+    if(bits[1]['file'] == nil)
+      file_name = "auto_bits_generated.h"
+    else
+      file_name = bits[1]['file']
+    end
+    same_file = false
+    @auto_bits.each do |bits2|
+      if(bits == bits2)
+        break
+      elsif(bits[1]['file'] == bits2[1]['file'])
+        same_file = true
+        break
+      elsif(bits[1]['file'] == nil && bits2[1]['file'] == file_name)
+        same_file = true
+        break
+      end
+    end
+    if(same_file == true)         # Append
+      File.open(file_name, "a") do |file|
+        file.puts(@text)
+      end
+    else                          # New File
+output = <<-END_OF_STRING
+/*
+
+   This file automatically generated by Ruby Gem - demake #{demake_version}
+
+*/
+
+#ifndef NULL
+  #define NULL				((void *) 0)
+#endif
+
+END_OF_STRING
+      File.open(file_name, "w") do |file|
+        file.puts(output)
+        file.puts(@text)
+      end
+      notify("#{@emoji_success} Created file: |y#{file_name}|n |[page facing up]\n\n")
+    end
+    @text = String.new
+  end
+  @auto_list.each do |list|
+    list[1]['list'].each_with_index do |entry, index|
+      text = @spaces + "#define #{list[1]['prefix'].upcase.gsub(' ', '_')}_"
+      text << entry.upcase.gsub(' ', '_')
+      text << "\t" * [1, @target_tab_column - (text.length / 8).floor].max
+      text << "#{index}\n"
+      @text << text
+    end
+    text = @spaces + "#define NUM_#{to_plural(list[1]['prefix']).upcase.gsub(' ', '_')}"
+    text << "\t" * [1, @target_tab_column - (text.length / 8).floor].max
+    text << list[1]['list'].count.to_s + "\n"
+    @text << "\n" + text
+    @text << "\n" + @spaces + "cc8 #{to_plural(list[1]['prefix']).gsub(' ', '_')}_list[] = {\n"
+    list[1]['list'].each do |entry|
+      text = @spaces + "  \"#{entry}\",\n"
+      @text << text
+    end
+    @text << @spaces + "  NULL\n"
+    @text << @spaces + "};\n\n"
+    if(list[1]['file'] == nil)
+      file_name = "auto_list_generated.h"
+    else
+      file_name = list[1]['file']
+    end
+    same_file = false
+    @auto_list.each do |list2|
+      if(list == list2)
+        break
+      elsif(list[1]['file'] == list2[1]['file'])
+        same_file = true
+        break
+      elsif(list[1]['file'] == nil && list2[1]['file'] == file_name)
+        same_file = true
+        break
+      end
+    end
+    if(same_file == true)         # Append
+      File.open(file_name, "a") do |file|
+        file.puts(@text)
+      end
+    else                          # New File
+output = <<-END_OF_STRING
+/*
+
+   This file automatically generated by Ruby Gem - demake #{demake_version}
+
+*/
+
+#ifndef NULL
+  #define NULL				((void *) 0)
+#endif
+
+END_OF_STRING
+      File.open(file_name, "w") do |file|
+        file.puts(output)
+        file.puts(@text)
+      end
+      notify("#{@emoji_success} Created file: |y#{file_name}|n |[page facing up]\n\n")
+    end
+    @text = String.new
+  end
+  exit!
+else
+  @available_apps.sort.each do |app|
+    if(ARGV[0] =~ /^#{app}$/)
+      if(File.directory?(app) == true)
+        notify("\n#{@emoji_fail}|RError|n: |Ydirectory #{app} |Ralready exists, aborting creation|n\n\n" +
+               "Delete the directory and try again if you wish to recreate it.\n\n")
+        exit!
+      end
+      @found_application = app
+      copy_template(File.join(@lib_apps, app))
+      begin
+        File.open(File.join(@lib_apps, app, 'demake', 'suggestion'), 'r') do |f|
+          @suggestion = f.read.chomp
+        end
+      rescue
+      end
+      Dir.chdir(app)
+      @working_directory = Dir.pwd
     end
-    Dir.chdir(app)
-    @working_directory = Dir.pwd
   end
 end
 
@@ -217,6 +477,10 @@ if(need_help == true)
   program = File.basename($0)
   COLUMN_WIDTH = 20
   syntax = "|]#{COLUMN_WIDTH}Command syntax:\n\n" + "|y#{program}|n|; - Create or update Makefile\n"
+  syntax << "|y#{program} ?|n|; - View this help information\n"
+  syntax << "|y#{program} new <name>|n|; - Create new application\n"
+  syntax << "|y#{program} auto_bits|n|; - Generate auto_bits code\n"
+  syntax << "|y#{program} auto_list|n|; - Generate auto_list code\n"
   @available_apps.sort.each do |app|
     data = String.new
     begin
@@ -231,6 +495,7 @@ if(need_help == true)
       syntax << "|y#{program} #{app}|n\n"
     end
   end
+  syntax << "\nVersion: |c#{demake_version}|n\n"
   notify(syntax + "\n")
   exit!
 end
@@ -965,9 +1230,14 @@ end
 
 if(@found_application != nil)
   File.open('Makefile', 'w').write(@output)
-  notify("#{@emoji_success} Created file: |y#{@found_application}/Makefile|n |[page facing up]\n\n")
-  if(@suggestion != "")
-    notify("Suggestion: |C#{@suggestion}|n\n")
+  if(@found_application == "new")
+    notify("#{@emoji_success} Created file: |y#{ARGV[1]}/Makefile|n |[page facing up]\n\n")
+    notify("Suggestion: |Ccd #{ARGV[1]} ; make ; make build ; make test|n\n")
+  else
+    notify("#{@emoji_success} Created file: |y#{@found_application}/Makefile|n |[page facing up]\n\n")
+    if(@suggestion != "")
+      notify("Suggestion: |C#{@suggestion}|n\n")
+    end
   end
   Dir.chdir('..')
 else

data/lib/apps/example/demake/auto_bits.rb

@@ -0,0 +1,59 @@
+#file = "auto_bits_generated.h"
+prefix = "bit"
+list = [ "0", "1", "2", "3" ]
+auto_bits_add(prefix, list)
+#auto_bits_add(prefix, list, file)
+
+prefix = "flag"
+list = [ "A", "B", "C", "D" ]
+auto_bits_add(prefix, list)
+
+@prespace = 0
+@target_tab_column = 5
+notify("|g|[check mark]|n demake/auto_bits.rb is present - generating code")
+
+=begin
+
+The default configuration above generates the following C code
+in the file auto_bits_generated.h:
+
+/*
+
+   This file automatically generated by Ruby Gem - demake 0.2.4
+
+*/
+
+#ifndef NULL
+  #define NULL				((void *) 0)
+#endif
+
+#define BIT_0				(1 << 0)
+#define BIT_1				(1 << 1)
+#define BIT_2				(1 << 2)
+#define BIT_3				(1 << 3)
+
+#define NUM_BITS			4
+
+cc8 bits_list[] = {
+  "0",
+  "1",
+  "2",
+  "3",
+  NULL
+};
+
+#define FLAG_A				(1 << 0)
+#define FLAG_B				(1 << 1)
+#define FLAG_C				(1 << 2)
+#define FLAG_D				(1 << 3)
+
+#define NUM_FLAGS			4
+
+cc8 flags_list[] = {
+  "A",
+  "B",
+  "C",
+  "D",
+  NULL
+};
+=end

data/lib/apps/example/demake/auto_list.rb

@@ -0,0 +1,60 @@
+#file = "auto_list_generated.h"
+prefix = "color"
+list = [ "blue", "green", "red", "purple" ]
+auto_list_add(prefix, list)
+#auto_bits_add(prefix, list, file)
+
+prefix = "shape"
+list = [ "circle", "triangle", "square", "hexagon" ]
+auto_list_add(prefix, list)
+
+@prespace = 0
+@target_tab_column = 5
+notify("|g|[check mark]|n demake/auto_list.rb is present - generating code")
+
+=begin
+
+The default configuration above generates the following C code
+in the file auto_list_generated.h:
+
+/*
+
+   This file automatically generated by Ruby Gem - demake 0.2.4
+
+*/
+
+#ifndef NULL
+  #define NULL				((void *) 0)
+#endif
+
+#define COLOR_BLUE			0
+#define COLOR_GREEN			1
+#define COLOR_RED			2
+#define COLOR_PURPLE			3
+
+#define NUM_COLORS			4
+
+cc8 colors_list[] = {
+  "blue",
+  "green",
+  "red",
+  "purple",
+  NULL
+};
+
+#define SHAPE_CIRCLE			0
+#define SHAPE_TRIANGLE			1
+#define SHAPE_SQUARE			2
+#define SHAPE_HEXAGON			3
+
+#define NUM_SHAPES			4
+
+cc8 shapes_list[] = {
+  "circle",
+  "triangle",
+  "square",
+  "hexagon",
+  NULL
+};
+
+=end

data/lib/apps/example/src/Makefile

@@ -0,0 +1,6 @@
+all :
+	(pushd .. && make build)
+clean :
+	(pushd .. && make clean)
+test :
+	(pushd .. && make test)

data/lib/apps/oreo/src/Makefile

@@ -0,0 +1,6 @@
+all :
+	(pushd .. && make build)
+clean :
+	(pushd .. && make clean)
+test :
+	(pushd .. && make test)

data/lib/data/libsrc/auto_bits.c

@@ -0,0 +1,41 @@
+  #define AUTO_BITS_IMPLEMENTATION
+  #include "auto_bits.h"
+
+  #define BIT_0                         (1 << 0)
+  #define BIT_1                         (1 << 1)
+  #define BIT_2                         (1 << 2)
+  #define BIT_3                         (1 << 3)
+
+  cc8 *bit_list[] = {
+    "0",
+    "1",
+    "2",
+    "3",
+    NULL
+  };
+
+  i32 main(i32 argc, c8 *argv[])
+  {
+    b8 bits = 0;
+
+    printf("-- Set both bits 1 & 2:\n");
+    SET_BIT(bits, BIT_1|BIT_2);
+    auto_bits_print(bit_list, bits);
+    if(IS_SET(bits, BIT_2))
+      printf("Bit #2 is set.\n");
+    printf("Manual list set bits: ");
+    auto_bits_show(bit_list, bits, "|");
+    printf("\n\n-- Remove both bits 1 & 2:\n");
+    REMOVE_BIT(bits, BIT_1|BIT_2);
+    auto_bits_print(bit_list, bits);
+    printf("\n-- Set all 4 bits:\n");
+    SET_BIT(bits, BIT_0|BIT_1|BIT_2|BIT_3);
+    auto_bits_print(bit_list, bits);
+    printf("Manual list set bits: ");
+    auto_bits_show(bit_list, bits, " + ");
+    printf("\n\n-- Toggle both bits 1 & 2:\n");
+    TOGGLE_BIT(bits, BIT_1|BIT_2);
+    auto_bits_print(bit_list, bits);
+
+    return 0;
+  }