bits-installer 0.1.0 → 0.1.1

data/lib/bits.rb

@@ -9,6 +9,7 @@ require 'bits/commands/install'
 require 'bits/commands/remove'
 require 'bits/commands/show'
 require 'bits/commands/sync'
+require 'bits/commands/setup'
 
 require 'bits/provider/python'
 require 'bits/provider/apt'

data/lib/bits/bit_declaration.rb

@@ -9,7 +9,7 @@ module Bits
     end
 
     def to_s
-      "<BitReference #{@atom}>"
+      "<BitReference '#{@atom}'>"
     end
   end
 
@@ -25,6 +25,19 @@ module Bits
     end
   end
 
+  class BitDependency
+    attr_reader :atom, :parameters
+
+    def initialize(atom, parameters)
+      @atom = atom
+      @parameters = parameters
+    end
+
+    def to_s
+      "<BitDependency '#{@atom}' parameters=#{@parameters}>"
+    end
+  end
+
   # Class used to manage state of a bit declaration file.
   class BitDeclaration
     attr_accessor :provider_data, :dependencies
@@ -108,7 +121,11 @@ module Bits
             raise "Expected :atom to be not null in dependency"
           end
 
-          h[atom] = BitParameters.new item
+          unless h[atom].nil?
+            raise "Dependency already specified: #{atom}"
+          end
+
+          h[atom] = BitDependency.new atom, item
         end
       end
 

data/lib/bits/commands/install.rb

@@ -31,10 +31,11 @@ module Bits
 
       repository = ns[:repository]
 
-      parameters = {}
-      parameters[:compiled] = ns[:compiled] if ns.has_key? :compiled
+      criteria = {
+        :compiled => ns[:compiled]
+      }
 
-      p = repository.find_package atom, parameters
+      p = repository.find_package atom, criteria
 
       if p.installed? and not ns[:force]
         log.info "Already installed '#{atom}' using provider(s): #{p.providers_s}"

data/lib/bits/commands/setup.rb

@@ -0,0 +1,62 @@
+require 'bits/command'
+require 'bits/logging'
+require 'bits/exceptions'
+
+require 'bits/bit_reader/local'
+require 'bits/bit'
+
+module Bits
+  define_command :setup, :desc => "Setup a local Bits declaration" do
+    include Bits::Logging
+
+    def setup(opts)
+      ns[:compiled] = nil
+
+      opts.banner = "Usage: bits setup"
+      opts.separator ""
+      opts.separator "Setup a local Bits declaration"
+
+      opts.on('--[no-]compiled', "Insist on installing an already compiled variant or not") do |v|
+        ns[:compiled] = v
+      end
+    end
+
+    def entry(args)
+      repository = ns[:repository]
+
+      criteria = {
+        :compiled => ns[:compiled]
+      }
+
+      path = File.join Dir.pwd, 'Bits'
+
+      raise "No such file: #{path}" unless File.file? path
+
+      reader = BitReaderLocal.new path
+
+      bit = Bit.eval reader, nil
+
+      bit.dependencies.each do |atom, dependency|
+        package = repository.find_package dependency.atom, criteria
+
+        if package.installed?
+          log.info "Dependency already installed '#{atom}'"
+          next
+        end
+
+        log.info "Installing dependency '#{atom}'"
+
+        matching = package.matching_ppps
+
+        raise "No matching PPP could be found" if matching.empty?
+
+        ppp = matching[0]
+
+        provider = ppp.provider
+        package = ppp.package
+
+        provider.install package
+      end
+    end
+  end
+end

data/lib/bits/version.rb

@@ -1,3 +1,3 @@
 module Bits
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bits-installer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -108,6 +108,7 @@ files:
 - lib/bits/commands/sync.rb
 - lib/bits/commands/install.rb
 - lib/bits/commands/show.rb
+- lib/bits/commands/setup.rb
 - lib/bits/package.rb
 - lib/bits/user.rb
 - lib/bits/bit_reader/local.rb