teleport 1.0.11 → 1.0.12

data/lib/teleport/infer.rb

@@ -38,7 +38,7 @@ module Teleport
     # official policies, either expressed or implied, of DevStructure.
     #
     # (for MD5SUMS)
-    
+
     MD5SUMS = {
       '/etc/adduser.conf' => ['/usr/share/adduser/adduser.conf'],
       '/etc/apparmor.d/tunables/home.d/ubuntu' =>
@@ -99,19 +99,19 @@ module Teleport
 
     NEW_FILES_WITHIN = %w(cron.d logrotate.d rsyslog.d init)
     CHECKSUM_FILES = %w(bash.bashrc environment inputrc rc.local ssh/ssh_config ssh/sshd_config)
-    
+
     def initialize
       @telfile = []
 
       if fails?("grep -q Ubuntu /etc/lsb-release")
         fatal "Sorry, --infer can only run on an Ubuntu machine."
       end
-      
+
       append "#" * 72
       append "# Telfile inferred from #{`hostname`.strip} at #{Time.now}"
       append "#" * 72
       append
-      
+
       user
       ruby
       apt
@@ -138,14 +138,15 @@ module Teleport
       when /Ruby Enterprise Edition/ then ruby = "REE"
       when /1\.8\.7/ then ruby = "1.8.7"
       when /1\.9\.2/ then ruby = "1.9.2"
-      when /1\.9\.3/ then ruby = "1.9.3"        
+      when /1\.9\.3/ then ruby = "1.9.3"
       end
       append "ruby #{ruby.inspect}" if ruby
     end
 
     def apt
       banner "Calculating apt sources and keys..."
-      list = run_capture_lines("cat /etc/apt/sources.list /etc/apt/sources.list.d/*.list")
+      list = Dir["/etc/apt/sources.list.d/*.list"].sort
+      list = run_capture_lines("cat /etc/apt/sources.list #{list.join(" ")}")
       list = list.grep(/^deb /).sort
       list.each do |line|
         if line =~ /^deb http:\/\/(\S+)\s+(\S+)/
@@ -163,7 +164,7 @@ module Teleport
     end
 
     def packages
-      banner "Looking for interesting packages..."      
+      banner "Looking for interesting packages..."
       @packages = Apt.new.added
       if !@packages.empty?
         append
@@ -175,7 +176,7 @@ module Teleport
     end
 
     def files
-      banner "Looking for interesting files..."            
+      banner "Looking for interesting files..."
       files = []
 
       # read checksums from dpkg status
@@ -205,7 +206,7 @@ module Teleport
         list = list.select { |i| fails?("dpkg -S #{i}") }
         files += list
       end
-      
+
       # now look for changed files from CHECKSUM_FILES
       scan = CHECKSUM_FILES.map { |i| "/etc/#{i}" }
       scan = scan.select { |i| File.file?(i) }
@@ -241,7 +242,7 @@ module Teleport
       include Util
 
       BLACKLIST = /^(linux-|grub-|cloud-init)/
-      
+
       Package = Struct.new(:name, :status, :deps, :base, :parents)
 
       def initialize
@@ -276,7 +277,7 @@ module Teleport
             pkg.parents = pkg.parents.sort.uniq
           end
         end
-        
+
         @packages
       end
 
@@ -289,7 +290,7 @@ module Teleport
       end
 
       def base_packages
-        packages.select { |i| i.base }.map(&:name)    
+        packages.select { |i| i.base }.map(&:name)
       end
 
       def ignored_packages
@@ -342,7 +343,7 @@ module Teleport
 
         # blacklist
         roots = roots.reject { |i| i =~ BLACKLIST }
-        
+
         roots.sort
       end
     end

data/lib/teleport/mirror.rb

@@ -110,6 +110,7 @@ module Teleport
       case f
       when %r{sudoers} then 0440
       when %r{/\.ssh/} then 0400
+      when %r{^/etc/(crontab|cron\.d/)} then 0644
       end
     end
   end

data/lib/teleport/run.sh

@@ -101,7 +101,7 @@ function install_ruby_192() {
 }
 
 function install_ruby_193_src() {
-  local patch=p286
+  local patch=p374
 
   install_ruby_19_requirements
 

data/lib/teleport/version.rb

@@ -1,4 +1,4 @@
 module Teleport
   # Gem version
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teleport
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazon-ec2
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2910091848613116079
+      hash: 1578862102269065251
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2910091848613116079
+      hash: 1578862102269065251
 requirements: []
 rubyforge_project: teleport
 rubygems_version: 1.8.24