Disabled rdebug & added another missing dependency.

This commit is contained in:
Glenn Y. Rolland 2011-08-07 17:06:30 +02:00
parent 8889330dd0
commit 6ced5078cb
4 changed files with 19 additions and 13 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
qasim (0.1.2) unstable; urgency=low
* Disabled rdebug & added another missing dependency.
-- Glenn Y. Rolland <glenux@glenux.net> Sun, 07 Aug 2011 17:06:15 +0200
qasim (0.1.1) unstable; urgency=low qasim (0.1.1) unstable; urgency=low
* Added missing dependencies (libqt4-ruby & ruby) * Added missing dependencies (libqt4-ruby & ruby)

2
debian/control vendored
View file

@ -7,7 +7,7 @@ Standards-Version: 3.7.2
Package: qasim Package: qasim
Architecture: all Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, sshfs (>= 1.7), ruby, libqt4-ruby Depends: ${shlibs:Depends}, ${misc:Depends}, sshfs (>= 1.7), ruby, libqt4-ruby, rubygems
Description: Easy mount solution for SSH filesystems. Description: Easy mount solution for SSH filesystems.
Qasim is a front-end for sshfs, the filesystem client based on fuse Qasim is a front-end for sshfs, the filesystem client based on fuse
and ssh. It provides automating and global settings control for sshfs mounts. and ssh. It provides automating and global settings control for sshfs mounts.

View file

@ -7,7 +7,7 @@ require 'pp'
require 'find' require 'find'
require 'rubygems' require 'rubygems'
require 'rdebug/base' #require 'rdebug/base'
require 'qasim/constants' require 'qasim/constants'
require 'qasim/map' require 'qasim/map'
@ -51,7 +51,7 @@ module Qasim
end end
def parse_maps &blk def parse_maps &blk
rdebug "Config: #{@config_dir}/config" #rdebug "Config: #{@config_dir}/config"
@maps = [] @maps = []
Find.find( @config_dir, APP_SYSCONFIG_DIR ) do |path| Find.find( @config_dir, APP_SYSCONFIG_DIR ) do |path|

View file

@ -1,6 +1,6 @@
require 'rubygems' require 'rubygems'
require 'rdebug/base' #require 'rdebug/base'
require 'qasim/config' require 'qasim/config'
module Qasim module Qasim
@ -38,7 +38,7 @@ module Qasim
def load path=nil def load path=nil
@path=path unless path.nil? @path=path unless path.nil?
rdebug "Parsing map #{@path}" #rdebug "Parsing map #{@path}"
f = File.open @path f = File.open @path
linect = 0 linect = 0
local_env = ENV.clone local_env = ENV.clone
@ -64,22 +64,22 @@ module Qasim
case line case line
when /^\s*REMOTE_USER\s*=\s*(.*)\s*$/ then when /^\s*REMOTE_USER\s*=\s*(.*)\s*$/ then
@user = $1 @user = $1
rdebug "d: remote_user => #{$1}" #rdebug "d: remote_user => #{$1}"
when /^\s*REMOTE_PORT\s*=\s*(.*)\s*$/ then when /^\s*REMOTE_PORT\s*=\s*(.*)\s*$/ then
@port = $1.to_i @port = $1.to_i
rdebug "d: remote_port => #{$1}" #rdebug "d: remote_port => #{$1}"
when /^\s*REMOTE_HOST\s*=\s*(.*)\s*$/ then when /^\s*REMOTE_HOST\s*=\s*(.*)\s*$/ then
@host = $1 @host = $1
rdebug "d: remote_host => #{$1}" #rdebug "d: remote_host => #{$1}"
when /^\s*REMOTE_CYPHER\s*=\s*(.*)\s*$/ then when /^\s*REMOTE_CYPHER\s*=\s*(.*)\s*$/ then
if CYPHERS.map{|x| x.to_s}.include? $1 then if CYPHERS.map{|x| x.to_s}.include? $1 then
@host = $1.to_sym @host = $1.to_sym
end end
when /^\s*MAP\s*=\s*(.*)\s+(.*)\s*$/ then when /^\s*MAP\s*=\s*(.*)\s+(.*)\s*$/ then
@links[$1] = $2 @links[$1] = $2
rdebug "d: link #{$1} => #{$2}" #rdebug "d: link #{$1} => #{$2}"
when /^\s*$/,/^\s*#/ then when /^\s*$/,/^\s*#/ then
rdebug "d: dropping empty line" #rdebug "d: dropping empty line"
else else
raise MapParseError, "parse error at #{@path}:#{linect}" raise MapParseError, "parse error at #{@path}:#{linect}"
end end
@ -99,7 +99,7 @@ module Qasim
end end
def online? def online?
rdebug "testing online? %s " % self.inspect #rdebug "testing online? %s " % self.inspect
#FIXME: test liveness #FIXME: test liveness
end end
@ -159,7 +159,7 @@ module Qasim
"-o","Port=%s" % @port, "-o","Port=%s" % @port,
"%s@%s:%s" % [@user,@host,remotepath], "%s@%s:%s" % [@user,@host,remotepath],
localpath ] localpath ]
rdebug "command: %s" % [ cmd, cmd_args ].flatten.join(' ') #rdebug "command: %s" % [ cmd, cmd_args ].flatten.join(' ')
if block_given? then if block_given? then
yield name, cmd, cmd_args yield name, cmd, cmd_args
else else
@ -180,7 +180,7 @@ module Qasim
"-u", #umount "-u", #umount
"-z" ,#lazy "-z" ,#lazy
localpath ] localpath ]
rdebug "command: %s" % [ cmd, cmd_args ].flatten.join(' ') #rdebug "command: %s" % [ cmd, cmd_args ].flatten.join(' ')
if block_given? then if block_given? then
yield name, cmd, cmd_args yield name, cmd, cmd_args
else else