Reorganize for later support of various map types.

This commit is contained in:
Glenn Y. Rolland 2015-08-11 23:58:45 +02:00
parent c7a86f6938
commit a56389f9eb
6 changed files with 236 additions and 194 deletions

View file

@ -9,4 +9,91 @@ module Qasim ; module Map
class ParseError < RuntimeError ; end
class ConnectError < RuntimeError ; end
module_function :from_file
def from_file
end
def to_file
end
#
# replace magic values withing map lines
#
# Allowed values :
#
# $(var) => variable value from environment
# ${var} => variable value from environment
#
def env_substitute str, lineno
local_env = ENV.clone
while str =~ /\$(\w+)/ do
case str
when /\$\{(.+)\}/ then
pattern = $1
str.gsub!(/\$\{#{pattern}\}/,local_env[pattern])
when /\$(\w+)/ then
pattern = $1
str.gsub!(/\$#{pattern}/,local_env[pattern])
else
puts "w: unknown pattern: %s at str %d" % [str, lineno]
end
end
str
end
#
# Load map description from file
#
def from_file filename
f = File.open filename
linect = 0
f.each do |line|
line = line.strip
linect += 1
line = env_substitute(line, linect)
case line
when /^\s*REMOTE_USER\s*=\s*(.*)\s*$/ then
@user = $1
#rdebug "d: remote_user => #{$1}"
when /^\s*REMOTE_PORT\s*=\s*(.*)\s*$/ then
@port = $1.to_i
#rdebug "d: remote_port => #{$1}"
when /^\s*REMOTE_HOST\s*=\s*(.*)\s*$/ then
@host = $1
#rdebug "d: remote_host => #{$1}"
when /^\s*REMOTE_CYPHER\s*=\s*(.*)\s*$/ then
if CYPHERS.map{|x| x.to_s}.include? $1 then
@host = $1.to_sym
end
when /^\s*MAP\s*=\s*(.*)\s+(.*)\s*$/ then
@links[$1] = $2
#rdebug "d: link #{$1} => #{$2}"
when /^\s*$/,/^\s*#/ then
#rdebug "d: dropping empty line"
else
raise MapParseError, "parse error at #{@filename}:#{linect}"
end
end
f.close
end
#
# Write map description to file
#
def write path=nil
@path=path unless path.nil?
File.open(@path, "w") do |f|
f.puts "REMOTE_USER=%s" % @user
f.puts "REMOTE_PORT=%s" % @port
f.puts "REMOTE_HOST=%s" % @host
f.puts "REMOTE_CYPHER=%s" % @cypher
end
end
end ; end

5
lib/qasim/map/generic.rb Normal file
View file

@ -0,0 +1,5 @@
require 'fileutils'
require 'qasim/map'
class Qasim::Map::Generic
end

View file

@ -1,9 +1,9 @@
require 'fileutils'
require 'qasim/map'
require 'qasim/map/generic'
module Qasim::Map
class Ssh
class Qasim::Map::Ssh < Qasim::Map::Generic
attr_reader :path,
:host,
:port,
@ -36,74 +36,6 @@ module Qasim::Map
end
#
# Load map description from file
#
def load path=nil
@path=path unless path.nil?
#rdebug "Parsing map #{@path}"
f = File.open @path
linect = 0
local_env = ENV.clone
f.each do |line|
line = line.strip
linect += 1
while line =~ /\$(\w+)/ do
#puts "FOUND PATTERN %s => %s" % [$1, local_env[$1]]
case line
when /\$\{(.+)\}/ then
pattern = $1
puts pattern
line.gsub!(/\$\{#{pattern}\}/,local_env[pattern])
when /\$(\w+)/ then
pattern = $1
line.gsub!(/\$#{pattern}/,local_env[pattern])
else
puts "w: unknown pattern: %s" % line
end
end
case line
when /^\s*REMOTE_USER\s*=\s*(.*)\s*$/ then
@user = $1
#rdebug "d: remote_user => #{$1}"
when /^\s*REMOTE_PORT\s*=\s*(.*)\s*$/ then
@port = $1.to_i
#rdebug "d: remote_port => #{$1}"
when /^\s*REMOTE_HOST\s*=\s*(.*)\s*$/ then
@host = $1
#rdebug "d: remote_host => #{$1}"
when /^\s*REMOTE_CYPHER\s*=\s*(.*)\s*$/ then
if CYPHERS.map{|x| x.to_s}.include? $1 then
@host = $1.to_sym
end
when /^\s*MAP\s*=\s*(.*)\s+(.*)\s*$/ then
@links[$1] = $2
#rdebug "d: link #{$1} => #{$2}"
when /^\s*$/,/^\s*#/ then
#rdebug "d: dropping empty line"
else
raise MapParseError, "parse error at #{@path}:#{linect}"
end
end
f.close
end
#
# Write map description to file
#
def write path=nil
@path=path unless path.nil?
File.open(@path, "w") do |f|
f.puts "REMOTE_USER=%s" % @user
f.puts "REMOTE_PORT=%s" % @port
f.puts "REMOTE_HOST=%s" % @host
f.puts "REMOTE_CYPHER=%s" % @cypher
end
end
#
@ -216,4 +148,3 @@ module Qasim::Map
end
end
end
end

11
lib/qasim/map/webdav.rb Normal file
View file

@ -0,0 +1,11 @@
require 'fileutils'
require 'qasim/map'
require 'qasim/map/generic'
class Qasim::Map::Webdav
# nothing
def initialize
end
end

View file

@ -1,7 +1,7 @@
require_relative 'spec_helper'
require 'qasim/map_ssh'
require 'qasim/map/ssh'
describe Qasim::Config do
describe Qasim::Map::Ssh do
# something
end

8
spec/map_webdav_spec.rb Normal file
View file

@ -0,0 +1,8 @@
require_relative 'spec_helper'
require 'qasim/map/webdav'
describe Qasim::Map::Webdav do
# something
end