demake 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3274ff2579bbe99e1f34dc59d4ea928cc8038f2887299035ce4dd91b48ec1e5f
-  data.tar.gz: d3b8bd0a0c724ae6ecf7934fc51ac2d0dabeef510688c864643e6fad63c8dbac
+  metadata.gz: 5c2a824e423f1590b984cd455c1cc798423b7739d2f2d6136c8cd5d2027e5504
+  data.tar.gz: a45262cbd164127e71c834a185dc133298de0c5b5916cac8a266d80df8d0786e
 SHA512:
-  metadata.gz: 19fbd37bdbae3376ff3a3a2b08d1957d849b10d28d166db72b95e08caac6bae7ad77d6bfbcf038344684fa73a781c2eac26d3d49f44db530f75d49c4fd187e64
-  data.tar.gz: a12f2d3c0f18888b523332fc3dbfb612236c11a5bce1112fbede19f7123eac5448095f01c89a4982080849de86256579be314ee0bb09218b3d4a3ca587968b95
+  metadata.gz: 9428832c08f525f34bb06e1a050311ddbf9a5188da8bc7d383b5c95728c9650a4babe3bb45d2aaf59c9a552485dd30c77882b103a5ecac756c5c268306d6664d
+  data.tar.gz: f8de83f44ec206fb9d6cec6e3735c36c7e10337a945e13f7be5266b986a052f8e8989e5147fefea33adc852caeba24236e74d2cc11dc63110a221ac631196383

data/bin/demake

@@ -6,7 +6,7 @@
 require 'rbconfig'	# Needed by older versions of Ruby
 require 'pipetext'
 
-demake_version = "0.2.2"
+demake_version = "0.2.3"
 
 @silent = false
 @compiler = "gcc"
@@ -123,7 +123,6 @@ end
 @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 +150,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 +174,102 @@ 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
+    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
-    @found_application = app
-    copy_template(File.join(@lib_apps, app))
+    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")
     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/typedefs.h", file_open_read_close(@lib_data + "/libsrc/typedefs.h"))
+    file_open_write_close(new_name + "/src/defines.h", file_open_read_close(@lib_data + "/libsrc/defines.h"))
+    file_open_write_close(new_name + "/src/base.h", file_open_read_close(@lib_data + "/libsrc/base.h"))
+    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
+
+@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
+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 +286,8 @@ 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"
   @available_apps.sort.each do |app|
     data = String.new
     begin
@@ -231,6 +302,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 +1037,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: demake
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Minaswan Nakamoto
@@ -36,6 +36,31 @@ description: |
 
     > gem install demake
 
+    To see command syntax:
+
+    > demake ?
+
+      Command syntax:
+
+      demake               - Create or update Makefile
+      demake ?             - View this help information
+      demake new <name>    - Create new application
+      demake example       - Create an example application
+      demake oreo          - Create a different sample application
+
+      Version: 0.2.3
+
+    To create a new application:
+
+    > demake new <name>
+
+    This will create a new directory and basic files for a new C application.
+
+    To create or update a GNU Makefile on an existing demake application,
+    execute without arguments:
+
+    > demake
+
     To create an example with multiple sample applications:
 
     > demake example
@@ -61,10 +86,6 @@ description: |
     demake/settings.rb, demake/test-target.rb, demake/install-target.rb,
     demake/license
 
-    The output of the command by itself is a (GNU style) file named Makefile:
-
-    > demake
-
     You can also clone from git:
 
     > git clone https://github.com/MinaswanNakamoto/demake.git