ruby_make_script 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3406be1df614999fd1ca1ea31185363c98ae75e77beae44547c3ea4a6225c2a4
-  data.tar.gz: c01a6f7f1975958eee6c8db653bf8001789575c12f3880651809cdd990ef7a75
+  metadata.gz: a370bfa77890704eba2e733162beac06b58ab808c12560aa80f82954ead81b9a
+  data.tar.gz: 2367de1ec588fa4927475288cdc9959e8aa13afb487e608d08911cd1f7d8c15f
 SHA512:
-  metadata.gz: 97cfd2352791c73010bf3c06239a02af829530e023d7092b10297b8fa80a090bfde40ff082b33fe7de8cd31851c48ade3cf0b3964d9e80237befac9f273a2de6
-  data.tar.gz: 387906e219c62fa99ed6d573b013b1037512623a02af0114e0b35d6585bfca532af5a856de7b7e83d4ab935429bdda65f49d348f8653c1c678adbd52fbf70c29
+  metadata.gz: b85472ea65c10e3642fdb99aa1b578b686e95fa3f6d85271e3a7f197efae992091f18b4b154a596fee23b8c01c737e28829dcd7c6d1329669759f695ea5cdbac
+  data.tar.gz: 3f6b650ac72704263761b7cded263e00378e893d0fc5838bf346646c461a80ca1bb0845ed5b5d3372e6516642aea77f079f89fa9a7789ea4428817dc741b895a

data/Gemfile

@@ -1,6 +1,5 @@
 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,23 @@ 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
 
     File.open('./.make_script.yaml', 'w') { |f| f.write(YAML.dump($cur_file_time_dict)) }
-
-end
+end

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.0"
+  VERSION = "0.1.5"
 end

data/ruby_make_script.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{A ruby make DSL for ruby like GNU make. (very simple)}
   spec.homepage      = "https://github.com/DnailZ/ruby_make_script"
   spec.license       = "MIT"
-
+ 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
@@ -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,4 +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" , "~> 0.7.4"
 end

data/test.rb

@@ -0,0 +1,7 @@
+require "ruby_make_script"
+
+make do
+    :setup.from do
+        r "echo", "Hello", "World"
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_make_script
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - dnailz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.4
 description: A ruby make DSL for ruby like GNU make. (very simple)
 email:
 - dnailzb@outlook.com
@@ -73,6 +87,7 @@ files:
 - lib/ruby_make_script/utils.rb
 - lib/ruby_make_script/version.rb
 - ruby_make_script.gemspec
+- test.rb
 homepage: https://github.com/DnailZ/ruby_make_script
 licenses:
 - MIT