rubycut-babushka 0.10.8 → 0.15.6.1

data/deps/templates/bin.rb

@@ -0,0 +1,16 @@
+meta :bin do
+  accepts_list_for :installs, :basename, :choose_with => :via
+  accepts_list_for :provides, :basename, :choose_with => :via
+
+  template {
+    requires_when_unmet Babushka.host.pkg_helper.manager_dep
+
+    met? {
+      in_path? provides
+    }
+
+    meet {
+      Babushka.host.pkg_helper.handle_install! installs
+    }
+  }
+end

data/deps/templates/installer.rb

@@ -1,11 +1,9 @@
 meta :installer do
   accepts_list_for :source
-  accepts_list_for :extra_source
   accepts_list_for :provides, :basename, :choose_with => :via
   accepts_list_for :prefix, %w[~/Applications /Applications]
 
   template {
-    prepare { setup_source_uris }
     met? { in_path?(provides) }
 
     # At the moment, we just try to install every .[m]pkg in the archive.
@@ -17,13 +15,15 @@ meta :installer do
     # end
     #
     meet {
-      process_sources {|archive|
-        Dir.glob("**/*pkg").select {|entry|
-          entry[/\.m?pkg$/] # Everything ending in .pkg or .mpkg
-        }.reject {|entry|
-          entry[/\.m?pkg\//] # and isn't inside another package
-        }.map {|entry|
-          log_shell "Installing #{entry}", "installer -target / -pkg '#{entry}'", :sudo => true
+      source.each {|uri|
+        Babushka::Resource.extract(uri) {|archive|
+          Dir.glob("**/*pkg").select {|entry|
+            entry[/\.m?pkg$/] # Everything ending in .pkg or .mpkg
+          }.reject {|entry|
+            entry[/\.m?pkg\//] # and isn't inside another package
+          }.map {|entry|
+            log_shell "Installing #{entry}", "installer -target / -pkg '#{entry}'", :sudo => true
+          }
         }
       }
     }

data/deps/templates/lib.rb

@@ -0,0 +1,17 @@
+meta :lib do
+  accepts_list_for :installs, :basename, :choose_with => :via
+
+  template {
+    requires Babushka.host.pkg_helper.manager_dep
+
+    met? {
+      installs.all? {|pkg|
+        Babushka.host.pkg_helper.has?(pkg)
+      }
+    }
+
+    meet {
+      Babushka.host.pkg_helper.handle_install! installs
+    }
+  }
+end

data/deps/templates/managed.rb

@@ -7,28 +7,7 @@ managed_template = L{
     packages.all? {|pkg| pkg_manager.has? pkg }
   end
 
-  def add_cfg_deps
-    cfg.all? {|target|
-      target_file = target.to_s
-      source_file = load_path.dirname / name / "#{File.basename(target_file)}.erb"
-      requires(dep("#{File.basename(target_file)} for #{name}") {
-        met? { babushka_config? target_file }
-        before {
-          shell "mkdir -p #{File.dirname(target_file)}", :sudo => !File.writable?(File.dirname(File.dirname(target_file)))
-          shell "chmod o+rx #{File.dirname(target_file)}", :sudo => !File.writable?(File.dirname(target_file))
-        }
-        meet { render_erb source_file, :to => target_file, :sudo => !File.writable?(File.dirname(target_file)) }
-        on :linux do
-          after { service_name.each {|s| sudo "/etc/init.d/#{s} restart" } }
-        end
-      })
-    }
-  end
-
   requires pkg_manager.manager_dep
-  prepare {
-    add_cfg_deps
-  }
   met? {
     if installs.blank?
       log_ok "Nothing to install on #{pkg_manager.manager_key}-based systems."
@@ -47,19 +26,9 @@ managed_template = L{
 meta :managed do
   accepts_list_for :installs, :basename, :choose_with => :via
   accepts_list_for :provides, :basename, :choose_with => :via
-  accepts_list_for :service_name, :name
-  accepts_list_for :cfg
 
   def pkg_manager
-    Babushka::Base.host.pkg_helper
-  end
-
-  def chooser
-    Babushka::Base.host.match_list
-  end
-
-  def chooser_choices
-    Babushka::PkgHelper.all_manager_keys + Babushka::SystemDefinitions.all_tokens
+    Babushka.host.pkg_helper
   end
 
   template(&managed_template)
@@ -68,8 +37,6 @@ end
 meta :gem do
   accepts_list_for :installs, :basename, :choose_with => :via
   accepts_list_for :provides, :basename, :choose_with => :via
-  accepts_list_for :service_name, :name
-  accepts_list_for :cfg
 
   def pkg_manager
     Babushka::GemHelper
@@ -81,8 +48,6 @@ end
 meta :pip do
   accepts_list_for :installs, :basename, :choose_with => :via
   accepts_list_for :provides, :basename, :choose_with => :via
-  accepts_list_for :service_name, :name
-  accepts_list_for :cfg
 
   def pkg_manager
     Babushka::PipHelper
@@ -94,8 +59,6 @@ end
 meta :npm do
   accepts_list_for :installs, :basename, :choose_with => :via
   accepts_list_for :provides, [], :choose_with => :via
-  accepts_list_for :service_name, :name
-  accepts_list_for :cfg
 
   def pkg_manager
     Babushka::NpmHelper

data/deps/templates/src.rb

@@ -22,11 +22,11 @@ meta :src do
   accepts_block_for(:postinstall)
 
   accepts_block_for(:process_source) {
-    call_task(:preconfigure) and
-    call_task(:configure) and
-    call_task(:build) and
-    call_task(:install) and
-    call_task(:postinstall)
+    invoke(:preconfigure) and
+    invoke(:configure) and
+    invoke(:build) and
+    invoke(:install) and
+    invoke(:postinstall)
   }
 
   def default_configure_command
@@ -34,9 +34,17 @@ meta :src do
   end
 
   template {
-    requires 'build tools', 'curl.managed'
-    prepare { setup_source_uris }
+    requires 'build tools', 'curl.bin'
     met? { in_path?(provides) }
-    meet { process_sources { call_task :process_source } }
+    meet {
+      extra_source.each {|uri|
+        Babushka::Resource.extract(uri)
+      }
+      source.each {|uri|
+        Babushka::Resource.extract(uri) {|archive|
+          invoke(:process_source)
+        }
+      }
+    }
   }
 end

data/deps/templates/task.rb

@@ -0,0 +1,11 @@
+meta :task do
+  accepts_block_for :run
+  template {
+    met? {
+      @run
+    }
+    meet {
+      invoke(:run).tap {|result| @run = result }
+    }
+  }
+end

data/deps/templates/tmbundle.rb

@@ -5,11 +5,25 @@ meta :tmbundle, :for => :osx do
     '~/Library/Application Support/TextMate/Bundles' / name
   end
 
+  def repo
+    @repo ||= Babushka::GitRepo.new(path).tap {|r|
+      r.repo_shell("git fetch") if r.exists?
+    }
+  end
+
   template {
     requires 'benhoskings:TextMate.app'
-    met? { path.dir? }
+    met? { repo.exists? && !repo.behind? }
     before { shell "mkdir -p '#{path.parent}'" }
-    meet { git source, :to => path }
+    meet {
+      if repo.exists?
+        log_block "Updating to #{repo.current_remote_branch} (#{repo.resolve(repo.current_remote_branch)})" do
+          repo.reset_hard!(repo.current_remote_branch)
+        end
+      else
+        git source, :to => path
+      end
+    }
     after { log_shell "Telling TextMate to reload bundles", %Q{osascript -e 'tell app "TextMate" to reload bundles'} }
   }
 end

data/lib/babushka.rb

@@ -1,5 +1,5 @@
 module Babushka
-  VERSION        = '0.10.8'
+  VERSION        = '0.15.6'
   WorkingPrefix  = '~/.babushka'
   SourcePrefix   = '~/.babushka/sources'
   BuildPrefix    = '~/.babushka/build'
@@ -11,10 +11,9 @@ module Babushka
   module Path
     def self.binary() File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__ end
     def self.bin() File.dirname(binary) end
-    # this is not correct in gem version
     def self.path() File.dirname(bin) end
     def self.lib() File.join(path, 'lib') end
-    def self.run_from_path?() ENV['PATH'].split(':').include? File.dirname($0) end
+    def self.run_from_path?() ENV['PATH'].split(':').include?(File.dirname($0)) end
   end
 end
 

data/lib/babushka/accepts_block_for.rb

@@ -8,10 +8,12 @@ module Babushka
       def default_blocks
         merged_default_blocks_for self
       end
+
       def merged_default_blocks_for klass
         parent_values = klass == DepDefiner ? {} : merged_default_blocks_for(klass.superclass)
         parent_values.merge(default_blocks_for(klass))
       end
+
       def default_blocks_for klass
         (@@default_blocks ||= Hashish.hash)[klass]
       end
@@ -41,7 +43,7 @@ module Babushka
     end
 
     def default_block_for block_name
-      differentiator = Base.host.differentiator_for payload[block_name].keys
+      differentiator = Babushka.host.differentiator_for payload[block_name].keys
       L{
         debug "#{block_name} not defined#{" for #{differentiator}" unless differentiator.nil?}."
         true
@@ -56,7 +58,7 @@ module Babushka
       raise "#{method_name} only accepts args like :on => :linux (as well as a block arg)." unless args.empty? || args.first.is_a?(Hash)
 
       payload[method_name] ||= {}
-      chosen_on = (args.first || {})[:on] || @current_platform || :all
+      chosen_on = (args.first || {})[:on] || current_platform || :all
       payload[method_name][chosen_on] = block
     end
 
@@ -65,7 +67,7 @@ module Babushka
     end
 
     def specific_block_for method_name
-      payload[method_name][(Base.host.match_list & payload[method_name].keys).first] ||
+      payload[method_name][(Babushka.host.match_list & payload[method_name].keys).first] ||
       default_blocks[method_name]
     end
   end

data/lib/babushka/asset.rb

@@ -0,0 +1,172 @@
+module Babushka
+  class AssetError < StandardError
+  end
+
+  class Asset
+    extend ShellHelpers
+    include ShellHelpers
+    include PathHelpers
+
+    def self.detect_type_by_extension path
+      ASSET_TYPES.keys.detect {|key|
+        ASSET_TYPES[key][:exts].any? {|extension|
+          path.has_extension? extension
+        }
+      }
+    end
+
+    def self.detect_type_by_contents path
+      ASSET_TYPES.keys.detect {|key|
+        shell("file '#{path}'")[ASSET_TYPES[key][:file_match]]
+      }
+    end
+
+    def self.type path
+      detect_type_by_extension(path) || detect_type_by_contents(path)
+    end
+
+    attr_reader :path, :name
+
+    def initialize path, opts = {}
+      @path = path.p
+      @name = ASSET_TYPES[type][:exts].inject(filename) {|fn,t| fn.gsub(/\.#{t}$/, '') }
+    end
+
+    def filename
+      path.basename.to_s
+    end
+
+    def type
+      self.class.type path
+    end
+
+    def supported?
+      !type.nil?
+    end
+
+    def extract &block
+      cd(build_prefix, :create => true) { process_extract(&block) }
+    end
+
+    def process_extract &block
+      shell("mkdir -p '#{name}'") and
+      cd(name) {
+        unless ShellHelpers.log_shell("Extracting #{filename}", extract_command)
+          LogHelpers.log_error "Couldn't extract #{path} - probably a bad download."
+        else
+          cd(content_subdir) {
+            block.nil? or block.call(self)
+          }
+        end
+      }.tap {|result|
+        if result
+          LogHelpers.log_block "Cleaning up" do
+            (build_prefix / name).p.rm
+          end
+        else
+          LogHelpers.log "The build artefacts are in #{build_prefix / name / content_subdir}."
+        end
+      }
+    end
+
+    def content_subdir
+      identity_dirs.reject {|dir|
+        %w[app pkg bundle tmbundle prefPane].map {|i|
+          /\.#{i}$/
+        }.any? {|dont_descend|
+          dir[dont_descend]
+        }
+      }.first
+    end
+
+    def identity_dirs
+      everything = Dir.glob('*')
+      if everything.length == 1 && File.directory?(everything.first)
+        everything
+      else
+        Dir.glob('*/').map {|dir| dir.chomp('/') }.select {|dir|
+          dir.downcase.gsub(/[ \-_\.]/, '') == name.downcase.gsub(/[ \-_\.]/, '')
+        }
+      end
+    end
+
+    def build_prefix
+      BuildPrefix
+    end
+  end
+
+  class FileAsset < Asset
+    def extract &block
+      in_download_dir {
+        block.call(self)
+      }
+    end
+  end
+
+  class TarAsset < Asset
+    def extract_command
+      "tar -#{extract_option(type)}xf '#{path}'"
+    end
+
+    def extract_option type
+      {
+        :tar => '',
+        :gzip => 'z',
+        :bzip2 => 'j'
+      }[type]
+    end
+  end
+
+  class ZipAsset < Asset
+    def extract_command
+      "unzip -o '#{path}'"
+    end
+  end
+
+  class DmgAsset < Asset
+    def extract &block
+      in_download_dir {
+        output = ShellHelpers.log_shell "Attaching #{filename}", "hdiutil attach '#{filename.p.basename}'"
+        if output.nil?
+          LogHelpers.log_error "Couldn't mount #{filename.p}."
+        elsif (path = mountpoint_for(output)).nil?
+          raise "Couldn't find where `hdiutil` mounted #{filename.p}."
+        else
+          cd(path) {
+            block.call(self)
+          }.tap {
+            ShellHelpers.log_shell "Detaching #{filename}", "hdiutil detach '#{path}'"
+          }
+        end
+      }
+    end
+
+    def mountpoint_for output
+      output.scan(/\s+(\/Volumes\/[^\n]+)/).flatten.first
+    end
+  end
+
+  class Asset
+    ASSET_TYPES = {
+      :deb =>   {:exts => %w[deb],          :class => FileAsset, :file_match => 'Debian binary package'},
+      :pkg =>   {:exts => %w[pkg],          :class => FileAsset, :file_match => 'xar archive'},
+      :tar =>   {:exts => %w[tar],          :class => TarAsset,  :file_match => 'tar archive'},
+      :gzip =>  {:exts => %w[tgz tar.gz],   :class => TarAsset,  :file_match => 'gzip compressed data'},
+      :bzip2 => {:exts => %w[tbz2 tar.bz2], :class => TarAsset,  :file_match => 'bzip2 compressed data'},
+      :zip =>   {:exts => %w[zip],          :class => ZipAsset,  :file_match => 'Zip archive data'},
+      :dmg =>   {:exts => %w[dmg],          :class => DmgAsset,  :file_match => 'VAX COFF executable not stripped'}
+    }
+
+    def self.for path, opts = {}
+      path = path.p
+      filename = path.basename.to_s
+      raise AssetError, "The archive #{filename} does not exist." unless path.exists?
+      if (asset_type = ASSET_TYPES[type(path)]).nil?
+        raise AssetError, "Don't know how to extract #{filename}."
+      else
+        asset_type[:class].new(path, opts)
+      end
+    end
+  end
+
+end