bits-installer 0.1.1 → 0.3.0

data/lib/bits.rb

@@ -1,40 +1,44 @@
 require 'optparse'
 
-require 'bits/backend/local'
 require 'bits/backend/join'
+require 'bits/backend/local'
+require 'bits/external_interface'
+require 'bits/logging'
 require 'bits/package'
 require 'bits/repository'
+require 'bits/user'
 
 require 'bits/commands/install'
 require 'bits/commands/remove'
+require 'bits/commands/setup'
 require 'bits/commands/show'
 require 'bits/commands/sync'
-require 'bits/commands/setup'
+require 'bits/commands/query'
+require 'bits/commands/manifest'
+require 'bits/commands/provider_query'
+require 'bits/commands/provider_sync'
 
-require 'bits/provider/python'
 require 'bits/provider/apt'
-require 'bits/provider/portage'
 require 'bits/provider/homebrew'
-
-require 'bits/external_interface'
-require 'bits/user'
+require 'bits/provider/portage'
+require 'bits/provider/python'
+require 'bits/provider/rubygems'
 
 module Bits
   class << self
+    DEFAULT_COMMAND = 'manifest'
+
     def parse_options(args)
       ns = {}
 
-      subcommands = Hash.new
-      available_providers = Array.new
-      unavailable_providers = Array.new
+      avail_commands = Bits.commands.values.sort_by{|c| c.command_id.to_s}
+      avail_providers = Bits.providers.values.sort_by{|p| p.provider_id.to_s}
+
+      commands = Hash.new
 
       global = OptionParser.new do |global_opts|
         global_opts.banner = "Usage: bits <command> [options]"
 
-        global_opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-          ns[:verbose] = v
-        end
-
         global_opts.on("-d", "--debug", "Enable debug logging") do |v|
           @log.level = Log4r::DEBUG
         end
@@ -42,91 +46,94 @@ module Bits
         global_opts.separator ""
         global_opts.separator "Available commands:"
 
-        Bits.commands.values.sort_by{|c| c.command_id.to_s}.each do |klass|
-          global_opts.separator "  #{klass.command_id}: #{klass.desc}"
-          subcommands[klass.command_id] = klass
+        avail_commands.each do |klass|
+          global_opts.separator "  #{klass.switch}: #{klass.desc}"
+          commands[klass.switch] = klass
         end
 
-        Bits.providers.values.sort_by{|p| p.provider_id.to_s}.each do |provider_class|
-          if provider_class.check
-            available_providers << provider_class
-          else
-            unavailable_providers << provider_class
-          end
-        end
+        global_opts.separator ""
 
         global_opts.separator "Providers:"
 
-        available_providers.each do |provider_class|
-          global_opts.separator "  #{provider_class.provider_id}: #{provider_class.desc}"
-        end
-
-        global_opts.separator "Unavailable providers:"
-        unavailable_providers.each do |klass|
-          global_opts.separator "  #{klass.provider_id}: #{klass.last_check_error}"
+        avail_providers.each do |klass|
+          global_opts.separator "  #{klass.provider_id}: #{klass.desc}"
         end
       end
 
       global.order!
       command = ARGV.shift
 
+      checked_providers = avail_providers.select do |klass|
+        @log.debug "Checking provider: #{klass.provider_id}"
+        klass.check
+      end
+
+      command = DEFAULT_COMMAND if command.nil?
+
       if command.nil? then
         $stderr.puts global.help
         exit 0
       end
 
-      command = command.to_sym
-
-      if subcommands[command].nil? then
+      if commands[command].nil? then
         $stderr.puts "No such command: #{command}"
         $stderr.puts global.help
         exit 0
       end
 
-      command_klass = subcommands[command]
-      command = command_klass.new ns
+      bits_dir = setup_bits_dir
+      repo_dir = setup_repo_dir bits_dir
+      backend = setup_backend repo_dir
 
-      command_parser = OptionParser.new do |opts|
-        command.setup opts
+      ns[:user] = setup_user
+      ns[:bits_dir] = bits_dir
+      ns[:repo_dir] = repo_dir
+
+      providers = checked_providers.collect do |klass|
+        provider = klass.new ns
+        provider.setup
+        provider
       end
 
