rubycut-babushka 0.10.8 → 0.15.6.1

data/lib/babushka/pkg_helpers/brew_helper.rb

@@ -6,19 +6,6 @@ module Babushka
     def manager_key; :brew end
     def manager_dep; 'homebrew' end
 
-    def _install! pkgs, opts
-      check_for_formulas(pkgs) && pkgs.all? {|pkg|
-        log "Installing #{pkg} via #{manager_key}" do
-          shell(
-            "#{pkg_cmd} install #{cmdline_spec_for pkg} #{opts}",
-            :sudo => should_sudo?,
-            :log => true,
-            :closing_status => :status_only
-          )
-        end
-      }
-    end
-
     def update_pkg_lists_if_required
       super.tap {|result|
         pkg_list_dir.touch if result
@@ -35,18 +22,23 @@ module Babushka
       super || !installed_pkgs_path.hypothetically_writable?
     end
 
-
     private
 
-    class LibraryDep
-      attr_reader :names
-      def initialize *names
-        @names = names
-      end
+    def has_pkg? pkg
+      versions_of(pkg).sort.reverse.detect {|version| pkg.matches? version }
     end
 
-    def _has? pkg
-      versions_of(pkg).sort.reverse.detect {|version| pkg.matches? version }
+    def install_pkgs! pkgs, opts
+      check_for_formulas(pkgs) && pkgs.all? {|pkg|
+        log "Installing #{pkg} via #{manager_key}" do
+          shell(
+            "#{pkg_cmd} install #{cmdline_spec_for pkg} #{opts}",
+            :sudo => should_sudo?,
+            :log => true,
+            :closing_status => :status_only
+          )
+        end
+      }
     end
 
     def check_for_formulas pkgs
@@ -71,7 +63,7 @@ module Babushka
       }.flatten.select {|i|
         i[/\d/] # For it to be a version, it has to have at least 1 digit.
       }.map {|i|
-        VersionOf i.split('/', 2)
+        Babushka.VersionOf i.split('/', 2)
       }.max.version
     end
 
@@ -89,6 +81,7 @@ module Babushka
     def pkg_update_timeout
       3600 # 1 hour
     end
+
     def pkg_list_dir
       prefix
     end
@@ -96,12 +89,11 @@ module Babushka
     def installed_pkgs_path
       prefix / 'Cellar'
     end
+
     def formulas_path
       prefix / 'Library/Formula'
     end
-    def formula_path_for pkg
-      formulas_path / pkg.to_s.end_with('.rb')
-    end
+
     def homebrew_lib_path
       prefix / 'Library/Homebrew'
     end

data/lib/babushka/pkg_helpers/gem_helper.rb

@@ -6,47 +6,48 @@ module Babushka
     def manager_key; :gem end
     def manager_dep; 'rubygems' end
 
