bits-installer 0.3.1 → 0.3.2

data/ext/apt/extconf.rb

@@ -4,8 +4,13 @@ require 'mkmf-rice'
 reqs = []
 reqs << have_library('apt-pkg')
 
-if not reqs.all? then
-  File.open('Makefile', 'w').write "all:\n\t@echo \"Not building APT extension\""
+unless reqs.all? then
+  File.open 'Makefile', 'w' do |f|
+    f.write "all:\n"
+    f.write "%:\n"
+    f.write "\t@echo \"$@: Not building APT extension\"\n"
+  end
+
   exit 0
 end
 

data/lib/bits/cache.rb

@@ -56,7 +56,7 @@ module Bits::Cache
       return {} unless File.file? path
 
       File.open path do |f|
-        return YAML.load_file f
+        return YAML.load f
       end
     end
   end

data/lib/bits/commands/manifest.rb

@@ -1,6 +1,7 @@
 require 'bits/command'
 require 'bits/logging'
 require 'bits/installer_mixin'
+require 'bits/manifest'
 require 'yaml'
 
 module Bits
@@ -27,38 +28,30 @@ module Bits
 
       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}"
+      manifest = File.open(path) do |f|
+        Bits::Manifest.new YAML.load(f)
       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:"
+      begin
+        packages = resolve_dependencies manifest, criteria
+      rescue Bits::MissingDependencies => e
+        puts "Missing Dependencies:"
 
-          e.missing.each do |m|
-            puts "  - #{m}"
-          end
-
-          return 1
+        e.missing.each do |dep|
+          puts "  - #{dep.atom}"
         end
 
-        packages.each do |package|
-          install_package package, force=ns[:force]
-        end
-      else
-        log.info "No dependencies specified"
+        return 1
+      end
+
+      packages.each do |package|
+        install_package package, force=ns[:force]
       end
 
       return 0

data/lib/bits/commands/sync.rb

@@ -25,9 +25,16 @@ module Bits
 
       clone repo_dir unless File.directory? repo_dir
 
+      log.info "Syncing bits"
+
       Dir.chdir(repo_dir) do
         Bits.spawn [GIT, 'pull', 'origin', 'master']
       end
+
+      providers.each do |provider|
+        log.info "Syncing provider: #{provider.to_s}"
+        provider.sync
+      end
     end
 
     def clone(repo_dir)

data/lib/bits/installer_mixin.rb

@@ -30,7 +30,7 @@ module Bits::InstallerMixin
 
   # Resolve a hash of dependencies with a criteria to packages.
   # Returns [<packages>, error]
-  def resolve_packages(depends, criteria)
+  def resolve_dependencies(manifest, criteria)
     repository = ns[:repository]
 
     raise "No repository in namespace" if repository.nil?
@@ -38,29 +38,16 @@ module Bits::InstallerMixin
     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
-
+    manifest.depends.each do |dep|
       crit = Hash.new
-      crit = criteria[:compiled] unless criteria[:compiled].nil?
-      crit = spec[:compiled] unless spec[:compiled].nil?
+
+      crit.update criteria
+      crit.update dep.parameters
 
       begin
-        packages << repository.find_package(atom, crit)
+        packages << repository.find_package(dep.atom, crit)
       rescue Bits::MissingBit
-        missing << atom
+        missing << dep
       end
     end
 

data/lib/bits/manifest.rb

