dyndoc-ruby 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5622f18534c9b96dd726efd7c93fcfdb91930bdc
-  data.tar.gz: 8cd8f09ee12b823c79bdbd78a456dae157d9c733
+  metadata.gz: bebb87f51e0f1e3b9469160469d386ab109c16ae
+  data.tar.gz: c46b653b64bae640b35c9d62b9a517069832ff09
 SHA512:
-  metadata.gz: 8dc24db4a81d07cdc4956996399bcddcf6c51d35ae3922ab62c3122e3bdffca8f43fb4ce6bbbb114100e18143d6df476a908b6195df1db608f7753b75f7d26b2
-  data.tar.gz: 474afc8ddebb578955ad12d216a05dc9ad78e785417841b71f22a553d409a0b314f8a6e62df0aae0305fd89b01d2f2b645fde42056d06df88c783875e886cbf0
+  metadata.gz: 83b288473b3a2a2e0d57e8a9b0801641d481cb066f2da9d3e540d416dfcdaf045af47b1f07d019616f667207e989bd772d04a0fa6bcdba8edded730d5b33a92d
+  data.tar.gz: a89b1361426ed5a3258e4cbf063526b5e7c86b08f6dbd7ac7ed00ceceee244b61ecf356ad0da9d6e388ce70a7df548f5196cf2f01a4364a64822fdedc538344b

data/lib/dyndoc-convert.rb

@@ -268,7 +268,7 @@ module Dyndoc
       code_path << "\n" << sys_root
       code_path << "\n" << File.join(opts[:dyn_root],'dynlib')
       code_path << "\n" << opts[:dyn_root] << "\n"
-      code_path << "\n" << "[#require]RodaSrvCore" << "\n"
+      code_path << "\n" << "[#require]RodaSrvCore" << "\n" #if File.exists? File.join(sys_root,'system','dynlib',"RodaSrvCore.dyn","index.dyn")
       code_path << "[#main][#<]\n"
       code = code_path + code
 

data/lib/dyndoc-html-servers.rb

@@ -2,6 +2,183 @@ require 'dyndoc/init/home'
 require 'pathname'
 require 'yaml'
 
+
+module Dyndoc
+  module Browser
+    @@browser_cfg_file= File.join(Dyndoc.home,"etc","browser.yml")
+
+    @@cfg=nil
+
+    def Browser.cfg
+      unless @@cfg
+        @@cfg=(File.exist? @@browser_cfg_file) ? ::YAML::load_file(@@browser_cfg_file) : {}
+      end
+      @@cfg
+    end
+
+    def Browser.name
+      mode=(Browser.cfg["browser"] || :safari).to_sym
+      case mode
+        when :chrome
+          "Google Chrome"
+        when :canary
+          "Google Chrome Canary"
+        when :firefox
+          "Firefox"
+        when :firefox_nightly
+          "FirefoxNightly"
+        when :firefox_developer
+          "FirefoxDeveloperEdition"
+        when :safari
+          "Safari"
+      end
+    end
+
+    @@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
+      code=case mode
+        when :chrome
+        %Q{
+        tell application "Google Chrome"
+          #{activate ? 'activate' : ''}
+          "chrome"
+          set winref to a reference to (first window whose title does not start with "Developer Tools - ")
+          set winref's index to 1
+          reload active tab of winref
+        end tell
+        }
+
+        when :canary
+        %Q{
+        tell application "Google Chrome Canary"
+          #{activate ? 'activate' : ''}
+          "chrome canary"
+          set winref to a reference to (first window whose title does not start with "Developer Tools - ")
+          set winref's index to 1
+          reload active tab of winref
+        end tell
+        }
+
+        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
+        %Q{
+        set a to path to frontmost application as text
+        tell application "FirefoxNightly"
+        	activate
+        	tell application "System Events" to keystroke "r" using command down
+        end tell
+        #{activate ? '' : 'delay 0.2\nactivate application a'}
+        }
+
+        when :firefox_developer
+        %Q{
+        set a to path to frontmost application as text
+        tell application "FirefoxDeveloperEdition"
+        	activate
+        	tell application "System Events" to keystroke "r" using command down
+        end tell
+        #{activate ? '' : 'delay 0.2\nactivate application a'}
+        }
+
+        when :safari
+        %Q{
+        tell application "Safari"
+          #{activate ? 'activate' : ''}
+          tell its first document
+            set its URL to (get its URL)
+          end tell
+        end tell
+        }
+      end
+      File.open(@@browser_reload_osa,"w") do |f|
+        f << code.strip
+      end
+    end
+
+    def Browser.reload
+      if RUBY_PLATFORM =~ /darwin/
+        Browser.set_browser_reload unless File.exists? @@browser_reload_osa
+        `osascript #{@@browser_reload_osa}`
+      end
+    end
+
+    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}'`
+    end
+  end
+end
+=begin
+Commands = {
+  darwin: {
+    firefox: MacFirefoxCmd,
+    firefoxNightly: MacFirefoxNightlyCmd,
+    firefoxDeveloperEdition: MacFirefoxDeveloperEditionCmd,
+    chrome: MacChromeCmd,
+    chromeCanary: MacChromeCanaryCmd,
+    safari: MacSafariCmd
+  },
+  linux: {
+    firefox: [
+      'search',
+      '--sync',
+      '--onlyvisible',
+      '--class',
+      'firefox',
+      'key',
+      'F5',
+      'windowactivate'
+    ],
+    chrome: [
+      'search',
+      '--sync',
+      '--onlyvisible',
+      '--class',
+      'chrome',
+      'key',
+      'F5',
+      'windowactivate'
+    ]
+  }
+}
+
+RunMacCmd = (cmd) ->
+  new BufferedProcess({
+    command: 'osascript'
+    args: ['-e', BrowserCmd]
+    stderr: (data) ->
+      OpenPanel(type: 'alert', message: data.toString())
+  })
+
+RunLinuxCmd = (BrowserArgs) ->
+  new BufferedProcess({
+    command: 'xdotool'
+    args: BrowserArgs
+    stderr: (data) ->
+      OpenPanel(type: 'alert', message: data.toString())
+  })
+
+RunCmd = (browser) ->
+  if OS.platform() == 'darwin'
+    RunMacCmd(Commands['darwin'][browser])
+  else if OS.platform() == 'linux' and browser isnt 'safari'
+    RunLinuxCmd(Commands['linux'][browser])
+  else
+    OpenPanel(type: 'alert', message: 'Unsupported platform')
+=end
+
 module Dyndoc
   module HtmlServers
 
@@ -88,16 +265,18 @@ module Dyndoc
                 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}'`
+                  # 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
-%x{osascript<<ENDREFRESH
-tell app "Safari" to activate
-tell application "System Events"
-  keystroke "r" using {command down}
-end tell
-ENDREFRESH
-}
+                  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

metadata

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