dyndoc-ruby 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bebb87f51e0f1e3b9469160469d386ab109c16ae
-  data.tar.gz: c46b653b64bae640b35c9d62b9a517069832ff09
+  metadata.gz: d23a1d92727de7c3993d15a9e29024df5902388a
+  data.tar.gz: f06151b02cff15234fe739c7b502f9da1c1c166d
 SHA512:
-  metadata.gz: 83b288473b3a2a2e0d57e8a9b0801641d481cb066f2da9d3e540d416dfcdaf045af47b1f07d019616f667207e989bd772d04a0fa6bcdba8edded730d5b33a92d
-  data.tar.gz: a89b1361426ed5a3258e4cbf063526b5e7c86b08f6dbd7ac7ed00ceceee244b61ecf356ad0da9d6e388ce70a7df548f5196cf2f01a4364a64822fdedc538344b
+  metadata.gz: b43e04840641f3c6f1b270495056fbb937dc9a59922ed7c73a9db9e35ba3934fc1f4ff47022817ff11c00757a32836ee4d1de4c3d70c4cf33123fa9b86570665
+  data.tar.gz: 66c646c5a6887ac6d48e22c511f3fcc32889eefc9bb3bfbf4c327b9dffe685db6bb83084ed15dc20ebd3594f6bb5425558b0260be9bd5cb78f10a3502f978d0e

data/bin/dyn-ctl

@@ -8,7 +8,6 @@ DYNCTL_PLIST=File.expand_path("~/Library/LaunchAgents/local.dyn-ctl.plist")
 
 case (ARGV[0] || "start").downcase
 when "init"
-  require 'fileutils'
   rodasrv=File.expand_path("~/RodaSrv")
   unless Dir.exists? rodasrv
     FileUtils.mkdir_p rodasrv
@@ -26,7 +25,7 @@ when "init"
   end
 
   user=ARGV[1]
-  
+
   if user
     FileUtils.mkdir_p File.join(rodasrv,"edit",user) unless Dir.exists? File.join(rodasrv,"edit",user)
     FileUtils.mkdir_p File.join(rodasrv,"public","users",user) unless Dir.exists? File.join(rodasrv,"public","users",user)
@@ -35,6 +34,30 @@ when "init"
     end
   end
 
+when "browser"
+  browser=ARGV[1]
+  require 'dyndoc-html-servers'
+  if browser
+    browser=browser.downcase
+    Dyndoc::Browser.set browser if ["firefox","safari","chrome"].include? browser
+  else
+    puts "Current browser is #{Dyndoc::Browser.get}"
+  end
+
+when "unwatch"
+  action=ARGV[1] || "ls"
+  path=ARGV[2]
+  require 'dyndoc-html-servers'
+  case action
+  when "ls"
+    Dyndoc::HtmlServers.unwatch_ls
+  when "add"
+    Dyndoc::HtmlServers.unwatch_add path
+  when "rm"
+    Dyndoc::HtmlServers.unwatch_rm path
+  end
+
+
 when "start"
   status=SRVS.map do |srv|
     `#{srv} status`.empty?

data/lib/dyndoc-html-servers.rb

@@ -9,6 +9,21 @@ module Dyndoc
 
     @@cfg=nil
 
+    @@default_browser=(RUBY_PLATFORM =~ /darwin/ ? "safari" : "firefox")
+
+    def Browser.set(browser)
+      Browser.cfg["browser"]=browser
+      Browser.save_cfg
+      FileUtils.rm(@@browser_load_osa) if File.exists? @@browser_load_osa
+      FileUtils.rm(@@browser_reload_osa) if File.exists? @@browser_reload_osa
+      Browser.set_browser_reload
+      puts "Current browser is set to "+Browser.get+"!"
+    end
+
+    def Browser.get
+      Browser.cfg["browser"] || @@default_browser
+    end
+
     def Browser.cfg
       unless @@cfg
         @@cfg=(File.exist? @@browser_cfg_file) ? ::YAML::load_file(@@browser_cfg_file) : {}
@@ -16,6 +31,12 @@ module Dyndoc
       @@cfg
     end
 
+    def Browser.save_cfg
+      File.open(@@browser_cfg_file,"w") do |f|
+        f << Browser.cfg.to_yaml
+      end
+    end
+
     def Browser.name
       mode=(Browser.cfg["browser"] || :safari).to_sym
       case mode
@@ -37,7 +58,7 @@ module Dyndoc
     @@browser_reload_osa= File.join(Dyndoc.home,"etc","browser_reload.osa")
     def Browser.set_browser_reload
       activate=Browser.cfg["activate"] || false