@@ -0,0 +1,51 @@
+module Bits
+  class Manifest
+    class Dependency
+      attr_reader :atom, :parameters
+
+      def initialize(atom, parameters)
+        @atom = atom
+        @parameters = parameters
+      end
+    end
+
+    attr_reader :depends
+
+    def initialize(root)
+      unless root.kind_of? Hash
+        raise "Manifest is not of type Hash: #{path}"
+      end
+
+      @depends = read_depends root
+    end
+
+    private
+
+    def read_depends(root)
+      depends = root[:depends]
+      return [] if depends.nil?
+
+      unless depends.kind_of? Array
+        raise "Expected Array for :depends but got #{depends.inspect}"
+      end
+
+      list = Array.new
+
+      depends.each do |spec|
+        unless spec.kind_of? Hash
+          raise "Expected Hash for dependency spec but got #{spec.inspect}"
+        end
+
+        atom = spec[:atom]
+
+        if atom.nil?
+          raise "Expected :atom key for dependency"
+        end
+
+        list << Bits::Manifest::Dependency.new(atom, spec)
+      end
+
+      list
+    end
+  end
+end

data/lib/bits/provider/homebrew.rb

@@ -29,7 +29,7 @@ module Bits
     end
 
     def sync
-      log.info "Does not know how to sync homebrew yet"
+      log.warn "Does not know how to sync homebrew yet"
     end
 
     def query(atom)

data/lib/bits/provider/python.rb

@@ -47,9 +47,16 @@ module Bits
     end
 
     def sync
+      # TODO: currently fetching the candidate version is a very slow operation
+      # sinc the initial list of packages does not include it. This needs to
+      # be mitigated somehow.
+
+      log.warn "Syncing without candidate version information"
+
       t = Time.new
 
       sync_file = File.join ns[:bits_dir], "#{provider_id}.sync"
+
       last_sync = get_last_sync sync_file
 
       if last_sync.nil?
@@ -67,10 +74,19 @@ module Bits
     end
 
     def query(package_atom)
-      candidate = get_candidate_version package_atom
-      raise MissingPackage.new package_atom if candidate.nil?
+      candidate = @cache[package_atom]
+
+      candidate_version = if candidate.nil?
+        get_candidate_version package_atom
+      else
+        candidate['version']
+      end
+
+      raise MissingPackage.new package_atom if candidate_version.nil?
+
       current = get_installed_version package_atom
-      Bits::Package.new package_atom, current, candidate
+
+      Bits::Package.new package_atom, current, candidate_version
     end
 
     def install(package)
@@ -121,36 +137,41 @@ module Bits
     def read_partial(last_sync)
       result = @client.call :changelog, last_sync
 
+      log.info "PARTIAL: Syncing #{result.size} python packages"
+
       releases = Hash.new
 
       result.each do |name, version, timestamp, purpose|
         next if purpose != 'new release'
 
         releases[name] = {
-          :atom => name,
-          :candidate => version,
+          'atom' => name,
+          'version' => version,
         }
       end
 
       releases
     end
 
-    # TODO: works really slowly right now, fix it
     def read_full
       remote_packages = @client.call :list_packages
 
-      puts remote_packages.size
+      log.info "FULL: Syncing #{remote_packages.size} python packages"
 
       packages = Hash.new
 
       remote_packages.each do |name|
-        candidate = get_candidate_version name
+        # TODO: currently syncing candidate version is very slow. This needs
+        # to be mitigated.
+
+        #candidate = get_candidate_version name
+        candidate = "0.0.0"
 
         next if candidate.nil?
 
         packages[name] = {
-          :atom => name,
-          :candidate => candidate,
+          'atom' => name,
+          'version' => candidate,
         }
       end
 

data/lib/bits/provider/rubygems.rb

@@ -40,7 +40,7 @@ module Bits
 
       candidates = response['candidates']
 
-      log.info "Synced #{candidates.size} gems"
+      log.info "Syncing #{candidates.size} gems"
 
       cache = candidates.inject({}){|h, i| h[i['atom']] = i; h}
 

data/lib/bits/version.rb

@@ -1,3 +1,3 @@
 module Bits
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bits-installer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -113,6 +113,7 @@ files:
 - lib/bits/commands/manifest.rb
 - lib/bits/commands/show.rb
 - lib/bits/commands/setup.rb
+- lib/bits/manifest.rb
 - lib/bits/package.rb
 - lib/bits/cache.rb
 - lib/bits/user.rb