ruby_make_script 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b85b310f3fca899111a9a318643189ce056c1dd247f4f12e85ec3a840ee3ef0c
-  data.tar.gz: 0c85142b81f27c6cadd8824c79a8f9595f386a27fdbca49f4697ba96656dae13
+  metadata.gz: 39795ddc3d0820433555bb57ffd41639be77a702ee4e3ff72cac6dd243fa9bb8
+  data.tar.gz: 629a6e4804bd3112e66660e3b921965d16456d94478da616453824de2ccd53ee
 SHA512:
-  metadata.gz: 752c14fc7c3c18285462f1663e6e38a9246e4e3ef81dbbea08986ce10508f40771cc51169cb6c3ef062b45f1c27fd564336964c568f3c991b2f15abdd2a395d3
-  data.tar.gz: a8047c2bcf0ccb99e2a06499630032b7725e3cfed0d32d58fad69f62f5b69b870f2339fdcab515cb14158377047fc30e64f2fab23a5aead5b43ae82d3e7ffe27
+  metadata.gz: d6dec45593827ae2055b5cef614fcb2ca905d61bc3b85c02524cff4cdaeb2b8397e255d4550aa9079557af32d0baed3082ac858d81608c885a1226d99130e648
+  data.tar.gz: 784d568d21a7ac1a3120ca7b125079a9bc2fc42a030e19e668cd99e18332b66739550561be954ce4f61be025b7076526f091c66a866d66d0213c9e3b11d2b273

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.make_script.yaml

data/Gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
+gem 'pastel'
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 

data/lib/ruby_make_script.rb

@@ -15,6 +15,10 @@
 #
 #
 
+if !system('gem list | grep pastel > /dev/null') 
+    puts "pastel not install automaticly, please 'gem install pastel'"
+end
+
 require 'pastel'
 require 'yaml'
 
@@ -35,7 +39,7 @@ require 'ruby_make_script/target'
 
 # check a file (recursively) and run the commands of the target.
 def resolve(file, force_exec=false)
-    if file_modified?(file) || force_exec
+    if force_exec || file_modified?(file)
         t = $file_target_dict[file]
         # when t == nil, its a file not used for target
         if t != nil 
@@ -108,7 +112,7 @@ class Symbol
     # end
     # ```
     def then
-        from()
+        PhonyTarget.new(String(self)).from() { yield }
     end
 end
 
@@ -158,23 +162,64 @@ def make
         $file_time_dict = YAML.load(File.read('./.make_script.yaml'))
         $cur_file_time_dict = $file_time_dict.clone()
     end
-    puts Pastel.new.green.bold("ruby_make_script> ") + "start"
+    puts Pastel.new.bright_cyan("make> ") + "start"
+    
     begin
-        if ARGV.length <= 1
+        if ARGV.length == 0
             $targetlist[0].resolve_all
         else
-            resolve(ARGV[1], force_exec=true)
+            resolve(ARGV[0], true)
         end
 
     rescue StandardError => e
-        puts Pastel.new.red.bold("ruby_make_script failed> ") + e.message
+        puts Pastel.new.red.bold("make failed> ") + e.message
         if e.message != "make command failed"
             puts e.backtrace
         end
     else
-        puts Pastel.new.green.bold("ruby_make_script> ") + "completed"
+        puts Pastel.new.bright_cyan("make> ") + "completed"
+    end
+    if !File.exist?('./.make_script.yaml')
+        File.open('.gitignore', 'a') do |f|
+            f << "\n.make_script.yaml\n"
+        end
     end
-
     File.open('./.make_script.yaml', 'w') { |f| f.write(YAML.dump($cur_file_time_dict)) }
+end
 
