scrappy 0.1.11 → 0.1.12

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.12 2011-01-10
+
+* Correction for Windows compatibility
+
 === 0.1.11 2010-12-23
 
 * Handling of timeout errors

data/bin/scrappy

@@ -1,8 +1,11 @@
 #!/usr/bin/ruby
 # encoding: UTF-8
 
-stty_save = `stty -g`.chomp
-trap('INT') { system('stty', stty_save); Scrappy::App.quit }
+if !RUBY_PLATFORM.include?("mswin")
+  stty_save = `stty -g`.chomp
+  trap('INT') { system('stty', stty_save); Scrappy::App.quit }
+end
+
 module Scrappy
   Root = File.expand_path(File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__) + "/..")
 
@@ -13,7 +16,6 @@ module Scrappy
   gem 'camping', '=2.0'
   require 'camping'
   require 'camping/server'
-  require 'etc'
   require "#{Root}/lib/scrappy"
   require 'scrappy/shell'
 
@@ -123,9 +125,11 @@ Copyright
 
     def onload
       # Check local or global knowledge base
-      if File.exists?("#{Etc.getpwuid.dir}/.scrappy/kb")
-        data_folder = "#{Etc.getpwuid.dir}/.scrappy/kb"
-        cache_file  = "#{Etc.getpwuid.dir}/.scrappy/kb.cache"
+      home = RUBY_PLATFORM.include?("mswin") ? "#{ENV['HOME']}/scrappy" : "#{ENV['HOME']}/.scrappy"
+      
+      if File.exists?("#{home}/kb")
+        data_folder = "#{home}/kb"
+        cache_file  = "#{home}/kb.cache"
       else
         data_folder = "#{Scrappy::Root}/kb"
         cache_file  = "#{Dir.tmpdir}/scrappy.kb.cache"

data/lib/scrappy/agent/agent.rb

@@ -74,8 +74,8 @@ module Scrappy
         end
 
         # Cache the request
-        cache[request]                       = { :time=>Time.now, :response=>response }
-        cache[request.merge(:uri=>self.uri)] = { :time=>Time.now, :response=>response } unless self.uri.nil?
+#        cache[request]                       = { :time=>Time.now, :response=>response }
+#        cache[request.merge(:uri=>self.uri)] = { :time=>Time.now, :response=>response } unless self.uri.nil?
 
         response
       end

data/lib/scrappy.rb

@@ -19,7 +19,7 @@ require 'scrappy/agent/agent'
 Namespace :sc, 'http://lab.gsi.dit.upm.es/scraping.rdf#'
 
 module Scrappy
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end
 
 # Require selectors

data/scrappy.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scrappy}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Ignacio"]
-  s.date = %q{2010-12-23}
+  s.date = %q{2011-01-10}
   s.default_executable = %q{scrappy}
   s.description = %q{RDF web scraper}
   s.email = %q{joseignacio.fernandez@gmail.com}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Jose Ignacio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 +01:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency