checksum-tools 1.2.0.beta2 → 1.2.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0371bdaff09d435e74df46278878d6a989b05d2f
-  data.tar.gz: e46ae5b985cc49646b036d34b6547fd404122ad4
+  metadata.gz: ff2633feaa353c335048a693b831f4205f819103
+  data.tar.gz: 1ee1945f4c93efd206534acd1fe1dd4e23311e0e
 SHA512:
-  metadata.gz: 0a518c027a2181af9a9daccacc4556b296a35db3b88261bc3a03897d28ab564cf6f1aed752c2248d30dd729205ee500ed5523cf276f1dbb0da40787c3ca4d407
-  data.tar.gz: 61c0efc458b82362ddf51f6868000bb27ba4a7466a9eefb5401c8977856cd7c37d71296200fa3a93cc3d5ac7350268573d4df63f02f1545ebd7c33669efa7f51
+  metadata.gz: 7349365c1d455fe14ddbc6639b4bdfecec3a14129c4108afb3d71c84f34dc46de62daa6a0c01146c086669dee506b8adbd5aec541f8e0ba93e71ebcf17f7ddf7
+  data.tar.gz: 6d0595b9893a1edf8d205ecc746ab485eb00edae1de58240073cf719f662db965d81d2c8384a16227971ba4d7345e6a6a827f5a2f6efd5ea9083f7e7f97505a1

data/Gemfile

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'gssapi', :github => 'cbeer/gssapi'
+# This fork of GSSAPI is needed to not cuase
+# segfaults when authenticating via gssapi-with-mic
+# gem 'gssapi', :github => 'cbeer/gssapi'

data/Gemfile.lock

@@ -1,14 +1,7 @@
-GIT
-  remote: git://github.com/cbeer/gssapi.git
-  revision: 59bbd6dd916cf2b96cf6b1984f5db8e7891c8bcd
-  specs:
-    gssapi (1.1.2)
-      ffi (>= 1.0.1)
-
 PATH
   remote: .
   specs:
-    checksum-tools (1.2.0.beta2)
+    checksum-tools (1.2.0.beta3)
       highline
       net-sftp
       net-ssh
@@ -20,13 +13,15 @@ GEM
   specs:
     diff-lcs (1.2.5)
     ffi (1.9.10)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
     highline (1.7.8)
     json (1.8.3)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (3.1.1)
-    net-ssh-krb (0.3.0)
-      gssapi (~> 1.1.2)
+    net-ssh-krb (0.4.0)
+      gssapi (~> 1.2.0)
       net-ssh (>= 2.0)
     progressbar (0.21.0)
     rake (11.1.2)
@@ -47,7 +42,6 @@ PLATFORMS
 
 DEPENDENCIES
   checksum-tools!
-  gssapi!
   rake (>= 0.8.7)
   rdoc
   rspec (~> 2.14.0)

data/lib/checksum-tools.rb

@@ -1,16 +1,16 @@
 module Checksum
   module Tools
-    VERSION = "1.2.0.beta2"
+    VERSION = "1.2.0.beta3"
 
     CHUNK_SIZE = 1048576 # 1M blocks
     DEFAULT_OPTS = { :overwrite => false, :recursive => false, :exclude => [], :extension => '.digest' }
 
     autoload :Local, File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), 'local')
     autoload :Remote, File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), 'remote')
-
+    
     class Exception < ::Exception; end
     class ConfigurationError < Exception; end
-
+    
     class << self
       def new(path_info, *args)
         remote = path_info[:remote]
@@ -20,7 +20,7 @@ module Checksum
           Remote.new(remote[:host],remote[:user],*args)
         end
       end
-
+    
       def parse_path(path)
         user,host,dir = path.to_s.scan(/^(?:(.+)@)?(?:(.+):)?(?:(.+))?$/).flatten
         dir ||= '.'
@@ -28,10 +28,10 @@ module Checksum
         return result
       end
     end
-
+    
     class Base
       attr_reader :host
-
+      
       def initialize(*args)
         @opts = DEFAULT_OPTS
         if args.last.is_a?(Hash)
@@ -41,7 +41,7 @@ module Checksum
         @opts[:exclude].uniq!
         @digest_types = args
       end
-
+    
       def digest_filename(filename)
         "#{filename}.#{opts[:extension].sub(/^\.+/,'')}"
       end
@@ -52,7 +52,7 @@ module Checksum
           create_digest_file(filename, &block)
         end
       end
-
+  
       def create_digest_file(filename, &block)
         digest_file = digest_filename(filename)
         if File.expand_path(filename) == File.expand_path(digest_file)
@@ -61,7 +61,7 @@ module Checksum
         if opts[:overwrite] or not file_exists?(digest_file)
           result = digest_file(filename, &block)
           file_open(digest_file,'w') do |cksum|
-            result.each_pair do |type,hexdigest|
+            result.each_pair do |type,hexdigest| 
               cksum.puts("#{type.to_s.upcase}(#{File.basename(filename)})= #{hexdigest}")
             end
           end
@@ -137,7 +137,7 @@ module Checksum
         replacements.each { |args| result.gsub!(*args) }
         Regexp.new(result)
       end
-
+      
       def file_read(filename)
         if file_exists?(filename)
           result = ''
@@ -152,19 +152,19 @@ module Checksum
         unless block_given?
           raise ArgumentError, "no block given"
         end
-
+        
         excludes = Array(opts[:exclude]).collect { |ex| glob_to_re(ex) }
         targets = file_list(base_dir, *include_masks).reject { |f| excludes.any? { |re| f.match(re) } }
         targets.sort!
         targets.uniq!
-
+      
         result = {}
         targets.each do |filename|
           result[filename] = yield(filename)
         end
         return result
       end
-
+  
       def with_types(new_types)
         old_types = @digest_types
         @digest_types = new_types
@@ -175,6 +175,6 @@ module Checksum
         end
       end
     end
-
+  
   end
 end

data/lib/checksum-tools/remote.rb

@@ -35,7 +35,7 @@ module Checksum::Tools
 
     def sftp
       @sftp ||= begin
-        auth_methods = %w(gssapi-with-mic publickey hostbased keyboard-interactive) if defined? Net::SSH::Kerberos
+        auth_methods = %w(publickey hostbased keyboard-interactive) if defined? Net::SSH::Kerberos
         auth_methods ||= %w(publickey hostbased keyboard-interactive)
         Net::SFTP.start(@host, @user, :auth_methods => auth_methods)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: checksum-tools
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta2
+  version: 1.2.0.beta3
 platform: ruby
 authors:
 - Michael Klein