+def dump_md(filename, thisfile="make.rb")
+    puts Pastel.new.bright_cyan("make> ") + "dumping markdown file #{filename}"
+    File.open(filename, 'w') do |f|
+        f.puts "# #{thisfile} Documentation"
+        f.puts ""
+        if block_given?
+            yield f
+            f.puts ""
+        end
+        f.puts "## Usage"
+        f.puts ""
+        f.puts "Please install ruby and some package first:"
+        f.puts ""
+        f.puts "```sh"
+        f.puts "$ apt instal ruby"
+        f.puts "$ gem instal pastel ruby_make_script"
+        f.puts "```"
+        f.puts ""
+        f.puts "then you can run these command below."
+        $targetlist.each { |t|
+            if t.class == PhonyTarget
+                args = t.doc.arglist.map{ |a| a[0] }.join(' ')
+                f.puts "### `./#{thisfile} #{t.target} #{args}`"
+                f.puts ""
+                f.puts "#{t.doc.descr}"
+                f.puts ""
+                t.doc.arglist.each { |a|
+                    f.puts "* `#{a[0]}` : #{a[1]}"
+                }
+                if t.doc.arglist != []
+                    f.puts ""
+                end
+            end
+        }
+    end
 end

data/lib/ruby_make_script/doc.rb

@@ -0,0 +1,42 @@
+
+class TargetDoc
+    attr_accessor :arglist
+    attr_accessor :descr
+    attr_accessor :name
+
+    def initialize()
+        @arglist = []
+        @descr = ""
+        @name = ""
+    end
+    def set_name(name)
+        @name = name
+    end
+
+    def add_arg(name, doc)
+        @arglist += [[name, doc]]
+    end
+
+    def add_descr(str)
+        @descr += str + "\n"
+    end
+
+    def empty?()
+        @arglist == [] || @descr == ""
+    end
+
+    def form_str()
+        [@name, *@arglist].join(" ")
+    end
+end
+
+$targetdoc = TargetDoc.new
+
+def descr!(str)
+    $targetdoc.add_descr(str)
+end
+
+def arg!(name, doc)
+    $targetdoc.add_arg(name, doc)
+end
+

data/lib/ruby_make_script/target.rb

@@ -1,8 +1,10 @@
 $t = []
 $d = []
 
-module Target
+require "ruby_make_script/doc"
 
+module Target
+    
     def depend_each
         depend.each { |f|
             yield f
@@ -39,6 +41,7 @@ class FileTarget
             resolve(f)
         }
     end
+
     def run
         if ! @completed
             @update_proc.call
@@ -53,6 +56,7 @@ class FileTarget
        @depend = []
        @completed = false
     end
+
     def from(*dependlist)
         @depend = dependlist
         @update_proc = Proc.new { 
@@ -72,7 +76,9 @@ end
 
 class PhonyTarget
     include Target
+    attr_accessor :target
     attr_accessor :depend
+    attr_accessor :doc
     def resolve_all
         resolve(@target)
     end
@@ -88,6 +94,9 @@ class PhonyTarget
         @target = str
         @depend = []
         @completed = false
+
+        @doc = $targetdoc
+        $targetdoc = TargetDoc.new
     end
 
     def from(*dependlist)

data/lib/ruby_make_script/utils.rb

@@ -1,15 +1,6 @@
-
-
 # since ~ "cd <path>" invalid, add a function here
 def cd(str)
-    if block_given?
-        orig = Dir.pwd
-        Dir.chdir(str)
-        yield
-        Dir.chdir(orig)
-    else
-        Dir.chdir(str)
-    end
+    Dir.chdir(str)
 end
 
 # these were like cd function
@@ -21,6 +12,15 @@ end
 def mkdir(*str)
     r"mkdir #{str.join(' ')}"
 end
+# these were like cd function
+def mv(*str)
+    r"mv #{str.join(' ')}"
+end
+
+# these were like cd function
+def cp(*str)
+    r"cp #{str.join(' ')}"
+end
 
 def r(*str)
     str =  str.join(" ")
@@ -34,14 +34,7 @@ end
 # since ~ "cd <path>" invalid, add a function here
 def cd?(str)
     begin
-        if block_given?
-            orig = Dir.pwd
-            Dir.chdir(str)
-            yield
-            Dir.chdir(orig)
-        else
-            Dir.chdir(str)
-        end
+        Dir.chdir(str)
     rescue => exception
         puts Pastel.new.yellow("warning> ") + "command error: cd " + str + " (suppressed)"
         return false
@@ -59,6 +52,16 @@ def mkdir?(*str)
     r?"mkdir #{str.join(' ')}"
 end
 
+# these were like cd function
+def mv?(*str)
+    r?"mv #{str.join(' ')}"
+end
+
+# these were like cd function
+def cp?(*str)
+    r?"cp #{str.join(' ')}"
+end
+
 # no error
 def r?(*str)
     str =  str.join(" ")
@@ -74,7 +77,65 @@ def runfile(file, *args)
     path = File.expand_path(file)
     r path, *args
 end
+
 def runfile?(file, *args)
     path = File.expand_path(file)
     r? path, *args
 end
+
+class InDir
+    def initialize(path, err=true)
+        @path = path
+        @err = err
+    end
+
+    def enter
+        @orig = Dir.pwd
+        if @err
+            cd @path
+        else
+            cd? @path
+        end
+    end
+
+    def exit
+        if @err
+            cd @orig
+        else
+            cd? @orig
+        end
+    end
+end
+
+def dir(path)
+    InDir.new(path)
+end
+
+def dir?(path)
+    InDir.new(path, false)
+end
+
+class InEnv
+    def initialize(expr)
+        @k, @v = expr.split('=')
+    end
+
+    def enter
+        @v0 = ENV[k]
+        ENV[k] = @v
+    end
+
+    def exit
+        ENV[k] = @v0
+    end
+end
+
+def envir(expr)
+    InEnv.new(expr)
+end
+
+def using(*operation)
+    operation.each{ |o| o.enter}
+    yield
+    operation.each{ |o| o.exit}
+end

data/lib/ruby_make_script/version.rb

@@ -1,3 +1,3 @@
 module RubyMakeScript
-  VERSION = "0.1.1"
+  VERSION = "0.1.6"
 end

data/make.md

@@ -0,0 +1 @@
+# `make.rb` Usage### `make.rb setup <args...>`

data/ruby_make_script.gemspec

@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  p spec.files
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
@@ -40,5 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "pastel"
+  spec.add_development_dependency "pastel" , "~> 0.7.4"
 end

data/test.rb

@@ -0,0 +1,11 @@
+require "ruby_make_script"
+
+make do
+    descr! "setup the environment"
+    arg! "<args...>", "command to run"
+    :setup.from do
+        r "echo", "Hello", "World"
+    end
+end
+
+dump_md('make.md'){}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_make_script
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - dnailz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.4
 description: A ruby make DSL for ruby like GNU make. (very simple)
 email:
 - dnailzb@outlook.com
@@ -77,17 +77,19 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - lib/ruby_make_script.rb
+- lib/ruby_make_script/doc.rb
 - lib/ruby_make_script/target.rb
 - lib/ruby_make_script/utils.rb
 - lib/ruby_make_script/version.rb
+- make.md
 - ruby_make_script.gemspec
+- test.rb
 homepage: https://github.com/DnailZ/ruby_make_script
 licenses:
 - MIT

data/Gemfile.lock

@@ -1,28 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ruby_make_script (0.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    equatable (0.6.1)
-    minitest (5.14.1)
-    pastel (0.7.4)
-      equatable (~> 0.6)
-      tty-color (~> 0.5)
-    rake (10.5.0)
-    tty-color (0.5.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.17)
-  minitest (~> 5.0)
-  pastel
-  rake (~> 10.0)
-  ruby_make_script!
-
-BUNDLED WITH
-   1.17.2