bits-installer 0.1.1 → 0.3.0

data/lib/bits/commands/provider_query.rb

@@ -0,0 +1,43 @@
+require 'bits/command'
+require 'bits/logging'
+require 'bits/exceptions'
+
+require 'fileutils'
+
+module Bits
+  define_command :provider_query, \
+    :switch => 'provider-query', \
+    :desc => "Query for an atom using the specified provider" \
+  do
+    include Bits::Logging
+
+    def setup(opts)
+      opts.banner = "Usage: bits query <provider> <atom>"
+    end
+
+    def entry(args)
+      if args.size != 2
+        raise InvalidArgument.new "Expected two arguments"
+      end
+
+      provider_id, atom = args
+      provider_id = provider_id.to_sym
+
+      providers = ns[:providers]
+
+      provider = find_provider providers, provider_id
+
+      raise "No such provider: #{provider_id}" if provider.nil?
+
+      puts provider.query(atom)
+    end
+
+    def find_provider(providers, provider_id)
+      providers.each do |provider|
+        return provider if provider.provider_id == provider_id
+      end
+
+      nil
+    end
+  end
+end

data/lib/bits/commands/provider_sync.rb

@@ -0,0 +1,49 @@
+require 'bits/command'
+require 'bits/logging'
+require 'bits/exceptions'
+
+module Bits
+  define_command :provider_sync, \
+    :switch => 'provider-sync', \
+    :desc => "Sync the specified provider" \
+  do
+    include Bits::Logging
+
+    def setup(opts)
+      opts.banner = "Usage: bits #{switch} <provider>"
+      opts.separator ""
+      opts.separator "Providers:"
+
+      ns[:providers].each do |provider|
+        opts.separator "  #{provider.provider_id}"
+      end
+    end
+
+    def entry(args)
+      if args.size != 1
+        raise InvalidArgument.new "Expected a single argument"
+      end
+
+      provider_id = args.first
+      provider_id = provider_id.to_sym
+
+      providers = ns[:providers]
+
+      provider = find_provider providers, provider_id
+
+      raise "No such provider: #{provider_id}" if provider.nil?
+
+      log.info "Syncing provider: #{provider_id}"
+
+      provider.sync
+    end
+
+    def find_provider(providers, provider_id)
+      providers.each do |provider|
+        return provider if provider.provider_id == provider_id
+      end
+
+      nil
+    end
+  end
+end

data/lib/bits/commands/show.rb

@@ -40,7 +40,7 @@ module Bits
         puts "    Package Atom: #{ppp.package.atom}"
         puts "    Installed: #{ppp.package.installed_s}"
         puts "    Candidate: #{ppp.package.candidate_s}"
-        puts "    Parameters: #{ppp.parameters}"
+        puts "    Parameters: #{ppp.parameters.inspect}"
       end
 
       return 0

data/lib/bits/commands/sync.rb

@@ -5,30 +5,33 @@ require 'bits/exceptions'
 require 'fileutils'
 
 module Bits
-  define_command :sync, :desc => "sync local repository" do
+  define_command :sync, \
+    :desc => "sync local repository" \
+  do
     include Bits::Logging
 
     GIT = 'git'
     CLONE_URL = 'https://github.com/udoprog/bits-repo'
 
     def setup(opts)
-      opts.banner = "Usage: bits sync"
+      opts.banner = "Usage: bits #{switch}"
       opts.separator ""
       opts.separator "Sync local repository"
     end
 
     def entry(args)
-      dir = ns[:local_repository_dir]
+      repo_dir = ns[:repo_dir]
+      providers = ns[:providers]
 
-      setup_original dir unless File.directory? dir
+      clone repo_dir unless File.directory? repo_dir
 
-      Dir.chdir(dir) do
+      Dir.chdir(repo_dir) do
         Bits.spawn [GIT, 'pull', 'origin', 'master']
       end
     end
 
-    def setup_original(dir)
-      Bits.spawn [GIT, 'clone', CLONE_URL, dir]
+    def clone(repo_dir)
+      Bits.spawn [GIT, 'clone', CLONE_URL, repo_dir]
     end
   end
 end