-      command_parser.order!
+      repository = Bits::Repository.new(providers, backend)
 
-      ns[:user] = setup_user
-      ns[:local_repository_dir] = setup_local_repository_dir ns
+      ns[:providers] = providers
+      ns[:repository] = repository
 
+      command_klass = commands[command]
       command = command_klass.new ns
-      providers = setup_providers available_providers, ns
-      backend = setup_backend ns
 
-      ns[:repository] = Bits::Repository.new(providers, backend)
+      command_parser = OptionParser.new do |opts|
+        command.setup opts
+      end
+
+      command_parser.order!
 
-      return ARGV, command
+      return ARGV, command, command_parser
     end
 
-    # Setup the path to the local repository directory.
-    def setup_local_repository_dir(ns)
+    def setup_bits_dir
       home = ENV['HOME']
       raise "HOME environment variable not defined" if home.nil?
-      File.join home, '.bits'
+      bits_dir = File.join home, '.bits'
+      FileUtils.mkdir_p bits_dir unless File.directory? bits_dir
+      bits_dir
+    end
+
+    # Setup the path to the local repository directory.
+    def setup_repo_dir(bits_dir)
+      File.join bits_dir, 'bits'
     end
 
     def setup_logging
       log = Log4r::Logger.new 'Bits'
       log.outputters << Log4r::Outputter.stdout
-      log.level =  Log4r::INFO
+      log.level = Log4r::INFO
       log
     end
 
-    def setup_providers(available_providers, ns)
-      available_providers.collect do |provider_class|
-        provider_class.new ns
-      end
-    end
-
-    def setup_backend(ns)
+    def setup_backend(local_dir)
       cwd_dir = File.join Dir.pwd, 'bits'
-      local_dir = ns[:local_repository_dir]
 
       backends = Array.new
 
@@ -139,10 +146,14 @@ module Bits
     def main(args)
       @log = setup_logging
 
-      args, command = parse_options(args)
+      args, command, command_parser = parse_options(args)
 
       begin
         command.entry args
+      rescue InvalidArgument => e
+        $stderr.puts "Argument Error: #{e}"
+        $stderr.puts command_parser.help
+        return 1
       ensure
         Bits::ExternalInterface.close_interfaces
       end

data/lib/bits/cache.rb

@@ -0,0 +1,67 @@
+require 'fileutils'
+
+module Bits::Cache
+  class FileCache
+    attr_reader :cache
+
+    def initialize(path)
+      @path = path
+      @cache = Hash.new
+    end
+
+    def bucket_for(bucket_name)
+      bucket = cache[bucket_name]
+      return bucket unless bucket.nil?
+      cache[bucket_name] = load_bucket bucket_name
+    end
+
+    def []=(key, value)
+      bucket = bucket_for(bucket_name key)
+      bucket[key] = value
+    end
+
+    def [](key)
+      bucket = bucket_for(bucket_name key)
+      return nil if bucket.nil?
+      bucket[key]
+    end
+
+    def set(content)
+      content.each do |key, value|
+        self[key] = value
+      end
+    end
+
+    def save
+      FileUtils.mkdir_p @path unless File.directory? @path
+
+      @cache.each do |bucket_name, bucket|
+        path = File.join @path, "#{bucket_name}.yml"
+
+        File.open path, 'w' do |f|
+          YAML.dump bucket, f
+        end
+      end
+    end
+
+    def bucket_name(string)
+      string[0..1].each_byte.map { |b| sprintf("%02x",b) }.join
+    end
+
+    private
+
+    def load_bucket(bucket_name)
+      path = File.join @path, "#{bucket_name}.yml"
+
+      return {} unless File.file? path
+
+      File.open path do |f|
+        return YAML.load_file f
+      end
+    end
+  end
+
+  def setup_cache(directory, cache_id)
+    FileCache.new File.join(directory, cache_id.to_s)
+  end
+end

data/lib/bits/command.rb

@@ -5,12 +5,16 @@ module Bits
   class Command
     attr_reader :ns
 
+    def initialize(ns)
+      @ns = ns
+    end
+
     def setup(opts)
       raise "not implemented: setup"
     end
 
-    def initialize(ns)
-      @ns = ns
+    def entry(args)
+      raise "not implemented: entry"
     end
   end
 
@@ -25,17 +29,27 @@ module Bits
       end
 
       desc = params[:desc] || "(no description)"
+      switch = params[:switch] || command_id.to_s
 
       klass = Class.new(Command) do
         @command_id = command_id
         @name = command_id.to_s.capitalize
         @desc = desc
+        @switch = switch
+
+        def switch
+          self.class.switch
+        end
+
+        def to_s
+          self.class.to_s
+        end
 
         class << self
-          attr_reader :command_id, :name, :desc
+          attr_reader :command_id, :name, :desc, :switch
 
           def to_s
-            "Bits::#{@name}"
+            "Bits::Command::#{@name}"
           end
         end
       end

data/lib/bits/commands/install.rb

@@ -1,24 +1,25 @@
 require 'bits/command'
 require 'bits/logging'
-
-require 'highline'
+require 'bits/installer_mixin'
 
 module Bits
-  define_command :install, :desc => 'Install a package' do
+  define_command :install, \
+    :desc => 'Install a package' \
+  do
     include Bits::Logging
+    include Bits::InstallerMixin
 
     def setup(opts)
       ns[:force] = false
       ns[:compiled] = nil
 
-      opts.banner = "Usage: bits install <bit>"
+      opts.banner = "Usage: bits #{switch} <bit>"
+
       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
+      setup_installer_opts opts
     end
 
     def entry(args)
@@ -35,42 +36,8 @@ module Bits
         :compiled => ns[:compiled]
       }
 
-      p = repository.find_package atom, criteria
-
-      if p.installed? and not ns[:force]
-        log.info "Already installed '#{atom}' using provider(s): #{p.providers_s}"
-        return 0
-      end
-
-      matching = p.matching_ppps
-
-      raise "No matching PPP could be found" if matching.empty?
-
-      ppp = pick_one atom, matching
-
-      install_ppp atom, ppp
-      return 0
-    end
-
-    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
+      package = repository.find_package atom, criteria
+      install_package package, force=ns[:force]
     end
   end
 end

data/lib/bits/commands/manifest.rb

@@ -0,0 +1,71 @@
+require 'bits/command'
+require 'bits/logging'
+require 'bits/installer_mixin'
+require 'yaml'
+
+module Bits
+  define_command :manifest, :desc => 'Run a manifest (this is the default action)' do
+    include Bits::Logging
+    include Bits::InstallerMixin
+
+    BITS_MANIFEST = "Bits"
+
+    def setup(opts)
+      ns[:compiled] = nil
+
+      opts.banner = "Usage: bits manifest [path]"
+
+      setup_installer_opts opts
+    end
+
+    def entry(args)
+      if args.empty? then
+        path = File.join Dir.pwd, BITS_MANIFEST
+      else
+        path = args.first
+      end
+
+      raise "No manifest in path: #{path}" unless File.file? path
+
+      manifest = YAML.load File.new(path)
+
+      unless manifest.kind_of? Hash
+        raise "Manifest is not of type Hash: #{path}"
+      end
+
+      depends = manifest[:depends]
+
+      criteria = {
+        :compiled => ns[:compiled]
+      }
+
+      log.info "Running manifest: #{path}"
+
+      unless depends.nil?
+        begin
+          packages = resolve_packages depends, criteria
+        rescue Bits::MissingDependencies => e
+          puts "Missing Dependencies:"
+
+          e.missing.each do |m|
+            puts "  - #{m}"
+          end
+
+          return 1
+        end
+
+        packages.each do |package|
+          log.info "Installing package: #{package}"
+          install_package package, force=ns[:force]
+        end
+      else
+        log.info "No dependencies specified"
+      end
+
+      return 0
+    end
+
+    private
+
+  end
+end