-    def _install! pkgs, opts
-      pkgs.each {|pkg|
-        log_shell "Installing #{pkg} via #{manager_key}",
-          "#{pkg_cmd} install #{cmdline_spec_for pkg} #{opts}",
-          :sudo => should_sudo?
+    def install! pkgs, opts = nil
+      super.tap {
+        shell!('rbenv rehash') if Babushka.ruby.rbenv?
       }
     end
 
     def gem_path_for gem_name, version = nil
-      unless (detected_version = has?(VersionOf(gem_name, version), :log => false)).nil?
-        gem_root / VersionOf(gem_name, detected_version)
+      unless (detected_version = has?(Babushka.VersionOf(gem_name, version), :log => false)).nil?
+        Babushka.ruby.gem_dir / Babushka.VersionOf(gem_name, detected_version)
       end
     end
 
     def bin_path
-      # The directory in which the binaries from gems are found. This is
-      # sometimes different to where `gem` itself is running from.
-      env_info.val_for('EXECUTABLE DIRECTORY').p
+      Babushka.ruby.bin_dir
     end
 
     def gem_root
-      gemdir / 'gems'
+      deprecated! '2013-04-28', :method_name => 'Babushka::GemHelper.gem_root', :instead => 'Babushka.ruby.gem_dir'
+      Babushka.ruby.gem_dir
     end
 
     def gemspec_dir
-      gemdir / 'specifications'
+      deprecated! '2013-04-28', :method_name => 'Babushka::GemHelper.gemspec_dir', :instead => 'Babushka.ruby.gemspec_dir'
+      Babushka.ruby.gemspec_dir
     end
 
     def gemdir
-      env_info.val_for('INSTALLATION DIRECTORY')
+      deprecated! '2013-04-28', :method_name => 'Babushka::GemHelper.gemdir'
+      Babushka.ruby.send(:gem_env).val_for('INSTALLATION DIRECTORY')
     end
 
     def ruby_path
-      env_info.val_for('RUBY EXECUTABLE').p
+      deprecated! '2013-04-28', :method_name => 'Babushka::GemHelper.ruby_path', :instead => 'Babushka.ruby.path'
+      Babushka.ruby.path
     end
 
     def ruby_wrapper_path
-      if ruby_path.to_s['/.rvm/rubies/'].nil?
-        ruby_path
+      deprecated! '2013-04-28', :method_name => 'Babushka::GemHelper.ruby_wrapper_path'
+      if Babushka.ruby.path.to_s['/.rvm/rubies/'].nil?
+        Babushka.ruby.path
       else
-        ruby_path.sub(
+        Babushka.ruby.path.sub(
           # /Users/ben/.rvm/rubies/ruby-1.9.2-p0/bin/ruby
           /^(.*)\/\.rvm\/rubies\/([^\/]+)\/bin\/ruby/
         ) {
@@ -57,19 +58,21 @@ module Babushka
     end
 
     def ruby_arch
+      deprecated! '2013-04-28', :method_name => 'Babushka::GemHelper.ruby_arch'
       if RUBY_PLATFORM =~ /universal/
         "universal"
       elsif RUBY_PLATFORM == "java"
         "java"
       elsif RUBY_PLATFORM =~ /darwin/
         # e.g. "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable x86_64"
-        shell("file -L '#{ruby_path}'").sub(/.* /, '')
+        shell("file -L '#{Babushka.ruby.path}'").sub(/.* /, '')
       else
-        Base.host.cpu_type
+        Babushka.host.cpu_type
       end
     end
 
     def ruby_binary_slug
+      deprecated! '2013-04-28', :method_name => 'Babushka::GemHelper.ruby_binary_slug'
       [
         (defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'),
         RUBY_VERSION,
@@ -79,24 +82,34 @@ module Babushka
     end
 
     def slug_for ruby
+      deprecated! '2013-04-28', :method_name => 'Babushka::GemHelper.slug_for'
       shell %Q{#{ruby} -e "require '#{Babushka::Path.lib / 'babushka'}'; puts Babushka::GemHelper.ruby_binary_slug"}
     end
 
     def should_sudo?
-      super || (gem_root.exists? && !gem_root.writable?)
+      super || (Babushka.ruby.gem_dir.exists? && !Babushka.ruby.gem_dir.writable?)
     end
 
     def version
-      env_info.val_for('RUBYGEMS VERSION').to_version
+      deprecated! '2013-04-28', :method_name => 'Babushka::GemHelper.version', :instead => 'Babushka.ruby.gem_version'
+      Babushka.ruby.gem_version
     end
 
 
     private
 
-    def _has? pkg
+    def has_pkg? pkg
       versions_of(pkg).sort.reverse.detect {|version| pkg.matches? version }
     end
 
+    def install_pkgs! pkgs, opts
+      pkgs.each {|pkg|
+        log_shell "Installing #{pkg} via #{manager_key}",
+          "#{pkg_cmd} install #{cmdline_spec_for pkg} #{opts}",
+          :sudo => should_sudo?
+      }
+    end
+
     def versions_of pkg
       pkg_name = pkg.respond_to?(:name) ? pkg.name : pkg
       gemspecs_for(pkg_name).select {|i|
@@ -109,11 +122,7 @@ module Babushka
     end
 
     def gemspecs_for pkg_name
-      gemspec_dir.glob("#{pkg_name}-*.gemspec")
-    end
-
-    def env_info
-      @_cached_env_info ||= shell('gem env')
+      Babushka.ruby.gemspec_dir.glob("#{pkg_name}-*.gemspec")
     end
   end
   end

data/lib/babushka/pkg_helpers/npm_helper.rb

@@ -8,15 +8,7 @@ module Babushka
 
     private
 
-    def _install! pkgs, opts
-      pkgs.each {|pkg|
-        log_shell "Installing #{pkg} via #{manager_key}",
-          "#{pkg_cmd} install -g #{cmdline_spec_for pkg} #{opts}",
-          :sudo => should_sudo?
-      }
-    end
-
-    def _has? pkg
+    def has_pkg? pkg
       # Some example output:
       #   socket.io@0.6.15      =rauchg active installed remote
       shell("#{pkg_cmd} ls -g").split("\n").grep(
@@ -26,6 +18,14 @@ module Babushka
       }
     end
 
+    def install_pkgs! pkgs, opts
+      pkgs.each {|pkg|
+        log_shell "Installing #{pkg} via #{manager_key}",
+          "#{pkg_cmd} install -g #{cmdline_spec_for pkg} #{opts}",
+          :sudo => should_sudo?
+      }
+    end
+
     def cmdline_spec_for pkg
       if pkg.version.nil?
         # e.g. 'socket.io'

data/lib/babushka/pkg_helpers/pacman_helper.rb

@@ -8,6 +8,10 @@ module Babushka
 
     private
 
+    def has_pkg? pkg_name
+      raw_shell("pacman -Q #{pkg_name}").stderr !~ /not found$/
+    end
+
     # NOTE By default, Arch has sudo's `tty_tickets` option enabled. This will
     # result in sudo asking for your password every single time it's run from
     # Babushka. If you find this annoying, please refer to
@@ -15,13 +19,10 @@ module Babushka
     #
     # tl;dr - Add the following line to /etc/sudoers:
     #         Defaults !tty_tickets
-    def _install! pkgs, opts
+    def install_pkgs! pkgs, opts
       log_shell "Downloading", "#{pkg_cmd} -S --noconfirm #{pkgs.join(' ')}", :sudo => should_sudo?
     end
 
-    def _has? pkg_name
-      raw_shell("pacman -Q #{pkg_name}").stderr !~ /not found$/
-    end
   end
   end
 end

data/lib/babushka/pkg_helpers/pip_helper.rb

@@ -6,26 +6,30 @@ module Babushka
     def pkg_binary; "pip" end
     def manager_key; :pip end
 
-    private
-
-    def _install! pkgs, opts
-      pkgs.each {|pkg|
-        log_shell "Installing #{pkg} via #{manager_key}",
-          "#{pkg_cmd} install #{cmdline_spec_for pkg} #{opts}",
-          :sudo => should_sudo?
-      }
+    def manager_dep
+      'pip'
     end
 
-    def _has? pkg
+    private
+
+    def has_pkg? pkg
       # Some example output:
       #   gunicorn==0.12.0
-      raw_shell("pip freeze '#{pkg.name}'").stdout.split("\n").select {|line|
+      raw_shell("pip freeze").stdout.split("\n").select {|line|
         line[/^#{Regexp.escape(pkg.name)}\=\=/]
       }.any? {|match|
         pkg.matches? match.scan(/\=\=(.*)$/).flatten.first
       }
     end
 
+    def install_pkgs! pkgs, opts
+      pkgs.each {|pkg|
+        log_shell "Installing #{pkg} via #{manager_key}",
+          "#{pkg_cmd} install #{cmdline_spec_for pkg} #{opts}",
+          :sudo => should_sudo?
+      }
+    end
+
     def cmdline_spec_for pkg
       if pkg.version.nil?
         # e.g. 'gunicorn'

data/lib/babushka/pkg_helpers/unknown_pkg_helper.rb

@@ -0,0 +1,19 @@
+module Babushka
+  class UnknownPkgHelper < PkgHelper
+  class << self
+    def pkg_type; :unknown end
+    def manager_key; :unknown end
+    def manager_dep; nil end
+
+    private
+
+    def has_pkg? pkg
+      raise UnmeetableDep, "This system's package manager (if it has one) isn't supported."
+    end
+
+    def install_pkgs! pkgs, opts
+      raise UnmeetableDep, "This system's package manager (if it has one) isn't supported."
+    end
+  end
+  end
+end

data/lib/babushka/pkg_helpers/yum_helper.rb

@@ -8,7 +8,7 @@ module Babushka
 
     private
 
-    def _has? pkg_name
+    def has_pkg? pkg_name
       # Some example output, with 'wget' installed:
       #   fedora-13:  'wget.x86_64  1.12-2.fc13       @fedora'
       #   centos-5.5: 'wget.x86_64  1.11.4-2.el5_4.1  installed'

data/lib/babushka/popen.rb

@@ -1,14 +1,17 @@
 module Babushka
   class Open3
     def self.popen3 cmd, opts = {}, &block
-      pipes = { :in => IO::pipe, :out => IO::pipe, :err => IO::pipe }
-      near = { :in => pipes[:in][1], :out => pipes[:out][0], :err => pipes[:err][0] }
-      far = { :in => pipes[:in][0], :out => pipes[:out][1], :err => pipes[:err][1] }
+      pipe_in, pipe_out, pipe_err = IO::pipe, IO::pipe, IO::pipe
+
+      # To write to the process' STDIN, and read from its STDOUT/ERR.
+      near = [pipe_in[1], pipe_out[0], pipe_err[0]]
+      # The other ends, connected to the process.
+      far  = [pipe_in[0], pipe_out[1], pipe_err[1]]
 
       pid = fork {
-        reopen_pipe_for :read, pipes[:in], STDIN
-        reopen_pipe_for :write, pipes[:out], STDOUT
-        reopen_pipe_for :write, pipes[:err], STDERR
+        reopen_pipe_for :read, pipe_in, STDIN
+        reopen_pipe_for :write, pipe_out, STDOUT
+        reopen_pipe_for :write, pipe_err, STDERR
 
         Dir.chdir opts[:chdir] if opts[:chdir]
         ENV.update opts[:env] if opts[:env]
@@ -16,14 +19,14 @@ module Babushka
         exec(*cmd)
       }
 
-      far.values.each(&:close)
-      near.values.each {|p| p.sync = true }
+      near.each {|p| p.sync = true }
+      far.each(&:close)
 
       begin
-        yield near[:in], near[:out], near[:err]
+        yield(*near)
         Process.waitpid2(pid).last.exitstatus
       ensure
-        near.values.each {|p| p.close unless p.closed? }
+        near.each {|p| p.close unless p.closed? }
       end
     end
 

data/lib/babushka/prompt.rb

@@ -22,6 +22,19 @@ module Babushka
     end
 
   class << self
+    def suggest_value_for typo, choices
+      if (possible_matches = choices.similar_to(typo.to_s)).empty?
+        nil # nothing to suggest
+      elsif possible_matches.length == 1
+        confirm "#{"Did you mean".colorize('grey')} '#{possible_matches.first}'#{"?".colorize('grey')}" do
+          possible_matches.first
+        end or false
+      else
+        log "Similar: #{possible_matches.map {|d| "'#{d}'" }.join(', ')}"
+        get_value("Did you mean any of those".colorize('grey'), :default => possible_matches.first)
+      end
+    end
+
     def confirm message, opts = {}, &block
       prompter = (!opts[:always_ask] && respond_to?(:var)) ? :var : :get_value
       answer = send(prompter, message,
@@ -127,7 +140,7 @@ module Babushka
         opts[:retry] || "That wasn't valid"
       elsif value.blank? && !(opts[:default] && opts[:default].empty?)
         "That was blank"
-      elsif !opts[:confirmation] && value == 'y' && !confirm("Wait, do you mean the literal value 'y'?", :default => 'n', :always_ask => true)
+      elsif !opts[:confirmation] && %w[y yes].include?(value) && !confirm("Wait, do you mean the literal value '#{value}'?", :default => 'n', :always_ask => true)
         "Thought so :) Hit enter for the [default]"
       end
 

data/lib/babushka/renderable.rb

@@ -7,7 +7,7 @@ module Babushka
 
     attr_reader :path
     def initialize path
-      @path = path
+      @path = path.p
     end
 
     def render source, opts = {}
@@ -22,7 +22,7 @@ module Babushka
     end
 
     def exists?
-      path.p.exists?
+      path.exists?
     end
 
     def clean?
@@ -33,6 +33,14 @@ module Babushka
       exists? && source_sha == sha_of(source)
     end
 
+    def source_sha
+      path.open {|f|
+        [f.gets, f.gets].compact.detect {|l|
+          l[/^#!/].nil? # The first line that isn't a hashbang
+        } || ''
+      }.scan(/, from ([0-9a-f]{40})\./).flatten.first
+    end
+
     private
 
     def inkan_output_for source, opts = {}
@@ -56,12 +64,6 @@ module Babushka
       raise "Source doesn't exist: #{source.p}" unless source.p.exists?
       Digest::SHA1.hexdigest(source.p.read)
     end
-
-    def source_sha
-      File.open(path.p) {|f|
-        first_line = f.gets
-        first_line[/\A#!/] ? f.gets : first_line
-      }.scan(/, from ([0-9a-f]{40})\./).flatten.first
-    end
   end
 end
+