davclient 0.0.6 → 0.0.7

data/Manifest

@@ -3,8 +3,9 @@ Manifest
 README.rdoc
 Rakefile
 bin/dav
-davclient.gemspec
+examples/meta_tags_in_use.rb
 examples/remove_ds_store.rb
+examples/scrape_site.rb
 examples/simple_find.rb
 lib/davclient.rb
 lib/davclient/curl_commands.rb
@@ -14,6 +15,8 @@ lib/davclient/dav-put.rb
 lib/davclient/davcli.rb
 lib/davclient/hpricot_extensions.rb
 lib/davclient/simple.rb
+lib/davclient/termutil.rb
+lib/davclient/util.rb
 tests/dav.rb
 tests/tc_dav-cat.rb
 tests/tc_dav-cd.rb
@@ -25,6 +28,8 @@ tests/tc_dav-mkcol.rb
 tests/tc_dav-mv.rb
 tests/tc_dav-propfind.rb
 tests/tc_dav-put.rb
+tests/tc_property_file.rb
+tests/tc_util.rb
 tests/tc_webdav_basic.rb
 tests/tc_webdav_publish.rb
 tests/test_helper.rb

data/Rakefile

@@ -12,7 +12,7 @@
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 
-GEM_VERSION = "0.0.6"
+GEM_VERSION = "0.0.7"
 
 spec = Gem::Specification.new do |s|
   s.name = "davclient"
@@ -29,7 +29,7 @@ spec = Gem::Specification.new do |s|
   s.files = ["lib/davclient.rb","lib/davclient/hpricot_extensions.rb",
              "lib/davclient/curl_commands.rb", "bin/dav", "lib/davclient/davcli.rb",
              "lib/davclient/dav-put.rb", "lib/davclient/dav-ls.rb",
-             "lib/davclient/dav-propfind.rb"]
+             "lib/davclient/dav-propfind.rb","lib/davclient/util.rb","lib/davclient/termutil.rb"]
   s.executables = ["dav"]
   s.require_path = "lib"
   s.rubyforge_project = "davclient"
@@ -37,6 +37,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.rdoc"]
   s.add_dependency("hpricot", ">= 0.6")
+  s.add_dependency("termios", ">= 0.9") # For password prompt
   s.add_dependency("ZenTest", ">= 3.5") # For tests
 end
 

data/davclient.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{davclient}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Flemming"]
-  s.date = %q{2009-09-22}
+  s.date = %q{2009-10-14}
   s.default_executable = %q{dav}
   s.description = %q{Command line WebDAV client and Ruby library.}
   s.email = %q{thomasfl@usit.uio.no}
   s.executables = ["dav"]
