rubycut-babushka 0.10.8 → 0.15.6.1

data/lib/babushka/source_pool.rb

@@ -7,8 +7,8 @@ module Babushka
     SEPARATOR = ':'
 
     def current
-      @_cached_current ||= default.concat(standard)
-      @_cached_current.dup
+      @current ||= default.concat(standard)
+      @current.dup
     end
 
     def default
@@ -24,16 +24,19 @@ module Babushka
     end
 
     def anonymous
-      @_cached_anonymous ||= Source.new(nil, :name => 'anonymous')
+      @anonymous ||= Source.new(nil, :name => 'anonymous')
     end
+
     def core
-      @_cached_core ||= Source.new(Path.path / 'deps', :name => 'core')
+      @core ||= Source.new(Path.path / 'deps', :name => 'core')
     end
+
     def current_dir
-      @_cached_current_dir ||= Source.new('./babushka-deps', :name => 'current dir')
+      @current_dir ||= Source.new('./babushka-deps', :name => 'current dir')
     end
+
     def personal
-      @_cached_personal ||= Source.new('~/.babushka/deps', :name => 'personal')
+      @personal ||= Source.new('~/.babushka/deps', :name => 'personal')
     end
 
     def standard
@@ -41,7 +44,12 @@ module Babushka
     end
 
     def source_for name
-      all_present.detect {|source| source.name == name } || Source.for_remote(name)
+      (
+        all_present.detect {|source| source.name == name } ||
+        Source.for_remote(name)
+      ).tap {|source|
+        source.load!(Base.task.opt(:update))
+      }
     end
 
     def dep_for dep_spec, opts = {}
@@ -50,9 +58,9 @@ module Babushka
       elsif dep_spec[/#{SEPARATOR}/] # If a source was specified, that's where we load from.
         source_name, dep_name = dep_spec.split(SEPARATOR, 2)
         source_for(source_name).find(dep_name)
-      elsif opts[:from]
+      elsif opts[:from] # Next, try opts[:from], the requiring dep's source.
         opts[:from].find(dep_spec) || dep_for(dep_spec)
-      else # Otherwise, load from the current source (opts[:from]) or the standard set.
+      else # Otherwise, try the standard set.
         matches = Base.sources.current.map {|source| source.find(dep_spec) }.flatten.compact
         if matches.length > 1
           log "Multiple sources (#{matches.map(&:dep_source).map(&:name).join(',')}) contain a dep called '#{dep_spec}'."
@@ -100,10 +108,6 @@ module Babushka
       )
     end
 
-    def uncache!
-      current.each {|source| source.deps.uncache! }
-    end
-
     def local_only?
       @local_only
     end
@@ -126,12 +130,15 @@ module Babushka
     def current_real_load_source
       current_load_context[:source]
     end
+
     def current_load_source
       current_real_load_source || Base.sources.anonymous
     end
+
     def current_load_path
       current_load_context[:path].try(:p)
     end
+
     def current_load_opts
       current_load_context[:opts] || {}
     end

data/lib/babushka/system_definitions.rb

@@ -3,12 +3,15 @@ module Babushka
     def self.all_systems
       names.keys
     end
+
     def self.all_flavours
       names.values.map(&:keys).flatten
     end
+
     def self.all_names
       names.values.map(&:values).map {|s| s.map(&:values) }.flatten
     end
+
     def self.all_tokens
       all_systems + PkgHelper.all_manager_keys + all_flavours + all_names
     end
@@ -39,14 +42,17 @@ module Babushka
             '9.10'  => :karmic,
             '10.04' => :lucid,
             '10.10' => :maverick,
-            '11.04' => :natty
+            '11.04' => :natty,
+            '11.10' => :oneiric,
+            '12.04' => :precise
           },
           :debian => {
             '4.0' => :etch,
             '5.0' => :lenny,
             '6.0' => :squeeze,
             '7.0' => :wheezy
-          }
+          },
+          :arch => {}
         },
         :bsd => {
           :dragonfly => {},
@@ -81,7 +87,9 @@ module Babushka
             '9.10'  => 'Karmic Koala',
             '10.04' => 'Lucid Lynx',
             '10.10' => 'Maverick Meerkat',
-            '11.04' => 'Natty Narwhal'
+            '11.04' => 'Natty Narwhal',
+            '11.10' => 'Oneiric Ocelot',
+            '12.04' => 'Precise Pangolin'
           },
           :debian => {
             '5.0.4' => 'Lenny'

data/lib/babushka/system_detector.rb

@@ -0,0 +1,31 @@
+module Babushka
+  class SystemDetector
+    def self.profile_for_host
+      (detect_using_uname || UnknownSystem).new
+    end
+
+    private
+
+    def self.detect_using_uname
+      case ShellHelpers.shell('uname -s')
+      when 'Darwin';    OSXSystemProfile
+      when 'DragonFly'; DragonFlySystemProfile
+      when 'FreeBSD';   FreeBSDSystemProfile
+      when 'Linux';     detect_using_release_file || LinuxSystemProfile
+      end
+    end
+
+    def self.detect_using_release_file
+      {
+        'debian_version' => DebianSystemProfile,
+        'redhat-release' => RedhatSystemProfile,
+        'arch-release'   => ArchSystemProfile,
+        'system-release' => FedoraSystemProfile,
+        # 'gentoo-release' =>
+        # 'SuSE-release'   =>
+      }.selekt {|release_file, system_profile|
+        File.exists? "/etc/#{release_file}"
+      }.values.first
+    end
+  end
+end

data/lib/babushka/system_matcher.rb

@@ -0,0 +1,53 @@
+module Babushka
+  class SystemMatcher
+    attr_reader :system, :flavour, :name, :pkg_helper_key
+
+    def initialize system, flavour, name, pkg_helper_key
+      @system, @flavour, @name, @pkg_helper_key = system, flavour, name, pkg_helper_key
+    end
+
+    def list
+      [name, flavour, pkg_helper_key, system, :all].compact
+    end
+
+    def matches? specs
+      # TODO: shouldn't this just be:
+      # (list & [*specs]).any?
+      [*specs].any? {|spec| first_nonmatch_for(spec).nil? }
+    end
+
+    def differentiator_for specs
+      [*specs].map {|spec|
+        first_nonmatch_for spec
+      }.sort_by {|spec|
+        [:system, :flavour, :name].index spec
+      }.compact.last
+    end
+
+    private
+
+    def first_nonmatch_for spec
+      if spec == :all
+        nil
+      elsif SystemDefinitions.all_systems.include? spec
+        spec == system ? nil : :system
+      elsif PkgHelper.all_manager_keys.include? spec
+        spec == pkg_helper_key ? nil : :pkg_helper
+      elsif our_flavours.include? spec
+        spec == flavour ? nil : :flavour
+      elsif our_flavour_names.include? spec
+        spec == name ? nil : :name
+      else
+        :system
+      end
+    end
+
+    def our_flavours
+      SystemDefinitions.names[system].keys
+    end
+
+    def our_flavour_names
+      SystemDefinitions.names[system][flavour].values
+    end
+  end
+end

data/lib/babushka/system_profile.rb

@@ -3,27 +3,27 @@ module Babushka
     include ShellHelpers
     extend ShellHelpers
 
-    def self.for_host
-      {
-        'Linux' => LinuxSystemProfile,
-        'Darwin' => OSXSystemProfile,
-        'DragonFly' => DragonFlySystemProfile,
-        'FreeBSD' => FreeBSDSystemProfile
-      }[shell('uname -s')].try(:for_flavour)
+    def matcher
+      @matcher ||= SystemMatcher.new(system, flavour, name, pkg_helper_key)
     end
 
-    def self.for_flavour
-      new
+    def matches?(specs) matcher.matches?(specs) end
+    def match_list()    matcher.list end
+
+    def differentiator_for(specs)
+      differentiator = matcher.differentiator_for(specs)
+      send("#{differentiator}_str") unless differentiator.nil?
     end
 
     def version_info
       @_version_info ||= get_version_info
     end
 
-    def linux?; false end
-    def osx?; false end
-    def bsd?; false end
-    def pkg_helper; nil end
+    def linux?; system == :linux end
+    def osx?;   system == :osx end
+    def bsd?;   system == :bsd end
+
+    def pkg_helper; UnknownPkgHelper end
     def pkg_helper_key; pkg_helper.try(:manager_key) end
     def pkg_helper_str; pkg_helper_key.to_s.capitalize end
     # The extension that dynamic libraries are given on this system. On linux
@@ -31,18 +31,25 @@ module Babushka
     def library_ext; 'so' end
 
     def cpu_type
-      shell('uname -p').tap {|result|
-        result.replace shell('uname -m') if result[/unknown|\s/]
+      shell('uname -m').tap {|result|
         # These replacements are taken from PhusionPassenger::PlatformInfo.cpu_architectures
         result.replace 'x86' if result[/^i.86$/]
         result.replace 'x86_64' if result == 'amd64'
       }
     end
 
+    def cpus
+      raise "#{self.class}#cpus is unimplemented."
+    end
+
     def total_memory
       raise "#{self.class}#total_memory is unimplemented."
     end
 
+    def public_ip
+      raise "#{self.class}#public_ip is unimplemented."
+    end
+
     def description
       [
         (flavour_str unless flavour_str == system_str),
@@ -55,65 +62,23 @@ module Babushka
     def name
       (SystemDefinitions.names[system][flavour] || {})[release]
     end
+
     def name_str
       (SystemDefinitions.descriptions[system][flavour] || {})[release]
     end
+  end
 
-    def match_list
-      [name, flavour, pkg_helper_key, system, :all].compact
-    end
-
-    def matches? specs
-      [*specs].any? {|spec| first_nonmatch_for(spec).nil? }
-    end
-
-    def first_nonmatch_for spec
-      if spec == :all
-        nil
-      elsif SystemDefinitions.all_systems.include? spec
-        spec == system ? nil : :system
-      elsif PkgHelper.all_manager_keys.include? spec
-        spec == pkg_helper_key ? nil : :pkg_helper
-      elsif our_flavours.include? spec
-        spec == flavour ? nil : :flavour
-      elsif our_flavour_names.include? spec
-        spec == name ? nil : :name
-      else
-        :system
-      end
-    end
-
-    def differentiator_for specs
-      nonmatches = [*specs].map {|spec|
-        first_nonmatch_for spec
-      }.sort_by {|spec|
-        [:system, :flavour, :name].index spec
-      }.compact
-      send "#{nonmatches.last}_str" unless nonmatches.empty?
-    end
-
-    def our_flavours
-      SystemDefinitions.names[system].keys
-    end
-    def our_flavour_names
-      SystemDefinitions.names[system][flavour].values
-    end
-
-    def flavour_str_map
-      # Only required for names that can't be auto-capitalized,
-      # e.g. :ubuntu => 'Ubuntu' isn't required.
-      {
-        :linux => {
-          :centos => 'CentOS',
-          :redhat => 'Red Hat'
-        }
-      }
+  class UnknownSystem < SystemProfile
+    def description
+      "Unknown system"
     end
 
+    def system; :unknown end
+    def flavour; :unknown end
+    def name; :unknown end
   end
 
   class OSXSystemProfile < SystemProfile
-    def osx?; true end
     def library_ext; 'bundle' end
     def system; :osx end
     def system_str; 'Mac OS X' end
@@ -123,11 +88,18 @@ module Babushka
     def release; version.match(/^\d+\.\d+/).to_s end
     def get_version_info; shell 'sw_vers' end
     def pkg_helper; BrewHelper end
+    def cpus; shell('sysctl -n hw.ncpu').to_i end
     def total_memory; shell("sysctl -a").val_for("hw.memsize").to_i end
+
+    def public_ip
+      shell('ifconfig',
+        shell('netstat -nr').val_for("default").scan(/\w+$/).first
+      ).val_for("inet").scan(/^[\d\.]+/).first
+    end
+
   end
 
   class BSDSystemProfile < SystemProfile
-    def bsd?; true end
     def system; :bsd end
     def system_str; 'BSD' end
     def flavour; :unknown end
@@ -152,30 +124,19 @@ module Babushka
   end
 
   class LinuxSystemProfile < SystemProfile
-    def linux?; true end
     def system; :linux end
     def system_str; 'Linux' end
     def flavour; :unknown end
-    def flavour_str; flavour_str_map[system][flavour] end
+    def flavour_str; 'Linux' end
     def version; 'unknown' end
     def release; version end
+    def cpus; shell("cat /proc/cpuinfo | grep '^processor\\b' | wc -l").to_i end
+    def total_memory; shell("free -b").val_for("Mem").scan(/^\d+\b/).first.to_i end
 
-    def self.for_flavour
-      (detect_using_release_file || LinuxSystemProfile).new
-    end
-
-    private
-
-    def self.detect_using_release_file
-      {
-        'debian_version' => DebianSystemProfile,
-        'redhat-release' => RedhatSystemProfile,
-        'arch-release'   => ArchSystemProfile,
-        # 'gentoo-release' =>
-        # 'SuSE-release'   =>
-      }.selekt {|release_file, system_profile|
-        File.exists? "/etc/#{release_file}"
-      }.values.first
+    def public_ip
+      shell('ifconfig',
+        shell('netstat -nr').val_for("0.0.0.0").scan(/\w+$/).first
+      ).val_for("inet addr").scan(/^[\d\.]+/).first
     end
   end
 
@@ -185,22 +146,39 @@ module Babushka
     def version; version_info.val_for 'Release' end
     def name; version_info.val_for('Codename').to_sym end
     def get_version_info; ensure_lsb_release and shell('lsb_release -a') end
+    def pkg_helper; AptHelper end
+
     def ensure_lsb_release
       which('lsb_release') or log("Babushka uses `lsb_release` to learn about debian-based systems.") {
         AptHelper.install!('lsb-release')
       }
     end
-    def pkg_helper; AptHelper end
-    def total_memory; shell("free -b").val_for("Mem").scan(/^\d+\b/).first.to_i end
   end
 
   class RedhatSystemProfile < LinuxSystemProfile
-    def flavour; version_info[/^Red Hat/i] ? :redhat : version_info[/^\w+/].downcase.to_sym end
-    def version; version_info[/release [\d\.]+ \((\w+)\)/i, 1] || version_info[/release ([\d\.]+)/i, 1] end
-    def get_version_info; File.read '/etc/redhat-release' end
+    def flavour
+      version_info[/^Red Hat/i] ? :redhat : version_info[/^\w+/].downcase.to_sym
+    end
+
+    def flavour_str
+      {
+        :centos => 'CentOS',
+        :redhat => 'Red Hat'
+      }[flavour]
+    end
+
+    def version
+      version_info[/release [\d\.]+ \((\w+)\)/i, 1] || version_info[/release ([\d\.]+)/i, 1]
+    end
+
+    def get_version_info; File.read('/etc/redhat-release') end
     def pkg_helper; YumHelper end
   end
 
+  class FedoraSystemProfile < RedhatSystemProfile
+    def get_version_info; File.read('/etc/system-release') end
+  end
+
   class ArchSystemProfile < LinuxSystemProfile
     def get_version_info; 'rolling' end
     def pkg_helper; PacmanHelper end