-      mode=(Browser.cfg["browser"] || :safari).to_sym
+      mode=Browser.get.to_sym
       code=case mode
         when :chrome
         %Q{
@@ -63,12 +84,10 @@ module Dyndoc
 
         when :firefox
         %Q{
-        set a to path to frontmost application as text
         tell application "Firefox"
         	activate
         	tell application "System Events" to keystroke "r" using command down
         end tell
-        #{activate ? '' : 'delay 0.2\nactivate application a'}
         }
 
         when :firefox_nightly
@@ -113,10 +132,27 @@ module Dyndoc
       end
     end
 
+    @@browser_load_osa= File.join(Dyndoc.home,"etc","browser_load.osa")
     def Browser.load(url)
-      mode=(Browser.cfg["browser"] || :safari).to_sym
-      cmd_to_open='tell application "'+Browser.name+'" to set URL of current tab of front window to "'+url+'"'
-      `osascript -e '#{cmd_to_open}'`
+      if RUBY_PLATFORM =~ /darwin/
+        mode=Browser.get.to_sym
+        if mode==:safari
+          code='tell application "'+Browser.name+'" to set URL of current tab of front window to "'+url+'"'
+        elsif mode == :firefox
+          code='tell application "Firefox" to open location "'+url+'"'
+        elsif mode == :chrome
+          code=%Q{
+            tell application "Google Chrome"
+              set frontIndex to active tab index of front window
+              set URL of tab frontIndex of front window to "#{url}"
+            end tell
+          }
+        end
+        File.open(@@browser_load_osa,"w") do |f|
+          f << code
+        end
+        `osascript #{@@browser_load_osa}`
+      end
     end
   end
 end
@@ -182,6 +218,47 @@ RunCmd = (browser) ->
 module Dyndoc
   module HtmlServers
 
+    ## Deal with unwatched files!
+
+    @@unwatch=[]
+    @@unwatch_yml = File.join(Dyndoc.home,"etc","unwatch.yml")
+
+    def HtmlServers.unwatch_cfg
+      if @@unwatch.empty?
+        @@unwatch=(File.exist? @@unwatch_yml) ? ::YAML::load_file(@@unwatch_yml) : []
+      end
+      @@unwatch
+    end
+
+    def HtmlServers.unwatch_ls
+      res=HtmlServers.unwatch_cfg.empty? ? "Empty folders list" : (HtmlServers.unwatch_cfg.each_with_index.map {|e,i| (i+1).to_s+") "+e}.join("\n") + "\n")
+      puts res
+    end
+
+    def HtmlServers.unwatch_save
+      File.open(@@unwatch_yml,"w") do |f|
+        f << @@unwatch.to_yaml
+      end
+    end
+
+    def HtmlServers.unwatch_add(path)
+      return unless path
+      HtmlServers.unwatch_cfg.unshift path
+      HtmlServers.unwatch_save
+    end
+
+    def HtmlServers.unwatch_rm(path)
+      return unless path
+      HtmlServers.unwatch_cfg
+      @@unwatch -= [path]
+      HtmlServers.unwatch_save
+    end
+
+    def HtmlServers.unwatched?(file)
+      return "" if HtmlServers.unwatch_cfg.empty?
+      return HtmlServers.unwatch_cfg.map{|e| file[0...e.length] == e ? e : ""}[0] || ""
+    end
+
     @@cfg=nil
 
     def HtmlServers.cfg
@@ -248,35 +325,41 @@ module Dyndoc
             unless filename =~ /(?:_pre|_post|_lib|_layout)\.dyn$/
               ## find dyn_file (relative path from root)
               dyn_file="/"+Pathname(filename).relative_path_from(Pathname(dyn_root)).to_s
-              opts_doc=Dyndoc::FileWatcher.get_dyn_html_info(filename,dyn_file,opts[:user])
-              opts.merge! opts_doc
-              ##p [:html_files,html_files]
-
-              html_file=opts[:html_files][opts[:current_doc_tag]] # No more default # || html_files[""]
-              ##p [:opts,opts,:current_doc_tag,opts[:current_doc_tag]]
-              Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
-              ## fix html_file for _rmd, _adoc and _ttm
-              if html_file =~ /^(.*)_(rmd|adoc|ttm)\.html$/
-                html_file = $1+".html"
-              end
-              puts dyn_file[1..-1]+" processed => "+html_file+" created!"
-              if RUBY_PLATFORM =~ /darwin/
-                options[:first] = html_file != old_html_file
-                if html_file != old_html_file
-                  old_html_file = html_file
-                  url=File.join(base_url,html_file)
-                  # cmd_to_open='tell application "Safari" to set URL of current tab of front window to "'+url+'"'
-                  # `osascript -e '#{cmd_to_open}'`
-                  Dyndoc::Browser.load(url)
-                else
-                  Dyndoc::Browser.reload
-# %x{osascript<<ENDREFRESH
-# tell app "Safari" to activate
-# tell application "System Events"
-#   keystroke "r" using {command down}
-# end tell
-# ENDREFRESH
-# }
+              unless HtmlServers.unwatched?(dyn_file[1..-1]).empty?
+                if RUBY_PLATFORM =~ /darwin/
+                  `osascript -e 'display notification "Warning: #{dyn_file} unwatched by #{HtmlServers.unwatched?(dyn_file[1..-1])}!" with title "dyn-ctl unwatch"'`
+                end
+              else
+                opts_doc=Dyndoc::FileWatcher.get_dyn_html_info(filename,dyn_file,opts[:user])
+                opts.merge! opts_doc
+                ##p [:html_files,html_files]
+
+                html_file=opts[:html_files][opts[:current_doc_tag]] # No more default # || html_files[""]
+                ##p [:opts,opts,:current_doc_tag,opts[:current_doc_tag]]
+                Dyndoc.cli_convert_from_file(dyn_file[1..-1],html_file, opts)
+                ## fix html_file for _rmd, _adoc and _ttm
+                if html_file =~ /^(.*)_(rmd|adoc|ttm)\.html$/
+                  html_file = $1+".html"
+                end
+                puts dyn_file[1..-1]+" processed => "+html_file+" created!"
+                if RUBY_PLATFORM =~ /darwin/
+                  options[:first] = html_file != old_html_file
+                  if html_file != old_html_file
+                    old_html_file = html_file
+                    url=File.join(base_url,html_file)
+                    # cmd_to_open='tell application "Safari" to set URL of current tab of front window to "'+url+'"'
+                    # `osascript -e '#{cmd_to_open}'`
+                    Dyndoc::Browser.load(url)
+                  else
+                    Dyndoc::Browser.reload
+  # %x{osascript<<ENDREFRESH
+  # tell app "Safari" to activate
+  # tell application "System Events"
+  #   keystroke "r" using {command down}
+  # end tell
+  # ENDREFRESH
+  # }
+                  end
                 end
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb