sitediff 0.0.3 → 0.0.5

data/lib/sitediff/webserver/resultserver.rb

@@ -1,98 +1,139 @@
+# frozen_string_literal: true
+
 require 'sitediff'
 require 'sitediff/webserver'
 require 'erb'
 
 class SiteDiff
-class Webserver
-class ResultServer < Webserver
-  # Display a page from the cache
-  class CacheServlet < WEBrick::HTTPServlet::AbstractServlet
-    def initialize(server, cache)
-      @cache = cache
-    end
+  class Webserver
+    class ResultServer < Webserver
+      # Display a page from the cache
+      class CacheServlet < WEBrick::HTTPServlet::AbstractServlet
+        def initialize(_server, cache)
+          @cache = cache
+        end
 
-    def do_GET(req, res)
-      path = req.path_info
-      md = %r[^/([^/]+)(/.*)$].match(path) or
-        raise WEBrick::HTTPStatus::NotFound
-      tag, path = *md.captures
-      r = @cache.get(tag.to_sym, path) or
-        raise WEBrick::HTTPStatus::NotFound
+        def do_GET(req, res)
+          path = req.path_info
+          (md = %r{^/([^/]+)(/.*)$}.match(path)) ||
+            raise(WEBrick::HTTPStatus::NotFound)
+          tag, path = *md.captures
+          (r = @cache.get(tag.to_sym, path)) ||
+            raise(WEBrick::HTTPStatus::NotFound)
 
-      raise WEBrick::HTTPStatus[r.error_code] if r.error_code
-      raise WEBrick::HTTPStatus::InternalServerError, r.error if r.error
+          raise WEBrick::HTTPStatus[r.error_code] if r.error_code
+          raise WEBrick::HTTPStatus::InternalServerError, r.error if r.error
 
-      res['content-type'] = 'text/html'
-      res.body = r.content
-    end
-  end
+          res['content-type'] = 'text/html'
+          res.body = r.content
+        end
+      end
 
-  # Display two pages side by side
-  class SideBySideServlet < WEBrick::HTTPServlet::AbstractServlet
-    def initialize(server, cache, settings)
-      @cache = cache
-      @settings = settings
-    end
+      # Display two pages side by side
+      class SideBySideServlet < WEBrick::HTTPServlet::AbstractServlet
+        def initialize(_server, cache, settings)
+          @cache = cache
+          @settings = settings
+        end
+
+        def urls(path)
+          %w[before after].map do |tag|
+            base = @settings[tag]
+            base = "/cache/#{tag}" if @settings['cached'].include? tag
+            base + path
+          end
+        end
 
-    def urls(path)
-      %w[before after].map do |tag|
-        base = @settings[tag]
-        base = "/cache/#{tag}" if @settings['cached'].include? tag
-        base + path
+        def do_GET(req, res)
+          path = req.path_info
+          before, after = *urls(path)
+
+          res['content-type'] = 'text/html'
+          erb = File.join(SiteDiff::FILES_DIR, 'sidebyside.html.erb')
+          res.body = ERB.new(File.read(erb)).result(binding)
+        end
       end
-    end
 
-    def do_GET(req, res)
-      path = req.path_info
-      before, after = *urls(path)
+      # Run sitediff command from browser. Probably dangerous in general.
+      class RunServlet < WEBrick::HTTPServlet::AbstractServlet
+        def initialize(_server, dir)
+          @dir = dir
+        end
 
-      res['content-type'] = 'text/html'
-      erb = File.join(SiteDiff::FILES_DIR, 'sidebyside.html.erb')
-      res.body = ERB.new(File.read(erb)).result(binding)
-    end
-  end
+        def do_GET(req, res)
+          path = req.path_info
+          if path != '/diff'
+            res['content-type'] = 'text/plain'
+            res.body = 'ERROR: Only /run/diff is supported by the /run API at the moment'
+            return
+          end
+          # Thor assumes only one command is called and some values like
+          # `options` are share across all SiteDiff::Cli instances so
+          # we can't just call SiteDiff::Cli.new().diff
+          # This is likely to go very wrong depending on how `sitediff serve`
+          # was actually called
+          cmd = "#{$PROGRAM_NAME} diff -C #{@dir} --cached=all"
+          system(cmd)
 