data/lib/bits/exceptions.rb

@@ -1,6 +1,27 @@
 module Bits
   class ProviderException < Exception; end
 
+  class CommandException < Exception; end
+
+  # Is raised when an invalid argument has been passed to a command.
+  # This indicates that the help text for this specific command should
+  # be shown.
+  class InvalidArgument < CommandException; end
+
+  # Indicate that some dependencies are missing
+  class MissingDependencies < CommandException
+    attr_reader :missing
+
+    def initialize(missing)
+      @missing = missing
+      super "Missing dependencies: #{missing_s}"
+    end
+
+    def missing_s
+      @missing.join ', '
+    end
+  end
+
   # Is raised when a package being requested does not exist.
   class MissingPackage < ProviderException; end
 

data/lib/bits/execute_context.rb

@@ -16,6 +16,7 @@ module Bits
       end
     end
 
+    # Run a command and return a boolean indicating weither exitcode is 0
     def run(args, params={})
       params[:ignore_exitcode] = true
       spawn(args, params) == 0

data/lib/bits/external_interface.rb

@@ -8,7 +8,7 @@ module Bits
     class Interface
       include Bits::Logging
 
-      attr_reader :capabilities
+      attr_reader :id, :capabilities, :exitstatus
 
       def initialize(id, args, stdin, stdout, pid)
         @id = id
@@ -17,13 +17,13 @@ module Bits
         @stdout = stdout
         @pid = pid
         @capabilities = []
+        @exitstatus = nil
       end
 
       # end the child process by closing stdin.
       def end
         @stdin.close
-        Process.wait @pid
-        $?
+        reap_child
       end
 
       def info(atom)
@@ -71,14 +71,20 @@ module Bits
       private
 
       def reap_child
-        @stdin.close unless @stdin.nil?
-        @stdout.close unless @stdout.nil?
+        return unless @exitstatus.nil?
+
+        log.debug "Reaping interface: #{id}"
+        return unless @exitstatus.nil?
+        log.debug "stdin=#{@stdin.inspect} stdout=#{@stdout.inspect}"
 
-        @stdin = nil
-        @stdout = nil
+        Process::kill "INT", @pid
+
+        log.debug "Waiting for interface to exit: #{id}"
 
         # don't hang since write might have reaped it already.
-        Process.wait @pid, Process::WNOHANG
+        Process.wait @pid
+
+        @exitstatus = $?.exitstatus
       end
 
       def write(data)

data/lib/bits/installer_mixin.rb

@@ -0,0 +1,96 @@
+require 'highline'
+
+module Bits::InstallerMixin
+  def setup_installer_opts opts
+    opts.on('--[no-]compiled', "Insist on installing an already compiled variant or not") do |v|
+      ns[:compiled] = v
+    end
+
+    opts.on('--force', "Insist on installing even if packages already installed") do |v|
+      ns[:force] = v
+    end
+  end
+
+  def install_package package, force=false
+    atom = package.atom
+
+    if package.installed? and not force
+      log.info "Already installed '#{atom}' using provider(s): #{package.providers_s}"
+      return
+    end
+
+    matching = package.matching_ppps
+
+    raise "No matching PPP could be found" if matching.empty?
+
+    ppp = pick_one atom, matching
+
+    install_ppp atom, ppp
+  end
+
+  # Resolve a hash of dependencies with a criteria to packages.
+  # Returns [<packages>, error]
+  def resolve_packages(depends, criteria)
+    repository = ns[:repository]
+
+    raise "No repository in namespace" if repository.nil?
+
+    packages = Array.new
+    missing = Array.new
+
+    unless depends.kind_of? Array
+      raise ":depends should be a List"
+    end
+
+    depends.each do |spec|
+      unless spec.kind_of? Hash
+        raise "dependency should be of type Hash"
+      end
+
+      atom = spec[:atom]
+
+      if atom.nil?
+        raise "dependency must specify :atom"
+      end
+
+      crit = Hash.new
+      crit = criteria[:compiled] unless criteria[:compiled].nil?
+      crit = spec[:compiled] unless spec[:compiled].nil?
+
+      begin
+        packages << repository.find_package(atom, crit)
+      rescue Bits::MissingBit
+        missing << atom
+      end
+    end
+
+    unless missing.empty?
+      raise Bits::MissingDependencies.new missing
+    end
+
+    packages
+  end
+
+  private
+
+  def pick_one(atom, matching)
+    return matching[0] if matching.size == 1
+
+    hl = HighLine.new $stdin
+
+    hl.choose do |menu|
+      menu.prompt = "Which provider would you like to install '#{atom}' with?"
+      matching.each do |match|
+        menu.choice(match.provider.provider_id) { match }
+      end
+    end
+  end
+
+  def install_ppp(atom, ppp)
+    provider = ppp.provider
+    package = ppp.package
+
+    log.info "Installing '#{atom}' using provider: #{provider.provider_id}"
+    provider.install package
+  end
+end

