whimsy-asf 0.0.69 → 0.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea5c1fb8825e5340b11582a9110eb38acdc7316
-  data.tar.gz: 23d3377769b45de7816b75152c2d0415e85b731d
+  metadata.gz: f924b1857e96a3bd4a2bd75839d149c7878a00e6
+  data.tar.gz: 09c84284eb5d791040fb2289d2c4ee6ac5d9ee63
 SHA512:
-  metadata.gz: 5d9375e4feb2de2e5d5bbf3b63951a79cd2a71d3ea5785e665961753f6844bb750b01abc63f046d147cbef21dc31aa3498106abf1fd351edf4d76e20664530f9
-  data.tar.gz: 3170dd19c89690236bed42915a7c17cbc8d34685c50f173bc47b8ae904897565bc5a3ca42a3f184323da98e82ba30c651b2e3eab569ec771208d2a1de549b808
+  metadata.gz: 654ef995bd682ff067ccaafe09bbbab30356fe5e367201057d89bc990466e95ae438029fb53390490887da510518f3ce177d4d568831c2562845b700242d53b5
+  data.tar.gz: 1c69d9652038b168085544dae93b210e1b4bb1be931820ae50e3bc94e3c707178b81654d2f1ab3f8685c94ab8b2bbff7ef2e1951dd950cb5de2120c3a3afed7f

data/asf.version

@@ -1 +1 @@
-0.0.69
+0.0.70

data/lib/whimsy/asf/bundler.rb

@@ -14,14 +14,14 @@ module Bundler
 
       path = nil
       libs.each do |lib|
-	 if File.exist?("#{lib}/#{pname}")
-	   path = lib
-	 end
+         if File.exist?("#{lib}/#{pname}")
+           path = lib
+         end
       end
 
       if path
-	args.push({}) unless args.last.is_a?(Hash)
-	args.last[:path] = File.dirname(path)
+        args.push({}) unless args.last.is_a?(Hash)
+        args.last[:path] = File.dirname(path)
       end
 
       bundler_gem.bind(self).(name, *args)

data/lib/whimsy/asf/config.rb

@@ -10,7 +10,7 @@ module ASF
     @config = YAML.load_file("#@home/.whimsy") rescue {}
 
     # default :svn for backwards compatibility
-    @config[:svn] ||= ['/home/whimsysvn/svn/*']
+    @config[:svn] ||= ['/srv/svn/*', '/home/whimsysvn/svn/*', "#{@home}/svn/*"]
 
     # add libraries to RUBYLIB, load path
     (@config[:lib] || []).reverse.each do |lib|

data/lib/whimsy/asf/ldap.rb

@@ -2,6 +2,18 @@ require 'wunderbar'
 require 'ldap'
 
 module ASF
+  module LDAP
+     # https://www.pingmybox.com/dashboard?location=304
+     # https://github.com/apache/infrastructure-puppet/blob/deployment/data/common.yaml (ldapserver::slapd_peers)
+    HOSTS = %w(
+      ldaps://ldap1-us-west.apache.org:636
+      ldaps://ldap1-eu-central.apache.org:636
+      ldaps://ldap2-us-west.apache.org:636
+      ldaps://ldap1-us-east.apache.org:636
+      ldaps://snappy5.apache.org:636
+    )
+  end
+
   # determine where ldap.conf resides
   if Dir.exist? '/etc/openldap'
     ETCLDAP = '/etc/openldap'
@@ -349,13 +361,7 @@ module ASF
       end
 
       # if all else fails, pick one at random
-      unless host
-        # https://www.pingmybox.com/dashboard?location=304
-        host = %w(ldaps://ldap1-us-west.apache.org:636
-          ldaps://ldap1-eu-central.apache.org:636
-          ldaps://ldap2-us-west.apache.org:636
-          ldaps://ldap1-us-east.apache.org:636).sample
-      end
+      host = ASF::LDAP::HOSTS.sample unless host
 
       host
     end

data/lib/whimsy/asf/svn.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'thread'
+require 'open3'
 
 module ASF
 
@@ -14,9 +15,12 @@ module ASF
         svn = ASF::Config.get(:svn).map {|dir| dir.untaint}
         @repos ||= Hash[Dir[*svn].map { |name| 
           Dir.chdir name.untaint do
-            [`svn info`[/URL: (.*)/,1].sub(/^http:/,'https:'), Dir.pwd.untaint]
+            out, err, status = Open3.capture3('svn', 'info')
+            if status.success?
+              [out[/URL: (.*)/,1].sub(/^http:/,'https:'), Dir.pwd.untaint]
+            end
           end
-        }]
+        }.compact]
       end
     end
 

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: whimsy-asf
 version: !ruby/object:Gem::Version
-  version: 0.0.69
+  version: 0.0.70
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wunderbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -137,12 +137,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []