webdavtools 0.0.5 → 0.0.6

data/bin/wdav

@@ -25,13 +25,17 @@ if(command == "-v" or command =~ /version/ ) then
   exit
 end
 
+$args_array = ARGV
+
 case command
   when "ls" then
     require 'webdavtools/wdav_ls'
+    WDav.ls(ARGV[1..200])
   when "pwd"
     require 'webdavtools/wdav_pwd'
   when "cd"
     require 'webdavtools/wdav_cd'
+    WDav.cd(ARGV[1..200])
   when "props"
     require 'webdavtools/wdav_props'
 #  when "put"

data/lib/webdavtools.rb

@@ -29,6 +29,7 @@ module WebDAV
 
   # Returns current working url. Used by command line utilites
   def self.CWURL
+    return $CWURL if($CWURL) # Used by tests
     cwurl = nil
     filename = cwurl_filename
     if(File.exists?(filename))
@@ -39,6 +40,7 @@ module WebDAV
 
   # Sets current working url
   def self.CWURL=(url)
+    $CWURL = url # Used by tests
     File.open(cwurl_filename, 'w') {|f| f.write(url) }
   end
 

data/lib/webdavtools/hpricot_extensions.rb

@@ -3,14 +3,17 @@
 require 'rubygems'
 require 'hpricot'
 
-# Extensions to hpricot xml parser
+# Extensions to the Hpricot XML parser.
 module Hpricot
 
 
-  # TODO: url method as alias for href
 
   class Elem
 
+    # Makes properties available as simple method calls.
+    #
+    # Example:
+    #    print item.creationdate()
     def method_missing(method_name, *args)
       if(args.size == 0) then
         return property(method_name.to_s)
@@ -18,10 +21,12 @@ module Hpricot
       raise "Method missing"
     end
 
+    # Resource url
     def href()
       self.at("d:href").innerText
     end
 
+    # Returns true of resource is a collection, i.e. a folder and not a file.
     def isCollection?()
       self.at("d:collection") != nil
     end

data/lib/webdavtools/wdav_cd.rb

@@ -1,27 +1,52 @@
-# Handle 'wdav cd URL' commands
+# WebDav cd command line utility
+# Synopsis:
+#       wdav cd [url|foldername|..]
+#
+
 require 'rubygems'
 require 'webdavtools'
 
-url = ARGV[1]
-if(url =~ /^http/)then
-  resource = WebDAV.propfind(url)
-  if(resource and resource.isCollection?)then
-    WebDAV.CWURL = url
-    puts "Set WebDAV URL: " + url
-  else
-    puts "Error: URL is not a WebDAV collection."
+module WDav
+
+  def self.cd(args)
+    url = args[0]
+    if(url =~ /^http/)then
+      set_cwurl(url)
+    else
+      if(url)then
+         if(url == "..")then
+          # TODO: Standard-lib 'File' class can handle
+          # proabably handle cd ../.. etc. better
+          url = WebDAV.CWURL.sub(/[^\/]*\/$/, "")
+           set_cwurl(url)
+        else
+          url = WebDAV.CWURL + url
+          set_cwurl(url)
+        end
+      else
+        puts "usage: "
+      end
+    end
   end
-elsif(url)then
-  cwurl = WebDAV.CWURL
-  if(not cwurl =~ /\/$/)then
-    cwurl += "/"
+
+  private
+
+  def self.set_cwurl(url)
+    if(not(url =~ /\/$/))then
+      url += "/"
+    end
+    resource = WebDAV.propfind(url)
+    if(resource and resource.isCollection?)then
+      WebDAV.CWURL = url
+      puts "Set WebDAV URL: " + url
+    else
+      puts "Error: URL is not a WebDAV collection."
+    end
   end
 
-  item = WebDAV.propfind(cwurl)
-  require 'pp'
-  # pp item
-  type = item.collection?
-  puts "DEBUG: type:" + type.to_s
 end
 
-# TODO Should take a folder name as parameter as well
+# Make this script file executable
+if $0 == __FILE__
+  WDav.cd(ARGV)
+end

data/lib/webdavtools/wdav_ls.rb

@@ -1,58 +1,79 @@
-# Handle command 'wdav ls [url]'
+# WebDav ls command line utility
+# Synopsis:
+#       wdav ls [options][url]
+#
 require 'rubygems'
 require 'webdavtools'
 require 'optparse'