data/lib/bits/package_proxy.rb

@@ -5,9 +5,10 @@ module Bits
   # This allows for eager loading and lazy lookup of if a specific atom can be
   # considered as 'installed' or not.
   class PackageProxy
-    attr_accessor :ppps, :criteria
+    attr_accessor :atom, :ppps, :criteria
 
-    def initialize(ppps, criteria)
+    def initialize(atom, ppps, criteria)
+      @atom = atom
       @ppps = ppps
       @criteria = criteria
     end

data/lib/bits/provider.rb

@@ -16,6 +16,14 @@ module Bits
       @ns = ns
     end
 
+    def setup
+      raise "not implemented: setup"
+    end
+
+    def sync
+      raise "not implemented: sync"
+    end
+
     def query(atom)
       raise "not implemented: query"
     end
@@ -64,7 +72,7 @@ module Bits
           attr_reader :provider_id, :desc, :name
 
           def to_s
-            "#<Bits::Provider::#{@name}>"
+            "Bits::Provider::#{@name}"
           end
         end
       end

data/lib/bits/provider/apt.rb

@@ -39,6 +39,16 @@ module Bits
       true
     end
 
+    def setup; end
+
+    def sync
+      execute do
+        unless run [APT_GET, 'update']
+          raise "Could not update apt provider"
+        end
+      end
+    end
+
     def query(atom)
       result = Apt::Cache::policy(atom)
 

data/lib/bits/provider/homebrew.rb

@@ -1,14 +1,7 @@
-$old = Array.new $:
-
-HAS_HOMEBREW = begin
-  $: << '/usr/local/Library/Homebrew'
-  require 'global'
-  require 'formula'
-  true
-rescue LoadError
-  $:.replace $old
-  false
-end
+require 'bits/logging'
+require 'bits/command_provider'
+require 'bits/provider_reporting'
+require 'bits/external_interface'
 
 module Bits
   define_provider :homebrew, \
@@ -17,27 +10,35 @@ module Bits
     include Bits::Logging
     include Bits::CommandProvider
     include Bits::ProviderReporting
+    include Bits::ExternalInterface
 
-    BREW = 'apt-get'
+    BREW = 'brew'
 
     def self.check
-      unless HAS_HOMEBREW
-        check_error "homebrew is not available on this system"
+      unless self.setup_interface :ruby, :capabilities => [:homebrew]
+        check_error "Could not setup required interface"
         return false
       end
 
-      log.debug "homebrew is available"
+      log.debug "Homebrew is available"
       true
     end
 
-    def query(atom)
-      begin
-        f = Formula.factory(atom)
-      rescue FormulaUnavailableError
-        raise MissingPackage.new(atom)
-      end
+    def setup
+      @client = interfaces[:ruby]
+    end
 
-      Bits::Package.new(atom, f.installed_version, f.version)
+    def sync
+      log.info "Does not know how to sync homebrew yet"
+    end
+
+    def query(atom)
+      type, info = @client.request :homebrew_info, :package => atom
+      raise MissingPackage.new atom if type == :missing_package
+      raise "Expected info response but got: #{type}" unless type == :info
+      installed = info['installed']
+      candidate = info['candidate']
+      Bits::Package.new(atom, installed, candidate)
     end
 
     def install(package)