dyntask-ruby 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 827461fdfafb90b7a5e426cd01f67b64dc0cfbbd
-  data.tar.gz: d023941a5758d1234ec4540e7e9ecf6d3e4f0faf
+  metadata.gz: 32df473416ea671d565651d749ea83fdd43d8c8e
+  data.tar.gz: 7b5e1a9c43b19551ec35330e1e1f8a06ce735165
 SHA512:
-  metadata.gz: 6ae62124ccd28f415fd87c4ccfbaa54fdc7443ac2acf6597662065750b29d679c622c95e52541c586eb25a6c1b7552c6f1d3022e07740b76708ce73076ca3ae5
-  data.tar.gz: 58101b2f9f1a918962cc5140ddb443a5765b72dffab3c8f317e0f50a9e05eadd1c4cada2314cbcfb9fc28435fe5b9a80a9f288bfaa1a2602e54561b780695dfd
+  metadata.gz: 7a439e181630ca61a6be46cf0bbc27968405433499cca6fb05aade855db8f70394db6ba8a6f4c30f4edd216d541a27afcd3073f72d4d551408240e35886cb6d1
+  data.tar.gz: 576e6296fbf1ad0d393a7605d73e88bfba28dfb94514e4084819b54be52209cb8bbd95d39562b669e9c624c92710b246d15a1c110816fbe5a89d617c3914320d

data/bin/dyntask-init

@@ -12,9 +12,9 @@ options = Trollop::options do
   banner <<-EOS
 dyntask-init executes the dynamic task file.
 Usage:
-   dyntask-init [--force] '<name>' '<working_dir>:<list_of_comma_separated_tasks>' ['<working_dir_2>:<list_of_comma_separated_tasks_2>' ...]
-   dyntask-init '<name>'
-   dyntask-init --force --rm '<name>'
+  dyntask-init [first] (for a initial setup)
+  dyntask-init ls or dyntask-init add|rm <working_dir> (to list, add or remove working directory)
+  dyntask-init pandoc-extra ls|dir|wget
 Options:
 EOS
   opt :force, "force is used to rewrite on an existing file", :short => 'f', :type => :boolean, :default => false
@@ -28,6 +28,42 @@ when "first"
   FileUtils.mkdir_p DynTask.cfg_dir[:root] unless File.directory? DynTask.cfg_dir[:root]
   FileUtils.mkdir_p DynTask.cfg_dir[:run] unless File.directory? DynTask.cfg_dir[:run]
   FileUtils.cp_r File.expand_path('../../share',__FILE__),DynTask.cfg_dir[:share] unless File.directory? File.join(DynTask.cfg_dir[:share])
+when "rundir","run"
+  rundirs=[]
+  etc_rundirs=File.join( DynTask.cfg_dir[:etc],"rundirs")
+  rundirs += File.read(etc_rundirs).strip.split(",").map{|d| d.strip} if File.exists? etc_rundirs
+  etc_rundirs_to_update=false
+  case ARGV[1]
+  when "ls"
+    puts "Additional directories watched: #{rundirs.empty? ? 'none' : rundirs.join(',')}"
+  when "add"
+    newdir=File.expand_path ARGV[2]
+    if File.directory? newdir and !rundirs.include? newdir
+      rundirs << newdir
+      puts "DynTask Server needs to be restarted to apply this change!"
+      etc_rundirs_to_update=true
+    else
+      "Nothing to do!"
+    end
+  when "rm"
+    newdir=File.expand_path ARGV[2]
+    if File.directory? newdir and rundirs.include? newdir
+      rundirs -= [newdir]
+      puts "DynTask Server needs to be restarted to apply this change!"
+      etc_rundirs_to_update=true
+    else
+      "Nothing to do!"
+    end
+  end
+  if etc_rundirs_to_update
+    if rundirs.empty?
+      File.unlink etc_rundirs
+    else
+      File.open(etc_rundirs,"w") do |f|
+        f << rundirs.join(",")
+      end
+    end
+  end
 when "pandoc-extra"
 	case ARGV[1]
 	when "ls"