-options = {}
 
-optparse = OptionParser.new do|opts|
-  opts.banner = "Usage: #{$0} ls [options] url"
+module WDav
 
-  opts.on( '-h', '--help', 'Display this screen' ) do
-    puts opts
-    exit
-  end
+  def self.ls(args)
+    options = read_options(args)
+    url = args[0]
+    if(not url)then
+      url = WebDAV.CWURL
+      if(not url)then
+        puts "wdav ls: no current working url"
+        puts "Usage: Use 'wdav open url' or 'wdav cd [url|dir] to set current working url"
+        exit
+      end
+    else
+      WebDAV.CWURL = url
+    end
 
-  options[:longFormat] = false
-  opts.on( '-l', "List in long format" ) do
-    options[:longFormat] = true
-  end
+    WebDAV.find(url, :recursive => false ) do |item|
+      if(options[:showUrl])then
+        puts item.href
+      elsif(options[:longFormat])
 
-  options[:showUrl] = false
-  opts.on('-a', "Include full url in names.") do
-    options[:showUrl] = true
+      else
+        print item.basename
+        print "/" if item.isCollection?
+        puts
+      end
+    end
   end
 
-end
+  private
 
-begin
-  optparse.parse!
-rescue
-  puts "Error: " + $!
-  puts optparse
-  exit
-end
+  def self.read_options(args)
+    options = {}
 
+    optparse = OptionParser.new do|opts|
+      opts.banner = "Usage: #{$0} ls [options] url"
 
-url = ARGV[1]
-if(not url)then
-  url = WebDAV.CWURL
-  if(not url)then
-    puts "wdav ls: no current working url"
-    puts "Usage: Use 'wdav open url' or 'wdav cd [url|dir] to set current working url"
-    exit
-  end
-end
+      opts.on( '-h', '--help', 'Display this screen' ) do
+        puts opts
+        exit
+      end
 
-WebDAV.find(url, :recursive => false ) do |item|
-  if(options[:showUrl])then
-    puts item.href
-  elsif(options[:longFormat])
+      options[:longFormat] = false
+      opts.on( '-l', "List in long format" ) do
+        options[:longFormat] = true
+      end
 
-  else
-    print item.basename
-    print "/" if item.isCollection?
-    puts
+      options[:showUrl] = false
+      opts.on('-a', "Include full url in names.") do
+        options[:showUrl] = true
+      end
+
+    end
+
+    begin
+      optparse.parse! args
+    rescue
+      puts "Error: " + $!
+      puts optparse
+      exit
+    end
+
+    return options
   end
+
 end
 
-# TODO only works on collections, should give som info about resources too.
+# Make this file an executable script
+if $0 == __FILE__
+  WDav.ls(ARGV)
+end

data/lib/webdavtools/wdav_props.rb

@@ -7,16 +7,16 @@ options = {}
 
 title = nil
 optparse = OptionParser.new do|opts|
-  opts.banner = "Usage: #{$0} [options] url"
+  opts.banner = "Usage: #{$0} props [options] url"
 
   opts.on( '-h', '--help', 'Display this screen' ) do
     puts opts
     exit
   end
 
-  options[:xml] = false
-  opts.on( '-x', '--xml', "Return full xml" ) do
-    options[:xml] = true
+  options[:xml] = true
+  opts.on( '-p', '--pretty', "Pretty print output instead of returning xml" ) do
+    options[:xml] = false
   end
 
   options[:children] = false
@@ -36,7 +36,10 @@ end
 
 url = ARGV[1]
 if(not(url)) then
-  # TODO: Use CWURL if not set
+  url = WebDAV.CWURL
+end
+
+if(not(url)) then
   puts "Error: Missing mandatory url"
   puts optparse
   exit
@@ -54,7 +57,7 @@ prev_url = nil
 WebDAV.find(url, :children => options[:children]) do | url, item |
   if(prev_url != url) then
     puts
-    puts "url = " + url
+    puts "url = " + url.to_s
     prev_url = url
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webdavtools
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Thomas Flemming
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-27 00:00:00 +02:00
+date: 2009-08-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.6"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: zentest
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "3.5"
+    version: 
 description: WebDAV client written in Ruby for managing content on webservers that support the WebDAV extensions.
 email: thomas.flemming@gmail.com
 executables: