right_scraper 1.0.19 → 1.0.20

data/lib/right_scraper/win32/process_monitor.rb

@@ -28,9 +28,9 @@ module RightScale
   # Windows specific watcher implementation
   class ProcessMonitor
 
-    include Windows::Process
-    include Windows::Synchronize
-    include Windows::Handle
+    include ::Windows::Process
+    include ::Windows::Synchronize
+    include ::Windows::Handle
 
     # Spawn given process and callback given block with output and exit code
     #

data/right_scraper.gemspec

@@ -23,7 +23,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |spec|
   spec.name      = 'right_scraper'
-  spec.version   = '1.0.19'
+  spec.version   = '1.0.20'
   spec.authors   = ['Raphael Simon']
   spec.email     = 'raphael@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_scraper'

data/spec/download_scraper_spec.rb

@@ -40,7 +40,7 @@ describe RightScale::DownloadScraper do
   def setup_download_repo
     @download_repo_path = File.expand_path(File.join(File.dirname(__FILE__), '__download_repo'))
     @repo_path = File.join(File.dirname(__FILE__), '__repo')
-    @repo_content = [ 'file1', { 'folder1' => [ 'file2', 'file3' ] }, { 'folder2' => [ { 'folder3' => [ 'file4' ] } ] } ]
+    @repo_content = [ { 'folder1' => [ 'file2', 'file3' ] }, { 'folder2' => [ { 'folder3' => [ 'file4' ] } ] }, 'file1' ]
     FileUtils.rm_rf(@download_repo_path)
     create_file_layout(@download_repo_path, @repo_content)
     @download_file = File.expand_path(File.join(File.dirname(__FILE__), '__download_file.tar'))

data/spec/git_scraper_spec.rb

@@ -37,7 +37,7 @@ describe RightScale::GitScraper do
   def setup_git_repo
     @origin_path = File.expand_path(File.join(File.dirname(__FILE__), '__origin'))
     @repo_path = File.join(File.dirname(__FILE__), '__repo')
-    @repo_content = [ 'file1', { 'folder1' => [ 'file2', 'file3' ] }, { 'folder2' => [ { 'folder3' => [ 'file4' ] } ] } ]
+    @repo_content = [ { 'folder1' => [ 'file2', 'file3' ] }, { 'folder2' => [ { 'folder3' => [ 'file4' ] } ] }, 'file1' ]
     FileUtils.rm_rf(@origin_path)
     FileUtils.mkdir_p(@origin_path)
     Dir.chdir(@origin_path) do

data/spec/spec_helper.rb

@@ -91,18 +91,19 @@ module RightScale
     # layout(Array):: Corresponding layout as used by 'create_file_layout'
     def extract_file_layout(path, ignore=[])
       return [] unless File.directory?(path)
-      layout = []
+      dirs = []
+      files = []
       ignore += [ '.', '..' ]
       Dir.foreach(path) do |f|
         next if ignore.include?(f)
         full_path = File.join(path, f)
         if File.directory?(full_path)
-          layout << { f => extract_file_layout(full_path, ignore) }
+          dirs << { f => extract_file_layout(full_path, ignore) }
         else
-          layout << f
+          files << f
         end
       end
-      layout   
+      dirs + files.sort
     end
            
  

data/spec/svn_scraper_spec.rb

@@ -37,9 +37,10 @@ describe RightScale::SvnScraper do
   def setup_svn_repo
     @svn_repo_path = File.expand_path(File.join(File.dirname(__FILE__), '__svn_repo'))
     @repo_path = File.join(File.dirname(__FILE__), '__repo')
-    @repo_content = [ 'file1', { 'folder1' => [ 'file2', 'file3' ] },
-                               { 'folder2' => [ { 'folder3' => [ 'file4' ] },
-                                                { 'folder5' => [ 'file6' ] } ] } ]
+    @repo_content = [ { 'folder1' => [ 'file2', 'file3' ] },
+                      { 'folder2' => [ { 'folder3' => [ 'file4' ] },
+                                       { 'folder5' => [ 'file6' ] } ] },
+                      'file1' ]
     FileUtils.rm_rf(@svn_repo_path)
     res, status = exec("svnadmin create \"#{@svn_repo_path}\"")
     raise "Failed to initialize SVN repository: #{res}" unless status.success?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: right_scraper
 version: !ruby/object:Gem::Version 
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors: 
 - Raphael Simon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -07:00
+date: 2010-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: []