dyndoc-ruby 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4db8863fa13cb6e5535c8292cd9a5307d51d087
-  data.tar.gz: de633b07d80fefaae256eeab6475d22b9160ca3f
+  metadata.gz: 2b104002585f67910c6674bd6d9937221cffe185
+  data.tar.gz: 5014c79451e427798d0b2dac7307d0c55c83ccd9
 SHA512:
-  metadata.gz: 4faf962339f5fa30f5293adc54fbfb874b06e92348a2dd40db505401bc8b93c72d6734950e0f18a1b244fc88d57d44108ddc4d6f348e1e373e92182f2eee56e4
-  data.tar.gz: fd84c5e9e8d25b4651922584ae85b44a6429d4c71c2c94fe742bc26d7bc3afa9bbd3a00761df64c2a0e991bb62b2e7b34d2803d54d99152f8dec2f36b8ed4445
+  metadata.gz: 0ca0e8ddfd72441ad99174c31615946580bb135ddafbb4c8719faafd61f629060d93560440cdf5874c69dfef44921a064c2f037b6b446afb324dee56f47b8a8f
+  data.tar.gz: 2d2d3e9eced1d1d0ce9ff6ed8e69134ed4c014f3a6e80cafb2a7ecde337e52973e3bbcd8c1cf64c7f95953852e4539bad62029a4f19cee7416532dcfd11b15bd

data/bin/dyn-html

@@ -29,10 +29,11 @@ $VERBOSE = nil
 ## 1) global mode:
 ##    dyn-html /dev/R/test.dyn
 ## 2) user mode: relative path used instead of ~ since ~ is interpreted in bash mode!
+##    dyn-html cfies2017/index.dyn:index # -u <default_user_email>
 ##    dyn-html -u remy.drouilhet@upmf-grenoble.fr cfies2017/index.dyn:index
 ##    dyn-html -u remy.drouilhet@upmf-grenoble.fr cfies2017/index.dyn:all
 
-options={watching: nil, refresh: nil, first: true}
+options={watching: nil, refresh: :auto, first: true}
 
 OptionParser.new do |opts|
   opts.banner = "Usage: dyn-html [-u email_user] [-w] [-r <url-to-refresh-when-watched>] [/]<relative_path>/<file>.dyn"
@@ -45,18 +46,17 @@ OptionParser.new do |opts|
     options[:watching]=true
   end
 
-  opts.on( '-r', '--refresh HTML', 'refresh page' ) do |html|
+  opts.on( '-r', '--refresh HTML', 'page to refresh (only for MacOsX)' ) do |html|
     options[:refresh]=html
   end
 
-end.parse!(args)
-
+  opts.on('--no-refresh', 'no refresh page' ) do
+    options[:refresh]=nil
+  end
 
-## THIS IS A COPY FROM edit.rb
-## TODO: TO PLACE IN SOME COMMON LIBRARY!
+end.parse!(args)
 
 ## Mandatory input
-p args
 dyn_file,doc_tag=args[0].split(":")
 doc_tag="" unless doc_tag
 doc_tag="__ALL_DOC_TAG__" if doc_tag.downcase == "all"
@@ -72,6 +72,15 @@ if dyn_file and (dyn_file=~/(.*)(?:\.dyn|_html.dyn)$/)
   ##p [:html_files,html_files]
   html_file=html_files[doc_tag] || html_files[""]
 
+  if options[:refresh] and options[:refresh] == :auto
+    options[:refresh] = File.join(cfg["localhost_url"] || "http://localhost:9292",File.dirname(dyn_file),File.basename(dyn_file,".*"))
+  end
+
+  output=""
+  output << "Watching "+dyn_file if options[:watching]
+  output << (options[:watching] ? " and refreshing " : "Refreshing ")+options[:refresh] if options[:refresh]
+  puts output unless output.empty?
+
 # Ex for opts:
 # rdrouilh : [:dyn_opts, {:dyn_root=>"/Users/remy/RCqls/RodaServer/edit", :html_root=>"/Users/remy/RCqls/RodaServer/public/pages", :user=>"rdrouilh@gmail.com", :doc_tag=>"bio", :html_files=>{""=>"/dev/R/test.html", "ssd"=>"/dev/R/ssd.html", "bio"=>"/dev/R/bio.html", "tmp"=>"/dev/R/tmp.html", "cours"=>"/dev/R/cours.html"}}]
 # remy.drouilhet : [:dyn_opts, {:dyn_root=>"/Users/remy/RCqls/RodaServer/edit", :html_root=>"/Users/remy/RCqls/RodaServer/public/pages", :user=>"remy.drouilhet@upmf-grenoble.fr", :doc_tag=>"index", :html_files=>{""=>"/users/remy.drouilhet@upmf-grenoble.fr/cfies2017/index.html", "index"=>"/users/remy.drouilhet@upmf-grenoble.fr/cfies2017/index.html", "dates"=>"/users/remy.drouilhet@upmf-grenoble.fr/cfies2017/dates.html", "sc"=>"/users/remy.drouilhet@upmf-grenoble.fr/cfies2017/sc.html", "orga"=>"/users/remy.drouilhet@upmf-grenoble.fr/cfies2017/orga.html"}}]
@@ -85,7 +94,7 @@ if dyn_file and (dyn_file=~/(.*)(?:\.dyn|_html.dyn)$/)
 ##p opts
   file_to_process=File.join(opts[:dyn_root],dyn_file)
   cmd_to_open=nil
-  if options[:refresh]
+  if options[:refresh] and RUBY_PLATFORM =~ /darwin/
     cmd_to_open='tell application "Safari" to set URL of current tab of front window to "'+options[:refresh]+'"'
     cmd_to_refresh='tell application "System Events"' + "\n" + 'tell process "Safari"' + "\n" + 'keystroke "r" using {command down}' + "\n" + 'delay 60' + "\n" + 'end tell' + "\n" + 'end tell'
   end
@@ -104,17 +113,19 @@ if dyn_file and (dyn_file=~/(.*)(?:\.dyn|_html.dyn)$/)
         if Dyndoc::Linter.check_file(file_to_process).empty?
           Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
           puts dyn_file[1..-1]+" processed!"
-          if options[:first]
-            `osascript -e '#{cmd_to_open}'`
-            options[:first]=nil
-          else
-            %x{osascript<<-ENDREFRESH
-              tell app "Safari" to activate
-              tell application "System Events"
-                keystroke "r" using {command down}
-              end tell
-              ENDREFRESH
-            }
+          if options[:refresh] and RUBY_PLATFORM =~ /darwin/
+            if options[:first]
+              `osascript -e '#{cmd_to_open}'`
+              options[:first]=nil
+            else
+%x{osascript<<ENDREFRESH
+tell app "Safari" to activate
+tell application "System Events"
+  keystroke "r" using {command down}
+end tell
+ENDREFRESH
+}
+            end
           end
         else
           puts dyn_file[1..-1]+" not well-formed!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - CQLS