-  def initialize(port, dir, opts = {})
-    @settings = YAML.load_file(File.join(dir, SiteDiff::SETTINGS_FILE))
-    @cache = opts[:cache]
-    super(port, [dir], opts)
-  end
+          # Could also add a message to indicate success/failure
+          # But for the moment, all our files are static
+          res.set_redirect(WEBrick::HTTPStatus::Found,
+                           "/files/#{SiteDiff::REPORT_FILE}")
+        end
+      end
 
-  def server(opts)
-    dir = opts.delete(:DocumentRoot)
-    srv = super(opts)
-    srv.mount_proc('/') do |req, res|
-      res.set_redirect(WEBrick::HTTPStatus::Found,
-        "/files/#{SiteDiff::REPORT_FILE}")
-    end
+      def initialize(port, dir, opts = {})
+        unless File.exist?(File.join(dir, SiteDiff::SETTINGS_FILE))
+          raise SiteDiffException,
+                "Please run 'sitediff diff' before running 'sitediff serve'"
+        end
 
-    srv.mount('/files', WEBrick::HTTPServlet::FileHandler, dir, true)
-    srv.mount('/cache', CacheServlet, @cache)
-    srv.mount('/sidebyside', SideBySideServlet, @cache, @settings)
-    return srv
-  end
+        @settings = YAML.load_file(File.join(dir, SiteDiff::SETTINGS_FILE))
+        @cache = opts[:cache]
+        super(port, [dir], opts)
+      end
 
-  def setup
-    super
-    root = uris.first
-    puts "Serving at #{root}"
-    open_in_browser(root) if @opts[:browse]
-  end
+      def server(opts)
+        dir = opts.delete(:DocumentRoot)
+        srv = super(opts)
+        srv.mount_proc('/') do |req, res|
+          if req.path == '/'
+            res.set_redirect(WEBrick::HTTPStatus::Found,
+                             "/files/#{SiteDiff::REPORT_FILE}")
+          else
+            res.set_redirect(WEBrick::HTTPStatus::TemporaryRedirect,
+                             "#{@settings['after']}#{req.path}")
+          end
+        end
 
-  def open_in_browser(url)
-    commands = %w[xdg-open open]
-    cmd = commands.find { |c| which(c) }
-    system(cmd, url) if cmd
-    return cmd
-  end
+        srv.mount('/files', WEBrick::HTTPServlet::FileHandler, dir, true)
+        srv.mount('/cache', CacheServlet, @cache)
+        srv.mount('/sidebyside', SideBySideServlet, @cache, @settings)
+        srv.mount('/run', RunServlet, dir)
+        srv
+      end
 
-  def which(cmd)
-    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-      file = File.join(path, cmd)
-      return file if File.executable?(file)
+      def setup
+        super
+        root = uris.first
+        puts "Serving at #{root}"
+        open_in_browser(root) if @opts[:browse]
+      end
+
+      def open_in_browser(url)
+        commands = %w[xdg-open open]
+        cmd = commands.find { |c| which(c) }
+        system(cmd, url) if cmd
+        cmd
+      end
+
+      def which(cmd)
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          file = File.join(path, cmd)
+          return file if File.executable?(file)
+        end
+        nil
+      end
     end
-    return nil
   end
 end
-end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sitediff
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Alex Dergachev
@@ -10,22 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pkg-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -46,89 +60,63 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
-  name: diffy
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-description: 'SiteDiff makes it easy to see differences between two versions of a
-  website. It accepts a set of paths to compare two versions of the site together
+        version: 3.2.0
+description: "  SiteDiff makes it easy to see differences between two versions of
+  a website. It accepts a set of paths to compare two versions of the site together
   with potential normalization/sanitization rules. From the provided paths and configuration
   SiteDiff generates an HTML report of all the status of HTML comparison between the
   given paths together with a readable diff-like HTML for each specified path containing
   the differences between the two versions of the site. It is useful tool for QAing
-  re-deployments, site upgrades, etc.
-
-'
+  re-deployments, site upgrades, etc.\n"
 email: alex@evolvingweb.ca
 executables:
 - sitediff
@@ -171,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="