dyndoc-ruby 1.0.6 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19d45fc111a01b00353776a681cbc64567f275ee
-  data.tar.gz: 5666b03f5ff1769e5a248201ebfb4fa15620dd1a
+  metadata.gz: b6c1b12fb52379a242ee6666bd58e6fb95514984
+  data.tar.gz: 4050a6b56fbc8484c07508d6bb31821e2a5d1772
 SHA512:
-  metadata.gz: 8cd73d30108e28fb03253ef3438a0c9bd25207691bb43e562659ad5c862afc49cd17b7fb30514344c352d1715672eae08c7d87cc6a33edd4c124ed925134e139
-  data.tar.gz: 923eab3685183944f69c1742e92e163226951d56f10ecf1e28de91fd406ec932b1a05582ddf64988fbae13e3b39ea8bd8ea88616cb20e16dcb35c311a214be15
+  metadata.gz: 035bf836dc73dbe0f1e882b0e32ce36e2dabda2ef8cd26f37c537cacda59a0aebdbac5f558e149b389652bfe63ff407b07b13a598943fb317514b029117a2b42
+  data.tar.gz: ea85e2ab5a4cc666172371de528bead712591873dcfafd751a91d6a31b5852d20df89b9dfb8e2eadd3b029af7825cc54f871a6e4da694b7304a2851b6ffe7b95

data/bin/dyn-ctl

@@ -39,7 +39,7 @@ when "browser"
   require 'dyndoc-html-servers'
   if browser
     browser=browser.downcase
-    Dyndoc::Browser.set browser if ["firefox","safari","chrome"].include? browser
+    Dyndoc::Browser.set browser if ["firefox","safari","chrome","midori"].include? browser
   else
     puts "Current browser is #{Dyndoc::Browser.get}"
   end

data/lib/dyndoc-html-servers.rb

@@ -9,7 +9,7 @@ module Dyndoc
 
     @@cfg=nil
 
-    @@default_browser=(RUBY_PLATFORM =~ /darwin/ ? "safari" : "firefox")
+    @@default_browser=(RUBY_PLATFORM =~ /darwin/ ? "safari" : (RUBY_PLATFORM =~ /linux/ ? "midori" : "firefox"))
 
     def Browser.set(browser)
       Browser.cfg["browser"]=browser
@@ -38,20 +38,24 @@ module Dyndoc
     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"
+      mode=Browser.get.to_sym
+      if RUBY_PLATFORM =~ /darwin/
+        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
+      elsif RUBY_PLATFORM =~ /linux/
+        mode.to_s
       end
     end
 
@@ -129,6 +133,8 @@ module Dyndoc
       if RUBY_PLATFORM =~ /darwin/
         Browser.set_browser_reload unless File.exists? @@browser_reload_osa
         `osascript #{@@browser_reload_osa}`
+      elsif RUBY_PLATFORM =~ /linux/ and File.exists? "/usr/bin/xdotool"
+        `export DISPLAY=':0.0';/usr/bin/xdotool search --sync --onlyvisible  #{Browser.name} key F5 windowactivate`
       end
     end
 
@@ -152,68 +158,12 @@ module Dyndoc
           f << code
         end
         `osascript #{@@browser_load_osa}`
+      elsif RUBY_PLATFORM =~ /linux/
+        system("xdg-open #{url} &")
       end
     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
@@ -342,24 +292,13 @@ module Dyndoc
                   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
+                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)
+                  Dyndoc::Browser.load(url)
+                else
+                  Dyndoc::Browser.reload
                 end
               end
             end

data/share/etc/systemd/README.md

@@ -0,0 +1,13 @@
+## Install dyndoc services
+
+* change user account prefixed to `conf` if necessary
+
+* then install the services
+
+```
+sudo cp *.service /etc/systemd/system/
+sudo systemctl enable dyn-srv
+sudo systemctl enable dyn-html
+sudo systemctl enable dyn-http
+sudo systemctl start dyn-http
+```

data/share/etc/systemd/dyn-html.service

@@ -1,8 +1,9 @@
 [Unit]
-Description=Syncthing - Open Source Continuous File Synchronization
+Description=Dyndoc Html service
 Wants=dyn-srv.service
 
 [Service]
+User=conf
 ExecStart=/usr/local/bin/dyn-html run
 Restart=on-failure
 SuccessExitStatus=3 4

data/share/etc/systemd/dyn-http.service

@@ -1,8 +1,9 @@
 [Unit]
-Description=Syncthing - Open Source Continuous File Synchronization
+Description=Dyndoc Http service
 Wants=dyn-html.service
 
 [Service]
+User=conf
 ExecStart=/usr/local/bin/dyn-http run
 Restart=on-failure
 SuccessExitStatus=3 4

data/share/etc/systemd/dyn-srv.service

@@ -1,7 +1,8 @@
 [Unit]
-Description=Syncthing - Open Source Continuous File Synchronization
+Description=Dyndoc Server service
 
 [Service]
+User=conf
 ExecStart=/usr/local/bin/dyn-srv run
 Restart=on-failure
 SuccessExitStatus=3 4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyndoc-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.16
 platform: ruby
 authors:
 - RCqls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: R4rb
@@ -176,6 +176,7 @@ files:
 - share/etc/dyn-cli/layout/default.dyn
 - share/etc/dyndoc_library_path
 - share/etc/helpers
+- share/etc/systemd/README.md
 - share/etc/systemd/dyn-html.service
 - share/etc/systemd/dyn-http.service
 - share/etc/systemd/dyn-srv.service