-  s.extra_rdoc_files = ["LICENSE", "README.rdoc", "bin/dav", "lib/davclient.rb", "lib/davclient/curl_commands.rb", "lib/davclient/dav-ls.rb", "lib/davclient/dav-propfind.rb", "lib/davclient/dav-put.rb", "lib/davclient/davcli.rb", "lib/davclient/hpricot_extensions.rb", "lib/davclient/simple.rb"]
-  s.files = ["LICENSE", "Manifest", "README.rdoc", "Rakefile", "bin/dav", "davclient.gemspec", "examples/remove_ds_store.rb", "examples/simple_find.rb", "lib/davclient.rb", "lib/davclient/curl_commands.rb", "lib/davclient/dav-ls.rb", "lib/davclient/dav-propfind.rb", "lib/davclient/dav-put.rb", "lib/davclient/davcli.rb", "lib/davclient/hpricot_extensions.rb", "lib/davclient/simple.rb", "tests/dav.rb", "tests/tc_dav-cat.rb", "tests/tc_dav-cd.rb", "tests/tc_dav-cp.rb", "tests/tc_dav-delete.rb", "tests/tc_dav-get.rb", "tests/tc_dav-ls.rb", "tests/tc_dav-mkcol.rb", "tests/tc_dav-mv.rb", "tests/tc_dav-propfind.rb", "tests/tc_dav-put.rb", "tests/tc_webdav_basic.rb", "tests/tc_webdav_publish.rb", "tests/test_helper.rb", "tests/ts_davclient.rb"]
+  s.extra_rdoc_files = ["LICENSE", "README.rdoc", "bin/dav", "lib/davclient.rb", "lib/davclient/curl_commands.rb", "lib/davclient/dav-ls.rb", "lib/davclient/dav-propfind.rb", "lib/davclient/dav-put.rb", "lib/davclient/davcli.rb", "lib/davclient/hpricot_extensions.rb", "lib/davclient/simple.rb", "lib/davclient/termutil.rb", "lib/davclient/util.rb"]
+  s.files = ["LICENSE", "Manifest", "README.rdoc", "Rakefile", "bin/dav", "examples/meta_tags_in_use.rb", "examples/remove_ds_store.rb", "examples/scrape_site.rb", "examples/simple_find.rb", "lib/davclient.rb", "lib/davclient/curl_commands.rb", "lib/davclient/dav-ls.rb", "lib/davclient/dav-propfind.rb", "lib/davclient/dav-put.rb", "lib/davclient/davcli.rb", "lib/davclient/hpricot_extensions.rb", "lib/davclient/simple.rb", "lib/davclient/termutil.rb", "lib/davclient/util.rb", "tests/dav.rb", "tests/tc_dav-cat.rb", "tests/tc_dav-cd.rb", "tests/tc_dav-cp.rb", "tests/tc_dav-delete.rb", "tests/tc_dav-get.rb", "tests/tc_dav-ls.rb", "tests/tc_dav-mkcol.rb", "tests/tc_dav-mv.rb", "tests/tc_dav-propfind.rb", "tests/tc_dav-put.rb", "tests/tc_property_file.rb", "tests/tc_util.rb", "tests/tc_webdav_basic.rb", "tests/tc_webdav_publish.rb", "tests/test_helper.rb", "tests/ts_davclient.rb", "davclient.gemspec"]
   s.homepage = %q{http://davclient.rubyforge.org/davclient}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Davclient", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/examples/meta_tags_in_use.rb

@@ -0,0 +1,64 @@
+require 'rubygems'
+require 'davclient/simple'
+
+# Prints out content of <meta > tags found in files
+
+def print_html_meta_elements(url)
+  doc = Hpricot(get(url))
+  if(doc.search("//meta").size > 0 )
+    puts "  <tr>"
+    puts "    <td><b>URL:</td><td><b>#{url}</b></td>"
+    puts "  </tr>"
+    # puts url
+    doc.search("//meta").each do |elem|
+      puts "  <tr>"
+      name,content = ""
+      if(elem.attributes.key?("name") )
+        name = elem.attributes["name"]
+      end
+      if(elem.attributes.key?("content") )
+        content =  elem.attributes["content"]
+      end
+      puts "    <td>#{name}</td><td>#{content}</td>"
+      puts "  </tr>"
+    end
+    puts
+  end
+end
+
+
+
+def print_html_meta_elements_as_plaintext(url)
+  doc = Hpricot(get(url))
+  if(doc.search("//meta").size > 0 )
+
+    puts url
+    doc.search("//meta").each do |elem|
+      if(elem.attributes.key?("name") )
+        print " Name: " + elem.attributes["name"].ljust(30)
+      end
+      if(elem.attributes.key?("content") )
+        print " Content: " + elem.attributes["content"]
+      end
+      puts
+    end
+    puts
+  end
+end
+
+
+cd "https://www-dav.jus.uio.no/it/"
+
+puts "<table>"
+puts "  <tr>"
+puts "    <td><b>Meta- name</td><td><b>Meta-content</b></td>"
+puts "  </tr>"
+
+find :recursive => true do |item|
+  url =  item.href.to_s
+  if(url =~ /htm?|\.xml$/ )
+    print_html_meta_elements(url)
+  end
+end
+
+puts "</table>"

data/examples/scrape_site.rb

@@ -0,0 +1,36 @@
+require 'rubygems'
+require 'davclient/simple'
+
+# Simple utility to extract all meta tags in use by html files
+
+def print_meta_elements(url)
+  doc = Hpricot(get(url))
+  if(doc.search("//meta").size > 0 )
+    doc.search("//meta").each do |elem|
+      name,content = ""
+      if(elem.attributes.key?("name") )
+        name = elem.attributes["name"]
+      end
+      if(elem.attributes.key?("content") )
+        content =  elem.attributes["content"]
+      end
+      puts "#{url}\t#{name}\t#{content}"
+    end
+  end
+end
+
+
+url = ARGV[0]
+if(!url)
+  puts "Missing url"
+  exit
+end
+
+cd url
+
+find :recursive => false do |item|
+  url =  item.href.to_s
+  if(url =~ /htm?|\.xml$/ )
+    print_meta_elements(url)
+  end
+end

data/lib/davclient/curl_commands.rb

@@ -1,23 +1,27 @@
 # -*- coding: utf-8 -*-
 
+#
+# Templates for curl commands
+#
+
+# Used to improve readability of curl commands that always
+# needs to be on one line
 def remove_newlines(string)
   string.gsub("\n","").gsub(/ +/," ") + " "
 end
 
 # Templates for curl commands:
 curl_propfind_cmd = <<EOF
-#{$curl}
   --request PROPFIND
+  --max-redirs 1
   --header 'Content-Type: text/xml; charset="utf-8"'
   --header "Depth: 1"
   --data-ascii '<?xml version="1.0" encoding="utf-8"?>
       <DAV:propfind xmlns:DAV="DAV:"><DAV:allprop/></DAV:propfind>'
-  --netrc
 EOF
 CURL_PROPFIND = remove_newlines(curl_propfind_cmd)
 
 curl_proppatch_cmd = <<EOF
-#{$curl}
   --request PROPPATCH
   --header 'Content-Type: text/xml; charset="utf-8"'
   --header "Depth: 1"
@@ -29,45 +33,38 @@ curl_proppatch_cmd = <<EOF
           </d:prop>
         </d:set>
       </d:propertyupdate>'
-  --netrc
 EOF
 CURL_PROPPATCH = remove_newlines(curl_proppatch_cmd)
 
 curl_delete_cmd = <<EOF
-#{$curl}
   --request DELETE
   --header 'Content-Type: text/xml; charset="utf-8"'
-  --netrc
 EOF
 CURL_DELETE = remove_newlines(curl_delete_cmd)
 
 curl_mkcol_cmd = <<EOF
-#{$curl}
   --request MKCOL
   --header 'Content-Type: text/xml; charset="utf-8"'
-  --netrc
 EOF
 CURL_MKCOL = remove_newlines(curl_mkcol_cmd)
 
-CURL_OPTIONS = "#{$curl} -i -X OPTIONS --netrc "
+CURL_OPTIONS = "-i -X OPTIONS "
 
 curl_copy = <<EOF
-#{$curl}
   --request COPY
   --header 'Content-Type: text/xml; charset="utf-8"'
   --header 'Destination: <!--destination-->'
-  --netrc
 EOF
 
 CURL_COPY  = remove_newlines(curl_copy)
 
 
 curl_move = <<EOF
-#{$curl}
   --request MOVE
   --header 'Content-Type: text/xml; charset="utf-8"'
   --header 'Destination: <!--destination-->'
-  --netrc
 EOF
 
 CURL_MOVE  = remove_newlines(curl_move)
+
+CURL_UPLOAD = "--upload-file"

data/lib/davclient/hpricot_extensions.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-
-require 'rubygems'
+# require 'rubygems'
 require 'hpricot'
+require 'davclient'
 
 # Extensions to the Hpricot XML parser.
 module Hpricot
@@ -31,26 +31,31 @@ module Hpricot
 
   end
 
-  # TODO Not used. Delete???
-  def type_convert_value(value)
-    if(returnValue == "true")then
-      return true
+
+  # Get content from resources on server
+  # Example:
+  #    webpage = WebDAV.find("http://example.org/index.html")
+  #    print "html src: " + page.content
+  def content
+    if(!isCollection?)
+      WebDAV.get(self.at("d:href").innerText)
     end
-    if(returnValue == "false")then
-      return false
+  end
+
+  def content=(string)
+    if(!isCollection?)
+      WebDAV.put_string(href,string)
     end
-    # Number format???
-    ## Dato format
-    return returnValue
   end
 
-  # TODO: Make list of recognized namespace prefixes configurable
-  # Get property.
+  # Get property for resource or collection.
   # Example:
   #    page = WebDAV.find(url)
   #    print page.property("published-date")
   def property(name)
 
+    # TODO: Make list of recognized namespace prefixes configurable
+
     property = property = self.at(name)
     if(property)then
       returnValue = property.innerText
@@ -89,6 +94,21 @@ module Hpricot
     File.basename(self.at("d:href").innerText)
   end
 
+
+  # Set the items WebDAV properties. Properties must be a string with XML.
+  # Example:
+  #
+  #    find(url) do |item|
+  #       if(item.href =~ /html$/) then
+  #         item.proppatch("<d:getcontenttype>text/html</d:getcontenttype>")
+  #       end
+  #    end
+  def proppatch(properties)
+    WebDAV.proppatch(href, properties)
+  end
+
+  # :stopdoc:
+
   # TODO: Move to vortex_lib.rb
   def dateProperty(name)
     date = self.property(name)
@@ -108,9 +128,21 @@ module Hpricot
     return time
   end
 
-  # Set the items WebDAV properties. Properties must be a string with XML.
-  def proppatch(properties)
-    WebDAV.proppatch(href, properties)
+
+  # TODO Not used. Delete???
+  def type_convert_value(value)
+    if(returnValue == "true")then
+      return true
+    end
+    if(returnValue == "false")then
+      return false
+    end
+    # Number format???
+    ## Dato format
+    return returnValue
   end
 
+
+  # :startdoc:
+
 end

data/lib/davclient/termutil.rb

@@ -0,0 +1,55 @@
+# require 'rubygems'
+require 'termios'
+
+# Prompt for password
+# Extracted from Ian Macdonald's Ruby/Password gem.
+#
+# Example:
+#
+#      password = getc(message="Password: ", mask='*')
+#      puts "It's:" + password
+
+class TermUtil
+
+  def self.echo(on=true, masked=false)
+    term = Termios::getattr( $stdin )
+
+    if on
+      term.c_lflag |= ( Termios::ECHO | Termios::ICANON )
+    else # off
+      term.c_lflag &= ~Termios::ECHO
+      term.c_lflag &= ~Termios::ICANON if masked
+    end
+
+    Termios::setattr( $stdin, Termios::TCSANOW, term )
+  end
+
+  def self.getc(message="Password: ", mask='*')
+    # Save current buffering mode
+    buffering = $stdout.sync
+
+    # Turn off buffering
+    $stdout.sync = true
+
+    begin
+      echo(false, true)
+      print message if message
+      pw = ""
+
+      while ( char = $stdin.getc ) != 10 # break after [Enter]
+        putc mask
+        pw << char
+      end
+
+    ensure
+      echo true
+      print "\n"
+    end
+
+    # Restore original buffering mode
+    $stdout.sync = buffering
+
+    return pw
+  end
+
+end

data/lib/davclient/util.rb

@@ -0,0 +1,241 @@
+require 'tempfile'
+require 'davclient/termutil'
+require 'open3'
+
+# DavClient Utilitis
+
+module DavClient
+
+  # Loads contents of property file into an array
+  def self.load_davclientrc_file
+    properties_filename = ENV['HOME'] + "/.davclientrc"
+    return nil if not(File.exists?( properties_filename ))
+
+    properties = []
+    index = 0
+    File.open(properties_filename, 'r') do |properties_file|
+      properties_file.read.each_line do |line|
+        line.strip!
+        line = line.sub(/#.*/,"")
+        if (line[0] != ?# and line[0] != ?= )
+          i = line.index('=')
+          if (i)
+            # properties[line[0..i - 1].strip] = line[i + 1..-1].strip
+            key = line[0..i - 1].strip
+            if(key != "")
+              properties[index] = [ key, line[i + 1..-1].strip ]
+              index += 1
+            end
+          else
+            key = line
+            if(key != "" and not(key =~ /^\[/) )
+              properties[index] = [key, '']
+              index += 1
+            end
+          end
+
+        end
+      end
+    end
+    return properties
+  end
+
+
+  # Returns options for an url read from .davclientrc file
+  def self.site_options(url, settings)
+    settings.each_index do | index|
+      key,value = settings[index]
+      # puts key + "--->" + value + "  " + url
+      if(url.match(key)  and key != "")then
+        return value
+      end
+    end
+    return ""
+  end
+
+
+
+  # Returns filename /tmp/cwurl.#pid that holds the current working directory
+  # for the shell's pid
+  def self.cwurl_filename
+    return DavClient.tmp_folder +  "cwurl." + Process.ppid.to_s
+  end
+
+
+  # Returns name of temp folder we're using
+  def self.tmp_folder
+    tmp_file = Tempfile.new("dummy").path
+    basename = File.basename(tmp_file)
+    return  tmp_file.gsub(basename, "")
+  end
+
+  # Write string to tempfile and returns filename
+  def self.string2tempfile(str)
+    tmp_dir = DavClient.tmp_folder + rand.to_s[2..10] + "/"
+    FileUtils.mkdir_p tmp_dir
+    tmp_file = tmp_dir + "webdav.tmp"
+    File.open(tmp_file, 'w') {|f| f.write(str) }
+    return tmp_file
+  end
+
+
+  # Display instructions for adding credentials to .netrc file
+  def self.display_unauthorized_message(href)
+    puts "Error: 401 Unauthorized: " + href
+    href.match(/^http.*\/\/([^\/]*)/)
+#    puts "\nTry adding the following to your ~/.netrc file:"
+#    puts ""
+#    puts "machine #{$1}"
+#    puts "  login    " + ENV['USER']
+#    puts "  password ********"
+#    puts ""
+  end
+
+  # Prompts user for username and password
+  # Prints hostname to console if set.
+  def self.prompt_for_username_and_password(host)
+    if(host)
+      print("Enter username for host '#{host}': ")
+    else
+      print("Username: ")
+    end
+    $stdout.flush
+    $username = STDIN.gets
+    $username.strip!
+    $password = TermUtil.getc(message="Password: ", mask='*')
+    $password.strip!
+  end
+
+
+  # Spawns a new process. Gives curl password if password
+  # is not nil.
+  def self.spawn_curl(command, password)
+    PTY.spawn(command) do |reader, writer, pid|
+      if(password)
+        reader.expect(/^Enter.*:/)
+        writer.puts(password)
+      end
+      answer = reader.readlines.join("")
+      reader.close
+      return answer
+    end
+  end
+
+  def self.exctract_host(url)
+    result = url.match(/http.*\/\/([^\/\?]*)/)
+    if(result)
+      return result[1]
+    end
+  end
+
+
+  # Run 'curl' as a subprocess
+  def self.exec_curl(curl_command)
+    response = ""
+
+    puts curl_command if($DEBUG)
+
+    # Common options for all curl commands
+    options = "--netrc"  #  --user-agent
+    curl_command = "#{$curl} " + options  + " " + curl_command
+    Open3.popen3(curl_command) do |stdin, stdout, stderr|
+
+      response = stdout.readlines.join("")
+
+      if(response == "")
+        stderr = stderr.readlines.join("").sub(/^\W/,"")
+        if(stderr =~ /command/)
+          raise stderr
+          # puts "Error: " + stderr
+          # exit
+        end
+        if(stderr =~ /^curl:/)
+          raise stderr
+          # puts "Error: " + stderr
+          # puts
+          # puts curl_command
+          # puts
+          # exit
+        end
+      end
+    end
+    if(response =~ /401 Unauthorized/)then
+      href = curl_command.match( /"(http[^\"]*)"$/ )[0].gsub(/"/,"")
+      # self.display_unauthorized_message(href)
+      # exit
+    end
+    return response
+  end
+
+  # Run 'curl' as a subprocess with pty
+  def self.exec_curl2(curl_command)
+    response = ""
+    puts curl_command if($DEBUG)
+
+    url = curl_command.match("http[^ ]*$").to_s
+    if(url == nil or url == "")then
+      puts "Curl command does not contain url."
+      raise RuntimeError
+    end
+    url = url.sub(/\"$/,"")
+    host = exctract_host(url)
+
+    settings = load_davclientrc_file
+    options = site_options(url, settings)
+
+    # puts;puts "url:" + url + " => '" + options + "'";
+
+    if(options =~ /password-prompt/)  # no-password-prompt
+      options = options.sub(/password-prompt/, "")
+
+      if($username)
+      # Is username stored in $username variable ???
+      else
+        print("Username: ")
+        $stdout.flush
+        $username = STDIN.gets
+        $username.strip!
+        require 'davclient/termutil'
+        $password = TermUtil.getc(message="Password: ", mask='*')
+        # $password.strip!
+        puts "pass::" + $password
+      end
+
+      options += " --user " + $username + " "
+
+    end
+
+    curl_command = "#{$curl} " + options  + " " + curl_command
+
+    puts
+    puts curl_command
+
+    Open3.popen3(curl_command) do |stdin, stdout, stderr|
+      stdin.puts $password # + "\n"
+      response = stdout.readlines.join("")
+      if(response == "")
+        stderr = stderr.readlines.join("").sub(/^\W/,"")
+        if(stderr  =~ /command/)
+          # puts "Error: " + stderr
+          raise "Error: " + stderr
+          # exit
+        end
+        if(stderr  =~ /^curl:/)
+          raise "Error: " + stderr
+          # puts "Error: " + stderr
+          # puts
+          # puts curl_command
+          # puts
+          # exit
+        end
+      end
+    end
+    if(response =~ /401 Unauthorized/)then
+      href = curl_command #.match( /"(http[^\"]*)"$/ )[0].gsub(/"/,"")
+      # DavClient.display_unauthorized_message(href)
+      raise "Could not execute :" + response
+    end
+    return response
+  end
+
+end

data/lib/davclient.rb

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 
 require 'hpricot'
-require 'tempfile'
-require 'open3'
 require 'pathname'
 require 'davclient/hpricot_extensions'
+require 'davclient/curl_commands'
+require 'davclient/util'
 
 # :stopdoc:
 
 # Path to curl executable:
 $curl = "curl"
 
-require 'davclient/curl_commands'
+
 
 # :startdoc:
 
@@ -41,10 +41,8 @@ module WebDAV
   def self.CWURL
     return $CWURL if($CWURL)
     cwurl = nil
-    filename = cwurl_filename
-    if(File.exists?(filename))
-      File.open(filename, 'r') {|f| cwurl = f.read() }
-    end
+    filename = DavClient.cwurl_filename
+
     return cwurl
   end
 
@@ -112,7 +110,7 @@ module WebDAV
   # as part of the filename.
   def self.CWURL=(url)
     $CWURL = url
-    File.open(cwurl_filename, 'w') {|f| f.write(url) }
+    File.open(DavClient.cwurl_filename, 'w') {|f| f.write(url) }
   end
 
 
@@ -126,8 +124,8 @@ module WebDAV
   def self.get(url)
     url = absoluteUrl(url)
 
-    curl_command = "#{$curl} --netrc " + url
-    return exec_curl(curl_command)
+    curl_command = url
+    return DavClient.exec_curl(curl_command)
   end
 
   # Set WebDAV properties for url as xml.
@@ -139,7 +137,7 @@ module WebDAV
     url = absoluteUrl(url)
     curl_command = CURL_PROPPATCH + " \""+url+"\""
     curl_command = curl_command.gsub("<!--property-and-value-->",property)
-    response = exec_curl(curl_command)
+    response = DavClient.exec_curl(curl_command)
     if(not(response =~ /200 OK/)) then
       puts "Error:\nRequest:\n" + curl_command + "\n\nResponse: " + response
       exit(0)
@@ -159,15 +157,16 @@ module WebDAV
     options = args[1]
 
     curl_command = CURL_PROPFIND + " \"" + url + "\""
-    response = exec_curl(curl_command)
+    response = DavClient.exec_curl(curl_command)
 
     if(response == "")then
       return nil
     end
 
     if(not(response =~ /200 OK/)) then
-      puts "Error:\nRequest:\n" + curl_command + "\n\nResponse: " + response
-      exit(0)
+      # puts "Error:\nRequest:\n" + curl_command + "\n\nResponse: " + response
+      # exit(0)
+      raise "Error:\nRequest:\n" + curl_command + "\n\nResponse: " + response
     end
 
     if(options and options[:xml])then
@@ -242,7 +241,13 @@ module WebDAV
         recursive = options[:recursive]
       end
     end
-    dav_xml_output = propfind(href, :xml => true)
+    begin
+      dav_xml_output = propfind(href, :xml => true)
+    rescue Exception => exception
+      $stderr.puts "Warning: " + href + " : " + exception
+      # raise "er
+      return nil
+    end
     if(not(dav_xml_output))then
       return nil
     end
@@ -304,7 +309,7 @@ module WebDAV
     props = args[3]
     url = absoluteUrl(url)
     curl_command = CURL_MKCOL + " " + url
-    response = exec_curl(curl_command)
+    response = DavClient.exec_curl(curl_command)
 
     if(props)then
       proppatch(url,props)
@@ -337,7 +342,7 @@ module WebDAV
 
     # puts "DEBUG: " + srcUrl + " => " + destUrl
     curl_command = CURL_COPY.sub("<!--destination-->", destUrl) + " " + srcUrl
-    response = exec_curl(curl_command)
+    response = DavClient.exec_curl(curl_command)
 
     if(response  == "")then
       return destUrl
@@ -357,7 +362,7 @@ module WebDAV
 
     # puts "DEBUG: " + srcUrl + " => " + destUrl
     curl_command = CURL_MOVE.sub("<!--destination-->", destUrl) + " " + srcUrl
-    response = exec_curl(curl_command)
+    response = DavClient.exec_curl(curl_command)
 
     if(response  == "")then
       return destUrl
@@ -378,7 +383,7 @@ module WebDAV
     url = absoluteUrl(url)
 
     curl_command = CURL_DELETE + url
-    response = exec_curl(curl_command)
+    response = DavClient.exec_curl(curl_command)
 
     if(response  == "")then
       return url
@@ -417,17 +422,21 @@ module WebDAV
       raise "Error: WebDAV.put_html: url can not be a collection (folder)."
     end
 
-    filename = string2tempfile(str)
+    filename = DavClient.string2tempfile(str)
     put(url,filename)
   end
 
 
-  # Upload local file
+  # Upload local file to webserver
+  #
+  # Example:
+  #
+  #  WebDAV.put("https://example.org/myfile.html", "myfile.html")
   def self.put(url, file_name)
     url = absoluteUrl(url)
 
-    curl_command = "#{$curl} --netrc --silent --upload-file #{file_name} #{url}"
-    response = exec_curl(curl_command)
+    curl_command = CURL_UPLOAD + " " + file_name + " " + url
+    response = DavClient.exec_curl(curl_command)
     if(response != "" and not(response =~ /200 OK/)) then
       raise "Error:\n WebDAV.put: WebDAV Request:\n" + curl_command + "\n\nResponse: " + response
     end
@@ -438,83 +447,7 @@ module WebDAV
     if(not(url))
       url = self.CWURL
     end
-    return self.exec_curl(CURL_OPTIONS + url )
+    return DavClient.exec_curl(CURL_OPTIONS + url )
   end
 
-  # Returns name of temp folder we're using
-  # TODO: Move this to utility library
-  def self.tmp_folder
-    tmp_file = Tempfile.new("dummy").path
-    basename = File.basename(tmp_file)
-    return  tmp_file.gsub(basename, "")
-  end
-
-
-  # TODO: Move this to utility library
-  # Write string to tempfile and returns filename
-  def self.string2tempfile(str)
-    tmp_dir = tmp_folder + rand.to_s[2..10] + "/"
-    FileUtils.mkdir_p tmp_dir
-    tmp_file = tmp_dir + "webdav.tmp"
-    File.open(tmp_file, 'w') {|f| f.write(str) }
-    return tmp_file
-  end
-
-
-
-  # Returns filename /tmp/cwurl.#pid that holds the current working directory
-  # for the shell's pid
-  def self.cwurl_filename
-    return tmp_folder +  "cwurl." + Process.ppid.to_s
-  end
-
-  private
-
-  # Display instructions for adding credentials to .netrc file
-  def self.display_unauthorized_message(href)
-    puts "Error: 401 Unauthorized: " + href
-    href.match(/^http.*\/\/([^\/]*)/)
-    puts "\nTry adding the following to your ~/.netrc file:"
-    puts ""
-    puts "machine #{$1}"
-    puts "  login    " + ENV['USER']
-    puts "  password ********"
-    puts ""
-  end
-
-
-  # Run 'curl' as a subprocess
-  def self.exec_curl(curl_command)
-    response = ""
-
-    puts curl_command if($DEBUG)
-
-    Open3.popen3(curl_command) do |stdin, stdout, stderr|
-
-      response = stdout.readlines.join("")
-
-      if(response == "")
-        stderr = stderr.readlines.join("").sub(/^\W/,"")
-        if(stderr  =~ /command/)
-          puts "Error: " + stderr
-          exit
-        end
-        if(stderr  =~ /^curl:/)
-          puts "Error: " + stderr
-          puts
-          puts curl_command
-          puts
-          exit
-        end
-      end
-    end
-    if(response =~ /401 Unauthorized/)then
-      href = curl_command.match( /"(http[^\"]*)"$/ )[0].gsub(/"/,"")
-      self.display_unauthorized_message(href)
-      exit
-    end
-    return response
-  end
-
-
 end

data/tests/tc_property_file.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+require 'test_helper'
+require 'rubygems'
+require 'test/unit'
+require 'davclient/util'
+
+class TestPropertyFile < Test::Unit::TestCase
+
+  def setup
+    $settings = DavClient.load_davclientrc_file
+    # url = "https://vortex-dav.uio.no/brukere/thomasfl/"
+    # settings = DavClient.site_settings(url,$settings)
+  end
+
+  def settings(url)
+    DavClient.site_options(url,$settings)
+  end
+
+  def test_test
+    assert true
+  end
+  def test_property_file
+    assert_equal "password-prompt", settings("https://vortex-dav.uio.no/brukere/thomasfl/testseminar/")
+    assert_equal "--netrc", settings("https://vortex-dav.uio.no/brukere/thomasfl/")
+    assert_equal "--netrc", settings("https://www.uio.no/brukere/")
+    # assert_equal "--netrc", settings("https://www-dav.test.no")
+    assert_equal "", settings("https://www-dav.test.com/homepage")
+    assert_equal "", settings("https://www-dav.test.com/homepage")
+  end
+
+end

data/tests/tc_util.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+require 'test_helper'
+require 'rubygems'
+require 'test/unit'
+require 'davclient/util'
+require 'davclient/curl_commands'
+
+$cmd = <<EOF
+curl  --user thomasfl   --request PROPFIND --header 'Content-Type: text/xml; charset="utf-8"' --header "Depth: 1" --data-ascii '<?xml version="1.0" encoding="utf-8"?><DAV:propfind xmlns:DAV="DAV:"><DAV:allprop/></DAV:propfind>'  "https://vortex-dav.uio.no/brukere/thomasfl/testseminar/"
+EOF
+
+class TestUtil < Test::Unit::TestCase
+
+  def test_extract_host
+    assert_equal "host.host.com", DavClient.exctract_host("https://host.host.com/lots-of-rubbish")
+    assert_equal "host.host.com", DavClient.exctract_host("http://host.host.com?lots-of-rubbish")
+    assert_equal nil, DavClient.exctract_host("//not-an-url")
+  end
+
+  # Interactiv tests
+  def zzz_test_01_password_prompt
+    $username = nil
+    $password = nil
+    DavClient.prompt_for_username_and_password("host.host.com")
+    assert $username
+    assert $password
+  end
+
+  def zzz_test_02_spawn_curl
+    result = DavClient.spawn_curl($cmd, $password)
+    assert result =~ /d:multistatus/
+    result = DavClient.spawn_curl($cmd, "feil")
+    assert result =~ /401 Unauthorized/
+    cmd = $cmd.sub("--user thomasfl","--netrc")
+    result = DavClient.spawn_curl(cmd, nil)
+    assert result =~ /d:multistatus/
+  end
+
+end

data/tests/tc_webdav_basic.rb

@@ -8,6 +8,30 @@ $curl = "/usr/local/bin/curl"
 
 class TestWebDAVLib < Test::Unit::TestCase
 
+  def test_01_hpricot_extensions
+    url = "https://vortex-dav.uio.no/brukere/thomasfl/"
+    test_content = "<html><head><title>title</title></head><body>one two three</body></html>"
+    WebDAV.delete(url + "testcase")
+    WebDAV.mkcol(url + "testcase")
+    WebDAV.publish(url + "testcase/test_page.html", test_content,nil)
+
+    webpage = nil
+    WebDAV.find(url + "testcase/") do |item|
+      webpage = item
+    end
+
+#    puts webpage.href
+#    puts "content: " + webpage.content
+
+    webpage.content = webpage.content.gsub(/two/,"2")
+
+    webpage = nil
+    WebDAV.find(url + "testcase/") do |item|
+      webpage = item
+    end
+    assert webpage.content =~ /one 2 three/
+
+  end
 
   def test_find
     url = "https://vortex-dav.uio.no/prosjekter/it-avisa/nyheter/"
@@ -40,45 +64,6 @@ class TestWebDAVLib < Test::Unit::TestCase
     assert(counter > 9 )
   end
 
-end
-
-class BullShit
-
-  def test_find_recursive
-    count = 0
-    url = "https://vortex-dav.uio.no/brukere/thomasfl/anniken_2007/sophos/"
-    WebDAV.find(url, :recursive => true ) do | item |
-      if(item.basename == ".DS_Store")
-        count += 1
-      end
-    end
-    assert_equal(1, count)
-  end
-
-  def test_get
-    url = "https://vortex-dav.uio.no/prosjekter/it-avisa/nyheter/2008/02/nynorsk-paa-nett.html"
-    item = WebDAV.propfind(url)
-    assert(item)
-
-    content = WebDAV.get(url)
-    assert( content =~ /\<html/ )
-
-  end
-
-  def test_mkcol
-    url = "https://vortex-dav.uio.no/prosjekter/it-avisa/nyheter/testcol/"
-
-    WebDAV.delete(url)
-
-    result = WebDAV.mkcol(url,nil)
-    assert(result)
-    col = WebDAV.propfind(url)
-    assert(col)
-
-    # TODO Set properties på collection
-
-  end
-
   def test_propfind
     url = "https://vortex-dav.uio.no/prosjekter/it-avisa/nyheter/"
     item = WebDAV.propfind(url, :xml => true)
@@ -98,5 +83,4 @@ class BullShit
 
   end
 
-
 end

data/tests/ts_davclient.rb

@@ -3,9 +3,10 @@ require 'tc_webdav_basic.rb'
 require 'tc_webdav_publish.rb'
 require 'tc_dav-cat.rb'
 # require 'tc_dav-cd.rb'
-# require 'tc_dav-cp.rb'
-# require 'tc_dav-delete.rb'
+require 'tc_dav-cp.rb'
+require 'tc_dav-delete.rb'
 # require 'tc_dav-ls.rb'
-# require 'tc_dav-mkcol.rb'
-# require 'tc_dav-mv.rb'
-# require 'tc_dav-propfind.rb'
+require 'tc_dav-mkcol.rb'
+require 'tc_dav-mv.rb'
+require 'tc_dav-propfind.rb'
+require 'tc_property_file.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: davclient
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Thomas Flemming
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 +02:00
+date: 2009-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -31,14 +31,17 @@ extra_rdoc_files:
 - lib/davclient/davcli.rb
 - lib/davclient/hpricot_extensions.rb
 - lib/davclient/simple.rb
+- lib/davclient/termutil.rb
+- lib/davclient/util.rb
 files: 
 - LICENSE
 - Manifest
 - README.rdoc
 - Rakefile
 - bin/dav
-- davclient.gemspec
+- examples/meta_tags_in_use.rb
 - examples/remove_ds_store.rb
+- examples/scrape_site.rb
 - examples/simple_find.rb
 - lib/davclient.rb
 - lib/davclient/curl_commands.rb
@@ -48,6 +51,8 @@ files:
 - lib/davclient/davcli.rb
 - lib/davclient/hpricot_extensions.rb
 - lib/davclient/simple.rb
+- lib/davclient/termutil.rb
+- lib/davclient/util.rb
 - tests/dav.rb
 - tests/tc_dav-cat.rb
 - tests/tc_dav-cd.rb
@@ -59,10 +64,13 @@ files:
 - tests/tc_dav-mv.rb
 - tests/tc_dav-propfind.rb
 - tests/tc_dav-put.rb
+- tests/tc_property_file.rb
+- tests/tc_util.rb
 - tests/tc_webdav_basic.rb
 - tests/tc_webdav_publish.rb
 - tests/test_helper.rb
 - tests/ts_davclient.rb
+- davclient.gemspec
 has_rdoc: true
 homepage: http://davclient.rubyforge.org/davclient
 licenses: []