rubycut-babushka 0.10.8 → 0.15.6.1

data/deps/deprecated.rb

@@ -0,0 +1,16 @@
+{
+  'curl.managed'    => 'curl.bin',
+  'gettext.managed' => 'gettext.lib',
+  'git.managed'     => 'git.bin',
+  'pip.managed'     => 'pip.bin',
+  'ruby.managed'    => 'ruby',
+  'sudo.managed'    => 'sudo.bin',
+  'sudo'            => 'sudo.bin'
+}.each_pair {|old_name, new_name|
+
+  dep old_name do
+    deprecated! "2012-11-14", :method_name => "'#{name}'", :callpoint => false, :instead => "the '#{new_name}' dep"
+    requires new_name
+  end
+
+}

data/deps/dev.rb

@@ -1,12 +1,37 @@
 dep 'build tools' do
   requires {
     on :osx, 'xcode commandline tools'
-    on :snow_leopard, 'llvm in path'
-    on :yum, dep('gcc'), dep('gcc-c++'), dep('autoconf.managed'), dep('automake.managed'), dep('libtool.managed')
-    on :linux, 'build-essential', dep('autoconf.managed'), dep('automake.managed'), dep('libtool.managed')
+    on :yum, dep('gcc'), dep('gcc-c++'), dep('autoconf.bin'), dep('automake.bin'), dep('libtool.bin')
+    on :linux, 'build-essential', dep('autoconf.bin'), dep('automake.bin'), dep('libtool.bin')
   }
 end
 
 dep 'build-essential', :template => 'managed' do
   provides 'gcc', 'g++', 'make', 'ld'
 end
+
+dep 'xcode tools', :template => 'external' do
+  expects 'gcc', 'g++', 'autoconf', 'make', 'ld'
+  otherwise {
+    log "Install Xcode, and then run Babushka again."
+    log "Official download at http://developer.apple.com/technology/xcode.html"
+    confirm "Open in browser now" do
+      shell "open http://developer.apple.com/technology/xcode.html"
+    end
+  }
+end
+
+dep 'xcode commandline tools', :template => 'external' do
+  # See http://kennethreitz.com/xcode-gcc-and-homebrew.html
+  expects %w[cc gcc c++ g++ llvm-gcc llvm-g++ clang] # compilers
+  expects %w[ld libtool] # linkety link
+  expects %w[make] # configure and build tools
+  expects %w[cpp m4 nasm yacc bison] # misc - the preprocessor, assembler, grammar stuff
+  otherwise {
+    log "Install Command Line Tools for Xcode, and then run Babushka again."
+    log "Official pacakge at http://developer.apple.com/downloads"
+    confirm "Open in browser now" do
+      shell "open http://developer.apple.com/downloads"
+    end
+  }
+end

data/deps/git.rb

@@ -1,29 +1,44 @@
-dep 'git' do
-  requires {
+dep 'git', :version do
+  # Accept a rather old git by default, so the installation process
+  # doesn't unnecessarily upgrade it.
+  version.default!('1.6')
+
+  requires_when_unmet {
     # Use the binary installer on OS X, so installing babushka
     # (which pulls in git) doesn't require a compiler.
-    on :osx, 'git.installer'
-    otherwise 'git.managed'
+    on :osx, 'git.installer'.with(owner.version)
+    # git-1.5 can't clone https:// repos properly. Let's build
+    # our own rather than monkeying with unstable debs.
+    on :lenny, 'git.src'.with(owner.version)
+    otherwise 'git.bin'.with(owner.version)
   }
-  met? { in_path? 'git >= 1.5' }
+  met? { in_path? "git >= #{version}" }
 end
 
-dep 'git.managed' do
+dep 'git.bin', :version do
+  # Accept any packaged git that's new enough to have proper https:// support.
+  version.default!('1.6')
   installs {
-    via :macports, 'git-core +svn +bash_completion'
     via :apt, 'git-core'
     via :binpkgsrc, 'scmgit'
     otherwise 'git'
   }
+  provides "git >= #{version}"
 end
 
 dep 'git.installer', :version do
-  version.default!('1.7.7')
-  source "http://git-osx-installer.googlecode.com/files/git-#{version}-intel-universal-snow-leopard.dmg"
+  version.default!('1.8.0')
+  requires 'layout.fhs'.with('/usr/local')
+  source "https://git-osx-installer.googlecode.com/files/git-#{version}-intel-universal-snow-leopard.dmg"
   provides "git >= #{version}"
   after {
-    cd '/usr/local/bin', :create => true, :sudo => true do
-      sudo "ln -sf /usr/local/git/bin/git* ."
-    end
+    sudo "ln -sf /usr/local/git/bin/git* /usr/local/bin"
   }
 end
+
+dep 'git.src', :version do
+  version.default!('1.8.0')
+  requires 'gettext.lib'
+  source "http://git-core.googlecode.com/files/git-#{version}.tar.gz"
+  provides "git >= #{version}"
+end

data/deps/homebrew.rb

@@ -9,7 +9,7 @@ end
 
 dep 'binary.homebrew' do
   requires 'repo.homebrew'
-  met? { which 'brew' }
+  met? { in_path? 'brew' }
   meet { log_shell "Resetting to HEAD", "git reset --hard", :cd => path }
 end
 
@@ -17,7 +17,7 @@ dep 'repo.homebrew' do
   requires_when_unmet 'writable.fhs'.with(path), 'git'
   met? {
     if repo.exists? && !repo.include?('29d85578e75170a6c0eaebda4d701b46f1acf446')
-      unmeetable "There is a non-homebrew repo at #{path}."
+      unmeetable! "There is a non-homebrew repo at #{path}."
     else
       repo.exists?
     end

data/deps/packages.rb

@@ -1,22 +1,21 @@
-dep 'curl.managed' do
-  installs {
-    via :apt, 'curl', 'libcurl4-openssl-dev'
-    via :yum, 'curl'
-  }
-end
+dep 'curl.bin'
 
-dep 'sudo' do
-  requires {
-    on :osx, 'sudo.external'
-    otherwise 'sudo.managed'
+dep 'gettext.lib'
+
+dep 'nodejs.src', :version do
+  deprecated! "2013-03-10", :method_name => "'#{name}'", :callpoint => false, :instead => "the 'nodejs.bin' dep"
+  requires 'nodejs.bin'
+  met? {
+    in_path? 'node >= 0.6.12'
   }
 end
 
-dep 'sudo.external' do
-  expects 'sudo'
-  otherwise {
-    log_error "Your system seems to be missing sudo."
+dep 'nodejs.bin' do
+  installs {
+    via :apt, 'nodejs', 'nodejs-dev'
+    otherwise 'node'
   }
+  provides 'node >= 0.6.12'
 end
 
-dep 'sudo.managed'
+dep 'sudo.bin'

data/deps/pkg_managers.rb

@@ -1,90 +1,50 @@
-dep 'macports.src' do
-  requires 'build tools'
-  provides 'port'
-  prefix '/opt/local'
-  source "http://distfiles.macports.org/MacPorts/MacPorts-1.8.0.tar.gz"
-  after { log_shell "Running port selfupdate", "port selfupdate", :sudo => true }
-end
-
-dep 'apt', :template => 'external' do
-  requires {
-    on :ubuntu, 'main.apt_source', 'universe.apt_source'
-    on :debian, 'main.apt_source'
-  }
-  expects 'apt-get'
-  otherwise {
-    log "Your system doesn't seem to have Apt installed. Is it Debian-based?"
-  }
-end
-
-dep 'pacman', :template => 'external' do
-  expects 'pacman'
-  otherwise {
-    log "You seem to be running Arch Linux, but are missing the Pacman package manager. Something is very, very wrong here."
-  }
-end
-
-meta :apt_source do
-  accepts_list_for :source_name
-  template {
-    met? {
-      source_name.all? {|name|
-        grep(/^deb .* #{Babushka::Base.host.name} (\w+ )*#{Regexp.escape(name.to_s)}/, '/etc/apt/sources.list')
-      }
+dep 'package manager', :cmd do
+  met? {
+    in_path?(cmd).tap {|result|
+      unmeetable! "The package manager's binary, #{cmd}, isn't in the $PATH." unless result
     }
-    before {
-      # Don't edit sources.list unless we know how to edit it for this debian flavour and version.
-      Babushka::AptHelper.source_for_system and Babushka::Base.host.name
-    }
-    meet {
-      source_name.each {|name|
-        append_to_file "deb #{Babushka::AptHelper.source_for_system} #{Babushka::Base.host.name} #{name}", '/etc/apt/sources.list', :sudo => true
-      }
-    }
-    after { Babushka::AptHelper.update_pkg_lists }
   }
 end
 
-dep 'main.apt_source' do
-  source_name 'main'
-end
-
-dep 'universe.apt_source' do
-  source_name 'universe'
+dep 'apt' do
+  requires 'package manager'.with('apt-get')
+  requires {
+    on :ubuntu, 'apt source'.with(:repo => 'main'), 'apt source'.with(:repo => 'universe')
+    on :debian, 'apt source'.with(:repo => 'main')
+  }
 end
 
 dep 'homebrew' do
   requires 'binary.homebrew', 'build tools'
 end
 
-dep 'yum', :template => 'external' do
-  expects 'yum'
-  otherwise {
-    log "Your system doesn't seem to have Yum installed. Is it Redhat-based?"
+dep 'npm' do
+  requires {
+    on :osx, 'npm.src'
+    otherwise 'npm.bin'
   }
 end
 
-dep 'npm' do
-  requires 'nodejs.src'
+dep 'npm.src' do
+  requires 'nodejs.bin'
   met? { which 'npm' }
   meet {
-    log_shell "Installing npm", "curl http://npmjs.org/install.sh | #{'sudo' unless which('node').p.writable?} sh"
+    log_shell "Installing npm", "curl https://npmjs.org/install.sh | #{'sudo' unless which('node').p.writable?} sh"
   }
 end
 
-dep 'nodejs.src' do
-  source 'https://github.com/joyent/node.git'
-  provides 'node >= 0.4', 'node-waf'
+dep 'npm.bin' do
+  provides 'npm >= 1.1'
 end
 
 dep 'pip' do
   requires {
     on :osx, 'pip.src'
-    otherwise 'pip.managed'
+    otherwise 'pip.bin'
   }
 end
 
-dep 'pip.managed' do
+dep 'pip.bin' do
   installs 'python-pip'
 end
 
@@ -94,17 +54,3 @@ dep 'pip.src' do
     log_shell "Installing pip", "python setup.py install", :sudo => !which('python').p.writable?
   }
 end
-
-dep 'binpkgsrc', :template => 'external' do
-  expects 'pkg_radd'
-  otherwise {
-    log "You seem to be running DragonflyBSD or NETBSD, but are missing the pkgsrc package manager. Something is very, very wrong here."
-  }
-end
-
-dep 'binports', :template => 'external' do
-  expects 'pkg_add'
-  otherwise {
-    log "You seem to be running FreeBSD, but are missing the ports package manager. Something is very, very wrong here."
-  }
-end

data/deps/ruby.rb

@@ -1,23 +1,9 @@
-dep 'ruby' do
-  met? {
-    in_path? ['ruby >= 1.8.6', 'irb']
-  }
-  requires_when_unmet {
-    on :osx, 'ruby.external'
-    otherwise 'ruby.managed'
-  }
-end
-
-dep 'ruby.managed' do
+dep 'ruby', :template => 'bin' do
   installs {
-    via :maverick, %w[ruby ruby1.8-dev]
-    via :apt, %w[ruby irb ruby1.8-dev libopenssl-ruby]
+    via [:lenny, :hardy, :lucid], %w[ruby irb ruby1.8-dev libopenssl-ruby]
+    via :apt, %w[ruby ruby1.8-dev]
     via :yum, %w[ruby ruby-irb]
+    otherwise 'ruby'
   }
-  provides %w[ruby irb]
-end
-
-dep 'ruby.external' do
-  expects 'ruby >= 1.8.6', 'irb'
-  otherwise { log_error "This system should already have ruby on it." }
+  provides 'ruby >= 1.8.6', 'irb'
 end

data/deps/rubygems.rb

@@ -1,13 +1,13 @@
 dep 'rubygems', :version do
-  version.default!('1.8.10')
+  version.default!('1.8.23')
   requires 'ruby'
-  requires_when_unmet 'curl.managed'
+  requires_when_unmet 'curl.bin'
   met? {
     # We check for ruby here too to make sure `ruby` and `gem` run from the same place.
     in_path? ["gem >= #{version}", 'ruby']
   }
   meet {
-    handle_source "http://production.cf.rubygems.org/rubygems/rubygems-#{version}.tgz" do
+    Babushka::Resource.extract "http://production.cf.rubygems.org/rubygems/rubygems-#{version}.tgz" do
       log_shell "Installing rubygems-#{version}", "ruby setup.rb", :spinner => true, :sudo => !File.writable?(which('ruby'))
     end
   }

data/deps/system.rb

@@ -1,10 +1,10 @@
 dep 'admins can sudo' do
-  requires 'admin group', 'sudo'
+  requires 'admin group', 'sudo.bin'
   met? { !sudo('cat /etc/sudoers').split("\n").grep(/^%admin/).empty? }
   meet { append_to_file '%admin  ALL=(ALL) ALL', '/etc/sudoers', :sudo => true }
 end
 
 dep 'admin group' do
-  met? { grep(/^admin\:/, '/etc/group') }
+  met? { '/etc/group'.p.grep(/^admin\:/) }
   meet { sudo 'groupadd admin' }
 end

data/deps/templates/app.rb

@@ -1,66 +1,85 @@
 meta :app do
   accepts_list_for :source
   accepts_list_for :prefix, %w[~/Applications /Applications]
-  accepts_list_for :extra_source
-  accepts_list_for :provides, :name
+  accepts_value_for :provides, :name
+  accepts_value_for :version, nil
   accepts_block_for :current_version do |path| nil end
-  accepts_block_for :latest_version
+  accepts_list_for :sparkle
 
-  def app_name_match
-    provides.first.to_s.sub(/\.app$/, '*.app')
+  def app
+    Babushka.VersionOf(provides, version)
   end
 
-  def check_version path
-    current = current_version.call(path)
-    if current.nil? || version.nil?
-      debug "Can't check versions without both current and latest."
-      true
-    elsif current >= version
-      log_ok "#{name} is up to date at #{current}."
-    else
-      log "#{name} could be updated from #{current} to #{version}."
-    end
+  def app_name_matcher
+    app.name.sub(/\.app$/, '*.app')
   end
 
-  def prefix_to_use
-    prefix.map(&:p).find {|pre|
-      pre.directory?
-    } || '/Applications'.p
+  def app_location
+    prefix.find {|p|
+      (p.to_s / app_name_matcher).glob.select {|entry|
+        (entry / 'Contents/MacOS').exists?
+      }.first
+    }
   end
 
-  def discover_latest_version
-    latest_value = latest_version.call
-    # TODO this is just to detect the default block and ignore it. Yuck :)
-    set_version latest_value unless latest_value == true
+  def prefix_to_use
+    prefix.map(&:p).find(&:directory?) || '/Applications'.p
   end
 
-  template {
-    prepare {
-      setup_source_uris
+  def app_in_path?
+    app_location.tap {|path|
+      if path
+        log "Found #{app.name} in #{path}."
+      else
+        log "Couldn't find #{provides}."
+      end
     }
+  end
+
+  def get_source_from_sparkle
+    require 'rexml/document'
+    require 'net/http'
 
+    log_block 'Querying sparkle' do
+      sparkle.map {|uri|
+        Net::HTTP.get(URI.parse(uri))
+      }.map {|response|
+        REXML::Document.new(response)
+      }.map {|doc|
+        doc.elements['rss/channel/item/enclosure'].attributes['url']
+      }
+    end
+  end
+
+  template {
     met? {
-      discover_latest_version
-      installed = app_dir app_name_match
-      (installed && check_version(installed)).tap {|result|
-        log "Found at #{installed}." if result
+      app_in_path? and
+      Babushka::PathChecker.matching_versions?([app]) {|cmd|
+        current_version.call(app_location / provides)
       }
     }
 
+    prepare {
+      # Append any sparkle URLs found to the list of sources to process.
+      source get_source_from_sparkle
+    }
+
     meet {
-      process_sources {|archive|
-        Dir.glob("**/#{app_name_match}").select {|entry|
-          (entry / 'Contents/MacOS').exists? # must be an app bundle itself
-        }.reject {|entry|
-          entry['.app/'] # mustn't be inside another app bundle
-        }.map {|entry|
-          pre = prefix_to_use
-          target_path = pre / File.basename(entry)
-          if !target_path.exists? || confirm("Overwrite #{target_path}?") { target_path.rm }
+      source.each {|uri|
+        Babushka::Resource.extract(uri) {|archive|
+          Dir.glob("**/#{app_name_matcher}").select {|entry|
+            (entry / 'Contents/MacOS').exists? # must be an app bundle itself
+          }.reject {|entry|
+            entry['.app/'] # mustn't be inside another app bundle
+          }.map {|entry|
+            pre = prefix_to_use
+            target_path = pre / File.basename(entry)
             log_block("Found #{entry}, copying to #{pre}") {
-              entry.p.copy target_path
+              if !target_path.exists? || confirm("Overwrite #{target_path}?") { target_path.rm }
+                entry.p.copy target_path
+              end
             }
-          end
+          }
         }
       }
     }