data/bin/dyntask-server

@@ -23,12 +23,17 @@ end
 
 ##Trollop::die Trollop::educate if(ARGV.size == 0)
 
-tasks_to_watch = DynTask::TaskMngr::TASKS
+rundirs=[DynTask.cfg_dir[:run]]
+etc_rundirs=File.join( DynTask.cfg_dir[:etc],"rundirs")
+rundirs += File.read(etc_rundirs).strip.split(",").map{|d| d.strip} if File.exists? etc_rundirs
+
+##tasks_to_watch = DynTask::TaskMngr::TASKS
 
 files_to_watch=[]
-rundir=DynTask.cfg_dir[:run]
-tasks_to_watch.each do |e|
-  files_to_watch << File.join(rundir,"*" +DynTask::TaskMngr::TASK_EXT+e) #if DynTask::TaskMngr::TASKS.include? file
+rundirs.each do |rundir|
+  ##tasks_to_watch.each do |e|
+    files_to_watch << File.join(rundir,"*" +DynTask::TaskMngr::TASK_EXT+"*" ) ##+e) #if DynTask::TaskMngr::TASKS.include? file
+  ##end
 end
 
 files_to_watch.uniq!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyntask-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -55,8 +55,6 @@ description: |2
 email: rdrouilh@gmail.com
 executables:
 - dyntask-server
-- dyntask-reader
-- dyntask-writer
 - dyntask-init
 extensions: []
 extra_rdoc_files: []
@@ -70,8 +68,6 @@ files:
 - share/tasks/task_dyn2html.rb
 - share/tasks/task_dyn2tex2pdf.rb
 - bin/dyntask-server
-- bin/dyntask-reader
-- bin/dyntask-writer
 - bin/dyntask-init
 homepage: http://cqls.upmf-grenoble.fr
 licenses:

data/bin/dyntask-reader

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'trollop'
-require 'pathname'
-require 'dyntask'
-
-VERSION='0.1.0'
-
-options = Trollop::options do
-  version "dyntask-reader version #{VERSION}"
-  banner <<-EOS
-dyntask-reader executes the dynamic task file.
-Usage:
-   dyntask-reader '<dyntask file>'
-Options:
-EOS
-
-end
-
-Trollop::die Trollop::educate if(ARGV.size == 0)
-
-filename=Pathname.new(ARGV[-1]).expand_path.to_s
-
-#p filename
-DynTask.read_tasks(filename)

data/bin/dyntask-writer

@@ -1,43 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'trollop'
-require 'pathname'
-require 'dyntask'
-
-VERSION='0.1.0'
-
-options = Trollop::options do
-  version "dyntask-writer version #{VERSION}"
-  banner <<-EOS
-dyntask-writer creates a dynamic task file.
-Usage:
-   dyntask-writer '<dyntask file>' ['<dyntask file2>' ...]
-Options:
-EOS
-
-end
-
-Trollop::die Trollop::educate if(ARGV.size == 0)
-task_basename=Pathname.new(ARGV[0]).expand_path.to_s
-ARGV[1..-1].each do |task|
-	cmd,*opts=task.split(",")
-	task2={cmd: cmd}
-	opts.each{|o|
-		key,*value=o.split("=")
-		value=value.join("=")
-		#p [:value,value]
-
-		begin
-			task2[key.to_sym]=Object.class_eval(value)
-		rescue Exception
-			task2[key.to_sym]=value
-		end
-	}
-	[:source,:target].each {|t|
-		task2[t]=Pathname.new(task2[t]).expand_path.to_s if task2[t] and !(task2[t] =~ /^\%/)
-	}
-	p [:added,task2]
-	id=DynTask.add_task(task2)
-end
-
-DynTask.save_tasks(task_basename)