dyndoc-ruby 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bca88b7d7f2be9a59d781003a2c95c8f7bc5a533
-  data.tar.gz: 8dce276662038212ff689f2b4435b48fdc05cb99
+  metadata.gz: 9e25fac0ef948c796350508a599ae34521208f35
+  data.tar.gz: 3bdc1eed85096d034c4be57f0ae512fd49568d21
 SHA512:
-  metadata.gz: d48ee6eb45438e3184a2e9aacb71a21edc71210b05b5de6b1d8d97b577aa765c6963bb288f5873658cc121f4ce1e63d75d3c9ae59e942dc92d0615e68b97a985
-  data.tar.gz: 4d5d850d5639dd7bb2f69ad555fd4b79eebd8f0d699d57738c538754e1db39b69da1ace56ca3afa3ac42b720ed4e61c21a80d27438b58d1869d7e7c7b466a945
+  metadata.gz: eb1ed952f1fc634d2a6c2b7bbe1cb5eeb72cc8d48d981c33161b52a68437770f2cdf131acdc609f2a57bad9a75817b782224f5034e8886e117b6f62fbd57535d
+  data.tar.gz: ce9c7214be8b20a437c5bb1c5dfddad7bb535a940c93bedd114164c6872cf5e1389e867cc4daca13ee9bc30b0415ff05935640df6a11e8b1efbfb9f51a9fac64

data/bin/dyn-cli

@@ -95,7 +95,7 @@ dyn_output=ARGV[next_i + 1]
 
 
 
-if arg.include? "@"
+if arg and arg.include? "@"
 	arg,addr=arg.split("@")
 else
 	addr="127.0.0.1"
@@ -103,7 +103,7 @@ end
 
 dyn_file,dyn_layout,dyn_libs,dyn_pre_code,dyn_post_code=nil,nil,nil,nil,nil
 
-if arg.include? ","
+if arg and arg.include? ","
 	dyn_file,dyn_layout=arg.split(",")
 else
 	dyn_file=arg
@@ -116,7 +116,13 @@ if !dyn_layout and File.exist? ".dyn_layout"
 	dyn_layout=File.read(".dyn_layout").strip
 end
 
-if !dyn_layout and File.exist?(etc_dyn_layout=File.join(ENV["HOME"],".dyndocker","etc","dyn_cli_layout"))
+# Can be extended to other output?
+if !dyn_layout and dyn_file =~ /\_(?:html|tex)(_[a-z,A-Z,0-9,-]*)\.dyn$/ # I guess this cpuld be very useful!
+	dyn_layout=$1 #layout class (not a path!) defined
+end
+
+# If you want a default layout put it inside ~/dyndoc/etc/dyn-cli/dyn_layout
+if !dyn_layout and File.exist?(etc_dyn_layout=File.join(ENV["HOME"],"dyndoc","etc","dyn-cli","dyn_layout"))
 	dyn_layout=File.read(etc_dyn_layout).strip
 end
 
@@ -125,7 +131,7 @@ if !dyn_libs and File.exist? ".dynlibs"
 	dyn_libs=File.read(".dynlibs").strip
 end
 
-if !dyn_libs and File.exist?(etc_dyn_libs=File.join(ENV["HOME"],".dyndocker","etc","dyn-cli","dyn_libs"))
+if !dyn_libs and File.exist?(etc_dyn_libs=File.join(ENV["HOME"],"dyndoc","etc","dyn-cli","dyn_libs"))
 	dyn_libs=File.read(etc_dyn_libs).strip
 end
 
@@ -140,7 +146,7 @@ if !dyn_pre_code and File.exist?(etc_dyn_pre_code=".dyn_pre_code")
 	dyn_pre_code=File.read(etc_dyn_pre_code) if File.exist? etc_dyn_pre_code
 end
 
-if !dyn_libs and File.exist?(etc_dyn_pre_code=File.join(ENV["HOME"],".dyndocker","etc","dyn-cli","dyn_pre_code"))
+if !dyn_libs and File.exist?(etc_dyn_pre_code=File.join(ENV["HOME"],"dyndoc","etc","dyn-cli","dyn_pre_code"))
 	etc_dyn_pre_code=File.read(etc_dyn_pre_code).strip
 	dyn_pre_code=File.read(etc_dyn_pre_code) if File.exist? etc_dyn_pre_code
 end
@@ -157,14 +163,20 @@ if !dyn_post_code and File.exist?(etc_dyn_post_code=".dyn_post_code")
 	dyn_post_code=File.read(etc_dyn_post_code) if File.exist? etc_dyn_post_code
 end
 
-if !dyn_post_code and File.exist?(etc_dyn_post_code=File.join(ENV["HOME"],".dyndocker","etc","dyn-cli","dyn_post_code"))
+if !dyn_post_code and File.exist?(etc_dyn_post_code=File.join(ENV["HOME"],"dyndoc","etc","dyn-cli","dyn_post_code"))
 	etc_dyn_post_code=File.read(etc_dyn_post_code).strip
 	dyn_post_code=File.read(etc_dyn_post_code) if File.exist? etc_dyn_post_code
 end
 
 
-dyn_file=nil unless File.exist? dyn_file
-dyn_layout=nil if dyn_layout and !File.exist? dyn_layout
+dyn_file=nil unless dyn_file and File.exist? dyn_file
+if dyn_layout and !File.exist? dyn_layout
+	dyn_layout_path = ""
+	dyn_layout_path << File.read(etc_dyn_cli_layout_path).strip if File.exist?(etc_dyn_cli_layout_path=File.join(ENV["HOME"],"dyndoc","etc","dyn_cli_layout_path"))
+	dyn_layout_path << (dyn_layout_path.empty? ? "" : ";") << File.join(ENV["HOME"],"dyndoc","etc","dyn-cli","layout")
+	dyn_layouts=dyn_layout_path.split(";").map{|p| (File.exists? (tmp=File.join(p,dyn_layout+".dyn"))) ? tmp : nil }.compact
+	dyn_layout=dyn_layouts[0] #can be nil!
+end
 
 if dyn_file
 	code=File.read(dyn_file)

data/bin/dyn-init

@@ -72,6 +72,11 @@ when "srv" # MacOSX user only
 			`launchctl #{mode} dyn-srv`
 		when "list"
 			puts `launchctl list | grep dyn`
+		when "log"
+			puts "Error:"
+			puts File.read("/tmp/dyn-srv.err")
+			puts "Out:"
+			puts File.read("/tmp/dyn-srv.out")
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb